current_hidden_fsm fixed in viewer

uleroboticsgroup · Aug 9, 2024 · 740dcaf · 740dcaf
1 parent 599d0df
commit 740dcaf
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 9 deletions.
diff --git a/yasmin_viewer/yasmin_viewer_web_client/build/asset-manifest.json b/yasmin_viewer/yasmin_viewer_web_client/build/asset-manifest.json
@@ -1,15 +1,15 @@
 {
   "files": {
     "main.css": "/static/css/main.073c9b0a.css",
-    "main.js": "/static/js/main.259d4f59.js",
+    "main.js": "/static/js/main.713a3c3e.js",
     "static/js/787.d1eb2cfc.chunk.js": "/static/js/787.d1eb2cfc.chunk.js",
     "index.html": "/index.html",
     "main.073c9b0a.css.map": "/static/css/main.073c9b0a.css.map",
-    "main.259d4f59.js.map": "/static/js/main.259d4f59.js.map",
+    "main.713a3c3e.js.map": "/static/js/main.713a3c3e.js.map",
     "787.d1eb2cfc.chunk.js.map": "/static/js/787.d1eb2cfc.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.073c9b0a.css",
-    "static/js/main.259d4f59.js"
+    "static/js/main.713a3c3e.js"
   ]
 }
diff --git a/yasmin_viewer/yasmin_viewer_web_client/build/index.html b/yasmin_viewer/yasmin_viewer_web_client/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>YASMIN Viewer</title><script defer="defer" src="/static/js/main.259d4f59.js"></script><link href="/static/css/main.073c9b0a.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>YASMIN Viewer</title><script defer="defer" src="/static/js/main.713a3c3e.js"></script><link href="/static/css/main.073c9b0a.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/...b_client/build/static/js/main.259d4f59.js → ...b_client/build/static/js/main.713a3c3e.js b/...b_client/build/static/js/main.259d4f59.js → ...b_client/build/static/js/main.713a3c3e.js
diff --git a/...ld/static/js/main.259d4f59.js.LICENSE.txt → ...ld/static/js/main.713a3c3e.js.LICENSE.txt b/...ld/static/js/main.259d4f59.js.LICENSE.txt → ...ld/static/js/main.713a3c3e.js.LICENSE.txt
diff --git a/...ient/build/static/js/main.259d4f59.js.map → ...ient/build/static/js/main.713a3c3e.js.map b/...ient/build/static/js/main.259d4f59.js.map → ...ient/build/static/js/main.713a3c3e.js.map
diff --git a/yasmin_viewer/yasmin_viewer_web_client/src/components/FSM.js b/yasmin_viewer/yasmin_viewer_web_client/src/components/FSM.js
@@ -64,7 +64,11 @@ class FSM extends React.Component {
         type = "fsm";
       } else {
         if (current_state === state.id) {
-          type = "current_state";
+          if (state.is_fsm && hide_nested_fsm) {
+            type = "current_hidden_fsm";
+          } else {
+            type = "current_state";
+          }
         } else if (state.is_fsm && hide_nested_fsm) {
           type = "hidden_fsm";
         }
@@ -248,6 +252,14 @@ class FSM extends React.Component {
                       borderWidth: 3,
                     },
                   },
+                  {
+                    selector: "node[type = 'current_hidden_fsm']",
+                    style: {
+                      shape: "octagon",
+                      borderWidth: 3,
+                      backgroundColor: "green",
+                    },
+                  },
                   {
                     selector: "node[type = 'fsm']",
                     style: {