From 3131e71dd5bbd792a9afaa7ecbf3e6da80e1fec2 Mon Sep 17 00:00:00 2001
From: CyclingNinja <bennett.sm89@gmail.com>
Date: Fri, 7 Jun 2024 13:55:57 +0100
Subject: [PATCH 1/8] Add histogram bin adjustment ui

---
 glue_jupyter/common/state_widgets/viewer_histogram.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/glue_jupyter/common/state_widgets/viewer_histogram.vue b/glue_jupyter/common/state_widgets/viewer_histogram.vue
index 1c434dd5..866793ba 100644
--- a/glue_jupyter/common/state_widgets/viewer_histogram.vue
+++ b/glue_jupyter/common/state_widgets/viewer_histogram.vue
@@ -3,6 +3,9 @@
         <div>
             <v-select :items="x_att_items" label="x axis" v-model="x_att_selected"/>
         </div>
+        <div>
+            <v-text-field type="number" step="1" label="number of bins" v-model="glue_state.hist_n_bin" />
+        </div>
         <div>
             <v-btn-toggle dense multiple :value="modeSet" @change="modeSetChange">
 

From 1580cda18524d6ad7090d0a6a9df54cda606444a Mon Sep 17 00:00:00 2001
From: CyclingNinja <bennett.sm89@gmail.com>
Date: Mon, 24 Jun 2024 14:07:13 +0100
Subject: [PATCH 2/8] Histogram UI implementation

---
 glue_jupyter/common/state_widgets/viewer_histogram.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/glue_jupyter/common/state_widgets/viewer_histogram.vue b/glue_jupyter/common/state_widgets/viewer_histogram.vue
index 866793ba..c30cb6d3 100644
--- a/glue_jupyter/common/state_widgets/viewer_histogram.vue
+++ b/glue_jupyter/common/state_widgets/viewer_histogram.vue
@@ -6,6 +6,12 @@
         <div>
             <v-text-field type="number" step="1" label="number of bins" v-model="glue_state.hist_n_bin" />
         </div>
+        <div>
+            <glue-float-field label="x-min" :value.sync="glue_state.hist_x_min" />-->
+        </div>
+        <div>
+            <glue-float-field label="x-max" :value.sync="glue_state.hist_x_max" />-->
+        </div>
         <div>
             <v-btn-toggle dense multiple :value="modeSet" @change="modeSetChange">
 

From b4fd671876f093a5b4019d92481b90efcbd1523d Mon Sep 17 00:00:00 2001
From: CyclingNinja <bennett.sm89@gmail.com>
Date: Wed, 3 Jul 2024 22:32:40 +0100
Subject: [PATCH 3/8] Adding button to prime for resize function

---
 glue_jupyter/common/state_widgets/viewer_histogram.py  | 2 ++
 glue_jupyter/common/state_widgets/viewer_histogram.vue | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/glue_jupyter/common/state_widgets/viewer_histogram.py b/glue_jupyter/common/state_widgets/viewer_histogram.py
index 9eff4583..fa1385cb 100644
--- a/glue_jupyter/common/state_widgets/viewer_histogram.py
+++ b/glue_jupyter/common/state_widgets/viewer_histogram.py
@@ -18,3 +18,5 @@ def __init__(self, viewer_state):
         self.glue_state = viewer_state
 
         link_glue_choices(self, viewer_state, 'x_att')
+
+    def axis_to_bins(self):
diff --git a/glue_jupyter/common/state_widgets/viewer_histogram.vue b/glue_jupyter/common/state_widgets/viewer_histogram.vue
index c30cb6d3..fc62551b 100644
--- a/glue_jupyter/common/state_widgets/viewer_histogram.vue
+++ b/glue_jupyter/common/state_widgets/viewer_histogram.vue
@@ -32,6 +32,15 @@
                     </template>
                     <span>cumulative</span>
                 </v-tooltip>
+
+                <v-tooltip bottom>
+                     <template v-slot:activator="{ on }">
+                         <v-btn v-on="on" small value="axis_to_bins">
+                             <v-icon>trending_down</v-icon>
+                         </v-btn>
+                     </template>
+                     <span>resize_axis</span>
+                </v-tooltip bottom>
             </v-btn-toggle>
         </div>
 

