Changeset 18

Timestamp:

Dec 12, 2006 4:54:27 PM (16 years ago)

Author:

ajj

Message:

Added check boxes to determine plot type

File:

• sans/utils/bt5/bt5plot/bt5plot (modified) (19 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 {
@@ -15 +19 @@
 } ]
 
-proc loadBT5File  {fileName x c t m} {
+proc loadBT5File  {fileName x c cr t m} {
         global datasets
-        global $x $c $t $m
+        global $x $c $cr $t $m
 
         #puts "In load proc: $x $c $cr $t $m"
@@ -29 +33 @@
         set det5(0) 0
         set xvar(0) 0
-        set trans(0) 0
 
         if [catch {open $fileName r} fileId] {
@@ -63 +66 @@
                 $x append {$xvar($index)}
                 $c append {$det1($index)+$det2($index)+$det3($index)+$det4($index)+$det5($index)}
+                $cr append [expr [$c index $index] / $counttime]
                 $t append {$trans($index)}
                 $m append {$mon($index)}
@@ -78 +82 @@
 
                 set xvec [join "$elem _xvec" ""]
+                set countratevec [join "$elem _countratevec" ""]
                 set countvec [join "$elem _countvec" ""]
                 set transvec [join "$elem _transvec" ""]
@@ -85 +90 @@
         
                 blt::vector destroy $xvec
+                blt::vector destroy $countratevec
                 blt::vector destroy $countvec
                 blt::vector destroy $transvec 
@@ -100 +106 @@
         global images
         global .tree
+        global plotType
         
         set fileName [.tree label $nodeID]      
@@ -111 +118 @@
 
                 set xvec [join "$filebase _xvec" ""]
+                set countratevec [join "$filebase _countratevec" ""]
                 set countvec [join "$filebase _countvec" ""]
                 set transvec [join "$filebase _transvec" ""]
@@ -118 +126 @@
         
                 blt::vector create $xvec
+                blt::vector create $countratevec
                 blt::vector create $countvec
                 blt::vector create $transvec 
                 blt::vector create $monvec
 
-                loadBT5File $fileName $xvec $countvec $transvec $monvec
+                loadBT5File $fileName $xvec $countvec $countratevec $transvec $monvec
 
                 $graph element create $filebase -symbol scross \
@@ -128 +137 @@
                         -ydata $countvec
 
+                switch -exact $plotType {
+                        count { $graph element configure $filebase -ydata $countvec}
+                        countrate { $graph element configure $filebase -ydata $countratevec}
+                        trans { $graph element configure $filebase -ydata $transvec}
+                        mon { $graph element configure $filebase -ydata  $monvec}
+                }
 
         } else {
@@ -136 +151 @@
         
                 set xvec [join "$filebase _xvec" ""]
+                set countratevec [join "$filebase _countratevec" ""]
                 set countvec [join "$filebase _countvec" ""]
                 set transvec [join "$filebase _transvec" ""]
@@ -143 +159 @@
         
                 blt::vector destroy $xvec
+                blt::vector destroy $countratevec
                 blt::vector destroy $countvec
                 blt::vector destroy $transvec 
@@ -153 +170 @@
 
 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
 }
 
@@ -166 +185 @@
         
         global .tree 
+        global defdir
         
         set dir [tk_chooseDirectory -title "Set Data Directory"]
@@ -172 +192 @@
                 EmptyTree .tree
                 LoadTree .tree 0 $dir
-                cd $dir
+                set defdir $dir 
         }       
 }
@@ -179 +199 @@
 
         global .tree
+        global defdir
 
         EmptyTree .tree
-        LoadTree .tree 0 [pwd]
+        LoadTree .tree 0 $defdir
 }
 
@@ -188 +209 @@
         
         global .tree
+        global defdir
 
         resetTree
@@ -209 +231 @@
 # Create tree
 blt::tree create .tree
-LoadTree .tree 0 [pwd]
+LoadTree .tree 0 $defdir 
 
 # Create view+plot frame
@@ -246 +268 @@
 pack .filter.filterLabel -side left
 pack .filter.filterEntry -side left 
+#pack .filter.filterButton -side left
+#pack .filter.filterReset -side right -padx 25
 
 #Plot controls
 set pcf [frame .filter.pc]
 button $pcf.filterReset -text "Clear Plot" -command {resetGraph}
+radiobutton $pcf.c -text "Counts" -variable plotType -value "count"
+radiobutton $pcf.cr -text "Count Rate" -variable plotType -value "countrate"
+radiobutton $pcf.t -text "Trans" -variable plotType -value "trans"
+radiobutton $pcf.m -text "Mon" -variable plotType -value "mon"
+$pcf.c select
 pack $pcf.filterReset -side right -padx 25
+pack $pcf.m -side right
+pack $pcf.t -side right
+pack $pcf.cr -side right
+pack $pcf.c -side right 
 pack $pcf -side right