rm plot seq flag

4 files changed, 23 insertions, 122 deletions

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}] \