From d43955e29d7e3c2d7218e18db7e1a9ec6d290deb Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Thu, 21 Mar 2019 13:32:43 -0400
Subject: restore plot seq flag, set only for bar

---
 ds9/doc/release/r8.1.html   |   2 +-
 ds9/library/plot.tcl        | 141 ++++++++++++++++++++++++++++++++++++--------
 ds9/library/plotbar.tcl     |   1 +
 ds9/library/plotline.tcl    |   1 +
 ds9/library/plotscatter.tcl |   1 +
 5 files changed, 122 insertions(+), 24 deletions(-)

diff --git a/ds9/doc/release/r8.1.html b/ds9/doc/release/r8.1.html
index d3ae4d9..afce23a 100644
--- a/ds9/doc/release/r8.1.html
+++ b/ds9/doc/release/r8.1.html
@@ -54,7 +54,6 @@
 <li><tt>02.15.2019 TCLLIB: updated to version 1.19.</tt></li>
 <li><tt>02.26.2019 GUI: add command "preserve scale" for backward compatibility.</tt></li>
 <li><tt>02.28.2019 TKBLT: fixed postscript bounding box issue.</tt></li>
-<li><tt>03.01.2019 PLOT: removed old sequence flag from plot widgets.</tt></li>
 <li><tt>03.02.2019 SHM: fixed type in loading shared memory segments.</tt></li>
 <li><tt>03.04.2019 CATALOG: fixed issue allowing column names for size/size2/angle via parser.</tt></li>
 <li><tt>03.06.2019 PLOT: update error cap documentation.</tt></li>
@@ -65,6 +64,7 @@
 <li><tt>03.18.2019 CONTOURS: contours are now threaded.</tt></li>
 <li><tt>03.18.2019 CONTOURS: default contour method is now smooth.</tt></li>
 <li><tt>03.19.2019 TKIMG: update to verision 1.4.9.</tt></li>
+<li><tt>03.21.2019 PLOT: set sequence flag off for line and scatter.</tt></li>
 <li><tt><b>xx.xx.2019 RELEASE version 8.1b1</b></tt></li>
 </ol>
 </div>
