Changeset 183

Timestamp:

Nov 22, 2010 9:22:32 AM (13 years ago)

Author:

vondreele

Message:

 

File:

• trunk/GSASIIimgGUI.py (modified) (4 diffs)

trunk/GSASIIimgGUI.py

@@ -50 +50 @@
         imax = int(maxSel.GetValue())*sqrtDeltZero/100.
         data['range'][1][1] = imax**2+data['range'][0][0]
-        data['range'][1][0] = min(data['range'][1][1]-1,data['range'][1][0])
+        data['range'][1][0] = max(0.0,min(data['range'][1][1]-1,data['range'][1][0]))
         DeltOne = data['range'][1][1]-data['range'][0][0]
         minSel.SetValue(int(100*(data['range'][1][0]-data['range'][0][0])/DeltOne))
@@ -58 +58 @@
         DeltOne = data['range'][1][1]-data['range'][0][0]
         imin = int(minSel.GetValue())*DeltOne/100.
-        data['range'][1][0] = min(data['range'][1][1]-1,imin)+data['range'][0][0]
+        data['range'][1][0] = max(0.0,min(data['range'][1][1]-1,imin)+data['range'][0][0])
         G2plt.PlotExposedImage(self,event=event)
         
@@ -290 +290 @@
     maxSizer = wx.FlexGridSizer(2,2,0,5)
     maxSizer.AddGrowableCol(1,1)
-    sqrtDeltZero = math.sqrt(data['range'][0][1]-data['range'][0][0])
-    DeltOne = data['range'][1][1]-data['range'][0][0]
+    sqrtDeltZero = math.sqrt(data['range'][0][1]-max(0.0,data['range'][0][0]))
+    DeltOne = data['range'][1][1]-max(0.0,data['range'][0][0])
     sqrtDeltOne = math.sqrt(DeltOne)
     maxSizer.Add(wx.StaticText(parent=self.dataDisplay,label=' Max intensity'),0,
@@ -302 +302 @@
         wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
     minSel = wx.Slider(parent=self.dataDisplay,style=wx.SL_HORIZONTAL,
-        value=int(100*(data['range'][1][0]-data['range'][0][0])/DeltOne))
+        value=int(100*(data['range'][1][0]-max(0.0,data['range'][0][0]))/DeltOne))
     maxSizer.Add(minSel,1,wx.EXPAND|wx.RIGHT)
     minSel.Bind(wx.EVT_SLIDER, OnMinSlider)