From 099aaa45f0d5997b8d9716d21fb4ca2a00825eeb Mon Sep 17 00:00:00 2001
From: CyclingNinja <bennett.sm89@gmail.com>
Date: Thu, 25 Jul 2024 13:14:33 +0200
Subject: [PATCH 4/8] Adding HistogramViewerState to Hist state widgett

---
 glue_jupyter/common/state_widgets/viewer_histogram.py  | 7 ++++++-
 glue_jupyter/common/state_widgets/viewer_histogram.vue | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/glue_jupyter/common/state_widgets/viewer_histogram.py b/glue_jupyter/common/state_widgets/viewer_histogram.py
index fa1385cb..05cdc1cf 100644
--- a/glue_jupyter/common/state_widgets/viewer_histogram.py
+++ b/glue_jupyter/common/state_widgets/viewer_histogram.py
@@ -3,6 +3,7 @@
 from ...state_traitlets_helpers import GlueState
 from ...vuetify_helpers import link_glue_choices
 
+
 __all__ = ['HistogramViewerStateWidget']
 
 
@@ -19,4 +20,8 @@ def __init__(self, viewer_state):
 
         link_glue_choices(self, viewer_state, 'x_att')
 
-    def axis_to_bins(self):
+    def vue_axis_to_bins(self):
+        self.glue_state.update_bins_to_view()
+        self.glue_state.x_axislabel = "Updated Bins"
+        print('Triggered axis to bins')
+        pass
diff --git a/glue_jupyter/common/state_widgets/viewer_histogram.vue b/glue_jupyter/common/state_widgets/viewer_histogram.vue
index fc62551b..db8fc9eb 100644
--- a/glue_jupyter/common/state_widgets/viewer_histogram.vue
+++ b/glue_jupyter/common/state_widgets/viewer_histogram.vue
@@ -35,7 +35,7 @@
 
                 <v-tooltip bottom>
                      <template v-slot:activator="{ on }">
-                         <v-btn v-on="on" small value="axis_to_bins">
+                         <v-btn v-on="on" small value="vue_axis_to_bins">
                              <v-icon>trending_down</v-icon>
                          </v-btn>
                      </template>

From a77026854d72ab5e0cd7bb0ffedc94d4c55a5257 Mon Sep 17 00:00:00 2001
From: CyclingNinja <bennett.sm89@gmail.com>
Date: Fri, 26 Jul 2024 14:06:43 +0200
Subject: [PATCH 5/8] Correct Button referencing

---
 .../common/state_widgets/viewer_histogram.py      |  2 +-
 .../common/state_widgets/viewer_histogram.vue     | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/glue_jupyter/common/state_widgets/viewer_histogram.py b/glue_jupyter/common/state_widgets/viewer_histogram.py
index 05cdc1cf..d1878ec8 100644
--- a/glue_jupyter/common/state_widgets/viewer_histogram.py
+++ b/glue_jupyter/common/state_widgets/viewer_histogram.py
@@ -21,7 +21,7 @@ def __init__(self, viewer_state):
         link_glue_choices(self, viewer_state, 'x_att')
 
     def vue_axis_to_bins(self):
-        self.glue_state.update_bins_to_view()
         self.glue_state.x_axislabel = "Updated Bins"
+        self.glue_state.update_bins_to_view()
         print('Triggered axis to bins')
         pass
diff --git a/glue_jupyter/common/state_widgets/viewer_histogram.vue b/glue_jupyter/common/state_widgets/viewer_histogram.vue
index db8fc9eb..8bb2c29c 100644
--- a/glue_jupyter/common/state_widgets/viewer_histogram.vue
+++ b/glue_jupyter/common/state_widgets/viewer_histogram.vue
@@ -32,18 +32,15 @@
                     </template>
                     <span>cumulative</span>
                 </v-tooltip>
-
-                <v-tooltip bottom>
-                     <template v-slot:activator="{ on }">
-                         <v-btn v-on="on" small value="vue_axis_to_bins">
-                             <v-icon>trending_down</v-icon>
-                         </v-btn>
-                     </template>
-                     <span>resize_axis</span>
-                </v-tooltip bottom>
             </v-btn-toggle>
         </div>
 
