a few tweaks for core_depthplot

PmagPy · Feb 23, 2015 · 7d613a5 · 7d613a5
1 parent 026ee61
commit 7d613a5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/ipmag.py b/ipmag.py
@@ -1056,17 +1056,19 @@ def core_depthplot(dir_path='.', meas_file='magic_measurements.txt', spc_file=''
     #
     #
     # get data read in
-    meas_file=dir_path+'/'+meas_file
+    meas_file = os.path.join(dir_path, meas_file)
     if age_file=="":
-        samp_file=dir_path+'/'+samp_file
-        Samps,file_type=pmag.magic_read(samp_file) 
+        samp_file = os.path.join(dir_path, samp_file)
+        Samps,file_type = pmag.magic_read(samp_file) 
     else:
         depth_scale='age'
-        age_file=dir_path+'/'+age_file
-        Samps,file_type=pmag.magic_read(age_file) 
-        age_unit=""
-    if spc_file!="":Specs,file_type=pmag.magic_read(spc_file)
-    if res_file!="":Results,file_type=pmag.magic_read(res_file)
+        age_file = os.path.join(dir_path, age_file)
+        Samps,file_type = pmag.magic_read(age_file) 
+        age_unit = ""
+    if spc_file != "":
+        Specs,file_type=pmag.magic_read(spc_file)
+    if res_file!="":
+        Results,file_type=pmag.magic_read(res_file)
     if norm==1:
         ErSpecs,file_type=pmag.magic_read(wt_file) 
         print len(ErSpecs), ' specimens read in from ',wt_file

diff --git a/pmag_menu_dialogs.py b/pmag_menu_dialogs.py
@@ -1692,9 +1692,9 @@ def on_okButton(self, event):
         else:
             pltMag = ''
         if not pltLine:
-            pltLine = "-L"
+            pltLine = ""
         else:
-            pltLine = ''
+            pltLine = '-L' # suppress line
         if logit:
             logit = "-log"
         else:

diff --git a/version.py b/version.py
@@ -1,2 +1,2 @@
-"pmagpy-3.1.6"
-version = 'pmagpy-3.1.6'
+"pmagpy-3.1.7"
+version = 'pmagpy-3.1.7'