Changeset 1729

Timestamp:

Mar 17, 2015 1:34:37 PM (9 years ago)

Author:

toby

Message:

switch default download dir; remove old tutorial help item; pretty-up help dialog; fix bug on directory change

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIctrls.py (modified) (12 diffs)
• GSASIIpath.py (modified) (1 diff)
• config_example.py (modified) (1 diff)

trunk/GSASII.py

@@ -2033 +2033 @@
             self._init_Macro()
         HelpMenu=G2G.MyHelp(self,helpType='Data tree',
-            morehelpitems=[('&Old Tutorials','OldTutorials'), # this will eventually go away
-                           ('&Download Tutorial','Tutorials'), 
+            morehelpitems=[#('&Old Tutorials','OldTutorials'), # this will eventually go away
+                           ('&Tutorials','Tutorials'), 
                            ])
         menubar.Append(menu=HelpMenu,title='&Help')

trunk/GSASIIctrls.py

@@ -1485 +1485 @@
             print 'Error: help lookup failed!',event.GetEventObject()
             print 'id=',event.GetId()
-        elif helpType == 'OldTutorials': # this will go away
-            #self.frame.Tutorials = True
-            ShowHelp(helpType,self.frame)
+        #elif helpType == 'OldTutorials': # this will go away
+            #ShowHelp(helpType,self.frame)
         elif helpType == 'Tutorials': 
             dlg = OpenTutorial(self.frame)
             dlg.ShowModal()
-            #if dlg.ShowModal() == wx.ID_OK:
-                #self.frame.Tutorials = True
             dlg.Destroy()
             return
@@ -1728 +1725 @@
         self.dlg.SetSizer(mainSizer)
         mainSizer.Fit(self.dlg)
+        self.dlg.CenterOnParent()
         self.dlg.ShowModal()
         self.dlg.Destroy()
@@ -2020 +2018 @@
     tutorialPath = GSASIIpath.GetConfigValue('Tutorial_location')
 else:
-    tutorialPath = GSASIIpath.path2GSAS2
+    # pick a default directory in a logical place
+    if sys.platform.lower().startswith('win') and os.path.exists(os.path.abspath(os.path.expanduser('~/My Documents'))):
+        tutorialPath = os.path.abspath(os.path.expanduser('~/My Documents/G2tutorials'))
+    else:
+        tutorialPath = os.path.abspath(os.path.expanduser('~/G2tutorials'))
 
 class OpenTutorial(wx.Dialog):
@@ -2037 +2039 @@
         pnl = wx.Panel(self)
         sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer1 = wx.BoxSizer(wx.HORIZONTAL)        
         label = wx.StaticText(
             pnl,  wx.ID_ANY,
             'Select the tutorial to be run and the mode of access'
             )
-        sizer.Add(label, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
         msg = '''To save download time for GSAS-II tutorials and their
         sample data files are being moved out of the standard
@@ -2061 +2063 @@
         '''
         hlp = HelpButton(pnl,msg)
-        sizer.Add(hlp,0,wx.ALIGN_RIGHT|wx.ALL)
+        sizer1.Add((-1,-1),1, wx.EXPAND, 0)
+        sizer1.Add(label, 0, wx.ALIGN_CENTRE|wx.ALL, 0)
+        sizer1.Add((-1,-1),1, wx.EXPAND, 0)
+        sizer1.Add(hlp,0,wx.ALIGN_RIGHT|wx.ALL)
+        sizer.Add(sizer1,0,wx.EXPAND|wx.ALL,0)
+        sizer.Add((10,10))
         #======================================================================
         # # This is needed only until we get all the tutorials items moved
@@ -2081 +2088 @@
         self.mode.Bind(wx.EVT_RADIOBOX, self.OnModeSelect)
         sizer.Add(self.mode,0,WACV)
+        sizer.Add((10,10))
+        label = wx.StaticText(pnl,  wx.ID_ANY,'Click on tutorial to be opened:')
+        sizer.Add(label, 0, wx.ALIGN_LEFT|wx.ALL, 2)
+        self.listbox = wx.ListBox(pnl, wx.ID_ANY, size=(450, 100), style=wx.LB_SINGLE)
+        self.listbox.Bind(wx.EVT_LISTBOX, self.OnTutorialSelected)
+        sizer.Add(self.listbox,1,WACV|wx.EXPAND|wx.ALL,1)
+        sizer.Add((10,10))
         sizer1 = wx.BoxSizer(wx.HORIZONTAL)
         btn = wx.Button(pnl, wx.ID_ANY, "Set download location")
@@ -2092 +2106 @@
             'Tutorials and Exercise files will be downloaded to:'
             )
-        sizer.Add(label, 0, wx.ALIGN_LEFT|wx.ALL, 5)
+        sizer.Add(label, 0, wx.ALIGN_LEFT|wx.ALL, 1)
         self.TutorialLabel = wx.StaticText(pnl,wx.ID_ANY,'')
         sizer.Add(self.TutorialLabel, 0, wx.ALIGN_LEFT|wx.EXPAND, 5)
         self.ExerciseLabel = wx.StaticText(pnl,wx.ID_ANY,'')
+        sizer.Add(self.ExerciseLabel, 0, wx.ALIGN_LEFT|wx.EXPAND, 5)
         self.ShowTutorialPath()
-        sizer.Add(self.ExerciseLabel, 0, wx.ALIGN_LEFT|wx.EXPAND, 5)
-        self.listbox = wx.ListBox(pnl, wx.ID_ANY, size=(450, 100), style=wx.LB_SINGLE)
-        self.listbox.Bind(wx.EVT_LISTBOX, self.OnTutorialSelected)
         self.OnModeSelect(None)
-        #self.FillListBox()
-        sizer.Add(self.listbox,1,WACV|wx.EXPAND|wx.ALL,1)
         
         btnsizer = wx.StdDialogButtonSizer()
@@ -2117 +2127 @@
     #     '''
     #     self.EndModal(wx.ID_OK)
-    #     self.frame.Tutorials = True 
     #     ShowHelp('Tutorials',self.frame)
     def OnModeSelect(self,event):
@@ -2161 +2170 @@
             self.LoadExercise(exedir,tutorialPath,G2BaseURL)
             URL = os.path.join(tutorialPath,'help',tutdir,htmlname)
+            self.frame.ImportDir = os.path.join(tutorialPath,'Exercises',exedir)
             ShowWebPage(URL,self.frame)
-            self.frame.ImportDir = os.path.join(tutorialPath,'Exercises',exedir)
         elif self.BrowseMode == 1:
             # xfer data locally, open web page remotely
             self.LoadExercise(exedir,tutorialPath,G2BaseURL)
             URL = os.path.join(G2BaseURL,'Tutorials',tutdir,htmlname)
+            self.frame.ImportDir = os.path.join(tutorialPath,'Exercises',exedir)
             ShowWebPage(URL,self.frame)
-            self.frame.ImportDir = os.path.join(tutorialPath,'Exercises',exedir)
         elif self.BrowseMode == 2:
             # open web page remotely, don't worry about data
             URL = os.path.join(G2BaseURL,'Tutorials',tutdir,htmlname)
             ShowWebPage(URL,self.frame)
-            self.frame.ImportDir = os.path.join(tutorialPath,'Exercises',exedir)
         elif self.BrowseMode == 3:
             # open web page that has already been transferred
             URL = os.path.join(tutorialPath,'help',tutdir,htmlname)
+            self.frame.ImportDir = os.path.join(tutorialPath,'Exercises',exedir)
             ShowWebPage(URL,self.frame)
         else:
@@ -2194 +2203 @@
         throws an exception if there is a problem.
         '''
+        wx.BeginBusyCursor()
+        wx.Yield()
         if os.path.exists(fullpath):
             if os.path.exists(os.path.join(fullpath,"help")):
                 if not GSASIIpath.svnGetRev(os.path.join(fullpath,"help")):
                     print("Problem with "+fullpath+" dir help exists but is not in SVN")
+                    wx.EndBusyCursor()
                     raise Exception
             if os.path.exists(os.path.join(fullpath,"Exercises")):
                 if not GSASIIpath.svnGetRev(os.path.join(fullpath,"Exercises")):
                     print("Problem with "+fullpath+" dir Exercises exists but is not in SVN")
+                    wx.EndBusyCursor()
                     raise Exception
             if (os.path.exists(os.path.join(fullpath,"help")) and
                     os.path.exists(os.path.join(fullpath,"Exercises"))):
+                if self.BrowseMode != 3:
+                    print('Checking for directory updates')
+                    GSASIIpath.svnUpdateDir(os.path.join(fullpath,"help"))
+                    GSASIIpath.svnUpdateDir(os.path.join(fullpath,"Exercises"))
+                wx.EndBusyCursor()
                 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")
+                wx.EndBusyCursor()
                 raise Exception
-        wx.BeginBusyCursor()
         if not GSASIIpath.svnInstallDir(baseURL+"/MT",fullpath):
             wx.EndBusyCursor()
@@ -2237 +2255 @@
         '''
         global tutorialPath
-        localpath = os.path.abspath(os.path.expanduser('~/G2tutorials'))
         dlg = wx.DirDialog(self, "Choose a directory for downloads:",
-                           defaultPath=localpath)#,style=wx.DD_DEFAULT_STYLE)
+                           defaultPath=tutorialPath)#,style=wx.DD_DEFAULT_STYLE)
                            #)
-        if dlg.ShowModal() == wx.ID_OK:
+        try:
+            if dlg.ShowModal() != wx.ID_OK:
+                return
             pth = dlg.GetPath()
-        else:
-            if GSASIIpath.GetConfigValue('Tutorial_location'):
-                pth = GSASIIpath.GetConfigValue('Tutorial_location')
-            else:
-                pth = GSASIIpath.path2GSAS2
+        finally:
+            dlg.Destroy()
+
         if not os.path.exists(pth):
             try:
@@ -2262 +2279 @@
         except:
             G2MessageBox(self.frame,
-            '''The selected directory is not valid.
+            '''Error downloading to the selected directory
+
+            Are you connected to the internet? If not, you can
+            only view previously downloaded tutorials (select
+            "open from local...")
             
             You must use a directory that you have write access
             to. You can reuse a directory previously used for 
             downloads, but the help and Tutorials subdirectories
-             must be created by this routine. 
+            must have been created by this routine. 
             ''')
         self.dataLoc.SetLabel(tutorialPath)
         self.ShowTutorialPath()
+        self.OnModeSelect(None)
     
 if __name__ == '__main__':

trunk/GSASIIpath.py

@@ -378 +378 @@
            '--accept','theirs-conflict','--force']
     if svnVersionNumber() > 1.6: cmd += ['--ignore-ancestry']
-    print("Loading files from "+URL)
+    print("Loading files from "+URL+'\n  to '+fpath)
     s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     out,err = s.communicate()

trunk/config_example.py

@@ -39 +39 @@
 Tutorial_location = None
 '''Change this to place tutorials by in a different spot. If None, this defaults to
-the location where GSAS-II is loaded GSASIIpath.path2GSAS2. For installations where
-G2 is installed by an administrator, it is a good idea to use something like this::
+~/My Documents/G2tutorials (on windows) or ~/G2tutorials. If you want to use a different
+location (such as to use the GSASII installation directory), this can be set here.
+As an example, to always use ~/G2tutorials do this::
 
     import os.path
     Tutorial_location = os.path.join(os.path.expanduser('~'),'G2tutorials')
 
-This will allow users to download tutorial files into their own file space.
+To install into the location where GSAS-II is installed, use this::
+
+    import GSASIIpath
+    Tutorial_location = GSASIIpath.path2GSAS2
+
 '''