Changeset 814

Timestamp:

Dec 12, 2012 3:26:21 PM (9 years ago)

Author:

vondreele

Message:

implement hot keys for some main menu & menu items
fix crash in general
put a status item in as a reminder for peak fitting options
continue restraint development

Location:

trunk

Files:

• GSASII.py (modified) (4 diffs)
• GSASIIphsGUI.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (1 diff)
• GSASIIrestrGUI.py (modified) (11 diffs)

trunk/GSASII.py

@@ -105 +105 @@
         item = parent.Append(
             help='Open a gsasii project file (*.gpx)', id=wx.ID_ANY,
-            kind=wx.ITEM_NORMAL,text='Open project...')
+            kind=wx.ITEM_NORMAL,text='&Open project...')
         self.Bind(wx.EVT_MENU, self.OnFileOpen, id=item.GetId())
         item = parent.Append(
             help='Save project to old file', id=wx.ID_ANY,
-            kind=wx.ITEM_NORMAL,text='Save project')
+            kind=wx.ITEM_NORMAL,text='&Save project')
         self.Bind(wx.EVT_MENU, self.OnFileSave, id=item.GetId())
         item = parent.Append(
@@ -117 +117 @@
         item = parent.Append(
             help='Close project, saving is optional', id=wx.ID_ANY,
-            kind=wx.ITEM_NORMAL,text='Close project')
+            kind=wx.ITEM_NORMAL,text='&Close project')
         self.Bind(wx.EVT_MENU, self.OnFileClose, id=item.GetId())
         item = parent.Append(
             help='Exit from gsasii', id=wx.ID_ANY,
-            kind=wx.ITEM_NORMAL,text='Exit')
+            kind=wx.ITEM_NORMAL,text='&Exit')
         self.Bind(wx.EVT_MENU, self.OnFileExit, id=item.GetId())
         
@@ -174 +174 @@
         
         item = parent.Append(help='View least squares parameters', 
-            id=wx.ID_ANY, kind=wx.ITEM_NORMAL,text='View LS parms')
+            id=wx.ID_ANY, kind=wx.ITEM_NORMAL,text='&View LS parms')
         self.Bind(wx.EVT_MENU, self.OnViewLSParms, id=item.GetId())
         
         item = parent.Append(help='', id=wx.ID_ANY, kind=wx.ITEM_NORMAL,
-            text='Refine')
+            text='&Refine')
         self.Refine.append(item)
         item.Enable(False)
