Allow flatmap to be set using api.

ABI-Software · Apr 27, 2023 · 4d8041d · 4d8041d
1 parent 57f97d5
commit 4d8041d
Show file tree

Hide file tree

Showing 8 changed files with 202 additions and 149 deletions.
diff --git a/.env b/.env
@@ -1,4 +1,4 @@
-VUE_APP_API_LOCATION=https://your-api-location/
+//VUE_APP_API_LOCATION=https://your-api-location/
 VUE_APP_FLATMAPAPI_LOCATION=https://mapcore-demo.org/current/flatmap/v3/
 VUE_APP_ALGOLIA_INDEX=k-core_dev_published_time_desc
 VUE_APP_ALGOLIA_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/mapintegratedvuer",
-  "version": "0.3.15",
+  "version": "0.4.0-beta.0",
   "license": "Apache-2.0",
   "scripts": {
     "serve": "vue-cli-service serve --port 8081",
@@ -26,10 +26,10 @@
     "*.js"
   ],
   "dependencies": {
-    "@abi-software/flatmapvuer": "^0.4.0",
+    "@abi-software/flatmapvuer": "^0.4.1-beta.1",
     "@abi-software/map-side-bar": "^1.3.38",
     "@abi-software/plotvuer": "^0.3.9",
-    "@abi-software/scaffoldvuer": "^0.1.58",
+    "@abi-software/scaffoldvuer": "^0.1.59",
     "@abi-software/simulationvuer": "^0.6.5",
     "@abi-software/svg-sprite": "^0.2.0",
     "@soda/get-current-script": "^1.0.2",

diff --git a/src/App.vue b/src/App.vue
@@ -20,6 +20,7 @@
           <el-button @click="setMultiFlatmap()" size="mini">Set MultiFlatmap</el-button>
           <el-button @click="setLegacyMultiFlatmap()" size="mini">Set Legacy MultiFlatmap</el-button>
           <el-button @click="setScaffold()" size="mini">Set To Scaffold</el-button>
+          <el-button @click="setFlatmap()" size="mini">Set Flatmap</el-button>
           <el-button @click="setSearch()" size="mini">Set Search</el-button>
         </el-row>
       </div>
@@ -103,6 +104,15 @@ export default {
       xmlhttp.send(JSON.stringify({"state": state}));
 
     },
+    setFlatmap: function() {
+      this.$refs.map.setCurrentEntry(
+        {
+          type: "Flatmap",
+          resource: "FunctionalConnectivity",
+          label: "Functional"
+        }
+      );
+    },
     setLegacyMultiFlatmap: function() {
       this.$refs.map.setCurrentEntry(
         {

diff --git a/src/components/MapContent.vue b/src/components/MapContent.vue
@@ -152,6 +152,21 @@ export default {
             }
           }
         }
+        else if (state.type === "Flatmap") {
+          //State for scaffold containing the following items:
+          //  label - Setting the name of the dialog
+          //  region - Which region/group currently focusing on
+          //  resource - the url to metadata
+          //  state - state to restore (viewport)
+          //  viewUrl - relative path of the view file to metadata 
+          const newView = {
+            type: state.type,
+            resource: state.resource,
+            state: state.state,
+            label: state.label
+          };
+          this.$refs.flow.createNewEntry(newView);
+        } 
       } 
     },
     /**

diff --git a/src/components/SplitpanesBar.vue b/src/components/SplitpanesBar.vue
@@ -134,7 +134,7 @@ export default {
         let title = entry.label ? entry.label + " ": '';
         let type = entry.type;
         if (type == "Scaffold")
-          type = "Scaffold 3D";
+          type = "3D Scaffold";
         title += type;
         if (entry.datasetId)
           title += " (" + entry.datasetId + ")";

diff --git a/src/components/viewers/Flatmap.vue b/src/components/viewers/Flatmap.vue
@@ -7,10 +7,10 @@
     style="height: 100%; width: 100%"
     :minZoom="entry.minZoom"
     :helpMode="helpMode"
-    :pathControls="entry.pathControls"
+    :pathControls="true"
     ref="flatmap"
     @ready="getAvailableTerms"
-    :displayMinimap="true"
+    :displayMinimap="false"
     :flatmapAPI="flatmapAPI"
   />
 </template>

diff --git a/src/components/viewers/MultiFlatmap.vue b/src/components/viewers/MultiFlatmap.vue
@@ -9,7 +9,7 @@
     :initial="entry.resource"
     :helpMode="helpMode"
     ref="multiflatmap"
-    :displayMinimap="true"
+    :displayMinimap="false"
     :flatmapAPI="flatmapAPI"
     @pan-zoom-callback="flatmapPanZoomCallback"
   />
@@ -76,7 +76,7 @@ const getBodyScaffold = async(sparcApi, species) => {
     if (species === "rat") {
       return "https://mapcore-bucket1.s3.us-west-2.amazonaws.com/WholeBody/31-May-2021/ratBody/ratBody_syncmap_metadata.json";
     } else if (species === "human") {
-      return "https://mapcore-bucket1.s3.us-west-2.amazonaws.com/WholeBody/24-11-2022-human/humanBody_metadata.json";
+      return "https://mapcore-bucket1.s3.us-west-2.amazonaws.com/WholeBody/27-4-23-human/human_body_metadata.json";
     }
   }
 }