Changeset 19

Timestamp:

Dec 13, 2006 10:39:32 AM (16 years ago)

Author:

ajj

Message:

Added catch to LoadTree? to avoid empty directory error.

File:

• sans/utils/bt5/bt5plot/bt5plot (modified) (10 diffs)

sans/utils/bt5/bt5plot/bt5plot

@@ -2 +2 @@
 
 package require BLT
-
-# Set default directory
-
-set defdir [pwd] 
 
 set images(normal) [image create photo -format gif -data {
@@ -33 +29 @@
         set det5(0) 0
         set xvar(0) 0
+        set trans(0) 0
 
         if [catch {open $fileName r} fileId] {
@@ -87 +84 @@
                 set monvec [join "$elem _monvec" ""]
         
-                global $xvec $countvec $transvec $monvec
+                global $xvec $countvec $countratevec $transvec $monvec
         
                 blt::vector destroy $xvec
@@ -123 +120 @@
                 set monvec [join "$filebase _monvec" ""]
         
-                global $xvec $countvec $transvec $monvec
+                global $xvec $countvec $countratevec $transvec $monvec
         
                 blt::vector create $xvec
@@ -170 +167 @@
 
 proc LoadTree { tree parentNode dir } {
-        set saved [pwd]
         cd $dir
         foreach f [lsort [glob *.bt5]] {
                 set e [$tree insert $parentNode -label $f -data "Plot 0"]
         }
-        cd $saved
 }
 
@@ -185 +180 @@
         
         global .tree 
-        global defdir
         
         set dir [tk_chooseDirectory -title "Set Data Directory"]
@@ -192 +186 @@
                 EmptyTree .tree
                 LoadTree .tree 0 $dir
-                set defdir $dir 
+                cd $dir
         }       
 }
@@ -199 +193 @@
 
         global .tree
-        global defdir
 
         EmptyTree .tree
-        LoadTree .tree 0 $defdir
+        LoadTree .tree 0 [pwd]
 }
 
@@ -209 +202 @@
         
         global .tree
-        global defdir
 
         resetTree
@@ -231 +223 @@
 # Create tree
 blt::tree create .tree
-LoadTree .tree 0 $defdir 
+catch { LoadTree .tree 0 [pwd] } result
 
 # Create view+plot frame