Changeset 1020

Timestamp:

Aug 7, 2013 5:38:21 PM (9 years ago)

Author:

toby

Message:

fix Matt's path bug; minor disagl cleanup

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIIO.py (modified) (2 diffs)
• GSASIIpath.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (3 diffs)

trunk/GSASII.py

@@ -216 +216 @@
         #pathlist = sys.path[:]
         #if path2GSAS2 not in pathlist: pathlist.append(path2GSAS2)
-        path2GSAS2 = os.path.join(
-            os.path.dirname(os.path.realpath(__file__)), # location of this file
-            'imports')
+        #path2GSAS2 = os.path.join(
+        #    os.path.dirname(os.path.realpath(__file__)), # location of this file
+        #    'imports')
         pathlist = sys.path[:]
-        if path2GSAS2 not in pathlist: pathlist.append(path2GSAS2)
+        #if path2GSAS2 not in pathlist: pathlist.append(path2GSAS2)
 
         filelist = []
@@ -1040 +1040 @@
             except:
                 pass
-        path2GSAS2 = os.path.join(
-            os.path.dirname(os.path.realpath(__file__)), # location of this file
-            'exports')
-        if path2GSAS2 not in sys.path: sys.path.append(path2GSAS2)
+        #path2GSAS2 = os.path.join(
+        #    os.path.dirname(os.path.realpath(__file__)), # location of this file
+        #    'exports')
+        #if path2GSAS2 not in sys.path: sys.path.append(path2GSAS2)
         #reload(G2IO)
         import G2cif

trunk/GSASIIIO.py

@@ -1552 +1552 @@
                  G2frame,
                  formatName,
+                 extension,
                  longFormatName=None,
                  ):
         self.G2frame = G2frame
         self.formatName = formatName # short string naming file type
+        self.extension = extension
         if longFormatName: # longer string naming file type
             self.longFormatName = longFormatName
@@ -1677 +1679 @@
             for key2 in self.Histograms[key1]:
                 print '      ',key2,Show(self.Histograms[key1][key2])
+
+    def defSaveFile(self):
+        return os.path.abspath(
+            os.path.splitext(self.G2frame.GSASprojectfile
+                             )[0]+self.extension)
+        
+    def askSaveFile(self):
+        '''Ask the user to supply a file name
+
+        :returns: a file name (str)
+        '''
+        defnam = os.path.splitext(
+            os.path.split(self.G2frame.GSASprojectfile)[1]
+            )[0]+self.extension
+        dlg = wx.FileDialog(
+            self.G2frame, 'Input name for file to write', '.', defnam,
+            self.longFormatName+' (*'+self.extension+')|*'+self.extension,
+            wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT|wx.CHANGE_DIR)
+        try:
+            if dlg.ShowModal() == wx.ID_OK:
+                filename = dlg.GetPath()
+                # make sure extension is correct
+                filename = os.path.splitext(filename)[0]+self.extension
+            else:
+                filename = None
+        finally:
+            dlg.Destroy()
+        return filename
+        
                     
 ######################################################################

trunk/GSASIIpath.py

@@ -37 +37 @@
     else:
         bindir = 'binlinux%d.%d' % sys.version_info[0:2]
-for loc in sys.path[0],os.path.split(__file__)[0]:
+for loc in sys.path[0],os.path.abspath(os.path.split(__file__)[0]):
     if bindir:
         if os.path.exists(os.path.join(loc,bindir)) and os.path.join(loc,bindir) not in sys.path: 
@@ -50 +50 @@
 if bindir == None:
     raise Exception,"**** ERROR GSAS-II binary libraries not found, GSAS-II fails ****"
-
+# add the data import and export directory to the search path
+path2GSAS2 = os.path.join(
+    os.path.dirname(os.path.realpath(__file__)), # location of this file
+    'imports')
+pathlist = sys.path[:]
+if path2GSAS2 not in sys.path: sys.path.append(path2GSAS2)
+path2GSAS2 = os.path.join(
+    os.path.dirname(os.path.realpath(__file__)), # location of this file
+    'exports')
+if path2GSAS2 not in sys.path: sys.path.append(path2GSAS2)
 # routines for looking a version numbers in files
 version = -1

trunk/GSASIIphsGUI.py

@@ -87 +87 @@
 
     '''
-       
+
 #patch
     if 'RBModels' not in data:
@@ -1564 +1564 @@
             if dlg.ShowModal() == wx.ID_OK:
                 DisAglCtls = dlg.GetData()
+            else:
+                dlg.Destroy()
+                return
             dlg.Destroy()
             generalData['DisAglCtls'] = DisAglCtls
@@ -1586 +1589 @@
             except KeyError:        # inside DistAngle for missing atom types in DisAglCtls
                 print '**** ERROR - try again but do "Reset" to fill in missing atom types ****'
-                
+        else:
+                print "select one or more rows of atoms"
+                G2frame.ErrorDialog('Select atom',"select one or more rows of atoms then redo")
+                        
     def OnReImport(event):
         print 'reimport atoms from file to be developed'