Changeset 1701

Timestamp:

Mar 13, 2015 6:41:45 PM (9 years ago)

Author:

toby

Message:

more tutorial fixes

Location:

trunk

Files:

• GSASIIctrls.py (modified) (6 diffs)
• GSASIIddataGUI.py (modified) (3 diffs)
• GSASIIpath.py (modified) (1 diff)

trunk/GSASIIctrls.py

@@ -2094 +2094 @@
         self.dataLoc.SetLabel(tutorialPath)
         self.EndModal(wx.ID_OK)
+        wx.BeginBusyCursor()
         if self.BrowseMode == 0:
             # xfer data & web page locally, then open web page
@@ -2114 +2115 @@
             ShowWebPage(URL,self.frame)
         else:
+            wx.EndBusyCursor()
             raise Exception("How did this happen!")
+        wx.EndBusyCursor()
     def ValidateTutorialDir(self,fullpath=tutorialPath,baseURL=G2BaseURL):
         '''Load help to new directory or make sure existing directory looks correctly set up
@@ -2122 +2125 @@
             if os.path.exists(os.path.join(fullpath,"help")):
                 if not GSASIIpath.svnGetRev(os.path.join(fullpath,"help")):
-                    raise Exception("Problem with "+fullpath+" dir help exists but is not in SVN")
-            else:
-                raise Exception("Problem: dir "+fullpath+" exists does not contain help")
+                    print("Problem with "+fullpath+" dir help exists but is not in SVN")
+                    raise Exception
             if os.path.exists(os.path.join(fullpath,"Exercises")):
                 if not GSASIIpath.svnGetRev(os.path.join(fullpath,"Exercises")):
-                    raise Exception("Problem with "+fullpath+" dir Exercises exists but is not in SVN")
-            else:
-                raise Exception("Problem: dir "+fullpath+" exists does not contain Exercises")
-        else:
-            if not GSASIIpath.svnInstallDir(baseURL+"/MT",fullpath):
-                raise Exception("Problem transferring empty directory from web")
+                    print("Problem with "+fullpath+" dir Exercises exists but is not in SVN")
+                    raise Exception
+            if (os.path.exists(os.path.join(fullpath,"help")) and
+                    os.path.exists(os.path.join(fullpath,"Exercises"))):
+                return True # both good
+            elif (os.path.exists(os.path.join(fullpath,"help")) or
+                    os.path.exists(os.path.join(fullpath,"Exercises"))):
+                print("Problem: dir "+fullpath+" exists has either help or Exercises, not both")
+                raise Exception
+        wx.BeginBusyCursor()
+        if not GSASIIpath.svnInstallDir(baseURL+"/MT",fullpath):
+            wx.EndBusyCursor()
+            print("Problem transferring empty directory from web")
+            raise Exception
+        wx.EndBusyCursor()
         return True
 
@@ -2139 +2150 @@
         if GSASIIpath.svnSwitchDir("help",tutorialname,baseURL+"/Tutorials",fullpath):
             return True
-        raise Exception("Problem transferring Tutorial from web")
+        print("Problem transferring Tutorial from web")
+        raise Exception
         
     def LoadExercise(self,tutorialname,fullpath=tutorialPath,baseURL=G2BaseURL):
@@ -2145 +2157 @@
         if GSASIIpath.svnSwitchDir("Exercises",tutorialname,baseURL+"/Exercises",fullpath):
             return True
-        raise Exception("Problem transferring Exercise from web")
+        print ("Problem transferring Exercise from web")
+        raise Exception
         
     def SelectDownloadLoc(self,event):
@@ -2167 +2180 @@
                 os.makedirs(pth)
             except OSError:
-                G2MessageBox(self.frame,
-                '''The selected directory is not valid.
-                
-                It appears you do not have write access to this location.
-                ''')
+                msg = 'The selected directory is not valid.\n\t'
+                msg += pth
+                msg += '\n\nAn attempt to create the directory failed'
+                G2MessageBox(self.frame,msg)
                 return
+        self.ValidateTutorialDir(pth,G2BaseURL)
         try: 
             self.ValidateTutorialDir(pth,G2BaseURL)

trunk/GSASIIddataGUI.py

@@ -858 +858 @@
     def OnSelSpin(event):
         hist = keyList[selSpin.GetValue()]
+        selSpin.Destroy() # remove button to discourage pressing too fast
         G2plt.PlotSizeStrainPO(G2frame,data)
         wx.CallLater(100,UpdateDData,G2frame,DData,data,hist)
@@ -870 +871 @@
     selSpin.SetValue(keyList.index(hist))
     selSpin.SetRange(0,len(keyList)-1)
-    selSpin.Bind(wx.EVT_SPIN,OnSelSpin)
     selSizer.Add(selSpin)
     select = wx.ListBox(DData,choices=keyList,style=wx.LB_SINGLE,size=(-1,100))
@@ -997 +997 @@
     mainSizer.Add((5,5),0)
     G2phsGUI.SetPhaseWindow(G2frame.dataFrame,DData,mainSizer)
+    selSpin.Bind(wx.EVT_SPIN,OnSelSpin)

trunk/GSASIIpath.py

@@ -400 +400 @@
     svn = whichsvn()
     if not svn: return
-    if os.path.exists(loadpath):
-        raise Exception("Error: Attempting to create existing directory "+loadpath)
     cmd = [svn,'co',URL,loadpath,'--non-interactive']
     if svnVersionNumber() >= 1.6: cmd += ['--trust-server-cert']