diff --git a/ds9/library/plot.tcl b/ds9/library/plot.tcl
index 19cd77d..48b3417 100644
--- a/ds9/library/plot.tcl
+++ b/ds9/library/plot.tcl
@@ -270,8 +270,19 @@ proc PlotDataSetOne {varname dim data} {
 	    set var(yedata) {}
 
 	    for {set ii 0} {$ii<$ll} {incr ii 2} {
-		lappend x [lindex $data $ii]
-		lappend y [lindex $data [expr $ii+1]]
+		set tx [lindex $data $ii]
+		if {$var(seq)} {
+		    if {$ox<=$tx} {
+			set ox $tx
+			lappend x $tx
+			lappend y [lindex $data [expr $ii+1]]
+		    } else {
+			break
+		    }
+		} else {
+		    lappend x $tx
+		    lappend y [lindex $data [expr $ii+1]]
+		}
 	    }
 	    $var(xdata) set $x
 	    $var(ydata) set $y
@@ -286,9 +297,21 @@ proc PlotDataSetOne {varname dim data} {
 	    blt::vector create $var(xedata)
 
 	    for {set ii 0} {$ii<$ll} {incr ii 3} {
-		lappend x [lindex $data $ii]
-		lappend y [lindex $data [expr $ii+1]]
-		lappend xe [lindex $data [expr $ii+2]]
+		set tx [lindex $data $ii]
+		if {$var(seq)} {
+		    if {$ox<=$tx} {
+			set ox $tx
+			lappend x $tx
+			lappend y [lindex $data [expr $ii+1]]
+			lappend xe [lindex $data [expr $ii+2]]
+		    } else {
+			break
+		    }
+		} else {
+		    lappend x $tx
+		    lappend y [lindex $data [expr $ii+1]]
+		    lappend xe [lindex $data [expr $ii+2]]
+		}
 	    }
 	    $var(xdata) set $x
 	    $var(ydata) set $y
@@ -305,9 +328,21 @@ proc PlotDataSetOne {varname dim data} {
 	    blt::vector create $var(yedata)
 
 	    for {set ii 0} {$ii<$ll} {incr ii 3} {
-		lappend x [lindex $data $ii]
-		lappend y [lindex $data [expr $ii+1]]
-		lappend ye [lindex $data [expr $ii+2]]
+		set tx [lindex $data $ii]
+		if {$var(seq)} {
+		    if {$ox<=$tx} {
+			set ox $tx
+			lappend x $tx
+			lappend y [lindex $data [expr $ii+1]]
+			lappend ye [lindex $data [expr $ii+2]]
+		    } else {
+			break
+		    }
+		} else {
+		    lappend x $tx
+		    lappend y [lindex $data [expr $ii+1]]
+		    lappend ye [lindex $data [expr $ii+2]]
+		}
 	    }
 	    $var(xdata) set $x
 	    $var(ydata) set $y
@@ -323,10 +358,23 @@ proc PlotDataSetOne {varname dim data} {
 	    blt::vector create $var(xedata) $var(yedata)
 
 	    for {set ii 0} {$ii<$ll} {incr ii 4} {
-		lappend x [lindex $data $ii]
-		lappend y [lindex $data [expr $ii+1]]
-		lappend xe [lindex $data [expr $ii+2]]
-		lappend ye [lindex $data [expr $ii+3]]
+		set tx [lindex $data $ii]
+		if {$var(seq)} {
+		    if {$ox<=$tx} {
+			set ox $tx
+			lappend x $tx
+			lappend y [lindex $data [expr $ii+1]]
+			lappend xe [lindex $data [expr $ii+2]]
+			lappend ye [lindex $data [expr $ii+3]]
+		    } else {
+			break
+		    }
+		} else {
+		    lappend x $tx
+		    lappend y [lindex $data [expr $ii+1]]
+		    lappend xe [lindex $data [expr $ii+2]]
+		    lappend ye [lindex $data [expr $ii+3]]
+		}
 	    }
 	    $var(xdata) set $x
 	    $var(ydata) set $y
@@ -343,9 +391,21 @@ proc PlotDataSetOne {varname dim data} {
 	    blt::vector create $var(yedata)
 
 	    for {set ii 0} {$ii<$ll} {incr ii 4} {
-		lappend x [lindex $data $ii]
-		lappend y [lindex $data [expr $ii+1]]
-		lappend ye [lindex $data [expr $ii+2]]
+		set tx [lindex $data $ii]
+		if {$var(seq)} {
+		    if {$ox<=$tx} {
+			set ox $tx
+			lappend x $tx
+			lappend y [lindex $data [expr $ii+1]]
+			lappend ye [lindex $data [expr $ii+2]]
+		    } else {
+			break
+		    }
+		} else {
+		    lappend x $tx
+		    lappend y [lindex $data [expr $ii+1]]
+		    lappend ye [lindex $data [expr $ii+2]]
+		}
 	    }
 	    $var(xdata) set $x
 	    $var(ydata) set $y
@@ -358,8 +418,19 @@ proc PlotDataSetOne {varname dim data} {
 	    set var(yedata) {}
 
 	    for {set ii 0} {$ii<$ll} {incr ii 4} {
-		lappend x [lindex $data $ii]
-		lappend y [lindex $data [expr $ii+3]]
+		set tx [lindex $data $ii]
+		if {$var(seq)} {
+		    if {$ox<=$tx} {
+			set ox $tx
+			lappend x $tx
+			lappend y [lindex $data [expr $ii+3]]
+		    } else {
+			break
+		    }
+		} else {
+		    lappend x $tx
+		    lappend y [lindex $data [expr $ii+3]]
+		}
 	    }
 	    $var(xdata) set $x
 	    $var(ydata) set $y
@@ -374,9 +445,21 @@ proc PlotDataSetOne {varname dim data} {
 	    blt::vector create $var(yedata)
 
 	    for {set ii 0} {$ii<$ll} {incr ii 5} {
-		lappend x [lindex $data $ii]
-		lappend y [lindex $data [expr $ii+1]]
-		lappend ye [lindex $data [expr $ii+2]]
+		set tx [lindex $data $ii]
+		if {$var(seq)} {
+		    if {$ox<=$tx} {
+			set ox $tx
+			lappend x $tx
+			lappend y [lindex $data [expr $ii+1]]
+			lappend ye [lindex $data [expr $ii+2]]
+		    } else {
+			break
+		    }
+		} else {
+		    lappend x $tx
+		    lappend y [lindex $data [expr $ii+1]]
+		    lappend ye [lindex $data [expr $ii+2]]
+		}
 	    }
 	    $var(xdata) set $x
 	    $var(ydata) set $y
@@ -392,9 +475,21 @@ proc PlotDataSetOne {varname dim data} {
 	    blt::vector create $var(yedata)
 
 	    for {set ii 0} {$ii<$ll} {incr ii 5} {
-		lappend x [lindex $data $ii]
-		lappend y [lindex $data [expr $ii+3]]
-		lappend ye [lindex $data [expr $ii+4]]
+		set tx [lindex $data $ii]
+		if {$var(seq)} {
+		    if {$ox<=$tx} {
+			set ox $tx
+			lappend x $tx
+			lappend y [lindex $data [expr $ii+3]]
+			lappend ye [lindex $data [expr $ii+4]]
+		    } else {
+			break
+		    }
+		} else {
+		    lappend x $tx
+		    lappend y [lindex $data [expr $ii+3]]
+		    lappend ye [lindex $data [expr $ii+4]]
+		}
 	    }
 	    $var(xdata) set $x
 	    $var(ydata) set $y
diff --git a/ds9/library/plotbar.tcl b/ds9/library/plotbar.tcl
index 3a1a75c..14c71bc 100644
--- a/ds9/library/plotbar.tcl
+++ b/ds9/library/plotbar.tcl
@@ -63,6 +63,7 @@ proc PlotDialogBar {varname} {
     global $varname
 
     global ds9
+    set var(seq) 1
 
     # Graph
     $var(mb).graph add separator
diff --git a/ds9/library/plotline.tcl b/ds9/library/plotline.tcl
index 7ad08cc..8954884 100644
--- a/ds9/library/plotline.tcl
+++ b/ds9/library/plotline.tcl
@@ -63,6 +63,7 @@ proc PlotDialogLine {varname} {
     global $varname
 
     global ds9
+    set var(seq) 0
 
     # Dataset
     $var(mb).dataset add checkbutton -label [msgcat::mc {Show}] \
diff --git a/ds9/library/plotscatter.tcl b/ds9/library/plotscatter.tcl
index a9b7fc5..aa5d582 100644
--- a/ds9/library/plotscatter.tcl
+++ b/ds9/library/plotscatter.tcl
@@ -63,6 +63,7 @@ proc PlotDialogScatter {varname} {
     global $varname
 
     global ds9
+    set var(seq) 0
 
     # Dataset
     $var(mb).dataset add checkbutton -label [msgcat::mc {Show}] \
-- 
cgit v0.12