From b5cc6897e78ce439182665d800f1b71195877cf6 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Fri, 22 Mar 2019 13:26:40 -0400
Subject: rm plot seq flag

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

diff --git a/ds9/doc/release/r8.1.html b/ds9/doc/release/r8.1.html
index ce3e914..3853fea 100644
--- a/ds9/doc/release/r8.1.html
+++ b/ds9/doc/release/r8.1.html
@@ -65,7 +65,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>03.21.2019 PLOT: removed old sequence flag.</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 7bc0ecc..19cd77d 100644
--- a/ds9/library/plot.tcl
+++ b/ds9/library/plot.tcl
@@ -258,7 +258,6 @@ proc PlotDataSetOne {varname dim data} {
     # remove all non-numeric data
     regsub -all {[^0-9.e\- ]+} $data {} data
 
-    set ox [lindex $data 0]
     set x {}
     set y {}
     set xe {}
@@ -271,19 +270,8 @@ proc PlotDataSetOne {varname dim data} {
 	    set var(yedata) {}
 
 	    for {set ii 0} {$ii<$ll} {incr 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]]
-		    } else {
-			break
-		    }
-		} else {
-		    lappend x $tx
-		    lappend y [lindex $data [expr $ii+1]]
-		}
+		lappend x [lindex $data $ii]
+		lappend y [lindex $data [expr $ii+1]]
 	    }
 	    $var(xdata) set $x
 	    $var(ydata) set $y
@@ -298,21 +286,9 @@ proc PlotDataSetOne {varname dim data} {
 	    blt::vector create $var(xedata)
 
 	    for {set ii 0} {$ii<$ll} {incr 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]]
-		    } else {
-			break
-		    }
-		} else {
-		    lappend x $tx
-		    lappend y [lindex $data [expr $ii+1]]
-		    lappend xe [lindex $data [expr $ii+2]]
-		}
+		lappend x [lindex $data $ii]
+		lappend y [lindex $data [expr $ii+1]]
+		lappend xe [lindex $data [expr $ii+2]]
 	    }
 	    $var(xdata) set $x
 	    $var(ydata) set $y
@@ -329,21 +305,9 @@ proc PlotDataSetOne {varname dim data} {
 	    blt::vector create $var(yedata)
 
 	    for {set ii 0} {$ii<$ll} {incr 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 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]]
-		}
+		lappend x [lindex $data $ii]
+		lappend y [lindex $data [expr $ii+1]]
+		lappend ye [lindex $data [expr $ii+2]]
 	    }
 	    $var(xdata) set $x
 	    $var(ydata) set $y
@@ -359,23 +323,10 @@ proc PlotDataSetOne {varname dim data} {
 	    blt::vector create $var(xedata) $var(yedata)
 
 	    for {set ii 0} {$ii<$ll} {incr 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+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]]
-		}
+		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]]
 	    }
 	    $var(xdata) set $x
 	    $var(ydata) set $y
@@ -392,21 +343,9 @@ proc PlotDataSetOne {varname dim data} {
 	    blt::vector create $var(yedata)
 
 	    for {set ii 0} {$ii<$ll} {incr 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+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]]
-		}
+		lappend x [lindex $data $ii]
+		lappend y [lindex $data [expr $ii+1]]
+		lappend ye [lindex $data [expr $ii+2]]
 	    }
 	    $var(xdata) set $x
 	    $var(ydata) set $y
@@ -419,19 +358,8 @@ proc PlotDataSetOne {varname dim data} {
 	    set var(yedata) {}
 
 	    for {set ii 0} {$ii<$ll} {incr 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]]
-		    } else {
-			break
-		    }
-		} else {
-		    lappend x $tx
-		    lappend y [lindex $data [expr $ii+3]]
-		}
+		lappend x [lindex $data $ii]
+		lappend y [lindex $data [expr $ii+3]]
 	    }
 	    $var(xdata) set $x
 	    $var(ydata) set $y
@@ -446,21 +374,9 @@ proc PlotDataSetOne {varname dim data} {
 	    blt::vector create $var(yedata)
 
 	    for {set ii 0} {$ii<$ll} {incr ii 5} {
-		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]]
-		}
+		lappend x [lindex $data $ii]
+		lappend y [lindex $data [expr $ii+1]]
+		lappend ye [lindex $data [expr $ii+2]]
 	    }
 	    $var(xdata) set $x
 	    $var(ydata) set $y
@@ -476,21 +392,9 @@ proc PlotDataSetOne {varname dim data} {
 	    blt::vector create $var(yedata)
 
 	    for {set ii 0} {$ii<$ll} {incr ii 5} {
-		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]]
-		}
+		lappend x [lindex $data $ii]
+		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 14c71bc..3a1a75c 100644
--- a/ds9/library/plotbar.tcl
+++ b/ds9/library/plotbar.tcl
@@ -63,7 +63,6 @@ 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 8954884..7ad08cc 100644
--- a/ds9/library/plotline.tcl
+++ b/ds9/library/plotline.tcl
@@ -63,7 +63,6 @@ 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 aa5d582..a9b7fc5 100644
--- a/ds9/library/plotscatter.tcl
+++ b/ds9/library/plotscatter.tcl
@@ -63,7 +63,6 @@ proc PlotDialogScatter {varname} {
     global $varname
 
     global ds9
-    set var(seq) 0
 
     # Dataset
     $var(mb).dataset add checkbutton -label [msgcat::mc {Show}] \
-- 
cgit v0.12