@@ -989 +989 @@
         '''
         File = wx.Menu(title='')
-        menubar.Append(menu=File, title='File')
+        menubar.Append(menu=File, title='&File')
         self._Add_FileMenuItems(File)
         Data = wx.Menu(title='')

trunk/GSASIIphsGUI.py

@@ -485 +485 @@
                 if not generalData['AtomTypes']:             #can change only if no atoms!
                     generalData['Type'] = TypeTxt.GetValue()
-                    dataDisplay.DestroyChildren()           #needed to clear away bad cellSizer, etc.
                     wx.CallAfter(UpdateGeneral)
                 else:
@@ -513 +512 @@
                     Text += line+'\n'
                 wx.MessageBox(Text,caption=msg,style=Style)
-                dataDisplay.DestroyChildren()           #needed to clear away bad cellSizer, etc.
+#                dataDisplay.DestroyChildren()           #needed to clear away bad cellSizer, etc.
                 wx.CallAfter(UpdateGeneral)
                 

trunk/GSASIIpwdGUI.py

@@ -262 +262 @@
     if not G2frame.dataFrame.GetStatusBar():
         Status = G2frame.dataFrame.CreateStatusBar()
+    Status.SetStatusText('Global refine: select refine column & press Y or N')
     G2frame.Bind(wx.EVT_MENU, OnAutoSearch, id=G2gd.wxID_AUTOSEARCH)
     G2frame.Bind(wx.EVT_MENU, OnUnDo, id=G2gd.wxID_UNDO)

trunk/GSASIIrestrGUI.py

@@ -181 +181 @@
                                     else:
                                         Topstr = str(Top)
-                                    bondRestData['Bonds'].append([[Oid,Tid],['1',Topstr], \
-                                        ma.getdata(dist[indb])[i],1.54,0.01])
+                                    newBond = [[Oid,Tid],['1',Topstr], \
+                                        ma.getdata(dist[indb])[i],1.54,0.01]
+                                    if newBond not in bondRestData['Bonds']:
+                                        bondRestData['Bonds'].append(newBond)
         finally:
             dlg.Destroy()
@@ -222 +224 @@
                         obsd = np.sqrt(np.sum(np.inner(Amat,tCoord-oCoord)**2))
                         if dist*Factor < obsd < dist/Factor:
-                            bondRestData['Bonds'].append([[oId,tId],['1','1'],obsd,dist,esd])                          
+                            newBond = [[oId,tId],['1','1'],obsd,dist,esd]
+                            if newBond not in bondRestData['Bonds']:
+                                bondRestData['Bonds'].append(newBond)                          
             macStr = macro.readline()
         macro.close()
@@ -250 +254 @@
         for Oid,Otype,Ocoord in origAtoms:
             IndBlist = []
-            angles = []
             VectB = []
             for Tid,Ttype,Tcoord in targAtoms:
@@ -283 +286 @@
                         XYZ = np.array([vecta[5],vecta[2],vectb[5]])
                         angle = G2mth.getRestAngle(XYZ,Amat)
-                        angles.append([ids,ops,angle,109.5,1.0])
-            angleRestData['Angles'] += angles
+                        if angle not in angleRestData['Angles']:
+                            angleRestData['Angles'].append([ids,ops,angle,109.5,1.0])
         UpdateAngleRestr(angleRestData)                
 
@@ -436 +439 @@
         return wtBox
         
+    def OnRowSelect(event):
+        r,c =  event.GetRow(),event.GetCol()
+        Obj = event.GetEventObject()
+        if r < 0 and c < 0:
+            if Obj.IsSelection():
+                Obj.ClearSelection()
+            else:
+                for row in range(Bonds.GetNumberRows()):
+                    Obj.SelectRow(row,True)
+        elif c < 0:                   #only row clicks
+            if event.ControlDown():                    
+                if r in Obj.GetSelectedRows():
+                    Obj.DeselectRow(r)
+                else:
+                    Obj.SelectRow(r,True)
+            elif event.ShiftDown():
+                indxs = Obj.GetSelectedRows()
+                Obj.ClearSelection()
+                ibeg = 0
+                if indxs:
+                    ibeg = indxs[-1]
+                for row in range(ibeg,r+1):
+                    Obj.SelectRow(row,True)
+            else:
+                Obj.ClearSelection()
+                Obj.SelectRow(r,True)
+                    
     def UpdateBondRestr(bondRestData):
-        
-        def OnColSort(event):
-            r,c = event.GetRow(),event.GetCol()
-            if r < 0 and c == 0:
-                names = G2mth.sortArray(table,0)
-                bonds = []
-                for name in names:
-                    idx = table.index(name)
-                    bonds.append(bondList[idx])
-                bondRestData['Bonds'] = bonds
-                UpdateBondRestr(bondRestData)                
         
         def OnChangeValue(event):
@@ -524 +543 @@
                     Bonds.SetReadOnly(r,c,True)
                     Bonds.SetCellStyle(r,c,VERY_LIGHT_GREY,True)
-            Bonds.Bind(wg.EVT_GRID_LABEL_LEFT_DCLICK,OnColSort)
+            Bonds.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK,OnRowSelect)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnChangeValue, id=G2gd.wxID_RESRCHANGEVAL)
@@ -626 +645 @@
                     Angles.SetReadOnly(r,c,True)
                     Angles.SetCellStyle(r,c,VERY_LIGHT_GREY,True)
-            Angles.Bind(wg.EVT_GRID_LABEL_LEFT_DCLICK,OnColSort)
+            Angles.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK,OnRowSelect)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnChangeValue, id=G2gd.wxID_RESRCHANGEVAL)
@@ -715 +734 @@
                     Planes.SetReadOnly(r,c,True)
                     Planes.SetCellStyle(r,c,VERY_LIGHT_GREY,True)
+            Planes.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK,OnRowSelect)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnChangeEsd, id=G2gd.wxID_RESTCHANGEESD)
@@ -804 +824 @@
                     Volumes.SetReadOnly(r,c,True)
                     Volumes.SetCellStyle(r,c,VERY_LIGHT_GREY,True)
+            Volumes.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK,OnRowSelect)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnChangeValue, id=G2gd.wxID_RESRCHANGEVAL)
@@ -866 +887 @@
                     Torsions.SetReadOnly(r,c,True)
                     Torsions.SetCellStyle(r,c,VERY_LIGHT_GREY,True)
+            Torsions.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK,OnRowSelect)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnChangeEsd, id=G2gd.wxID_RESTCHANGEESD)
@@ -927 +949 @@
                     Ramas.SetReadOnly(r,c,True)
                     Ramas.SetCellStyle(r,c,VERY_LIGHT_GREY,True)
+            Ramas.Bind(wg.EVT_GRID_LABEL_LEFT_CLICK,OnRowSelect)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnDeleteRestraint, id=G2gd.wxID_RESTDELETE)
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnChangeEsd, id=G2gd.wxID_RESTCHANGEESD)