+        <div>
+          <v-btn icon color="primary" text small @click="axis_to_bins">
+              <v-icon>Fit Axes to Bins</v-icon>
+          </v-btn>
+        </div>
+
         <v-switch v-model="glue_state.show_axes" label="Show axes" hide-details/>
     </div>
 </template>

From cb6e3adb0ac668cd26595ebda34e5220770e0501 Mon Sep 17 00:00:00 2001
From: CyclingNinja <bennett.sm89@gmail.com>
Date: Mon, 29 Jul 2024 17:18:10 +0200
Subject: [PATCH 6/8] Streamline tooltip to toolbar

---
 .../common/state_widgets/viewer_histogram.py  |  3 +-
 .../common/state_widgets/viewer_histogram.vue | 32 ++++++++-----------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/glue_jupyter/common/state_widgets/viewer_histogram.py b/glue_jupyter/common/state_widgets/viewer_histogram.py
index d1878ec8..8272b5d3 100644
--- a/glue_jupyter/common/state_widgets/viewer_histogram.py
+++ b/glue_jupyter/common/state_widgets/viewer_histogram.py
@@ -20,8 +20,7 @@ def __init__(self, viewer_state):
 
         link_glue_choices(self, viewer_state, 'x_att')
 
-    def vue_axis_to_bins(self):
+    def vue_axis_to_bins(self, *args):
         self.glue_state.x_axislabel = "Updated Bins"
         self.glue_state.update_bins_to_view()
         print('Triggered axis to bins')
-        pass
diff --git a/glue_jupyter/common/state_widgets/viewer_histogram.vue b/glue_jupyter/common/state_widgets/viewer_histogram.vue
index 8bb2c29c..4c98e65f 100644
--- a/glue_jupyter/common/state_widgets/viewer_histogram.vue
+++ b/glue_jupyter/common/state_widgets/viewer_histogram.vue
@@ -13,34 +13,30 @@
             <glue-float-field label="x-max" :value.sync="glue_state.hist_x_max" />-->
         </div>
         <div>
-            <v-btn-toggle dense multiple :value="modeSet" @change="modeSetChange">
-
-                <v-tooltip bottom>
+            <v-toolbar title="Toolbar">
+                <v-toolbar-items>
+                  <v-tooltip>
                     <template v-slot:activator="{ on }">
-                        <v-btn v-on="on" small value="normalize">
-                            <v-icon>unfold_more</v-icon>
-                        </v-btn>
-                    </template>
+                         <v-btn v-on="on" small value="normalize">
+                             <v-icon>unfold_more</v-icon>
+                         </v-btn>
+                     </template>
                     <span>normalize</span>
-                </v-tooltip>
-
-                <v-tooltip bottom>
+                  </v-tooltip>
+                  <v-tooltip bottom>
                     <template v-slot:activator="{ on }">
                         <v-btn v-on="on" small value="cumulative">
                             <v-icon>trending_up</v-icon>
                         </v-btn>
                     </template>
                     <span>cumulative</span>
-                </v-tooltip>
-            </v-btn-toggle>
-        </div>
+                  </v-tooltip>
 
-        <div>
-          <v-btn icon color="primary" text small @click="axis_to_bins">
-              <v-icon>Fit Axes to Bins</v-icon>
-          </v-btn>
+                  <v-btn variant="outlined" small @click="axis_to_bins">
+                      Fit Axes to Bins
+                  </v-btn>
+              </v-toolbar-items>
         </div>
-
         <v-switch v-model="glue_state.show_axes" label="Show axes" hide-details/>
     </div>
 </template>

From 4c856ebc9a50d780792c91a9f4633ba832313969 Mon Sep 17 00:00:00 2001
From: CyclingNinja <bennett.sm89@gmail.com>
Date: Tue, 6 Aug 2024 15:57:13 +0200
Subject: [PATCH 7/8] Cleaning up naming

---
 glue_jupyter/common/state_widgets/viewer_histogram.py  | 2 --
 glue_jupyter/common/state_widgets/viewer_histogram.vue | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/glue_jupyter/common/state_widgets/viewer_histogram.py b/glue_jupyter/common/state_widgets/viewer_histogram.py
