diff --git a/package-lock.json b/package-lock.json index 7d0b1ca3..f4efe914 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.20.0", "license": "Apache-2.0", "dependencies": { - "@abi-software/flatmapvuer": "1.14.0", + "@abi-software/flatmapvuer": "^1.14.1", "@abi-software/map-side-bar": "2.16.0", "@abi-software/map-utilities": "1.9.0", "@abi-software/plotvuer": "1.1.0", @@ -73,9 +73,9 @@ } }, "node_modules/@abi-software/flatmapvuer": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/@abi-software/flatmapvuer/-/flatmapvuer-1.14.0.tgz", - "integrity": "sha512-Ptca3A1tRAvLMQ37FvsELuOtFaSHmIR5ljNEPpuy2/nEbaSUJnwIq1eYShmfKmQ8mCdVSjS8vgfjLHHURD96qA==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@abi-software/flatmapvuer/-/flatmapvuer-1.14.1.tgz", + "integrity": "sha512-miQ15hK799w1DIijTFVTu28lR4RhIUESLxQpFmfkjTfo0NF4urpqKApFRNn39SwabcPGn496vUtOZ2gm4L2PgA==", "license": "Apache-2.0", "dependencies": { "@abi-software/map-utilities": "1.9.0", diff --git a/package.json b/package.json index 39eb5ae2..5472fb82 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "*.js" ], "dependencies": { - "@abi-software/flatmapvuer": "1.14.0", + "@abi-software/flatmapvuer": "^1.14.1", "@abi-software/map-side-bar": "2.16.0", "@abi-software/map-utilities": "1.9.0", "@abi-software/plotvuer": "1.1.0", diff --git a/src/App.vue b/src/App.vue index 3977e04e..da9ea742 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,34 +4,46 @@ href="https://fonts.googleapis.com/css?family=Asap:400,400i,500,600,700&display=swap">
-
-
- Save Settings - Restore Settings - Get Link -
-
- Set Rat Flatmap - Set MultiFlatmap - Set Legacy MultiFlatmap - Set To Scaffold - Set to Wholebody - Set Flatmap - Set Search - Toggle Long Label -
+ > +
+
+ Save Settings + Restore Settings + Get Link
- +
+ Set Rat Flatmap + Set MultiFlatmap + Set Legacy MultiFlatmap + Set To Scaffold + Set to Wholebody + Set Flatmap + Set Search +
+
+
Connectivity tooltip labels:
+
+
+ + Show long label + + + Truncate long label + + + Show ID in tooltip + +
+
+
@@ -42,6 +54,8 @@ :options="options" :state="state" :showLongLabel="showLongLabel" + :truncateLongLabel="truncateLongLabel" + :showIdInTooltip="showIdInTooltip" :shareLink="shareLink" :useHelpModeDialog="true" :connectivityInfoSidebar="true" @@ -161,6 +175,8 @@ export default { ElIconSetting: shallowRef(ElIconSetting), routerIsReady: false, showLongLabel: true, + truncateLongLabel: true, + showIdInTooltip: true, } }, computed: { @@ -182,6 +198,11 @@ export default { } }, methods: { + closePopover: function() { + if (this.$refs.optionsPopover) { + this.$refs.optionsPopover.hide(); + } + }, changeViewingMode: function(modeName) { this.$refs.map.changeViewingMode(modeName); }, @@ -261,6 +282,7 @@ export default { label: "Functional" } ); + this.closePopover(); }, setLegacyMultiFlatmap: function() { this.$refs.map.setCurrentEntry( @@ -270,6 +292,7 @@ export default { uuid: "01fedbf9-d783-509c-a10c-827941ab13da", } ); + this.closePopover(); }, setMultiFlatmap: function() { this.$refs.map.setCurrentEntry( @@ -281,6 +304,7 @@ export default { organ: "UBERON:0018675" } ); + this.closePopover(); }, setRatFlatmap: function() { this.$refs.map.setCurrentEntry( @@ -289,6 +313,7 @@ export default { taxo: "NCBITaxon:10114" } ); + this.closePopover(); }, setScaffold: function() { this.$refs.map.setCurrentEntry( @@ -299,6 +324,7 @@ export default { viewUrl: "colonMouse_Layout1_view.json" } ); + this.closePopover(); }, setWholebody: function() { this.$refs.map.setCurrentEntry( @@ -308,12 +334,20 @@ export default { isBodyScaffold: true } ); + this.closePopover(); }, setSearch: function() { this.$refs.map.openSearch([], "10.26275/1uno-tynt"); + this.closePopover(); + }, + onShowLongLabelChange: function() { + this.closePopover(); + }, + onTruncateLongLabelChange: function() { + this.closePopover(); }, - toggleLongLabel: function() { - this.showLongLabel = !this.showLongLabel; + onShowIdInTooltipChange: function() { + this.closePopover(); }, mapIsLoaded: function(map) { console.log("map is loaded", map) diff --git a/src/components/MapContent.vue b/src/components/MapContent.vue index 79b078e5..03b7fc88 100644 --- a/src/components/MapContent.vue +++ b/src/components/MapContent.vue @@ -20,6 +20,7 @@