From 1381981022894d2d3f88cf17c5c8b3cdc2ab48ca Mon Sep 17 00:00:00 2001 From: William Joye Date: Sun, 28 Jul 2019 15:48:26 -0400 Subject: support multiple graphs per plot --- ds9/library/plot.tcl | 12 ------------ ds9/parsers/plotparser.tac | 2 +- ds9/parsers/plotparser.tcl | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/ds9/library/plot.tcl b/ds9/library/plot.tcl index 55c7688..e6cd090 100644 --- a/ds9/library/plot.tcl +++ b/ds9/library/plot.tcl @@ -733,9 +733,6 @@ proc PlotUpdateCanvas {varname} { $var($cc,graph) xaxis configure -showticks 1 -linewidth 1 $var($cc,graph) yaxis configure -showticks 1 -linewidth 1 - - $var($cc,graph) x2axis configure -hide yes - $var($cc,graph) y2axis configure -hide yes } strip { if {$cc != $first} { @@ -759,21 +756,12 @@ proc PlotUpdateCanvas {varname} { $var($cc,graph) configure -topmargin 1 -bottommargin 1 } - $var($cc,graph) x2axis configure -hide yes -grid no \ - -bg $var(background) -linewidth 0 - $var($cc,graph) y2axis configure -hide yes -grid no \ - -bg $var(background) -linewidth 0 - if {$cc != $last} { $var($cc,graph) xaxis configure -showticks 0 -linewidth 0 - $var($cc,graph) x2axis configure -showticks 0 -linewidth 0 $var($cc,graph) yaxis configure -showticks 1 -linewidth 1 - $var($cc,graph) y2axis configure -showticks 0 -linewidth 0 } else { $var($cc,graph) xaxis configure -showticks 1 -linewidth 1 - $var($cc,graph) x2axis configure -showticks 0 -linewidth 0 $var($cc,graph) yaxis configure -showticks 1 -linewidth 1 - $var($cc,graph) y2axis configure -showticks 0 -linewidth 0 } } } diff --git a/ds9/parsers/plotparser.tac b/ds9/parsers/plotparser.tac index d22fa48..61b7765 100644 --- a/ds9/parsers/plotparser.tac +++ b/ds9/parsers/plotparser.tac @@ -278,7 +278,7 @@ plotCmd : LOAD_ load | SMOOTH_ smooth {PlotCmdUpdateElement graph,ds,smooth $2} | WIDTH_ INT_ {PlotCmdUpdateElement graph,ds,width $2} | DASH_ yesno {PlotCmdUpdateElement graph,ds,dash $2} - | LAYOUT_ layout {ProcessCmdCVAR layout strip PlotChangeLayout} + | LAYOUT_ layout {ProcessCmdCVAR layout $2 PlotChangeLayout} | LAYOUT_ STRIP_ WEIGHT_ numeric {ProcessCmdCVAR layout,strip,weight $4 PlotChangeLayout} diff --git a/ds9/parsers/plotparser.tcl b/ds9/parsers/plotparser.tcl index bcdb14b..31f28be 100644 --- a/ds9/parsers/plotparser.tcl +++ b/ds9/parsers/plotparser.tcl @@ -5712,7 +5712,7 @@ proc plot::yyparse {} { 97 { PlotCmdUpdateElement graph,ds,smooth $2 } 98 { PlotCmdUpdateElement graph,ds,width $2 } 99 { PlotCmdUpdateElement graph,ds,dash $2 } - 100 { ProcessCmdCVAR layout strip PlotChangeLayout } + 100 { ProcessCmdCVAR layout $2 PlotChangeLayout } 101 { ProcessCmdCVAR layout,strip,weight $4 PlotChangeLayout } 103 { ProcessCmdCVAR graph,ds,current $2 } 106 { set _ line } -- cgit v0.12