trying to figure out why git is making me commit twice

pyglance/glance/data.py

@@ -160,6 +160,23 @@ class DataObject (object) :
         
         return DataObject(self.data.copy(), fillValue=self.fill_value, ignoreMask=self.masks.ignore_mask,
                  overrideFillValue=self.override_fill_value, defaultFillValue=self.default_fill_value)
+
+    def holding_array(self):
+        """
+        Return a version of myself where self.data is always an array.
+
+        Suitable for code paths that insist on an array. 
+
+        If self.data is already an array, returns self.
+        If self.data is a simple scalar, copies myself, changing the copy's
+        self.data to be an array with a single value, and return the copy.
+        """
+        if len(self.data.shape) != 0:
+            return self
+        copy = self.copy()
+        copy.data = np.array([self.data.item()])
+        copy.self_analysis()
+        return copy
     
     def self_analysis(self, re_do_analysis=False) :
         """

pyglance/glance/gui_view.py

@@ -8,6 +8,7 @@ Copyright (c) 2011 University of Wisconsin SSEC. All rights reserved.
 """
 
 import sys, os.path, logging
+import numpy
 
 from PyQt4 import QtGui, QtCore
 
@@ -839,6 +840,14 @@ class GlanceGUIView (QtGui.QWidget) :
         given variable data, pop a window to show it to the user
         """
 
+        if len(variableDataObject.data.shape) == 0:
+            # This is a simple scalar value. Toss it into an array
+            # so the following code can cope
+            newData = variableDataObject.copy()
+            newData.data = numpy.array([variableDataObject.data.item()])
+            variableDataObject = newData
+
+
         if len(variableDataObject.data.shape) > 0 and len(variableDataObject.data.shape) <= 2 :
 
             tempID                = self.dataShowCounter

pyglance/glance/stats.py

@@ -1064,6 +1064,8 @@ class StatisticalInspectionAnalysis (StatisticalData) :
         """
         build and set all of the statistics sets
         """
+
+        dataObject = dataObject.holding_array()
         
         self.general      = GeneralStatistics(     dataObject=dataObject,
                                                            doExtras=True)