From f173990a328daa9925154db2af0974d131cd7a37 Mon Sep 17 00:00:00 2001 From: joye Date: Mon, 16 Jun 2014 19:02:46 +0000 Subject: *** empty log message *** --- bltGrMarkerBitmap.C | 10 ++++++---- tests/axis.tcl | 1 - tests/barelement.tcl | 1 - tests/bargraph.tcl | 1 - tests/bitmapmarker.tcl | 2 -- tests/crosshairs.tcl | 1 - tests/legend.tcl | 1 - tests/lineelement.tcl | 1 - tests/linegraph.tcl | 1 - tests/linemarker.tcl | 2 -- tests/linepen.tcl | 1 - tests/marker.tcl | 1 - tests/polygonmarker.tcl | 2 -- tests/textmarker.tcl | 2 -- 14 files changed, 6 insertions(+), 21 deletions(-) diff --git a/bltGrMarkerBitmap.C b/bltGrMarkerBitmap.C index 6615ca4..9823c69 100644 --- a/bltGrMarkerBitmap.C +++ b/bltGrMarkerBitmap.C @@ -270,10 +270,12 @@ void BitmapMarker::print(PostScript* psPtr) } psPtr->setForeground(ops->outlineColor); - psPtr->format(" gsave\n %g %g translate\n %d %d scale\n", - anchorPt_.x, anchorPt_.y + height_, width_, -height_); - psPtr->format(" %d %d true [%d 0 0 %d 0 %d] {", + psPtr->append("gsave\n"); + psPtr->format("%g %g translate\n", anchorPt_.x, anchorPt_.y + height_); + psPtr->format("%d %d scale\n", width_, -height_); + psPtr->format("%d %d true [%d 0 0 %d 0 %d]\n{", width_, height_, width_, -height_, height_); psPtr->setBitmap(graphPtr_->display_, ops->bitmap, width_, height_); - psPtr->varAppend(" } imagemask\n", "grestore\n", NULL); + psPtr->append("}\nimagemask\n"); + psPtr->append("grestore\n"); } diff --git a/tests/axis.tcl b/tests/axis.tcl index 296adc7..51aeabd 100644 --- a/tests/axis.tcl +++ b/tests/axis.tcl @@ -8,7 +8,6 @@ $graph axis configure y -bd 2 -background cyan -title "Y\nAxis" bltCmd $graph axis activate y echo "Testing Axis..." -bltCmd $graph axis configure x bltTest3 $graph axis y -activeforeground red $dops bltTest3 $graph axis y -activerelief sunken $dops diff --git a/tests/barelement.tcl b/tests/barelement.tcl index 414d14c..247bd79 100644 --- a/tests/barelement.tcl +++ b/tests/barelement.tcl @@ -10,7 +10,6 @@ $graph pen create foo -showvalues y -color purple $graph element activate data3 echo "Testing Bar Element..." -bltCmd $graph element data1 configure bltTest3 $graph element data3 -activepen foo $dops bltTest3 $graph element data2 -background yellow $dops diff --git a/tests/bargraph.tcl b/tests/bargraph.tcl index c9a77aa..23e986c 100644 --- a/tests/bargraph.tcl +++ b/tests/bargraph.tcl @@ -4,7 +4,6 @@ set w .bar set graph [bltBarGraph $w] echo "Testing Bar Graph..." -bltCmd $graph configure # Graph bltTest $graph -aspect 2 $dops diff --git a/tests/bitmapmarker.tcl b/tests/bitmapmarker.tcl index 655929c..91fa272 100644 --- a/tests/bitmapmarker.tcl +++ b/tests/bitmapmarker.tcl @@ -8,7 +8,6 @@ set mm [$graph marker create bitmap tt -element data2 \ $graph element configure data1 -hide yes echo "Testing Bitmap Marker..." -bltCmd $graph marker configure $mm bltTest3 $graph marker $mm -anchor nw $dops bltTest3 $graph marker $mm -background yellow $dops @@ -24,7 +23,6 @@ bltTest3 $graph marker $mm -hide yes $dops bltTest3 $graph marker $mm -mapx x2 $dops bltTest3 $graph marker $mm -mapy y2 $dops bltTest3 $graph marker $mm -outline green $dops -bltTest3 $graph marker $mm -state disabled $dops bltTest3 $graph marker $mm -under yes $dops bltTest3 $graph marker $mm -xoffset 20 $dops bltTest3 $graph marker $mm -yoffset 20 $dops diff --git a/tests/crosshairs.tcl b/tests/crosshairs.tcl index dd1f41b..d8e93ae 100644 --- a/tests/crosshairs.tcl +++ b/tests/crosshairs.tcl @@ -7,7 +7,6 @@ $graph crosshairs configure -hide no $graph crosshairs configure -x 200 -y 200 echo "Testing Crosshairs..." -$graph crosshairs configure bltTest2 $graph crosshairs -color green $dops bltTest2 $graph crosshairs -dashes "8 3" $dops diff --git a/tests/legend.tcl b/tests/legend.tcl index ea59f2c..15b3411 100644 --- a/tests/legend.tcl +++ b/tests/legend.tcl @@ -8,7 +8,6 @@ $graph legend focus data1 $graph legend configure -selectrelief groove echo "Testing Legend..." -$graph legend configure #bltTest2 $graph legend -activebackground $dops #bltTest2 $graph legend -activeborderwidth $dops diff --git a/tests/lineelement.tcl b/tests/lineelement.tcl index 4a402c6..734a8ab 100644 --- a/tests/lineelement.tcl +++ b/tests/lineelement.tcl @@ -9,7 +9,6 @@ $graph pen create foo -showvalues y -symbol circle -dashes {8 3} -color purple $graph element activate data3 echo "Testing Line Element.." -bltTest3 $graph element configure data1 bltTest3 $graph element data3 -activepen foo $dops bltTest3 $graph element data2 -areabackground yellow $dops diff --git a/tests/linegraph.tcl b/tests/linegraph.tcl index a40ea99..ab56fd1 100644 --- a/tests/linegraph.tcl +++ b/tests/linegraph.tcl @@ -4,7 +4,6 @@ set w .line set graph [bltLineGraph $w] echo "Testing Line Graph..." -bltCmd $graph configure bltTest $graph -aspect 2 $dops bltTest $graph -background red $dops diff --git a/tests/linemarker.tcl b/tests/linemarker.tcl index c2ecf81..a1e9809 100644 --- a/tests/linemarker.tcl +++ b/tests/linemarker.tcl @@ -11,7 +11,6 @@ set nn [$graph marker create line ss -element data2 \ $graph element configure data1 -hide yes echo "Testing Line Marker..." -bltCmd $graph marker configure $mm bltTest3 $graph marker $mm -bindtags {aa} 0 bltTest3 $graph marker $mm -cap round $dops @@ -26,7 +25,6 @@ bltTest3 $graph marker $mm -hide yes $dops bltTest3 $graph marker $mm -mapx x2 $dops bltTest3 $graph marker $mm -mapy y2 $dops bltTest3 $graph marker $mm -outline green $dops -bltTest3 $graph marker $mm -state disabled $dops bltTest3 $graph marker $mm -under yes $dops bltTest3 $graph marker $mm -xoffset 20 $dops bltTest3 $graph marker $mm -xor yes $dops diff --git a/tests/linepen.tcl b/tests/linepen.tcl index 3228cce..77503f9 100644 --- a/tests/linepen.tcl +++ b/tests/linepen.tcl @@ -7,7 +7,6 @@ $graph pen create foo -color red -showvalues y -symbol circle -dashes {4 4} $graph element configure data2 -pen foo echo "Testing Line Pen..." -$graph element configure data1 bltTest3 $graph pen foo -color yellow $dops bltTest3 $graph pen foo -dashes {8 3} $dops diff --git a/tests/marker.tcl b/tests/marker.tcl index cca9629..12776b0 100644 --- a/tests/marker.tcl +++ b/tests/marker.tcl @@ -10,7 +10,6 @@ set nn [$graph marker create line ss -element data1 \ -outline green -dashes 4] echo "Testing Marker..." -bltCmd $graph marker configure $mm #bltCmd $graph marker bind aa [list puts "%x %y"] bltCmd $graph marker cget $mm -cap diff --git a/tests/polygonmarker.tcl b/tests/polygonmarker.tcl index 52460f2..5a1bb8d 100644 --- a/tests/polygonmarker.tcl +++ b/tests/polygonmarker.tcl @@ -8,7 +8,6 @@ set mm [$graph marker create polygon tt -element data2 \ $graph element configure data1 -hide yes echo "Testing Polygon Marker..." -bltCmd $graph marker configure $mm bltTest3 $graph marker $mm -bindtags {aa} 0 bltTest3 $graph marker $mm -cap round $dops @@ -24,7 +23,6 @@ bltTest3 $graph marker $mm -mapx x2 $dops bltTest3 $graph marker $mm -mapy y2 $dops bltTest3 $graph marker $mm -outline green $dops bltTest3 $graph marker $mm -outlinebg cyan $dops -bltTest3 $graph marker $mm -state disabled $dops bltTest3 $graph marker $mm -under yes $dops bltTest3 $graph marker $mm -xoffset 20 $dops bltTest3 $graph marker $mm -xor yes $dops diff --git a/tests/textmarker.tcl b/tests/textmarker.tcl index f741ad8..28706aa 100644 --- a/tests/textmarker.tcl +++ b/tests/textmarker.tcl @@ -8,7 +8,6 @@ set mm [$graph marker create text tt -element data2 \ $graph element configure data1 -hide yes echo "Testing Text Marker..." -bltCmd $graph marker configure $mm bltTest3 $graph marker $mm -anchor nw $dops bltTest3 $graph marker $mm -background yellow $dops @@ -26,7 +25,6 @@ bltTest3 $graph marker $mm -mapx x2 $dops bltTest3 $graph marker $mm -mapy y2 $dops bltTest3 $graph marker $mm -outline green $dops bltTest3 $graph marker $mm -rotate 45 $dops -bltTest3 $graph marker $mm -state disabled $dops bltTest3 $graph marker $mm -text {Hello World} $dops bltTest3 $graph marker $mm -under yes $dops bltTest3 $graph marker $mm -xoffset 20 $dops -- cgit v0.12