Changeset 2498 for trunk

Timestamp:

Oct 20, 2016 10:03:57 AM (9 years ago)

Author:

toby

Message:

set Refine flag after linking hist & phase in import

Location:

trunk

Files:

• GSASII.py (modified) (5 diffs)
• GSASIIctrls.py (modified) (1 diff)

trunk/GSASII.py ¶

@@ -765 +765 @@
                     raise Exception('Unexpected histogram '+str(histoName))
         wx.EndBusyCursor()
+        self.EnableRefineCommand()
         return # success
         
@@ -952 +953 @@
                             ref[3] = 0
         wx.EndBusyCursor()
-        
+        self.EnableRefineCommand()        
         return # success
 
@@ -1444 +1445 @@
                     self.ErrorDialog('Read Error',
                                      'Error opening/reading file '+str(instfile))
+    def EnableRefineCommand(self):
+        haveData = False
+        # check for phases connected to histograms
+        sub = G2gd.GetPatternTreeItemId(self,self.root,'Phases')
+        if not sub: return
+        item, cookie = self.PatternTree.GetFirstChild(sub)
+        while item: # loop over phases
+            data = self.PatternTree.GetItemPyData(item)
+            item, cookie = self.PatternTree.GetNextChild(sub, cookie)
+            UseList = data['Histograms']
+            if UseList: haveData = True
+        if haveData:
+            self.dataFrame.DataMenu.Enable(G2gd.wxID_DATADELETE,True)
+            for item in self.Refine: item.Enable(True)
+        else:
+            self.dataFrame.DataMenu.Enable(G2gd.wxID_DATADELETE,False)
+            for item in self.Refine: item.Enable(False)
+
         
     def OnImportPowder(self,event):
@@ -1637 +1656 @@
                     G2gd.GetPatternTreeItemId(self,Id,'Reflection Lists'))
                 refList[generalData['Name']] = []
+        self.EnableRefineCommand()
         return # success
 
@@ -1802 +1822 @@
                 G2gd.GetPatternTreeItemId(self,Id,'Reflection Lists'))
             refList[generalData['Name']] = []
+        self.EnableRefineCommand()
         return # success
         

trunk/GSASIIctrls.py ¶

@@ -4021 +4021 @@
             if os.path.exists(os.path.join(self.tutorialPath,i[0],i[1]))]
         if not indices:
-            G2MessageBox(self,'There are no downloaded tutorials','None downloaded')
+            G2MessageBox(self,
+                         'There are no downloaded tutorials in '+self.tutorialPath,
+                         'None downloaded')
             return
         choices = [tutorialCatalog[i][2] for i in indices]