Split SimulationView, rename Extractor

src/Renderer/Interface/FilesIO.fs

@@ -626,7 +626,7 @@ let checkMemoryContents (projectPath:string) (comp: Component) : Component =
 /// load a component from its canvas and other elements
 let makeLoadedComponentFromCanvasData (canvas: CanvasState) filePath timeStamp waveInfo (sheetInfo:SheetInfo option) =
     let projectPath = dirName filePath
-    let inputs, outputs = Extractor.parseDiagramSignature canvas
+    let inputs, outputs = CanvasExtractor.parseDiagramSignature canvas
     //printfn "parsed component"
     let comps,conns = canvas
     let comps' = List.map (checkMemoryContents projectPath) comps

src/Renderer/Playground.fs

@@ -283,8 +283,8 @@ module Misc =
 
 
     let highLightChangedConnections dispatch =
-        dispatch (Sheet (SheetT.Msg.SelectWires Extractor.debugChangedConnections))
-        Extractor.debugChangedConnections <- []
+        dispatch (Sheet (SheetT.Msg.SelectWires CanvasExtractor.debugChangedConnections))
+        CanvasExtractor.debugChangedConnections <- []
 
 module Memory =
     open Fable.Core

src/Renderer/Renderer.fsproj

@@ -28,7 +28,7 @@
     <Compile Include="Simulator\SimulatorTypes.fs" />
     <Compile Include="Simulator\TruthTableTypes.fs" />
     <Compile Include="Simulator\NumberHelpers.fs" />
-    <Compile Include="Simulator\Extractor.fs" />
+    <Compile Include="Simulator\CanvasExtractor.fs" />
     <Compile Include="Simulator\SynchronousUtils.fs" />
     <Compile Include="Simulator\CanvasStateAnalyser.fs" />
     <Compile Include="Simulator\GraphBuilder.fs" />
@@ -96,6 +96,7 @@
     <Compile Include="UI\TopMenuView.fs" />
     <Compile Include="UI\CustomCompPorts.fs" />
     <Compile Include="UI\SimulationView.fs" />
+    <Compile Include="UI\StepSimulationTop.fs" />
     <Compile Include="UI\TruthTable\TruthTableReduce.fs" />
     <Compile Include="UI\TruthTable\TruthTableCreate.fs" />
     <Compile Include="UI\TruthTable\ConstraintReduceView.fs" />

src/Renderer/Simulator/Extractor.fs → src/Renderer/Simulator/CanvasExtractor.fs

@@ -1,4 +1,4 @@
-module Extractor
+module CanvasExtractor
 
 open CommonTypes
 open Fable.Core

src/Renderer/Simulator/FastSim/FastExtract.fs

@@ -257,7 +257,7 @@ let extractViewers (simulationData: SimulationData) : ((string * string) * int *
         getFLabel fs fid, width, extractFastSimulationOutput fs simulationData.ClockTickNumber fid (OutputPortNumber 0))
 
 let compareLoadedStates (fs: FastSimulation) (canv: CanvasState) (p: Project option) =
-    List.forall (fun ldc -> Extractor.loadedComponentIsSameAsProject canv ldc p) fs.SimulatedCanvasState
+    List.forall (fun ldc -> CanvasExtractor.loadedComponentIsSameAsProject canv ldc p) fs.SimulatedCanvasState
 
 /// Get the input value of a fast component as a bigint.
 /// fc: the fast component to get the input from.

src/Renderer/Simulator/Simulator.fs

@@ -12,7 +12,7 @@ open SynchronousUtils
 open GraphBuilder
 open GraphMerger
 open SimulationGraphAnalyser
-open Extractor
+open CanvasExtractor
 
 // Building a SimulationGraph has four phases (not precisely in order of execution):
 // 1. Building a simulation graph made of SimulationComponents.
@@ -63,7 +63,7 @@ let rec sheetsNeeded (ldcs: LoadedComponent list) (sheet: string) : string list
 /// diagramName: name of current open sheet.
 /// return updated list of all LDCs
 let getUpdatedLoadedComponentState diagramName canvasState projLdcs =