index 8272b5d3..1c5038f7 100644
--- a/glue_jupyter/common/state_widgets/viewer_histogram.py
+++ b/glue_jupyter/common/state_widgets/viewer_histogram.py
@@ -21,6 +21,4 @@ def __init__(self, viewer_state):
         link_glue_choices(self, viewer_state, 'x_att')
 
     def vue_axis_to_bins(self, *args):
-        self.glue_state.x_axislabel = "Updated Bins"
         self.glue_state.update_bins_to_view()
-        print('Triggered axis to bins')
diff --git a/glue_jupyter/common/state_widgets/viewer_histogram.vue b/glue_jupyter/common/state_widgets/viewer_histogram.vue
index 4c98e65f..036e600c 100644
--- a/glue_jupyter/common/state_widgets/viewer_histogram.vue
+++ b/glue_jupyter/common/state_widgets/viewer_histogram.vue
@@ -32,8 +32,8 @@
                     <span>cumulative</span>
                   </v-tooltip>
 
-                  <v-btn variant="outlined" small @click="axis_to_bins">
-                      Fit Axes to Bins
+                  <v-btn variant="outlined" small @click="bins_to_axes">
+                      Fit Bins to Axes
                   </v-btn>
               </v-toolbar-items>
         </div>

From 52a3c29c6f6f094e4994c5002ec94a0cd453cee5 Mon Sep 17 00:00:00 2001
From: CyclingNinja <bennett.sm89@gmail.com>
Date: Tue, 6 Aug 2024 17:23:20 +0200
Subject: [PATCH 8/8] Compactixze toolbar buttons

---
 glue_jupyter/common/state_widgets/viewer_histogram.py |  2 +-
 .../common/state_widgets/viewer_histogram.vue         | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/glue_jupyter/common/state_widgets/viewer_histogram.py b/glue_jupyter/common/state_widgets/viewer_histogram.py
index 1c5038f7..8a021068 100644
--- a/glue_jupyter/common/state_widgets/viewer_histogram.py
+++ b/glue_jupyter/common/state_widgets/viewer_histogram.py
@@ -20,5 +20,5 @@ def __init__(self, viewer_state):
 
         link_glue_choices(self, viewer_state, 'x_att')
 
-    def vue_axis_to_bins(self, *args):
+    def vue_bins_to_axis(self, *args):
         self.glue_state.update_bins_to_view()
diff --git a/glue_jupyter/common/state_widgets/viewer_histogram.vue b/glue_jupyter/common/state_widgets/viewer_histogram.vue
index 036e600c..b021300e 100644
--- a/glue_jupyter/common/state_widgets/viewer_histogram.vue
+++ b/glue_jupyter/common/state_widgets/viewer_histogram.vue
@@ -13,11 +13,10 @@
             <glue-float-field label="x-max" :value.sync="glue_state.hist_x_max" />-->
         </div>
         <div>
-            <v-toolbar title="Toolbar">
-                <v-toolbar-items>
+            <v-toolbar density="compact" >
                   <v-tooltip>
                     <template v-slot:activator="{ on }">
-                         <v-btn v-on="on" small value="normalize">
+                         <v-btn v-on="on" size="x-small" value="normalize">
                              <v-icon>unfold_more</v-icon>
                          </v-btn>
                      </template>
@@ -25,17 +24,17 @@
                   </v-tooltip>
                   <v-tooltip bottom>
                     <template v-slot:activator="{ on }">
-                        <v-btn v-on="on" small value="cumulative">
+                        <v-btn v-on="on" size="x-small" value="cumulative">
                             <v-icon>trending_up</v-icon>
                         </v-btn>
                     </template>
                     <span>cumulative</span>
                   </v-tooltip>
 
-                  <v-btn variant="outlined" small @click="bins_to_axes">
+                  <v-btn variant="outlined" size="x-small" @click="bins_to_axes">
                       Fit Bins to Axes
                   </v-btn>
-              </v-toolbar-items>
+            </v-toolbar>
         </div>
         <v-switch v-model="glue_state.show_axes" label="Show axes" hide-details/>
     </div>