From: <arj...@us...> - 2008-08-30 11:15:08
|
Revision: 8726 http://plplot.svn.sourceforge.net/plplot/?rev=8726&view=rev Author: arjenmarkus Date: 2008-08-30 11:15:19 +0000 (Sat, 30 Aug 2008) Log Message: ----------- Corrected the parts with plimagefr. The example is complete, apart from testing against x20c, checking the refreshing behaviour and plgetcursor Modified Paths: -------------- trunk/examples/tcl/x20.tcl Modified: trunk/examples/tcl/x20.tcl =================================================================== --- trunk/examples/tcl/x20.tcl 2008-08-30 11:13:21 UTC (rev 8725) +++ trunk/examples/tcl/x20.tcl 2008-08-30 11:15:19 UTC (rev 8726) @@ -182,7 +182,7 @@ #C $w cmd plabort "No such file" puts "Image could not be read" $w cmd plend - exit + return } } @@ -210,7 +210,7 @@ if { [get_clip $w $xi $xe $yi $ye] } { $w cmd plend - $w cmd exit 0 + return } # @@ -265,26 +265,25 @@ set widthp1 [expr {$width+1}] set heightp1 [expr {$height+1}] - matrix xg f $withp1 $heightp1 - matrix yg f $withp1 $heightp1 + matrix xg f $widthp1 $heightp1 + matrix yg f $widthp1 $heightp1 set x0 [expr {0.5*$width}] set y0 [expr {0.5*$height}] set dy [expr {0.5*$height}] set stretch 0.5 for { set i 0 } { $i < $widthp1 } { incr i } { - for { set j 0 } { $j < $widthp1 } { incr j } { + for { set j 0 } { $j < $heightp1 } { incr j } { xg $i $j = [expr {$x0 + ($x0-double($i))*(1.0 - $stretch * cos((double($j)-$y0)/$dy*$PI*0.5))}] yg $i $j = $j } } - $w cmd plimagefr img_f 0. $width_r 0. $height_r 0. 0. $img_min \ + $w cmd plimagefr img_f 0. $width 0. $height 0. 0. $img_min \ $img_max xg yg $w cmd pladv 0 $w cmd plend - $w cmd exit 0 } # ------------------------------------------- @@ -344,10 +343,7 @@ for { set j 0 } { $j < $h } { incr j } { for { set i 0 } { $i < $w } { incr i } { - binary scan [string index $picture $count] c value - if { $value < 0 } { - set value [expr {256+$value}] - } + binary scan [string index $picture $count] cu value img_f $i [expr {$h-$j-1}] = $value incr count } @@ -487,8 +483,7 @@ set get_clip [expr { $gin_keysym == $Q}] } else { # driver has no xormod capability, just do nothing - get_clip = 0 - return + return 0 } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2008-08-31 10:21:35
|
Revision: 8729 http://plplot.svn.sourceforge.net/plplot/?rev=8729&view=rev Author: andrewross Date: 2008-08-31 10:21:45 +0000 (Sun, 31 Aug 2008) Log Message: ----------- Changes to tcl example 20 to ensure it works with tcl 8.4. Fix some errors with quotes in pllab. Avoid use of u flag in binary scan. This is only available with tcl8.5 upwards. Many distributions still have 8.4 as default. Fix a few other bugs with the interactive part of the code. The example works with non-interactive drivers (e.g. psc) but not with interactive drivers such as xwin. Modified Paths: -------------- trunk/examples/tcl/x20.tcl Modified: trunk/examples/tcl/x20.tcl =================================================================== --- trunk/examples/tcl/x20.tcl 2008-08-31 08:02:16 UTC (rev 8728) +++ trunk/examples/tcl/x20.tcl 2008-08-31 10:21:45 UTC (rev 8729) @@ -128,8 +128,8 @@ z $XDIMM1 $i = 1.0 } - $w cmd pllab "...around a blue square."" " \ - "A red border should appear...") + $w cmd pllab "...around a blue square." " " \ + "A red border should appear..." $w cmd plimage z 1. $XDIM 1. $YDIM 0. 0. 1. $XDIM 1.$YDIM @@ -196,7 +196,7 @@ $w cmd pllab "Set and drag Button 1 to re set selection Button 2 to finish." \ "" "Lena..." } else { - $w cmd pllab """ ""Lena..." + $w cmd pllab "" " " "Lena..." } $w cmd plimage img_f 1. $width 1. $height 0. 0. 1. $width 1. $height @@ -343,7 +343,12 @@ for { set j 0 } { $j < $h } { incr j } { for { set i 0 } { $i < $w } { incr i } { - binary scan [string index $picture $count] cu value + # The u flag for binary scan is only available + # with tcl8.5 onwards - use a simpler method + # for compatibility. + #binary scan [string index $picture $count] cu value + binary scan [string index $picture $count] c value + set value [expr ( $value + 0x100 ) % 0x100] img_f $i [expr {$h-$j-1}] = $value incr count } @@ -418,7 +423,7 @@ if { $gin_button == 1 } { set xxi $gin_wX set yyi $gin_wY - if { start } { + if { $start } { #C clear previous rectangle $w cmd plline 5 sx sy } @@ -431,7 +436,7 @@ sy 4 = $yyi } - if { gin%state & 0x100 != 0 } { + if { $gin_state & 0x100 != 0 } { set xxe $gin_wX set yye $gin_wY if { $start } { @@ -450,8 +455,8 @@ $w cmd plline 5 sx sy } - if {($gin_button == 3) || ($gin_keysym == $PLK_Return) || - ($gin_keysym == $Q } { + if {($gin_button == 3) || ($gin_keysym == $PLK_Return) || \ + ($gin_keysym == $Q) } { if { $start } { # Clear previous rectangle $w cmd plline 5 sx sy This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Arjen M. <arj...@wl...> - 2008-09-01 06:25:41
|
and...@us... wrote: >Revision: 8729 > http://plplot.svn.sourceforge.net/plplot/?rev=8729&view=rev >Author: andrewross >Date: 2008-08-31 10:21:45 +0000 (Sun, 31 Aug 2008) > >Log Message: >----------- >Changes to tcl example 20 to ensure it works with tcl 8.4. > >Fix some errors with quotes in pllab. > >Avoid use of u flag in binary scan. This is only available with tcl8.5 >upwards. Many distributions still have 8.4 as default. > >Fix a few other bugs with the interactive part of the code. > >The example works with non-interactive drivers (e.g. psc) but not with >interactive drivers such as xwin. > > > Hi Andrew, what does not work exactly with xwin? I have developed and tested the example with wingcc under Windows XP and there it works fine, except for zooming in (I have not implemented plGetCursor yet) and it takes slightly more spaces to go through the example's pages than I think is necessary. Regards, Arjen |
From: Andrew R. <and...@us...> - 2008-09-01 07:07:57
|
On Mon, Sep 01, 2008 at 08:25:43AM +0200, Arjen Markus wrote: > and...@us... wrote: > > >Revision: 8729 > > http://plplot.svn.sourceforge.net/plplot/?rev=8729&view=rev > >Author: andrewross > >Date: 2008-08-31 10:21:45 +0000 (Sun, 31 Aug 2008) > > > >Log Message: > >----------- > >Changes to tcl example 20 to ensure it works with tcl 8.4. > > > >Fix some errors with quotes in pllab. > > > >Avoid use of u flag in binary scan. This is only available with tcl8.5 > >upwards. Many distributions still have 8.4 as default. > > > >Fix a few other bugs with the interactive part of the code. > > > >The example works with non-interactive drivers (e.g. psc) but not with > >interactive drivers such as xwin. > > > > > > > Hi Andrew, > > what does not work exactly with xwin? I have developed and tested the > example > with wingcc under Windows XP and there it works fine, except for zooming in > (I have not implemented plGetCursor yet) and it takes slightly more > spaces to > go through the example's pages than I think is necessary. Arjen, It was the get_clip function which caused problems. I see this now returns a 0 though, and with this the example works ok for me using xwin. Andrew |
From: <and...@us...> - 2008-09-01 09:58:19
|
Revision: 8741 http://plplot.svn.sourceforge.net/plplot/?rev=8741&view=rev Author: andrewross Date: 2008-09-01 09:58:23 +0000 (Mon, 01 Sep 2008) Log Message: ----------- Update labels for tcl example 20 consistent with C version. Modified Paths: -------------- trunk/examples/tcl/x20.tcl Modified: trunk/examples/tcl/x20.tcl =================================================================== --- trunk/examples/tcl/x20.tcl 2008-09-01 07:12:22 UTC (rev 8740) +++ trunk/examples/tcl/x20.tcl 2008-09-01 09:58:23 UTC (rev 8741) @@ -159,7 +159,7 @@ } } - $w cmd pllab "No an amplitude clipped \"sombrero\"" "" "Saturn?" + $w cmd pllab "No, an amplitude clipped \"sombrero\"" "" "Saturn?" $w cmd plptex 2. 2. 3. 4. 0. "Transparent image" $w cmd plimage z 0. [expr {2.*$PI}] 0.0 [expr {3.*$PI}] \ 0.05 1. 0. [expr {2.*$PI}] 0. [expr {3.*$PI}] @@ -193,8 +193,8 @@ $w cmd plenv 1. $width 1. $height 1 -1 if { !$nointeractive } { - $w cmd pllab "Set and drag Button 1 to re set selection Button 2 to finish." \ - "" "Lena..." + $w cmd pllab "Set and drag Button 1 to (re)set selection Button 2 to finish." \ + " " "Lena..." } else { $w cmd pllab "" " " "Lena..." } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2008-09-01 10:07:06
|
Revision: 8742 http://plplot.svn.sourceforge.net/plplot/?rev=8742&view=rev Author: andrewross Date: 2008-09-01 10:07:09 +0000 (Mon, 01 Sep 2008) Log Message: ----------- Further label fix for tcl example 20. Modified Paths: -------------- trunk/examples/tcl/x20.tcl Modified: trunk/examples/tcl/x20.tcl =================================================================== --- trunk/examples/tcl/x20.tcl 2008-09-01 09:58:23 UTC (rev 8741) +++ trunk/examples/tcl/x20.tcl 2008-09-01 10:07:09 UTC (rev 8742) @@ -193,7 +193,7 @@ $w cmd plenv 1. $width 1. $height 1 -1 if { !$nointeractive } { - $w cmd pllab "Set and drag Button 1 to (re)set selection Button 2 to finish." \ + $w cmd pllab "Set and drag Button 1 to (re)set selection, Button 2 to finish." \ " " "Lena..." } else { $w cmd pllab "" " " "Lena..." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-08-09 18:39:51
|
Revision: 10225 http://plplot.svn.sourceforge.net/plplot/?rev=10225&view=rev Author: airwin Date: 2009-08-09 18:39:45 +0000 (Sun, 09 Aug 2009) Log Message: ----------- Drop plend commands which were interfering with the next example called when using tkdemos.tcl. In any case, x20.tcl is not meant to be standalone so any tcl script that calls x20.tcl (e.g., x?? or tkdemos.tcl) calls plend. Modified Paths: -------------- trunk/examples/tcl/x20.tcl Modified: trunk/examples/tcl/x20.tcl =================================================================== --- trunk/examples/tcl/x20.tcl 2009-08-09 15:52:51 UTC (rev 10224) +++ trunk/examples/tcl/x20.tcl 2009-08-09 18:39:45 UTC (rev 10225) @@ -177,7 +177,7 @@ if { ![read_img "../lena.pgm" img_f width height num_col] } { #C $w cmd plabort "No such file" puts "Image could not be read" - $w cmd plend +# $w cmd plend return } } @@ -205,7 +205,7 @@ set ye 220.0 if { [get_clip $w $xi $xe $yi $ye] } { - $w cmd plend +# $w cmd plend return } @@ -276,7 +276,7 @@ $w cmd plimagefr img_f 0. $width 0. $height 0. 0. $img_min \ $img_max xg yg - $w cmd plend +# $w cmd plend } # ------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2009-01-06 20:26:22
|
Revision: 9267 http://plplot.svn.sourceforge.net/plplot/?rev=9267&view=rev Author: arjenmarkus Date: 2009-01-06 20:26:20 +0000 (Tue, 06 Jan 2009) Log Message: ----------- Just a small but important mistake: num_col instead of $num_col. The results are now identical to the C example Modified Paths: -------------- trunk/examples/tcl/x20.tcl Modified: trunk/examples/tcl/x20.tcl =================================================================== --- trunk/examples/tcl/x20.tcl 2009-01-06 19:57:52 UTC (rev 9266) +++ trunk/examples/tcl/x20.tcl 2009-01-06 20:26:20 UTC (rev 9267) @@ -506,7 +506,7 @@ rev 0 = 0 rev 1 = 0 - $w cmd plscmap1n num_col + $w cmd plscmap1n $num_col $w cmd plscmap1l 1 2 pos R G B rev } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-01-22 22:17:57
|
Revision: 9373 http://plplot.svn.sourceforge.net/plplot/?rev=9373&view=rev Author: airwin Date: 2009-01-22 22:15:31 +0000 (Thu, 22 Jan 2009) Log Message: ----------- Remove "_use_" Fortran workaround for cmake-2.4.x that had crept into this Tcl example. Modified Paths: -------------- trunk/examples/tcl/x20.tcl Modified: trunk/examples/tcl/x20.tcl =================================================================== --- trunk/examples/tcl/x20.tcl 2009-01-22 21:20:21 UTC (rev 9372) +++ trunk/examples/tcl/x20.tcl 2009-01-22 22:15:31 UTC (rev 9373) @@ -367,7 +367,7 @@ # Create a new one $w cmd plmkstrm new_strm -# New device type. _Use_ a known existing driver +# New device type. Use a known existing driver $w cmd plsdev "psc" $w cmd plsfnam $fname This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |