chnage to circuit router

tomcl · Dec 12, 2020 · 419eff9 · 419eff9
1 parent 706f2f0
commit 419eff9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/Renderer/Draw2dWrapper/draw2d_digital_connections.js b/src/Renderer/Draw2dWrapper/draw2d_digital_connections.js
@@ -104,8 +104,8 @@ draw2d.policy.line.OrthogonalSelectionFeedbackPolicy = draw2d.policy.line.Orthog
 })
 
 /// Setup circuit-like connections in the diagram.
-let router = new draw2d.layout.connection.InteractiveManhattanConnectionRouter();
-//let router = new draw2d.layout.connection.CircuitConnectionRouter();
+//let router = new draw2d.layout.connection.InteractiveManhattanConnectionRouter();
+let router = new draw2d.layout.connection.CircuitConnectionRouter();
 // TODO: use CircuitConnectionRouter instead?
 router.abortRoutingOnFirstVertexNode = false;
 

diff --git a/src/Renderer/Interface/JSHelpers.fs b/src/Renderer/Interface/JSHelpers.fs
@@ -91,7 +91,7 @@ let mutable debugLevel = 0
 #endif
 
 /// trace UI execution: "view" - mark view function. "update" print update messages.
-let mutable debugTraceUI: string Set = Set ["view";"update"]
+let mutable debugTraceUI: string Set = Set []
 
 /// Call debugAction() and print its result if debugTraceUI mutable contains string traceCode
 let traceIf traceCode debugAction =

diff --git a/src/Renderer/UI/Update.fs b/src/Renderer/UI/Update.fs
@@ -118,8 +118,14 @@ let private handleJSDiagramMsg msg model =
     | InferWidths () ->
         runBusWidthInference model
     | SetHasUnsavedChanges s -> 
+        let quicklyKnowItHasChanged comps1 comps2 =
+            match (comps1:Component list), (comps2:Component list) with
+            | {Id=id1;X=x1;Y=y1}::_, {Id=id2;X=x2;Y=y2}::_ when id1 = id2 && (x1 <> x2 || y1 <> y2)
+                -> true
+            | _ -> false
         let isNotEquiv (comps1,conns1) (comps2,conns2) =
-            Set comps1 <> Set comps2 || Set conns1 <> Set conns2           
+            quicklyKnowItHasChanged comps1 comps2 ||
+                Set comps1 <> Set comps2 || Set conns1 <> Set conns2           
         let nState = getDetailedState model
         if s && isNotEquiv model.LastDetailedSavedState nState && not model.IsLoading then
             //printfn "Setting Changed %A" s