Merge pull request #761 from VirtualFlyBrain/debug

Fixes for test release
VirtualFlyBrain · Nov 6, 2020 · a12cbee · a12cbee
2 parents 4702599 + 9bff9e7
commit a12cbee
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 31 deletions.
diff --git a/components/VFBMain.js b/components/VFBMain.js
@@ -37,7 +37,7 @@ class VFBMain extends React.Component {
       canvasVisible: true,
       listViewerVisible: true,
       graphVisible : true,
-      circuitBrowserVisible : true,
+      circuitBrowserVisible : false,
       htmlFromToolbar: undefined,
       idSelected: undefined,
       instanceOnFocus: undefined,

diff --git a/components/configuration/VFBGraph/graphConfiguration.js b/components/configuration/VFBGraph/graphConfiguration.js
@@ -13,7 +13,7 @@ var whatCypherQuery = instance => ({
   "statements": [
     {
       "statement": "MATCH (n:Entity {short_form:'" + instance + "'}) OPTIONAL MATCH p=(n)-[:INSTANCEOF|:SUBCLASSOF*..]->(x) "
-      + "WHERE (('Anatomy' IN  labels(x)) AND ('Class' IN  labels(n))) OR (('Cell' IN  labels(x)) OR ('synaptic neuropil' IN labels(x))) "
+      + "WHERE ('Nervous_system' IN  labels(x)) OR (('Cell' IN  labels(x)) OR ('synaptic neuropil' IN labels(x))) "
       + " OR (('Ganglion' IN  labels(x)) OR ('Neuron_projection_bundle' IN labels(x))) "
       + "RETURN  n,p, n.short_form as root",
       "resultDataContents": ["graph"]

diff --git a/components/configuration/VFBMain/layoutModel.js b/components/configuration/VFBMain/layoutModel.js
@@ -71,11 +71,6 @@ var modelJson = {
             "type": "tab",
             "name": "Layers",
             "component": "vfbListViewer"
-          },
-          {
-            "type": "tab",
-            "name": "Circuit Browser",
-            "component": "vfbCircuitBrowser"
           }
         ]
       },

diff --git a/components/configuration/VFBTermInfo/VFBTermInfoConfiguration.js b/components/configuration/VFBTermInfo/VFBTermInfoConfiguration.js
@@ -144,7 +144,7 @@ const linksConfiguration = {
   "CircuitBrowser": {
     "title": "Circuit browser For",
     "visibility": true,
-    "superType": "Neuron"
+    "superType": "hasSynapses"
   }
 }
 

diff --git a/components/configuration/VFBToolbar/vfbtoolbarMenuConfiguration.js b/components/configuration/VFBToolbar/vfbtoolbarMenuConfiguration.js
@@ -245,14 +245,6 @@ var toolbarMenu = {
             parameters: ["graphVisible"]
           }
         },
-        {
-          label: "Circuit Browser",
-          icon: "fa fa-cogs",
-          action: {
-            handlerAction: "UIElementHandler",
-            parameters: ["circuitBrowserVisible"]
-          }
-        },
         {
           label: "NBLAST",
           icon: "",

diff --git a/images/slice-viewer.png b/images/slice-viewer.png
diff --git a/images/slice-viewer_old.png b/images/slice-viewer_old.png
diff --git a/images/term-info.png b/images/term-info.png
diff --git a/images/term-info_old.png b/images/term-info_old.png
diff --git a/model/vfb.xmi b/model/vfb.xmi
diff --git a/tests/jest/vfb/review/focus-term-tests.js → tests/jest/vfb/batch1/focus-term-tests.js b/tests/jest/vfb/review/focus-term-tests.js → tests/jest/vfb/batch1/focus-term-tests.js
diff --git a/.../jest/vfb/review/layer-component-tests.js → .../jest/vfb/batch1/layer-component-tests.js b/.../jest/vfb/review/layer-component-tests.js → .../jest/vfb/batch1/layer-component-tests.js
diff --git a/tests/jest/vfb/batch3/term-info-tests.js → tests/jest/vfb/batch1/term-info-tests.js b/tests/jest/vfb/batch3/term-info-tests.js → tests/jest/vfb/batch1/term-info-tests.js
diff --git a/tests/jest/vfb/batch1/3d-viewer-tests.js → tests/jest/vfb/batch2/3d-viewer-tests.js b/tests/jest/vfb/batch1/3d-viewer-tests.js → tests/jest/vfb/batch2/3d-viewer-tests.js
diff --git a/tests/jest/vfb/review/tree-browser-tests.js → tests/jest/vfb/batch2/tree-browser-tests.js b/tests/jest/vfb/review/tree-browser-tests.js → tests/jest/vfb/batch2/tree-browser-tests.js
diff --git a/tests/jest/vfb/review/loader-tests.js → tests/jest/vfb/batch3/loader-tests.js b/tests/jest/vfb/review/loader-tests.js → tests/jest/vfb/batch3/loader-tests.js
diff --git a/tests/jest/vfb/batch2/url-params-tests.js → tests/jest/vfb/batch3/url-params-tests.js b/tests/jest/vfb/batch2/url-params-tests.js → tests/jest/vfb/batch3/url-params-tests.js