From 572970ab60ef073a275a9ada5af03f77a86715f8 Mon Sep 17 00:00:00 2001 From: TripZz Date: Mon, 23 Oct 2023 11:39:44 +0200 Subject: [PATCH] NN-366 Implemented new graph parameter selection window - adjusted structure - add new design --- .../src/components/term_graph/TermToolBar.vue | 8 +- .../src/components/toolbar/MainToolBar.vue | 13 +- .../toolbar/modules/EdgeOpacity.vue | 24 +- .../toolbar/modules/ProteinList.vue | 18 +- .../toolbar/modules/SelectionList.vue | 367 +++++++++++------- .../toolbar/modules/SelectionWindow.vue | 67 ---- 6 files changed, 255 insertions(+), 242 deletions(-) delete mode 100644 frontend/src/components/toolbar/modules/SelectionWindow.vue diff --git a/frontend/src/components/term_graph/TermToolBar.vue b/frontend/src/components/term_graph/TermToolBar.vue index cfa1ff52..f94fcb41 100644 --- a/frontend/src/components/term_graph/TermToolBar.vue +++ b/frontend/src/components/term_graph/TermToolBar.vue @@ -23,9 +23,9 @@ @@ -70,7 +70,7 @@ import NodeLabelSelect from '@/components/toolbar/modules/NodeLabelSelect.vue' import TermConnectedGraph from '@/components/term_graph/TermConnectedGraph.vue' import TermSearch from '@/components/term_graph/TermSearch.vue' import FDRValue from '@/components/term_graph/FDRValue.vue' -import SelectionWindow from '@/components/toolbar/modules/SelectionWindow.vue' +// import SelectionWindow from '@/components/toolbar/modules/SelectionWindow.vue' import SelectionList from '@/components/toolbar/modules/SelectionList.vue' @@ -84,7 +84,7 @@ export default { TermSearch, FDRValue, NodeLabelSelect, - SelectionWindow, + // SelectionWindow, SelectionList }, diff --git a/frontend/src/components/toolbar/MainToolBar.vue b/frontend/src/components/toolbar/MainToolBar.vue index 3fb2ad41..4492da86 100644 --- a/frontend/src/components/toolbar/MainToolBar.vue +++ b/frontend/src/components/toolbar/MainToolBar.vue @@ -11,8 +11,7 @@ v-on:mouseleave="tools_active=false"> Tool Icon -
  • +
  • Graph Icon
  • @@ -28,7 +27,12 @@ :tools_active = 'tools_active' @tools_active_changed = 'tools_active = $event' > - + + @@ -39,6 +43,7 @@ import MenuWindow from '@/components/toolbar/windows/MenuWindow.vue' import ProteinList from '@/components/toolbar/modules/ProteinList.vue' +import SelectionList from '@/components/toolbar/modules/SelectionList.vue' export default { name: 'MainToolBar', @@ -47,11 +52,13 @@ export default { components: { MenuWindow, ProteinList, + SelectionList }, data() { return { tools_active: false, protein_active: false, + selection_active: false, } }, methods: { diff --git a/frontend/src/components/toolbar/modules/EdgeOpacity.vue b/frontend/src/components/toolbar/modules/EdgeOpacity.vue index b787d963..1737d2d3 100644 --- a/frontend/src/components/toolbar/modules/EdgeOpacity.vue +++ b/frontend/src/components/toolbar/modules/EdgeOpacity.vue @@ -1,6 +1,7 @@ @@ -56,7 +60,7 @@ export default { \ No newline at end of file diff --git a/frontend/src/components/toolbar/modules/SelectionWindow.vue b/frontend/src/components/toolbar/modules/SelectionWindow.vue deleted file mode 100644 index c4f3020f..00000000 --- a/frontend/src/components/toolbar/modules/SelectionWindow.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - \ No newline at end of file