Changeset 2890 for branch

Timestamp:

Jul 1, 2017 11:17:10 AM (6 years ago)

Author:

vondreele

Message:

Constraints now displayed
fix TopLevel? references
fix display issues for Sample Parameters
fix Resttraints display issues

Location:

branch/2frame

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIconstrGUI.py (modified) (1 diff)
• GSASIIctrls.py (modified) (1 diff)
• GSASIIgrid.py (modified) (5 diffs)
• GSASIIpwdGUI.py (modified) (5 diffs)
• GSASIIrestrGUI.py (modified) (10 diffs)

branch/2frame/GSASII.py

@@ -2563 +2563 @@
         self.mainPanel = GSASIIsplit(self,-1)
         self.treePanel = wx.Panel(self.mainPanel, wx.ID_ANY,
-                style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
+            style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
         self.treePanel.SetAutoLayout(True)
         self.dataPanel = wx.Panel(self.mainPanel, wx.ID_ANY,
-                style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
-        self.dataPanel.SetAutoLayout(True)
+            style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
         self.dataWindow = G2gd.DataWindow(self.dataPanel)
-        self.dataWindow.SetupScrolling()
+        self.dataWindow.SetAutoLayout(True)
+        self.dataWindow.SetInitialSize()
         self.mainPanel.SetMinimumPaneSize(100)
         self.mainPanel.SplitVertically(self.treePanel, self.dataPanel, 200)
@@ -2711 +2711 @@
         'Called to make PatternTree fill mainPanel'
         w,h = self.GetClientSizeTuple()
+        self.dataWindow.SetupScrolling()
+        self.mainPanel.SetSize(wx.Size(w,h+1))
         self.mainPanel.SetSize(wx.Size(w,h))
         self.PatternTree.SetSize(wx.Size(w,h))
+        self.dataWindow.SetSize(wx.Size(w,h))
+#        self.dataWindow.Refresh()
+#        self.dataWindow.Update()
         
     def SetDataSize(self):
         Size = self.GetSize()
+        Size[1] += 1        #kluge to ensure scrollbar settings & window properly displayed
         self.SetSize(Size)
-        Size[1] += 1        #kluge to ensure scrollbar settings & window properly displayed
+        Size[1] -= 1        #kluge to ensure scrollbar settings & window properly displayed
         self.SetSize(Size)
                                 

branch/2frame/GSASIIconstrGUI.py

@@ -1138 +1138 @@
 
     G2frame.dataWindow.ClearData()
-    G2frame.constr = G2G.GSNoteBook(parent=G2frame.dataWindow)
+    G2frame.constr = G2G.GSNoteBook(parent=G2frame.dataWindow,size=G2frame.dataWindow.GetClientSize())
     # note that order of pages is hard-coded in RaisePage
     PhaseConstr = wx.ScrolledWindow(G2frame.constr)

branch/2frame/GSASIIctrls.py

@@ -57 +57 @@
     def __init__(self,parent=None,*args,**kwargs):
         super(self.__class__,self).__init__(parent=parent,*args,**kwargs)
-        self.G2frame = parent.GetParent().GetParent()
+        self.G2frame = parent.GetTopLevelParent()
         self.root = self.AddRoot('Loaded Data: ')
         self.SelectionChanged = None

branch/2frame/GSASIIgrid.py

@@ -1627 +1627 @@
         '''
         self.datamenu = menu
-        self.GetGrandParent().GetParent().FillMainMenu(menu,addhelp=False) # add the data tree menu items to the main menu
+        self.GetTopLevelParent().FillMainMenu(menu,addhelp=False) # add the data tree menu items to the main menu
         if not empty:
             menu.Append(wx.Menu(title=''),title='|') # add a separator
@@ -1826 +1826 @@
                         ):
             objlist = []
-            for obj in self.parent.GetParent().GetParent().exporterlist:
+            for obj in self.parent.GetTopLevelParent().exporterlist:
                 if lbl.lower() in obj.exporttype:
                     try:
@@ -2376 +2376 @@
         # setup a cascade menu for the formats that have been defined
         self.ReImportMenuId = {}  # points to readers for each menu entry
-        for reader in self.parent.GetParent().GetParent().ImportPhaseReaderlist:
+        for reader in self.parent.GetTopLevelParent().ImportPhaseReaderlist:
             item = submenu.Append(
                 wx.ID_ANY,help=reader.longFormatName,
@@ -2599 +2599 @@
         self.SetBackgroundColour(wx.WHITE)
         self.DestroyChildren()
-#        self.SetSize(self.GetParent().GetSize())
+        self.SetSize(self.GetParent().GetSize())
+        self.SetAutoLayout(True)
+        self.SetupScrolling()
         
 #TODO - remove         
@@ -2698 +2700 @@
     G2frame.SetLabel(G2frame.GetLabel().split('||')[0]+' || '+'Comments')
     G2frame.dataWindow.ClearData()
-    G2frame.dataWindow.SetupScrolling()
+#    G2frame.dataWindow.SetupScrolling()
     text = wx.TextCtrl(parent=G2frame.dataWindow,size=G2frame.dataWindow.GetSize(),
         style=wx.TE_MULTILINE|wx.TE_READONLY|wx.TE_DONTWRAP)

branch/2frame/GSASIIpwdGUI.py

@@ -2248 +2248 @@
         # Assemble a list of item labels
         TextTable = {key:label for key,label,dig in
-                     SetupSampleLabels(hst,data.get('Type'),Inst['Type'][0])
-                     }
+            SetupSampleLabels(hst,data.get('Type'),Inst['Type'][0])}
         # get flexible labels
-        TextTable.update({
-            key:Controls[key] for key in Controls if key.startswith('FreePrm')
-            })
+        TextTable.update({key:Controls[key] for key in Controls if key.startswith('FreePrm')})
         # add a few extra
-        TextTable.update({
-            'Type':'Diffractometer type',
-            'InstrName':'Instrument Name',
-            })
+        TextTable.update({'Type':'Diffractometer type','InstrName':'Instrument Name',})
         # Assemble a list of dict entries that would be labeled in the Sample
         # params data window (drop ranId and items not used).
@@ -2425 +2419 @@
     mainSizer = wx.BoxSizer(wx.VERTICAL)
     topSizer = wx.BoxSizer(wx.HORIZONTAL)
-    topSizer.Add((-1,-1),1,wx.EXPAND,1)
-    topSizer.Add(wx.StaticText(G2frame.dataWindow,label='Sample and Experimental Parameters'))
-    topSizer.Add((-1,-1),1,wx.EXPAND,1)
-    mainSizer.Add(topSizer,0,wx.EXPAND,1)
+    topSizer.Add((-1,-1),0,WACV)
+    topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Sample and Experimental Parameters'))
+    topSizer.Add((-1,-1),0,WACV)
+    mainSizer.Add(topSizer,0,WACV)
     nameSizer = wx.BoxSizer(wx.HORIZONTAL)
-    nameSizer.Add(wx.StaticText(G2frame.dataWindow,wx.ID_ANY,' Instrument Name'),
-                0,WACV)
-    nameSizer.Add((-1,-1),1,wx.EXPAND,1)
+    nameSizer.Add(wx.StaticText(G2frame.dataWindow,wx.ID_ANY,' Instrument Name '),0,WACV)
+    nameSizer.Add((-1,-1),1,WACV)
     instNameVal = wx.TextCtrl(G2frame.dataWindow,wx.ID_ANY,data['InstrName'],
-                              size=(200,-1),style=wx.TE_PROCESS_ENTER)        
+        size=(200,-1),style=wx.TE_PROCESS_ENTER)        
     nameSizer.Add(instNameVal)
     instNameVal.Bind(wx.EVT_CHAR,OnNameVal)
-    mainSizer.Add(nameSizer,0,wx.EXPAND,1)
+    mainSizer.Add(nameSizer,0,WACV)
     mainSizer.Add((5,5),0)
     labelLst.append('Instrument Name')
@@ -2456 +2449 @@
                     onChoice=OnHistoChange)
         nameSizer.Add(histoType)
-        mainSizer.Add(nameSizer,0,wx.EXPAND,1)
+        mainSizer.Add(nameSizer,0,WACV)
         mainSizer.Add((5,5),0)
 
@@ -2477 +2470 @@
             elemKeysLst.append([key])
             refFlgElem.append(None)
-        parmSizer.Add(parmVal,1,wx.EXPAND)
+        parmSizer.Add(parmVal,0,WACV)
     Info = {}
         
@@ -2485 +2478 @@
         parmSizer.Add(parmVal,1,wx.EXPAND)
         parmVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,data,key,typeHint=float)
-        parmSizer.Add(parmVal,1,wx.EXPAND)
+        parmSizer.Add(parmVal,0,WACV)
         labelLst.append(Controls[key])
         dspLst.append(None)

branch/2frame/GSASIIrestrGUI.py

@@ -763 +763 @@
 
         wtBox = wx.BoxSizer(wx.HORIZONTAL)
-        wtBox.Add(wx.StaticText(wind,-1,'Restraint weight factor:'),0,wx.ALIGN_CENTER_VERTICAL)
+        wtBox.Add(wx.StaticText(wind,-1,'Restraint weight factor: '),0,wx.ALIGN_CENTER_VERTICAL)
         wtfactor = G2G.ValidatedTxtCtrl(wind,restData,'wtFactor',nDig=(10,2),typeHint=float)
         wtBox.Add(wtfactor,0,wx.ALIGN_CENTER_VERTICAL)
@@ -771 +771 @@
         wtBox.Add(useData,0,wx.ALIGN_CENTER_VERTICAL)
         if 'Bonds' in restData or 'Angles' in restData:
-            wtBox.Add(wx.StaticText(wind,-1,'  Search range:'),0,wx.ALIGN_CENTER_VERTICAL)
+            wtBox.Add(wx.StaticText(wind,-1,'  Search range: '),0,wx.ALIGN_CENTER_VERTICAL)
             sRange = G2G.ValidatedTxtCtrl(wind,restData,'Range',nDig=(10,2),typeHint=float)
             wtBox.Add(sRange,0,wx.ALIGN_CENTER_VERTICAL)
-            wtBox.Add(wx.StaticText(wind,-1,'(x sum(atom radii)'),0,wx.ALIGN_CENTER_VERTICAL)
+            wtBox.Add(wx.StaticText(wind,-1,' x sum(atom radii)'),0,wx.ALIGN_CENTER_VERTICAL)
         return wtBox
         
@@ -931 +931 @@
 
         BondRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(BondRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
@@ -1062 +1062 @@
 
         AngleRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(AngleRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
@@ -1189 +1189 @@
 
         PlaneRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(PlaneRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
@@ -1320 +1320 @@
 
         ChiralRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(ChiralRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
@@ -1441 +1441 @@
 
         TorsionRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(TorsionRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
@@ -1564 +1564 @@
 
         RamaRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(RamaRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
@@ -1697 +1697 @@
 
         ChemCompRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(ChemCompRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
@@ -1770 +1770 @@
             mainSizer.Add(wx.StaticText(TextureRestr,-1,'No texture restraints for this phase'),0,)
         TextureRestr.SetSizer(mainSizer)
-        Size = mainSizer.Fit(G2frame.dataFrame)
+        Size = mainSizer.Fit(TextureRestr)
         Size[0] = 600
         Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big