Design read from TOML files

Author: Brad Carman

Manifest.toml

@@ -2,7 +2,7 @@
 
 julia_version = "1.9.0-rc1"
 manifest_format = "2.0"
-project_hash = "713e17a84cfb50a483b6bccd433ea2ac228a9331"
+project_hash = "245a12c4a05084897342c6385479733236148032"
 
 [[deps.AbstractAlgebra]]
 deps = ["GroupsCore", "InteractiveUtils", "LinearAlgebra", "MacroTools", "Markdown", "Random", "RandomExtensions", "SparseArrays", "Test"]

Project.toml

@@ -8,3 +8,4 @@ FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
 FilterHelpers = "d8f44d74-4a63-4059-add9-16c5740a0809"
 GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
 ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
+TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"

src/ModelingToolkitDesigner.jl

@@ -3,6 +3,7 @@ using GLMakie
 using ModelingToolkit
 using FilterHelpers
 using FileIO
+using TOML
 
 
 #TODO: write out design code
@@ -33,7 +34,7 @@ end
 mutable struct ODESystemDesign
     # parameters::Vector{Parameter}
     # states::Vector{State}
-    namespace::Union{Symbol, Nothing}
+    
     system::ODESystem
     system_color::Symbol
     systems::Vector{ODESystemDesign}
@@ -47,91 +48,89 @@ mutable struct ODESystemDesign
 
 end
 
-function ODESystemDesign(rootnamespace::Union{Symbol, Nothing}, system::ODESystem, maps::Vector{DesignMap}, design::Union{Vector{Pair{ODESystem, NamedTuple}}, Dict}; x=0.0, y=0.0, icon=nothing, wall=:E)
+function design_file(system::ODESystem, path::String)
+    @assert !isnothing(system.gui_metadata) "ODESystem must use @component"
 
-    #update design to a Dict()
-    if design isa Vector
-        pars = design
-        design = Dict()
-        for (sys, args) in pars
-            push!(design, sys.name => args)
-        end
+    # path = joinpath(@__DIR__, "designs")
+    if !isdir(path)
+        mkdir(path)
     end
 
-    println("system: $(system.name)")
-    if !isnothing(rootnamespace)
-        namespace = Symbol(rootnamespace, "₊", system.name)
-    else
-        namespace = system.name
+    parts = split(string(system.gui_metadata.type),'.')
+    for part in parts[1:end-1]
+        path = joinpath(path, part)
+        if !isdir(path)
+            mkdir(path)
+        end
     end
+    file = joinpath(path, "$(parts[end]).toml")
 
-    systems = filter(x-> typeof(x) == ODESystem, ModelingToolkit.get_systems(system))
-    
+    return file
+end
 
-    children = ODESystemDesign[]
-    connectors = ODESystemDesign[]
-    connections = Tuple{ODESystemDesign, ODESystemDesign}[]
-    if !isempty(systems)
-        children_ = filter(x->!ModelingToolkit.isconnector(x), systems)
-        if !isempty(children_)
+function process_children!(children::Vector{ODESystemDesign}, systems::Vector{ODESystem}, design::Dict, maps, design_path, is_connector=false; connectors...)
+    children_ = filter(x->ModelingToolkit.isconnector(x) == is_connector, systems)
+    if !isempty(children_)
+        for (i,c) in enumerate(children_)
+            # key = Symbol(namespace, "₊", c.name)
+            key = string(c.name)
+            kwargs = if haskey(design, key)
+                design[key]
+            else
+                Dict()
+            end
 
-            for (i,c) in enumerate(children_)
-                key = Symbol(namespace, "₊", c.name)
-                kwargs = if haskey(design, key)
-                    design[key]
-                else
-                    NamedTuple()
-                end
-
-                kwargs_pair = Pair[]
-
+            kwargs_pair = Pair[]
+    
+            if !is_connector
                 if !haskey(kwargs, :x) && !haskey(kwargs, :y)
                     push!(kwargs_pair, :x=> i*3*Δh )
                     push!(kwargs_pair, :y=> i*Δh )
                 end
-
-                for (key, value) in pairs(kwargs)
-                    push!(kwargs_pair, key=>value)
+            else
+                if haskey(connectors, c.name)
+                    push!(kwargs_pair, :wall => connectors[c.name])
                 end
-                push!(kwargs_pair, :icon=>find_icon(c))
-
-                push!(children, ODESystemDesign(namespace, c, maps, design; NamedTuple(kwargs_pair)...))                
             end
