Changeset 467 for trunk/liveplot

Timestamp:

Dec 4, 2009 5:06:39 PM (14 years ago)

Author:

toby

Message:

# on 2001/10/18 23:23:58, toby did:
add new peak labeling options

File:

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

trunk/liveplot

@@ -401 +401 @@
     global blt_version expgui tcl_platform tcl_version
     global refhkllist refphaselist peakinfo refpos
-    # look for peaks within pixelregion pixels
-    set xmin [$plot xaxis invtransform [expr $x - $expgui(pixelregion)]]
-    set xmax [$plot xaxis invtransform [expr $x + $expgui(pixelregion)]]
+    # look for peaks within pixelregion pixels or the entire plot range
+    if {$x == "all"} {
+        foreach {xmin xmax} [$plot xaxis limits] {}
+    } else {
+        set xmin [$plot xaxis invtransform [expr $x - $expgui(pixelregion)]]
+        set xmax [$plot xaxis invtransform [expr $x + $expgui(pixelregion)]]
+    }
     set peaknums [refposvec search $xmin $xmax]
     set peaklist {}
-    set xcen 0
-    # select by displayed phases
-    set lbls 0
+    # create a box, if needed
     if {$expgui(hklbox)} {
         catch {
@@ -424 +426 @@
         }
     }
+    set xcen 0
+    set lbls 0
     foreach peak $peaknums {
+        # put all hkls, all phases in the box
         if {$expgui(hklbox)} {
             catch {
@@ -433 +438 @@
             }
         }
+        # label phases with tick marks
         if [set peakinfo(flag[lindex $refphaselist $peak])] {
-            set xcen [expr $xcen + [refposvec range $peak $peak]]
-            lappend peaklist [lindex $refhkllist $peak]
-            incr lbls
-        }
-    }
+            set pos [refposvec range $peak $peak]
+            if {$lbls <= 0} {
+                set xcen $pos
+                set peaklist [lindex $refhkllist $peak]
+                set lbls 1
+            } elseif {abs($xcen/$lbls-$pos) <= $expgui(pixelregion)} {
+                set xcen [expr $xcen + $pos]
+                lappend peaklist [lindex $refhkllist $peak]
+                incr lbls
+            } else {
+                puthkllbl $plot $peaklist $xcen $lbls 
+                set xcen $pos
+                set peaklist [lindex $refhkllist $peak]
+                set lbls 1
+            }
+        }
+    }
+    puthkllbl $plot $peaklist $xcen $lbls 
+}
+
+proc puthkllbl {plot peaklist xcen lbls} {
+    global blt_version tcl_platform tcl_version expgui
     if {$peaklist == ""} return
     set xcen [expr $xcen / $lbls]
@@ -447 +470 @@
         set ycen Inf
     }
-    if {$tcl_platform(platform) == "windows"} {
-        # at least right now, text can't be rotated in windows
+    # older BLT versions can't rotate text in windows
+    if {$tcl_platform(platform) == "windows" && \
+            ($blt_version <= 2.3 || $blt_version == 8.0)} {
         regsub -all { } $peaklist "\n" peaklist
         set mark [$plot marker create text -coords "$xcen $ycen" \
-        -text $peaklist -anchor n -bg "" -name hkl$xcen]
+                -text $peaklist -anchor n -bg "" -name hkl$xcen] 
     } else {
         set mark [$plot marker create text -coords "$xcen $ycen" \
-        -rotate 90 -text $peaklist -anchor n -bg "" -name hkl$xcen]
+                -rotate 90 -text $peaklist -anchor n -bg "" -name hkl$xcen]
     }
     if {$tcl_version >= 8.0} {
@@ -462 +486 @@
         catch {
             after [expr $expgui(fadetime) * 1000 ] \
-            "catch \{ $plot marker delete $mark \}"
+                    "catch \{ $plot marker delete $mark \}"
         }
     }
@@ -673 +697 @@
     toplevel $box
     focus $box
+    wm title $box "Set PS options"
     pack [frame $box.4] -side top -anchor w -fill x
     pack [checkbutton $box.4.a -text "Write PostScript files" \
@@ -701 +726 @@
     toplevel $box
     focus $box
+    wm title $box "Set hkl options"
     pack [frame $box.c] -side top  -anchor w
     pack [label $box.c.l -text "HKL label\nerase time:"] -side left
@@ -1445 +1471 @@
     bind . <Key-h> "lblhkl $box %x"
     bind . <Key-H> "lblhkl $box %x"
-#    bind $box <Shift-Double-Button-1> "lblallhkl %W"
+    bind . <Key-a> "lblhkl $box all"
+    bind . <Key-A> "lblhkl $box all"
+    bind . <Key-d> "delallhkllbl $box"
+    bind . <Key-D> "delallhkllbl $box"
     if {[bind bltZoomGraph] != ""} {
         bind bltZoomGraph <Shift-Button-1> "lblhkl $box %x"