- Add makie.jl to be used by Makie backends.

- For backwards compatibilty to ModiaResult, also accept ENV["MODIA_PLOT_PACKAGE"] instead of ENV["SignalTablesPlotPackage"] to define plot package - at all places (some parts have been missing).
ModiaSim · Jul 4, 2022 · 514af2e · 514af2e
1 parent 5f3b5b6
commit 514af2e
Show file tree

Hide file tree

Showing 6 changed files with 402 additions and 18 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "SignalTables"
 uuid = "3201582d-3078-4276-ba5d-0a1254d79d7c"
 authors = ["[email protected] <[email protected]>"]
-version = "0.3.1"
+version = "0.3.2"
 
 [deps]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"

diff --git a/docs/src/index.md b/docs/src/index.md
@@ -183,6 +183,13 @@ are different to the Python 2.x version.
 
 ## Release Notes
 
+### version 0.3.2
+
+- Add makie.jl to be used by Makie backends.
+- For backwards compatibilty to ModiaResult, also accept ENV["MODIA_PLOT_PACKAGE"] instead of ENV["SignalTablesPlotPackage"]
+  to define plot package - at all places (some parts have been missing).
+
+
 ### Version 0.3.1
 
 - writeSignalTable(..): Do not store elements, that cannot be mapped to JSON + add _classVersion to signal table on file.

diff --git a/src/PlotPackageDefinition.jl b/src/PlotPackageDefinition.jl
@@ -44,7 +44,7 @@ macro usingPlotPackage()
             println("$expr")
             return esc( :(using $PlotPackage) )
         end
-        
+
     else
         @info "No plot package activated. Using \"SilentNoPlot\"."
         @goto USE_NO_PLOT
@@ -91,23 +91,47 @@ end
 function usePlotPackage(plotPackage::String; pushPreviousOnStack=true)::Bool
     success = true
     if plotPackage == "NoPlot" || plotPackage == "SilentNoPlot"
-        if  pushPreviousOnStack && haskey(ENV, "SignalTablesPlotPackage")
-            push!(PlotPackagesStack, ENV["SignalTablesPlotPackage"])
+        newPlot = true
+        if  pushPreviousOnStack
+            if haskey(ENV, "SignalTablesPlotPackage")
+                push!(PlotPackagesStack, ENV["SignalTablesPlotPackage"])
+            elseif haskey(ENV, "MODIA_PLOT_PACKAGE")
+                push!(PlotPackagesStack, ENV["MODIA_PLOT_PACKAGE"])
+                newPlot=false
+            end
         end
         if plotPackage == "NoPlot"
-            ENV["SignalTablesPlotPackage"] = "NoPlot"
+            if newPlot
+                ENV["SignalTablesPlotPackage"] = "NoPlot"
+            else
+                ENV["MODIA_PLOT_PACKAGE"] = "NoPlot"
+            end
         else
-            ENV["SignalTablesPlotPackage"] = "SilentNoPlot"
+            if newPlot
+                ENV["SignalTablesPlotPackage"] = "SilentNoPlot"
+            else
+                ENV["MODIA_PLOT_PACKAGE"] = "SilentNoPlot"
+            end
         end
     else
         plotPackageName = "SignalTablesInterface_" * plotPackage
         if plotPackage in AvailablePlotPackages
             # Check that plotPackage is defined in current environment
             if isinstalled(plotPackageName)
-                if pushPreviousOnStack && haskey(ENV, "SignalTablesPlotPackage")
-                    push!(PlotPackagesStack, ENV["SignalTablesPlotPackage"])
+                newPlot = true
+                if  pushPreviousOnStack
+                    if haskey(ENV, "SignalTablesPlotPackage")
+                        push!(PlotPackagesStack, ENV["SignalTablesPlotPackage"])
+                    elseif haskey(ENV, "MODIA_PLOT_PACKAGE")
+                        push!(PlotPackagesStack, ENV["MODIA_PLOT_PACKAGE"])
+                        newPlot=false
+                    end
+                end
+                if newPlot
+                    ENV["SignalTablesPlotPackage"] = plotPackage
+                else
+                    ENV["MODIA_PLOT_PACKAGE"] = plotPackage
                 end
-                ENV["SignalTablesPlotPackage"] = plotPackage
             else
                 @warn "... usePlotPackage(\"$plotPackage\"): Call ignored, since package $plotPackageName is not in your current environment"
                 success = false
@@ -132,9 +156,9 @@ function usePreviousPlotPackage()::Bool
     if length(PlotPackagesStack) > 0
         plotPackage = pop!(PlotPackagesStack)
         success = usePlotPackage(plotPackage, pushPreviousOnStack=false)
-    else
-        @warn "usePreviousPlotPackage(): Call ignored, because nothing saved."
-        success = false
+    #else
+    #    @warn "usePreviousPlotPackage(): Call ignored, because nothing saved."
+    #    success = false
     end
     return success
 end
@@ -148,7 +172,5 @@ defined with [`usePlotPackage`](@ref).
 For example, the function may return "GLMakie", "PyPlot" or "NoPlot" or
 or "", if no PlotPackage is defined.
 """
-currentPlotPackage() = haskey(ENV, "SignalTablesPlotPackage") ? ENV["SignalTablesPlotPackage"] : ""
-
-
-
+currentPlotPackage() = haskey(ENV, "SignalTablesPlotPackage") ? ENV["SignalTablesPlotPackage"] : 
+                      (haskey(ENV, "MODIA_PLOT_PACKAGE")      ? ENV["MODIA_PLOT_PACKAGE"]      : "" )
diff --git a/src/SignalTableFunctions.jl b/src/SignalTableFunctions.jl
@@ -676,7 +676,7 @@ the corresponding signals are encoded.
 function encodeSignalTable(signalTable; signalNames=nothing)
     if isSignalTable(signalTable)
         jdict = OrderedDict{String,Any}("_class" => "SignalTable",
-                                        "_classVersion" => version)
+                                        "_classVersion" => version_SignalTable_JSON)
         if isnothing(signalNames)
             signalNames = getSignalNames(signalTable)
         end

diff --git a/src/SignalTables.jl b/src/SignalTables.jl
@@ -1,7 +1,8 @@
 module SignalTables
 
 const path = dirname(dirname(@__FILE__))
-const version = "0.3.1"   # version tag of SignalTables release without "v"
+const version = "0.3.2" 
+const version_SignalTable_JSON = "0.3.1"   # version tag to be stored in JSON files
 
 using  OrderedCollections
 using  Unitful