+    
+            for (key, value) in kwargs
+                push!(kwargs_pair, Symbol(key)=>value)
+            end
+            push!(kwargs_pair, :icon=>find_icon(c))
+    
+            push!(children, ODESystemDesign(c, maps, design_path; NamedTuple(kwargs_pair)...))                
         end
+       
+    end
+    
+end
 
-        connectors_ = filter(x->ModelingToolkit.isconnector(x), systems)
-        if !isempty(connectors_)
-            
-            for (i,c) in enumerate(connectors_)
+function ODESystemDesign(system::ODESystem, maps::Vector{DesignMap}, design_path::String; x=0.0, y=0.0, icon=nothing, wall=:E, kwargs...)
 
-                key = Symbol(namespace, "₊", c.name)
-                kwargs = if haskey(design, key)
-                    design[key]
-                else
-                    NamedTuple()
-                end
+    file = design_file(system, design_path)
+    design = if isfile(file)
+        TOML.parsefile(file)
+    else
+        Dict()
+    end
 
-                kwargs_pair = Pair[]
-                # style = get_style(c)
-                # if !isnothing(style)
-                #     println("found style! $style")
-                #     if haskey(kwargs, :wall)
-                #         kwargs[:wall] = style
-                #     else
-                #         push!(kwargs_pair, :wall=>style)
-                #     end
-                # end
-
-                for (key, value) in pairs(kwargs)
-                    push!(kwargs_pair, key=>value)
-                end
-                push!(kwargs_pair, :icon=>find_icon(c))
+    println("system: $(system.name)")
+    # if !isnothing(rootnamespace)
+    #     namespace = Symbol(rootnamespace, "₊", system.name)
+    # else
+    #     namespace = system.name
+    # end
 
-                
-                push!(connectors, ODESystemDesign(namespace, c, maps, design; NamedTuple(kwargs_pair)...))                
-            end
-        end
+    systems = filter(x-> typeof(x) == ODESystem, ModelingToolkit.get_systems(system))
+    
 
+    children = ODESystemDesign[]
+    connectors = ODESystemDesign[]
+    connections = Tuple{ODESystemDesign, ODESystemDesign}[]
+    if !isempty(systems)
+        
+        process_children!(children, systems, design, maps, design_path, false; kwargs...)
+        process_children!(connectors, systems, design, maps, design_path, true; kwargs...)
 
         for eq in equations(system)
 
@@ -163,16 +162,17 @@ function ODESystemDesign(rootnamespace::Union{Symbol, Nothing}, system::ODESyste
 
 
         end
-        
-        
-    
+   
     end
 
     xy= Observable((x,y))
     color = get_color(system, maps) 
+    if wall isa String
+        wall = Symbol(wall)
+    end
 
 
-    return ODESystemDesign(rootnamespace, system, color, children, connectors, connections, xy, icon, Observable(color), Observable(wall))
+    return ODESystemDesign(system, color, children, connectors, connections, xy, icon, Observable(color), Observable(wall))
 end
 
 function find_icon(sys::ODESystem)

test/designs/Main/system.toml

@@ -0,0 +1,18 @@
+[fluid]
+x = 0.5
+y = -0.5
+
+[res]
+port_a = "W"
+x = 1.0
+
+[src]
+input = "W"
+x = 0.5
+
+[stp]
+x = 0.0
+
+[vol]
+port = "W"
+x = 1.5

test/designs/ModelingToolkitStandardLibrary/Hydraulic/IsothermalCompressible/Pipe.toml

@@ -0,0 +1,52 @@
+[p1]
+port_a = "W"
+x = 0.67
+y = 0.3
+
+[p2]
+port_a = "W"
+x = 0.84
+y = 0.3
+
+[p3]
+port_a = "W"
+x = 1.02
+y = 0.3
+
+[p4]
+port_a = "W"
+x = 1.2
+y = 0.3
+
+[port_a]
+x = 0.54
+y = 0.14
+
+[port_b]
+x = 1.31
+y = 0.15
+
+[v1]
+port = "S"
+x = 0.58
+y = 0.46
+
+[v2]
+port = "S"
+x = 0.76
+y = 0.46
+
+[v3]
+port = "S"
+x = 0.93
+y = 0.46
+
+[v4]
+port = "S"
+x = 1.12
+y = 0.46
+
+[v5]
+port = "S"
+x = 1.3
+y = 0.46