Changeset 2195 for trunk/GSASIIgrid.py

Timestamp:

Apr 3, 2016 2:30:21 PM (7 years ago)

Author:

vondreele

Message:

remove selected area image multiplier - not necessary
fix image scaling issues for selected area simulations
fix issues with absent pydiffaxlib & DIFFaX.exe on some platforms

File:

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

trunk/GSASIIgrid.py

@@ -506 +506 @@
         self.lmax = '2'
         self.lmaxChoice = [str(i+1) for i in range(6)]
-        self.mult = '1'
-        self.multChoice = [str(2**i) for i in range(10)]
         self.Parms = parms
         self.Parm = None
@@ -527 +525 @@
         def OnMaxL(event):
             self.lmax = lmax.GetValue()
-            
-        def OnMult(event):
-            self.mult = mult.GetValue()
             
         def OnParmSel(event):
@@ -592 +587 @@
             planeSizer.Add(lmax,0,WACV)            
             mainSizer.Add(planeSizer)
-            multSizer = wx.BoxSizer(wx.HORIZONTAL)
-            multSizer.Add(wx.StaticText(self.panel,label=' Image scale: '),0,WACV)
-            mult = wx.ComboBox(self.panel,value=self.mult,choices=self.multChoice,
-                style=wx.CB_READONLY|wx.CB_DROPDOWN)
-            mult.Bind(wx.EVT_COMBOBOX,OnMult)
-            multSizer.Add(mult,0,WACV)
-            mainSizer.Add(multSizer)
         OkBtn = wx.Button(self.panel,-1,"Ok")
         OkBtn.Bind(wx.EVT_BUTTON, self.OnOk)
@@ -617 +605 @@
     def GetSelection(self):
         if 'powder' in self.calcType:
-            return '0\n0\n3\n','','','',self.Parm,self.parmRange,self.parmStep
+            return '0\n0\n3\n','','',self.Parm,self.parmRange,self.parmStep
         elif 'selected' in self.calcType:
-            return '0\n0\n4\n1\n%d\n%d\n16\n1\n%d\n0\nend\n'%    \
-                (self.planeChoice.index(self.plane)+1,self.lmaxChoice.index(self.lmax)+1,   \
-                self.multChoice.index(self.mult)+1),self.plane,self.lmax,self.mult,       \
-                self.Parm,self.parmRange,self.parmStep
+            return '0\n0\n4\n1\n%d\n1\n16\n1\n%d\n0\nend\n'%    \
+                (self.planeChoice.index(self.plane)+1,self.lmaxChoice.index(self.lmax)+1),   \
+                self.plane,self.lmax,self.Parm,self.parmRange,self.parmStep
 
     def OnOk(self,event):