Browse Source

wxGUI: remove globalvar.HIST_WINDOW_SIZE

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@50326 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 13 năm trước cách đây
mục cha
commit
f726f19cee
2 tập tin đã thay đổi với 14 bổ sung28 xóa
  1. 0 1
      gui/wxpython/core/globalvar.py
  2. 14 27
      gui/wxpython/lmgr/layertree.py

+ 0 - 1
gui/wxpython/core/globalvar.py

@@ -100,7 +100,6 @@ DIALOG_LAYER_SIZE = (100, -1)
 DIALOG_COLOR_SIZE = (30, 30)
 
 MAP_WINDOW_SIZE = (800, 600)
-HIST_WINDOW_SIZE = (500, 350)
 GM_WINDOW_SIZE = (500, 600)
 
 

+ 14 - 27
gui/wxpython/lmgr/layertree.py

@@ -572,36 +572,23 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
                                                                  'map=%s' % name])
         
     def OnHistogram(self, event):
-        """
-        Plot histogram for given raster map layer
+        """!Plot histogram for given raster map layer
         """
         mapLayer = self.GetPyData(self.layer_selected)[0]['maplayer']
         if not mapLayer.GetName():
-            wx.MessageBox(parent = self,
-                          message = _("Unable to display histogram of "
-                                    "raster map."),
-                          caption = _("Error"), style = wx.OK | wx.ICON_ERROR | wx.CENTRE)
-            return False
-
-        if not hasattr (self, "histogramFrame"):
-            self.histogramFrame = None
-
-        if hasattr (self.mapdisplay, "histogram") and self.mapdisplay.histogram:
-            self.histogramFrame = self.mapdisplay.histogram
-
-        if not self.histogramFrame:
-            self.histogramFrame = HistogramFrame(self, size = globalvar.HIST_WINDOW_SIZE,
-                                                 style = wx.DEFAULT_FRAME_STYLE)
-            self.histogramFrame.CentreOnScreen()
-            # show new display
-            self.histogramFrame.Show()
-
-        self.histogramFrame.SetHistLayer(mapLayer.GetName())
-        self.histogramFrame.HistWindow.UpdateHist()
-        self.histogramFrame.Refresh()
-        self.histogramFrame.Update()
-
-        return True
+            GError(parent = self,
+                   message = _("Unable to display histogram of "
+                               "raster map. No map name defined."))
+            return
+        
+        win = HistogramFrame(parent = self)
+        
+        win.CentreOnScreen()
+        win.Show()
+        win.SetHistLayer(mapLayer.GetName())
+        win.HistWindow.UpdateHist()
+        win.Refresh()
+        win.Update()
 
     def OnUnivariateStats(self, event):
         """!Univariate raster statistics"""