From 57329c620b5b44aaf32c8d4d96ca95781a64136e Mon Sep 17 00:00:00 2001 From: joye Date: Tue, 18 Mar 2014 21:09:38 +0000 Subject: *** empty log message *** --- src/bltGrMarker.C | 2 +- tests/axis.tcl | 100 ++++++++---------------------------------------- tests/bargraph.tcl | 29 +++----------- tests/base.tcl | 1 - tests/linegraph.tcl | 26 ++----------- tests/linemarker.tcl | 18 --------- tests/marker.tcl | 32 ++++++++++++++++ tests/polygonmarker.tcl | 31 ++++----------- tests/textmarker.tcl | 35 +++++++++++++++++ 9 files changed, 100 insertions(+), 174 deletions(-) create mode 100644 tests/marker.tcl create mode 100644 tests/textmarker.tcl diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C index 19617d7..221be91 100644 --- a/src/bltGrMarker.C +++ b/src/bltGrMarker.C @@ -610,7 +610,7 @@ static Blt_OpSpec markerOps[] = {"delete", 1, (void*)DeleteOp, 4, 4, "marker",}, {"exists", 1, (void*)ExistsOp, 4, 4, "marker",}, {"find", 1, (void*)FindOp, 8, 8, "enclosed|overlapping x1 y1 x2 y2",}, - {"get", 1, (void*)GetOp, 4, 4, "current",}, + {"get", 1, (void*)GetOp, 5, 5, "current",}, {"lower", 1, (void*)RelinkOp, 4, 5, "marker ?afterMarker?",}, {"names", 1, (void*)NamesOp, 3, 0, "?pattern?",}, {"raise", 1, (void*)RelinkOp, 4, 5, "marker ?beforeMarker?",}, diff --git a/tests/axis.tcl b/tests/axis.tcl index 5d844a8..c5d21f1 100644 --- a/tests/axis.tcl +++ b/tests/axis.tcl @@ -5,90 +5,22 @@ set graph [bltLineGraph $w] $graph xaxis configure -title "X Axis" -limitsformat "%g" -#bltTest2 $graph xaxis -activeforeground red -#bltTest2 $graph xaxis -activerelief grooved -#bltTest2 $graph xaxis -autorange 10 -bltTest2 $graph xaxis -background yellow -bltTest2 $graph xaxis -bg cyan -#bltTest2 $graph xaxis -bindtags -##bltTest2 $graph xaxis -bd 2 -##bltTest2 $graph xaxis -borderwidth 4 -#bltTest2 $graph xaxis -checklimits -bltTest2 $graph xaxis -color red -#bltTest2 $graph xaxis -command -bltTest2 $graph xaxis -descending yes -bltTest2 $graph xaxis -exterior no -bltTest2 $graph xaxis -fg magenta -bltTest2 $graph xaxis -foreground yellow -bltTest2 $graph xaxis -grid no -bltTest2 $graph xaxis -gridcolor green -bltTest2 $graph xaxis -griddashes dashdot -bltTest2 $graph xaxis -gridlinewidth 2 -bltTest2 $graph xaxis -gridminor no -bltTest2 $graph xaxis -gridminorcolor blue -bltTest2 $graph xaxis -gridminordashes dashdot -bltTest2 $graph xaxis -gridminorlinewidth 2 -bltTest2 $graph xaxis -hide yes -##bltTest2 $graph xaxis -justify left -bltTest2 $graph xaxis -labeloffset yes -bltTest2 $graph xaxis -limitscolor red -bltTest2 $graph xaxis -limitsfont "times 18 bold italic" -bltTest2 $graph xaxis -limitsformat "%e" -bltTest2 $graph xaxis -linewidth 2 -bltTest2 $graph xaxis -logscale yes -#bltTest2 $graph xaxis -loosemin -#bltTest2 $graph xaxis -loosemax -#bltTest2 $graph xaxis -majorticks -#bltTest2 $graph xaxis -max -#bltTest2 $graph xaxis -min -#bltTest2 $graph xaxis -minorticks -##bltTest2 $graph xaxis -relief groove -bltTest2 $graph xaxis -rotate 45 -#bltTest2 $graph xaxis -scrollcommand -#bltTest2 $graph xaxis -scrollincrement -#bltTest2 $graph xaxis -scrollmax -#bltTest2 $graph xaxis -scrollmin -#bltTest2 $graph xaxis -shiftby -bltTest2 $graph xaxis -showticks no -bltTest2 $graph xaxis -stepsize 10 -bltTest2 $graph xaxis -subdivisions 4 -##bltTest2 $graph xaxis -tickanchor n -bltTest2 $graph xaxis -tickfont {times 12 bold italic} -bltTest2 $graph xaxis -ticklength 20 -bltTest2 $graph xaxis -tickdefault 10 -bltTest2 $graph xaxis -title {This is a Title} -#bltTest2 $graph xaxis -titlealternate yes -bltTest2 $graph xaxis -titlecolor yellow -bltTest2 $graph xaxis -titlefont {times 24 bold italic} -#bltTest2 $graph xaxis -use - -#bltCmd $graph xaxis activate -#bltCmd $graph xaxis bind -#bltCmd $graph xaxis cget -#bltCmd $graph xaxis configure -#bltCmd $graph xaxis deactivate -#bltCmd $graph xaxis invtransform -#bltCmd $graph xaxis limits -#bltCmd $graph xaxis transform -#bltCmd $graph xaxis use -#bltCmd $graph xaxis view - -#bltCmd $graph vaxis activate -#bltCmd $graph vaxis bind -#bltCmd $graph vaxis cget -#bltCmd $graph vaxis configure -#bltCmd $graph vaxis create -#bltCmd $graph vaxis deactivate -#bltCmd $graph vaxis delete -#bltCmd $graph vaxis focus -#bltCmd $graph vaxis get -#bltCmd $graph vaxis invtransform -#bltCmd $graph vaxis limits -#bltCmd $graph vaxis margin -#bltCmd $graph vaxis names -#bltCmd $graph vaxis transform -#bltCmd $graph vaxis type -#bltCmd $graph vaxis view +#bltCmd $graph axis activate +#bltCmd $graph axis bind +#bltCmd $graph axis cget +#bltCmd $graph axis configure +#bltCmd $graph axis create +#bltCmd $graph axis deactivate +#bltCmd $graph axis delete +#bltCmd $graph axis focus +#bltCmd $graph axis get +#bltCmd $graph axis invtransform +#bltCmd $graph axis limits +#bltCmd $graph axis margin +#bltCmd $graph axis names +#bltCmd $graph axis transform +#bltCmd $graph axis type +#bltCmd $graph axis view echo "done" bltPlotDestroy $w diff --git a/tests/bargraph.tcl b/tests/bargraph.tcl index 25d3091..db3fd7f 100644 --- a/tests/bargraph.tcl +++ b/tests/bargraph.tcl @@ -18,9 +18,9 @@ bltTest $graph -bottommargin 50 #bltTest $graph -bufferelements #bltTest $graph -buffergraph bltTest $graph -cursor cross -#bltTest $graph -fg -bltTest $graph -font "times 36 bold italic" -#bltTest $graph -foreground +bltTest $graph -fg blue +bltTest $graph -font {times 36 bold italic} +bltTest $graph -foreground cyan #bltTest $graph -halo bltTest $graph -height 300 #bltTest $graph -highlightbackground @@ -40,6 +40,9 @@ bltTest $graph -relief groove bltTest $graph -rightmargin 50 #bltTest $graph -rightvariable bltTest $graph -rm 50 +#bltTest $graph -searchhalo +#bltTest $graph -searchmode +#bltTest $graph -searchalong #bltTest $graph -stackaxes #bltTest $graph -takefocus bltTest $graph -title "This is a Title" @@ -50,26 +53,6 @@ bltTest $graph -width 300 bltTest $graph -plotwidth 300 bltTest $graph -plotheight 300 -#bltCmd $graph axis -#bltCmd $graph bar (elem) -#bltCmd $graph cget -#bltCmd $graph configure -#bltCmd $graph crosshairs (Blt_CrosshairsOp) -#bltCmd $graph element (elem) -#bltCmd $graph extents -#bltCmd $graph inside -#bltCmd $graph invtransform -#bltCmd $graph legend (Blt_LegendOp) -#bltCmd $graph line (elem) -#bltCmd $graph marker (Blt_MarkerOp) -#bltCmd $graph pen (Blt_PenOp) -#bltCmd $graph postscript (Blt_PostscriptOp) -#bltCmd $graph transform -#bltCmd $graph x2axis (axis) -#bltCmd $graph xaxis (axis) -#bltCmd $graph y2axis (axis) -#bltCmd $graph yaxis (axis) - echo "done" bltPlotDestroy $w diff --git a/tests/base.tcl b/tests/base.tcl index 518f8c6..179850d 100644 --- a/tests/base.tcl +++ b/tests/base.tcl @@ -22,7 +22,6 @@ proc bltTest {graph option value} { set org [$graph cget $option] $graph configure $option $value update -# read stdin after $sleep $graph configure $option $org update diff --git a/tests/linegraph.tcl b/tests/linegraph.tcl index aae78a4..7b43526 100644 --- a/tests/linegraph.tcl +++ b/tests/linegraph.tcl @@ -17,9 +17,9 @@ bltTest $graph -bottommargin 50 #bltTest $graph -bufferelements #bltTest $graph -buffergraph bltTest $graph -cursor cross -#bltTest $graph -fg -bltTest $graph -font "times 36 bold italic" -#bltTest $graph -foreground +bltTest $graph -fg blue +bltTest $graph -font {times 36 bold italic} +bltTest $graph -foreground cyan #bltTest $graph -halo bltTest $graph -height 300 #bltTest $graph -highlightbackground @@ -52,26 +52,6 @@ bltTest $graph -width 300 bltTest $graph -plotwidth 300 bltTest $graph -plotheight 300 -#bltCmd $graph axis -#bltCmd $graph bar (elem) -#bltCmd $graph cget -#bltCmd $graph configure -#bltCmd $graph crosshairs (Blt_CrosshairsOp) -#bltCmd $graph element (elem) -#bltCmd $graph extents -#bltCmd $graph inside -#bltCmd $graph invtransform -#bltCmd $graph legend (Blt_LegendOp) -#bltCmd $graph line (elem) -#bltCmd $graph marker (Blt_MarkerOp) -#bltCmd $graph pen (Blt_PenOp) -#bltCmd $graph postscript (Blt_PostscriptOp) -#bltCmd $graph transform -#bltCmd $graph x2axis (axis) -#bltCmd $graph xaxis (axis) -#bltCmd $graph y2axis (axis) -#bltCmd $graph yaxis (axis) - echo "done" bltPlotDestroy $w diff --git a/tests/linemarker.tcl b/tests/linemarker.tcl index 8bd669f..a8d20dc 100644 --- a/tests/linemarker.tcl +++ b/tests/linemarker.tcl @@ -28,24 +28,6 @@ bltTest3 $graph marker $mm -xoffset 20 bltTest3 $graph marker $mm -xor yes bltTest3 $graph marker $mm -yoffset 20 -#bltCmd $graph marker bind marker ?sequence command? -bltCmd $graph marker cget $mm -cap -bltCmd $graph marker configure $mm -bltCmd $graph marker configure $mm -cap -set foo [$graph marker create line] -bltCmd $graph marker delete $foo -set foo [$graph marker create line foo] -bltCmd $graph marker delete $foo -bltCmd $graph marker exists $mm -bltCmd $graph marker find enclosed 0 0 2 200 -bltCmd $graph marker get name current -bltCmd $graph marker lower $mm -bltCmd $graph marker lower $mm $nn -bltCmd $graph marker names -bltCmd $graph marker raise $mm -bltCmd $graph marker raise $mm $nn -bltCmd $graph marker type $mm - echo "done" bltPlotDestroy $w diff --git a/tests/marker.tcl b/tests/marker.tcl new file mode 100644 index 0000000..345654d --- /dev/null +++ b/tests/marker.tcl @@ -0,0 +1,32 @@ +source base.tcl + +set w .line +set graph [bltLineGraph $w] + +set mm [$graph marker create line tt -element data1 \ + -coords {1 50 1.5 100 1 150} -linewidth 5] +set nn [$graph marker create line ss -element data1 \ + -coords {1 150 .5 100 1 50} -linewidth 1 \ + -outline green -dashes 4] + +#bltCmd $graph marker bind marker ?sequence command? +bltCmd $graph marker cget $mm -cap +bltCmd $graph marker configure $mm +bltCmd $graph marker configure $mm -cap +set foo [$graph marker create line] +bltCmd $graph marker delete $foo +set foo [$graph marker create line foo] +bltCmd $graph marker delete $foo +bltCmd $graph marker exists $mm +bltCmd $graph marker find enclosed 0 0 2 200 +bltCmd $graph marker get name current +bltCmd $graph marker lower $mm +bltCmd $graph marker lower $mm $nn +bltCmd $graph marker names +bltCmd $graph marker raise $mm +bltCmd $graph marker raise $mm $nn +bltCmd $graph marker type $mm + +echo "done" +bltPlotDestroy $w + diff --git a/tests/polygonmarker.tcl b/tests/polygonmarker.tcl index a5240b8..d6403bf 100644 --- a/tests/polygonmarker.tcl +++ b/tests/polygonmarker.tcl @@ -3,47 +3,30 @@ source base.tcl set w .line set graph [bltLineGraph $w] -set mm [$graph marker create line tt -element data1 \ - -coords {1 50 1.5 100 1 150} -linewidth 5] -set nn [$graph marker create line ss -element data1 \ - -coords {1 150 .5 100 1 50} -linewidth 1 \ - -outline green -dashes 4] +set mm [$graph marker create polygon tt -element data1 \ + -coords {1 50 1.5 100 1 150} -polygonwidth 5] #bltTest3 $graph marker $mm -bindtags bltTest3 $graph marker $mm -cap round bltTest3 $graph marker $mm -coords {1 50 1.5 100 2 150} bltTest3 $graph marker $mm -dashes dashdot -bltTest3 $graph marker $mm -dashoffset 10 bltTest3 $graph marker $mm -element data2 -bltTest3 $graph marker $nn -fill yellow +bltTest3 $graph marker $mm -fill yellow +bltTest3 $graph marker $mm -fillbg blue bltTest3 $graph marker $mm -join round -bltTest3 $graph marker $mm -linewidth 1 +bltTest3 $graph marker $mm -polygonwidth 1 bltTest3 $graph marker $mm -hide yes bltTest3 $graph marker $mm -mapx x bltTest3 $graph marker $mm -mapy y bltTest3 $graph marker $mm -outline green +bltTest3 $graph marker $mm -outlinebg cyan bltTest3 $graph marker $mm -state disabled +#bltTest3 $graph marker $mm -stipple bltTest3 $graph marker $mm -under yes bltTest3 $graph marker $mm -xoffset 20 bltTest3 $graph marker $mm -xor yes bltTest3 $graph marker $mm -yoffset 20 -#bltCmd $graph marker bind marker ?sequence command? -bltCmd $graph marker cget $mm -cap -bltCmd $graph marker configure $mm -bltCmd $graph marker configure $mm -cap -set foo [$graph marker create line] -bltCmd $graph marker delete $foo -set foo [$graph marker create line foo] -bltCmd $graph marker delete $foo -bltCmd $graph marker exists $mm -bltCmd $graph marker find enclosed 0 0 2 200 -bltCmd $graph marker get name current -bltCmd $graph marker lower $mm -bltCmd $graph marker names -bltCmd $graph marker raise $mm -bltCmd $graph marker type $mm - echo "done" bltPlotDestroy $w diff --git a/tests/textmarker.tcl b/tests/textmarker.tcl new file mode 100644 index 0000000..7e37e94 --- /dev/null +++ b/tests/textmarker.tcl @@ -0,0 +1,35 @@ +source base.tcl + +set w .line +set graph [bltLineGraph $w] + +set mm [$graph marker create text tt -element data1 \ + -coords {1.5 100} -text {Text Marker} -font {24}] + +bltTest3 $graph marker $mm -anchor nw +bltTest3 $graph marker $mm -background blue +bltTest3 $graph marker $mm -bg red +#bltTest3 $graph marker $mm -bindtags +bltTest3 $graph marker $mm -coords {1 50} +bltTest3 $graph marker $mm -element data2 +bltTest3 $graph marker $mm -fg cyan +bltTest3 $graph marker $mm -fill yellow +bltTest3 $graph marker $mm -font {times 24 bold italic} +bltTest3 $graph marker $mm -foreground red +bltTest3 $graph marker $mm -justify right +bltTest3 $graph marker $mm -hide yes +bltTest3 $graph marker $mm -mapx x +bltTest3 $graph marker $mm -mapy y +bltTest3 $graph marker $mm -outline green +bltTest3 $graph marker $mm -padx 10 +bltTest3 $graph marker $mm -pady 10 +bltTest3 $graph marker $mm -rotate 45 +bltTest3 $graph marker $mm -state disabled +bltTest3 $graph marker $mm -text {Hello World} +bltTest3 $graph marker $mm -under yes +bltTest3 $graph marker $mm -xoffset 20 +bltTest3 $graph marker $mm -yoffset 20 + +echo "done" +bltPlotDestroy $w + -- cgit v0.12