Changeset 87 for trunk/liveplot

Timestamp:

Dec 4, 2009 5:00:11 PM (14 years ago)

Author:

toby

Message:

# on 1999/04/20 19:22:46, toby did:
rearrange order of commands so that graph & menus are made when icdd & cmpr are added

File:

• trunk/liveplot (modified) (2 diffs, 3 props)

trunk/liveplot

@@ -766 +766 @@
 }
 
-# fetch EXP file processing routines 
-#source [file join $expgui(scriptdir) readexp.tcl]
-
-set fl [file join $expgui(scriptdir) icddcmd.tcl]
-if [file exists $fl] {source $fl}
-set fl [file join $expgui(scriptdir) cellgen.tcl]
-if [file exists $fl] {source $fl}
+proc plotdataupdate {array element action} {
+    global box peakinfo reflns graph
+    # parse the element
+    regexp {([a-z]*)([0-9]*)} $element junk var num
+    if {$var == "color"} {
+        if {$peakinfo($element) == ""} return
+        if [catch {
+            .opt$num.c$num.2 config -bg $peakinfo($element)
+        } ] return
+        set i $num
+        set j 0
+        if [set peakinfo(flag$i)] {
+            catch {
+                $box element config phase$i -color $peakinfo(color$i) 
+            } 
+            foreach X $reflns($i) {
+                incr j
+                catch {
+                    $box marker config peaks${i}_$j \
+                            $graph(MarkerColorOpt) [list $peakinfo(color$i)]
+                }
+            }
+        }
+        return
+    }
+    waitmsg {Updating}
+    plotdata $box
+    donewait
+}
 
 # override options with locally defined values
@@ -906 +928 @@
 pack .a -side top -fill both
 pack $box -fill both -expand yes
+
+# add the extra options
+set fl [file join $expgui(scriptdir) icddcmd.tcl]
+if [file exists $fl] {source $fl}
+set fl [file join $expgui(scriptdir) cellgen.tcl]
+if [file exists $fl] {source $fl}
+
 donewait
-proc plotdataupdate {array element action} {
-    global box peakinfo reflns graph
-    # parse the element
-    regexp {([a-z]*)([0-9]*)} $element junk var num
-    if {$var == "color"} {
-        if {$peakinfo($element) == ""} return
-        if [catch {
-            .opt$num.c$num.2 config -bg $peakinfo($element)
-        } ] return
-        set i $num
-        set j 0
-        if [set peakinfo(flag$i)] {
-            catch {
-                $box element config phase$i -color $peakinfo(color$i) 
-            } 
-            foreach X $reflns($i) {
-                incr j
-                catch {
-                    $box marker config peaks${i}_$j \
-                            $graph(MarkerColorOpt) [list $peakinfo(color$i)]
-                }
-            }
-        }
-        return
-    }
-    waitmsg {Updating}
-    plotdata $box
-    donewait
-}
 trace variable peakinfo w plotdataupdate