-    let ldc' = Extractor.extractLoadedSimulatorComponent canvasState diagramName
+    let ldc' = CanvasExtractor.extractLoadedSimulatorComponent canvasState diagramName
 
     let ldcs =
         let ldcIsOpen ldc = ldc.Name = diagramName
@@ -97,8 +97,8 @@ let getCurrentSimulationState
                     List.tryFind (fun (ldc': LoadedComponent) -> ldc'.Name = ldc.Name) p.LoadedComponents
                 with
                 | _, None -> false
-                | false, Some ldc' -> Extractor.loadedComponentIsEqual ldc ldc'
-                | true, Some _ -> Extractor.stateIsEqual ldc.CanvasState canvState)
+                | false, Some ldc' -> CanvasExtractor.loadedComponentIsEqual ldc ldc'
+                | true, Some _ -> CanvasExtractor.stateIsEqual ldc.CanvasState canvState)
 
         match simIsUpToDate, p.OpenFileName = fs.SimulatedTopSheet with
         | false, _ -> SimOutOfDate

src/Renderer/UI/CatalogueView.fs

@@ -58,8 +58,8 @@ let private makeCustom styles model dispatch (loadedComponent: LoadedComponent)
     menuItem styles loadedComponent.Name (fun _ ->
         let custom = Custom {
             Name = loadedComponent.Name
-            InputLabels = Extractor.getOrderedCompLabels (Input1 (0, None)) canvas
-            OutputLabels = Extractor.getOrderedCompLabels (Output 0) canvas
+            InputLabels = CanvasExtractor.getOrderedCompLabels (Input1 (0, None)) canvas
+            OutputLabels = CanvasExtractor.getOrderedCompLabels (Output 0) canvas
             Form = loadedComponent.Form
             Description = loadedComponent.Description
         }
@@ -87,8 +87,8 @@ let private makeVerilog styles model dispatch (loadedComponent: LoadedComponent)
     menuItem styles loadedComponent.Name (fun _ ->
         let verilog = Custom {
             Name = loadedComponent.Name
-            InputLabels = Extractor.getOrderedCompLabels (Input1 (0, None)) canvas
-            OutputLabels = Extractor.getOrderedCompLabels (Output 0) canvas
+            InputLabels = CanvasExtractor.getOrderedCompLabels (Input1 (0, None)) canvas
+            OutputLabels = CanvasExtractor.getOrderedCompLabels (Output 0) canvas
             Form = loadedComponent.Form
             Description = loadedComponent.Description
         }

src/Renderer/UI/CustomCompPorts.fs

@@ -19,7 +19,7 @@ open ModelType
 open ModelHelpers
 open CommonTypes
 open FilesIO
-open Extractor
+open CanvasExtractor
 open PopupHelpers
 open MenuHelpers
 

src/Renderer/UI/MainView.fs

@@ -136,7 +136,7 @@ let viewSimSubTab canvasState model dispatch =
     | StepSim -> 
         div [ Style [Width "90%"; MarginLeft "5%"; MarginTop "15px" ] ] [
             Heading.h4 [] [ str "Step Simulation" ]
-            SimulationView.viewSimulation canvasState model dispatch
+            StepSimulationTop.viewSimulation canvasState model dispatch
         ]
     | TruthTable ->
         div [ Style [Width "90%"; MarginLeft "5%"; MarginTop "15px" ] ] [

src/Renderer/UI/MenuHelpers.fs

@@ -12,7 +12,7 @@ open ModelType
 open ModelHelpers
 open CommonTypes
 open FilesIO
-open Extractor
+open CanvasExtractor
 open Notifications
 open PopupHelpers
 open DrawModelType

src/Renderer/UI/MiscMenuView.fs

@@ -10,7 +10,7 @@ open CommonTypes
 open ModelType
 open ModelHelpers
 open MenuHelpers
-open Extractor
+open CanvasExtractor
 open FilesIO
 open PopupHelpers
 open DrawModelType