Changeset 3177 for trunk/GSASIIimgGUI.py

Timestamp:

Dec 6, 2017 2:34:23 PM (5 years ago)

Author:

vondreele

Message:

fix bug involving load image controls - update of min/max slider values

File:

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

trunk/GSASIIimgGUI.py

@@ -235 +235 @@
         data['range'] = [(0,Imax),[Imin,Imax]]
         masks['Thresholds'] = [(0,Imax),[Imin,Imax]]
-        MaxSizer.GetChildren()[2].Window.SetValue(Imax)   #tricky 
-        MaxSizer.GetChildren()[5].Window.SetValue(Imin)   #tricky
+        G2frame.slideSizer.GetChildren()[1].Window.SetValue(Imax)   #tricky 
+        G2frame.slideSizer.GetChildren()[4].Window.SetValue(Imin)   #tricky
          
     def OnIntegrate(event,useTA=None):
@@ -723 +723 @@
         #   [Imin, Imax] => Range[1] = data['range'][1] #   lowest to highest pixel intensity on cmap scale
         maxSizer = wx.BoxSizer(wx.VERTICAL)
-        slideSizer = wx.FlexGridSizer(2,3,5,5)
-        slideSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' Max intensity'),0,WACV)
+        G2frame.slideSizer = wx.FlexGridSizer(2,3,5,5)
+        G2frame.slideSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' Max intensity'),0,WACV)
         # maxSel is a slider with 101 steps scaled from Imin+1 to Imax0 with sqrt scaling
         # slider value = sv = 100 * sqrt((Imax-Imin-1)/(Imax0-Imin-1))
@@ -732 +732 @@
         sv1 = min(100,max(0,int(0.5+100.*sqrtDeltOne/sqrtDeltZero)))
         maxSel = wx.Slider(parent=G2frame.dataWindow,style=wx.SL_HORIZONTAL,value=sv1)
-        slideSizer.AddGrowableCol(2)
+        G2frame.slideSizer.AddGrowableCol(2)
         maxSel.Bind(wx.EVT_SLIDER, OnMaxSlider)
         maxVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,Range[1],1,min=Range[0][0]+1,
             max=Range[0][1],OnLeave=OnNewVal)
-        slideSizer.Add(maxVal,0,WACV)
-        slideSizer.Add(maxSel,flag=wx.EXPAND|wx.ALL)
-        slideSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' Min intensity'),0,WACV)
+        G2frame.slideSizer.Add(maxVal,0,WACV)
+        G2frame.slideSizer.Add(maxSel,flag=wx.EXPAND|wx.ALL)
+        G2frame.slideSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' Min intensity'),0,WACV)
         # minSel is a slider with 101 steps scaled from Imin0 to Imax-1 with linear scaling
         # slider value = sv0 = 100 * (Imin-Imin0)/(Imax-Imin0-1)
@@ -748 +748 @@
         minVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,Range[1],0,
             max=Range[0][1],typeHint=int,OnLeave=OnNewVal)
-        slideSizer.Add(minVal,0,WACV)
-        slideSizer.Add(minSel,flag=wx.EXPAND|wx.ALL)
-        maxSizer.Add(slideSizer,flag=wx.EXPAND|wx.ALL)
+        G2frame.slideSizer.Add(minVal,0,WACV)
+        G2frame.slideSizer.Add(minSel,flag=wx.EXPAND|wx.ALL)
+        maxSizer.Add(G2frame.slideSizer,flag=wx.EXPAND|wx.ALL)
         autoSizer = wx.BoxSizer(wx.HORIZONTAL)
         autoSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Auto scaler '),0,WACV)