Changeset 122

Timestamp:

Jul 19, 2010 8:08:12 AM (13 years ago)

Author:

vondreel

Message:

implement .gpx file name on GSASII command line
fixes for integrate all

File:

• trunk/GSASII.py (modified) (7 diffs)

trunk/GSASII.py

@@ -220 +220 @@
         self._init_ctrls(parent)
         self.Bind(wx.EVT_CLOSE, self.ExitMain)
+        self.GSASprojectfile = ''
         self.dirname = ''
-        self.GSASprojectfile = ''
         self.Offset = 0.0
         self.Weight = False
@@ -245 +245 @@
         self.ifGetRing = False
         self.setPoly = False
+        arg = sys.argv
+        if len(arg) > 1:
+            self.GSASprojectfile = arg[1]
+            self.dirname = ospath.dirname(arg[1])
+            G2IO.ProjFileOpen(self)
+            self.PatternTree.Expand(self.root)
 
     def OnSize(self,event):
@@ -619 +625 @@
                 self.ErrorDialog('Not enough data to sum','There must be more than one "PWDR" pattern')
                 return
-            TextList.append('default sum name')                
+            TextList.append('default_sum_name')                
             dlg = self.SumDialog(self,'Sum data','Enter scale for each pattern in summation','PWDR',TextList)
             try:
@@ -706 +712 @@
                 self.ErrorDialog('Not enough data to sum','There must be more than one "IMG" pattern')
                 return
-            TextList.append('default sum name')                
+            TextList.append('default_sum_name')                
             dlg = self.SumDialog(self,'Sum data','Enter scale for each image in summation','IMG',TextList)
             try:
@@ -713 +719 @@
                     result = dlg.GetData()
                     First = True
+                    Found = False
                     for i,item in enumerate(result[:-1]):
                         scale,name = item
                         data = DataList[i]
-                        if scale:                                
+                        if scale:
+                            Found = True                                
                             Comments.append("%10.3f %s" % (scale,' * '+name))
                             size,imagefile = data
@@ -734 +742 @@
                                 newImage = newImage+scale*image
                             del(image)
+                    if not Found:
+                        self.ErrorDialog('Image sum error','No nonzero image multipliers found')
+                        return
+                        
                     newImage = np.asfarray(newImage,dtype=np.float32)                        
-                    print 'result dtype',newImage.dtype                                
                     outname = 'IMG '+result[-1]
                     Id = 0
@@ -764 +775 @@
                         if self.imageDefault:
                             Data = copy.copy(self.imageDefault)
-                            Data['showLines'] = True
-                            Data['ring'] = []
-                            Data['rings'] = []
-                            Data['cutoff'] = 10
-                            Data['pixLimit'] = 20
-                            Data['ellipses'] = []
-                            Data['calibrant'] = ''
-                            Data['range'] = [(Imin,Imax),[Imin,Imax]]
-                            self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Image Controls'),Data)                                            
-                            self.PatternTree.SelectItem(Id)
-                            self.PatternTree.Expand(Id)
+                        Data['showLines'] = True
+                        Data['ring'] = []
+                        Data['rings'] = []
+                        Data['cutoff'] = 10
+                        Data['pixLimit'] = 20
+                        Data['ellipses'] = []
+                        Data['calibrant'] = ''
+                        Data['range'] = [(Imin,Imax),[Imin,Imax]]
+                        self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Image Controls'),Data)                                            
                         Masks = {'Points':[],'Rings':[],'Arcs':[],'Polygons':[],'Thresholds':[(Imin,Imax),[Imin,Imax]]}
                         self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Masks'),Masks)
+                        self.PatternTree.SelectItem(Id)
+                        self.PatternTree.Expand(Id)
                         self.PickId = G2gd.GetPatternTreeItemId(self,self.root,outname)
                         self.Image = self.PickId