From 705bdd40b6b384e49beb01ef081081827e937844 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Wed, 26 Oct 2022 06:37:55 -0600 Subject: [PATCH] Fixed the layout of the TrafficSimulation page to show longer paths. --- .../traffic/simulation/TrafficSimulationGen.java | 14 +++++--------- .../traffic/simulation/TrafficSimulation.java | 12 +++++------- .../templates/enUS/TrafficSimulationGenPage.hbs | 9 ++++++--- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/simulation/TrafficSimulationGen.java b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/simulation/TrafficSimulationGen.java index 8714b2b9..49424beb 100644 --- a/src/gen/java/org/computate/smartvillageview/enus/model/traffic/simulation/TrafficSimulationGen.java +++ b/src/gen/java/org/computate/smartvillageview/enus/model/traffic/simulation/TrafficSimulationGen.java @@ -1362,15 +1362,13 @@ public static Integer htmlRowTrafficSimulation(String var) { case VAR_sumocfgPath: return 4; case VAR_fcdFilePath: - return 4; - case VAR_netFilePath: - return 4; - case VAR_startSeconds: return 5; + case VAR_startSeconds: + return 6; case VAR_endSeconds: - return 5; + return 6; case VAR_stepSeconds: - return 5; + return 6; default: return BaseModel.htmlRowBaseModel(var); } @@ -1383,9 +1381,7 @@ public static Integer htmlCellTrafficSimulation(String var) { case VAR_sumocfgPath: return 1; case VAR_fcdFilePath: - return 3; - case VAR_netFilePath: - return 3; + return 1; case VAR_startSeconds: return 1; case VAR_endSeconds: diff --git a/src/main/java/org/computate/smartvillageview/enus/model/traffic/simulation/TrafficSimulation.java b/src/main/java/org/computate/smartvillageview/enus/model/traffic/simulation/TrafficSimulation.java index 894ed35d..fdf2e989 100644 --- a/src/main/java/org/computate/smartvillageview/enus/model/traffic/simulation/TrafficSimulation.java +++ b/src/main/java/org/computate/smartvillageview/enus/model/traffic/simulation/TrafficSimulation.java @@ -77,8 +77,8 @@ protected void _sumocfgPath(Wrap w) { * DocValues: true * Persist: true * DisplayName: Floating Car Data file path - * HtmlRow: 4 - * HtmlCell: 3 + * HtmlRow: 5 + * HtmlCell: 1 * Facet: true */ protected void _fcdFilePath(Wrap w) { @@ -89,8 +89,6 @@ protected void _fcdFilePath(Wrap w) { * DocValues: true * Persist: true * DisplayName: net file path - * HtmlRow: 4 - * HtmlCell: 3 * Facet: true */ protected void _netFilePath(Wrap w) { @@ -102,7 +100,7 @@ protected void _netFilePath(Wrap w) { * Persist: true * DisplayName: start seconds * Description: -b, --begin TIME Defines the begin time in seconds; The simulation starts at this time - * HtmlRow: 5 + * HtmlRow: 6 * HtmlCell: 1 * Facet: true */ @@ -115,7 +113,7 @@ protected void _startSeconds(Wrap w) { * Persist: true * DisplayName: end seconds * Description: -e, --end TIME Defines the end time in seconds; The simulation ends at this time - * HtmlRow: 5 + * HtmlRow: 6 * HtmlCell: 2 * Facet: true */ @@ -128,7 +126,7 @@ protected void _endSeconds(Wrap w) { * Persist: true * DisplayName: step seconds * Description: --step-length TIME Defines the step duration in seconds - * HtmlRow: 5 + * HtmlRow: 6 * HtmlCell: 3 * Facet: true */ diff --git a/src/main/resources/templates/enUS/TrafficSimulationGenPage.hbs b/src/main/resources/templates/enUS/TrafficSimulationGenPage.hbs index abed9fa0..586a2361 100644 --- a/src/main/resources/templates/enUS/TrafficSimulationGenPage.hbs +++ b/src/main/resources/templates/enUS/TrafficSimulationGenPage.hbs @@ -418,8 +418,9 @@
{{> "htmSumocfgPath" classApiMethodMethod="PATCH"}} +
+
{{> "htmFcdFilePath" classApiMethodMethod="PATCH"}} -{{> "htmNetFilePath" classApiMethodMethod="PATCH"}}
{{> "htmStartSeconds" classApiMethodMethod="PATCH"}} @@ -466,8 +467,9 @@
{{> "htmSumocfgPath" classApiMethodMethod="POST"}} +
+
{{> "htmFcdFilePath" classApiMethodMethod="POST"}} -{{> "htmNetFilePath" classApiMethodMethod="POST"}}
{{> "htmStartSeconds" classApiMethodMethod="POST"}} @@ -539,8 +541,9 @@
{{> "htmSumocfgPath" classApiMethodMethod="Page"}} +
+
{{> "htmFcdFilePath" classApiMethodMethod="Page"}} -{{> "htmNetFilePath" classApiMethodMethod="Page"}}
{{> "htmStartSeconds" classApiMethodMethod="Page"}}