Changeset 134

Timestamp:

Jul 27, 2010 6:01:58 PM (13 years ago)

Author:

vondreel

Message:

modify image intensity sliders

File:

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

trunk/GSASIIimgGUI.py

@@ -34 +34 @@
         
     def OnMaxSlider(event):
-        logDeltZero = math.sqrt(data['range'][0][1]-data['range'][0][0])
-        imax = int(maxSel.GetValue())*logDeltZero/100.
+        sqrtDeltZero = math.sqrt(data['range'][0][1]-data['range'][0][0])
+        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])
+        DeltOne = data['range'][1][1]-data['range'][0][0]
+        minSel.SetValue(int(100*(data['range'][1][0]-data['range'][0][0])/DeltOne))
         G2plt.PlotExposedImage(self,event=event)
         
@@ -43 +45 @@
         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] = min(data['range'][1][1]-1,imin)+data['range'][0][0]
         G2plt.PlotExposedImage(self,event=event)
         
@@ -212 +214 @@
                                     G2gd.GetPatternTreeItemId(self,self.Image, 'Masks'),Masks)                                
                             self.Integrate = G2img.ImageIntegrate(image,Data,Masks)
-                            G2plt.PlotIntegration(self,newPlot=True,event=event)
+#                            G2plt.PlotIntegration(self,newPlot=True,event=event)
                             self.dataFrame.ImageEdit.Enable(id=G2gd.wxID_SAVEINTG,enable=True)
                             G2IO.SaveIntegration(self,Id,Data)
@@ -283 +285 @@
     maxSizer = wx.FlexGridSizer(2,2,0,5)
     maxSizer.AddGrowableCol(1,1)
-    logDeltZero = math.log(data['range'][0][1]-data['range'][0][0])
+    sqrtDeltZero = math.sqrt(data['range'][0][1]-data['range'][0][0])
     DeltOne = data['range'][1][1]-data['range'][0][0]
-    logDeltOne = math.sqrt(DeltOne)
+    sqrtDeltOne = math.sqrt(DeltOne)
     maxSizer.Add(wx.StaticText(parent=self.dataDisplay,label=' Max intensity'),0,
         wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
     maxSel = wx.Slider(parent=self.dataDisplay,style=wx.SL_HORIZONTAL,
-        value=int(100*logDeltOne/logDeltZero))
+        value=int(100*sqrtDeltOne/sqrtDeltZero))
     maxSizer.Add(maxSel,1,wx.EXPAND|wx.RIGHT)
     maxSel.Bind(wx.EVT_SLIDER, OnMaxSlider)    
@@ -295 +297 @@
         wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
     minSel = wx.Slider(parent=self.dataDisplay,style=wx.SL_HORIZONTAL,
-        value=int(100*data['range'][1][0]/DeltOne))
+        value=int(100*(data['range'][1][0]-data['range'][0][0])/DeltOne))
     maxSizer.Add(minSel,1,wx.EXPAND|wx.RIGHT)
     minSel.Bind(wx.EVT_SLIDER, OnMinSlider)