Changeset 4521 for trunk/testDeriv.py

Timestamp:

Jul 15, 2020 3:08:04 PM (3 years ago)

Author:

vondreele

Message:

complete pink Rietveld refinement
fix problem with weights
enhance testDeriv
put new pink parms in parm dictionary
fix problem with Instrument parm display after load

File:

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

trunk/testDeriv.py

@@ -52 +52 @@
     return testDeriv(parent)
     
-[wxID_FILEEXIT, wxID_FILEOPEN, wxID_MAKEPLOTS, wxID_CLEARSEL,
-] = [wx.NewId() for _init_coll_File_Items in range(4)]
+[wxID_FILEEXIT, wxID_FILEOPEN, wxID_MAKEPLOTS, wxID_CLEARSEL,wxID_SELECTALL,
+] = [wx.NewId() for _init_coll_File_Items in range(5)]
 
 def FileDlgFixExt(dlg,file):            #this is needed to fix a problem in linux wx.FileDialog
@@ -70 +70 @@
         self.File.Append(wxID_FILEOPEN,'Open testDeriv file','Open testDeriv')
         self.File.Append(wxID_MAKEPLOTS,'Make plots','Make derivative plots')
+        self.File.Append(wxID_SELECTALL,'Select all')
         self.File.Append(wxID_CLEARSEL,'Clear selections')
         self.File.Append(wxID_FILEEXIT,'Exit','Exit from testDeriv')
@@ -75 +76 @@
         self.Bind(wx.EVT_MENU,self.OnMakePlots,id=wxID_MAKEPLOTS)
         self.Bind(wx.EVT_MENU,self.ClearSelect,id=wxID_CLEARSEL)
+        self.Bind(wx.EVT_MENU,self.SelectAll,id=wxID_SELECTALL)
         self.Bind(wx.EVT_MENU,self.OnFileExit, id=wxID_FILEEXIT)
         self.testDerivMenu.Append(menu=self.File, title='File')
@@ -106 +108 @@
         self.Close()
         
+    def SelectAll(self,event):
+        self.use = [True for name in self.names]
+        for i,name in enumerate(self.names):
+            if 'Back' in name:
+                self.use[i] = False
+        self.UpdateControls(event)
+        
     def ClearSelect(self,event):
         self.use = [False for i in range(len(self.names))]
@@ -126 +135 @@
     def TestRead(self):
         file = open(self.testFile,'rb')
-        if '2' in platform.python_version_tuple()[0]:
-            self.values = cPickle.load(file)
-            self.HistoPhases = cPickle.load(file)
-            (self.constrDict,self.fixedList,self.depVarList) = cPickle.load(file)
-            self.parmDict = cPickle.load(file)
-            self.varylist = cPickle.load(file)
-            self.calcControls = cPickle.load(file)
-            self.pawleyLookup = cPickle.load(file)
-        else:
-            self.values = cPickle.load(file,encoding='Latin-1')
-            self.HistoPhases = cPickle.load(file,encoding='Latin-1')
-            (self.constrDict,self.fixedList,self.depVarList) = cPickle.load(file,encoding='Latin-1')
-            self.parmDict = cPickle.load(file,encoding='Latin-1')
-            self.varylist = cPickle.load(file,encoding='Latin-1')
-            self.calcControls = cPickle.load(file,encoding='Latin-1')
-            self.pawleyLookup = cPickle.load(file,encoding='Latin-1')
+        self.values = cPickle.load(file,encoding='Latin-1')
+        self.HistoPhases = cPickle.load(file,encoding='Latin-1')
+        (self.constrDict,self.fixedList,self.depVarList) = cPickle.load(file,encoding='Latin-1')
+        self.parmDict = cPickle.load(file,encoding='Latin-1')
+        self.varylist = cPickle.load(file,encoding='Latin-1')
+        self.calcControls = cPickle.load(file,encoding='Latin-1')
+        self.pawleyLookup = cPickle.load(file,encoding='Latin-1')
         self.names = self.varylist+self.depVarList
         self.use = [False for i in range(len(self.names))]