Fixed serialization bug

jean-bovet · Nov 18, 2022 · b774ed6 · b774ed6
1 parent 94de91f
commit b774ed6
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/BTrain.xcodeproj/project.pbxproj b/BTrain.xcodeproj/project.pbxproj
@@ -1112,6 +1112,7 @@
 			children = (
 				A7F779E2272E20F500E73275 /* TrainControlListView.swift */,
 				A7CA5EBE2795D05A00171398 /* TrainControlActionsView.swift */,
+				A700B21E292741AF001CC33E /* TrainControlScriptView.swift */,
 				A747967E291EA869001DF7FA /* TrainControlHeaderView.swift */,
 				A7F779F72732407E00E73275 /* TrainControlContainerView.swift */,
 				A76507E7275AD1FE0079C71A /* TrainControlLocationView.swift */,
@@ -1121,7 +1122,6 @@
 				A76FD43728FD07A000E1A295 /* TrainControlMoveSheet.swift */,
 				A76FD43928FD07AA00E1A295 /* TrainControlRemoveSheet.swift */,
 				A744D13427659330005C2F37 /* TrainControlRouteView.swift */,
-				A700B21E292741AF001CC33E /* TrainControlScriptView.swift */,
 			);
 			path = "Train Controls";
 			sourceTree = "<group>";

diff --git a/BTrain/Scripts/LayoutScript/LayoutScriptCommand.swift b/BTrain/Scripts/LayoutScript/LayoutScriptCommand.swift
@@ -46,8 +46,8 @@ extension LayoutScriptCommand: Codable {
         self.action = try container.decode(Action.self, forKey: CodingKeys.action)
         self.children = try container.decode([LayoutScriptCommand].self, forKey: CodingKeys.children)
 
-        self.trainId = try container.decode(Identifier<Train>.self, forKey: CodingKeys.train)
-        self.routeScriptId = try container.decode(Identifier<RouteScript>.self, forKey: CodingKeys.route)
+        self.trainId = try container.decodeIfPresent(Identifier<Train>.self, forKey: CodingKeys.train)
+        self.routeScriptId = try container.decodeIfPresent(Identifier<RouteScript>.self, forKey: CodingKeys.route)
     }
 
     func encode(to encoder: Encoder) throws {

diff --git a/BTrain/Views/Document/DocumentView.swift b/BTrain/Views/Document/DocumentView.swift
@@ -89,7 +89,7 @@ struct DocumentView: View {
     }
 
     var displaySheetView: some View {
-        ConfigurationSheet(title: document.displaySheetType.rawValue) {
+        ConfigurationSheet(title: document.displaySheetType.label) {
             switch document.displaySheetType {
             case .layoutScripts:
                 LayoutScriptEditingView(doc: document, layout: document.layout)

diff --git a/BTrain/Views/Scripts/LayoutScript/LayoutScriptEditorView.swift b/BTrain/Views/Scripts/LayoutScript/LayoutScriptEditorView.swift
@@ -16,8 +16,11 @@ struct LayoutScriptEditorView: View {
 
     let doc: LayoutDocument
     let layout: Layout
+
     @ObservedObject var script: LayoutScript
+
     @State private var invalidCommandIds = Set<UUID>()
+    @State private var verifyStatus: RouteScriptValidator.VerifyStatus = .none
 
     var body: some View {
         VStack {
@@ -48,24 +51,42 @@ struct LayoutScriptEditorView: View {
                     Button("Verify") {
                         verify()
                     }
-                    Spacer()
+
+                    switch verifyStatus {
+                    case .none:
+                        Spacer()
+
+                    case .failure:
+                        Text("􀇾")
+                        Spacer()
+
+                    case .success:
+                        Text("􀁢")
+
+                        Spacer()
+                    }
+
                 }
             }
         }
     }    
 
     func verify() {
         invalidCommandIds.removeAll()
+        verifyStatus = .success
 
         for command in script.commands {
             guard let routeScript = layout.routeScripts[command.routeScriptId] else {
+                invalidCommandIds.insert(command.id)
+                verifyStatus = .failure
                 return
             }
 
             var validator = RouteScriptValidator()
             validator.validate(script: routeScript, layout: layout)
             if validator.verifyStatus == .failure {
                 invalidCommandIds.insert(command.id)
+                verifyStatus = .failure
             }
         }
     }

diff --git a/BTrain/Views/Scripts/RouteScript/RouteScriptEditorView.swift b/BTrain/Views/Scripts/RouteScript/RouteScriptEditorView.swift
@@ -47,6 +47,7 @@ struct RouteScriptEditorView: View {
                     Button("Verify") {
                         validator.validate(script: script, layout: layout)
                     }
+
                     switch validator.verifyStatus {
                     case .none:
                         Spacer()

diff --git a/BTrain/Views/Train Controls/TrainControlActionsView.swift b/BTrain/Views/Train Controls/TrainControlActionsView.swift
@@ -29,13 +29,13 @@ struct TrainControlActionsView: View {
 
             Button("􀛷 Stop All") {
                 document.stopAll()
-            }.disabled(!document.trainsThatCanBeStopped)
+            }.disabled(!document.trainsThatCanBeStopped || !document.power)
 
             Spacer().fixedSpace()
 
             Button("􀊆 Finish All") {
                 document.finishAll()
-            }.disabled(!document.trainsThatCanBeFinished)
+            }.disabled(!document.trainsThatCanBeFinished || !document.power)
 
             Spacer()