Merge branch 'master' into eagle-1335

ICRAR · Nov 6, 2024 · 5e85b32 · 5e85b32
2 parents 68959b5 + 52b6803
commit 5e85b32
Show file tree

Hide file tree

Showing 6 changed files with 350 additions and 349 deletions.
diff --git a/src/GraphConfig.ts b/src/GraphConfig.ts
@@ -5,6 +5,7 @@ import { Eagle } from "./Eagle";
 import { Errors } from "./Errors";
 import { Field } from "./Field";
 import { LogicalGraph } from "./LogicalGraph";
+import { Utils } from "./Utils";
 
 export class GraphConfig {
     private id: ko.Observable<GraphConfig.Id>;
@@ -394,6 +395,11 @@ export class GraphConfigField {
         return this.value();
     }
 
+    toggle = () : GraphConfigField => {        
+        this.value((!Utils.asBool(this.value())).toString());
+        return this;
+    }
+
     setComment = (comment: string): GraphConfigField => {
         this.comment(comment);
         return this;

diff --git a/src/LogicalGraph.ts b/src/LogicalGraph.ts
@@ -221,7 +221,12 @@ export class LogicalGraph {
 
             //if the saved 'activeGraphConfigId' is empty or missing, we use the last one in the array, else we set the saved one as active                
             if(dataObject["activeGraphConfigId"] === '' || dataObject["activeGraphConfigId"] === undefined){
-                result.activeGraphConfigId(result.graphConfigs()[result.graphConfigs().length - 1].getId() as GraphConfig.Id)
+                // if graph has no configs, we can't use the last one in the array, so we'll set the active id to 'undefined'
+                if (result.graphConfigs().length === 0){
+                    result.activeGraphConfigId(undefined);
+                } else {
+                    result.activeGraphConfigId(result.graphConfigs()[result.graphConfigs().length - 1].getId() as GraphConfig.Id)
+                }
             }else{
                 result.activeGraphConfigId(dataObject["activeGraphConfigId"] as GraphConfig.Id)
             }

diff --git a/src/ParameterTable.ts b/src/ParameterTable.ts
@@ -62,7 +62,7 @@ export class ParameterTable {
             return "";
         }
 
-        if (Setting.findValue(Setting.BOTTOM_WINDOW_MODE) === Eagle.BottomWindowMode.ParameterTable){
+        if (Setting.findValue(Setting.BOTTOM_WINDOW_MODE) === Eagle.BottomWindowMode.ParameterTable || Setting.findValue(Setting.BOTTOM_WINDOW_MODE) === Eagle.BottomWindowMode.GraphConfigAttributesTable){
             return ParameterTable.selectionParent().getDisplayText() + " - " + ParameterTable.selectionName();
         } else {
             return "Unknown";
@@ -74,7 +74,7 @@ export class ParameterTable {
             return "";
         }
 
-        if (Setting.findValue(Setting.BOTTOM_WINDOW_MODE) === Eagle.BottomWindowMode.ParameterTable){
+        if (Setting.findValue(Setting.BOTTOM_WINDOW_MODE) === Eagle.BottomWindowMode.ParameterTable || Setting.findValue(Setting.BOTTOM_WINDOW_MODE) === Eagle.BottomWindowMode.GraphConfigAttributesTable){
             return ParameterTable.selection();
         } else {
             return "Unknown";

diff --git a/static/base.css b/static/base.css
@@ -221,6 +221,7 @@ color: #00bb00;}
 }
 
 #bottomWindow{
+    border-top: solid 2px black;
     background-color: #002349;
     width: 100%;
     height: 150px;
@@ -842,11 +843,6 @@ color: #00bb00;}
     z-index:10;
 }
 
-#tableOpenDocker{
-    position: absolute;
-    left: 160px;
-}
-
 .settingCategoryActive{
     display: inline-block;
 }
@@ -1804,6 +1800,7 @@ ul.nav.navbat-nav .btn-outline-secondary:hover{
     color: white;
     visibility: hidden;
     padding-left: 3px;
+    margin-bottom: -0.5px;
     pointer-events: none;
 }
 

diff --git a/static/tables.css b/static/tables.css
@@ -1,7 +1,3 @@
-#paramsTableWrapper {
-    top: 24px;
-}
-
 #parameterTable #tableInspector{
     position: sticky;
     top: 0px;
@@ -34,7 +30,6 @@
 
 #parameterTableAddParameterButton{
     left: 15px;
-    /* position: absolute; */
 }
 
 #tableInspectorSelection{
@@ -206,7 +201,6 @@ td:first-child input {
 #parameterTable .bottomWindowHeaderWrap{
     border: none;
     justify-content: unset;
-    border-top: solid 2px black;
     height: 46px;
 }
 
@@ -227,7 +221,7 @@ td:first-child input {
 .eagleTableWrapper thead{
     position: sticky;
     z-index: 111;
-    top: 24px;
+    top: 0px;
 }
 
 #graphConfigurationsTableWrapper thead{
@@ -271,13 +265,18 @@ td:first-child input {
 .eagleTableDisplay .tableBody, .issuesDisplay .issuesBody{
     padding:10px;
     background-color: aliceblue;
-    overflow: auto;
     width: 100%;
     position: absolute;
     top: 53px;
     height: calc(100% - 46px);
 }
 
+.eagleTableDisplay .scrollWrapper {
+    height: calc(100% - 24px);
+    overflow: auto;
+    position: relative;
+}
+
 .eagleTableWrapper tr:nth-child(even) {
     background-color: rgba(214, 219, 239, 0.95);
 }
@@ -488,14 +487,6 @@ td:first-child input {
     cursor: col-resize;
 }
 
-
-
-
-#tableOpenDocker{
-    position: absolute;
-    left: 160px;
-}
-
 #graphConfigurationsTableWrapper {
 }