Changeset 2743
- Timestamp:
- Dec 27, 2011, 2:38:51 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 14 edited
-
gui/configure.in (modified) (3 diffs)
-
gui/scripts/moleculeViewer.tcl (modified) (1 diff)
-
gui/scripts/nanovisviewer.tcl (modified) (9 diffs)
-
gui/scripts/sequenceresult.tcl (modified) (4 diffs)
-
gui/scripts/sidebarframe.tcl (modified) (1 diff)
-
gui/scripts/tool.tcl (modified) (1 diff)
-
gui/scripts/videoparticle.tcl (modified) (1 diff)
-
gui/scripts/vtkcontourviewer.tcl (modified) (2 diffs)
-
gui/scripts/vtkstreamlinesviewer.tcl (modified) (2 diffs)
-
gui/scripts/vtkviewer.tcl (modified) (3 diffs)
-
gui/scripts/xylegend.tcl (modified) (6 diffs)
-
gui/scripts/xyprint.tcl (modified) (1 diff)
-
gui/src/Makefile.in (modified) (1 diff)
-
lang/tcl/src/Makefile.in (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/gui/configure.in
r2400 r2743 29 29 AC_PROG_CC 30 30 31 SC_CONFIG_CFLAGS 32 SC_ENABLE_SHARED 33 34 AC_SUBST(CFLAGS_DEBUG) 35 AC_SUBST(CFLAGS_OPTIMIZE) 36 AC_SUBST(STLIB_LD) 37 AC_SUBST(SHLIB_LD) 38 AC_SUBST(SHLIB_CFLAGS) 39 AC_SUBST(SHLIB_LDFLAGS) 40 AC_SUBST(SHLIB_SUFFIX) 31 #SC_CONFIG_CFLAGS 32 #SC_ENABLE_SHARED 41 33 42 34 gui_with_tcl="" … … 148 140 AC_SUBST(TCLSH) 149 141 150 AC_SUBST(TCL_VERSION)151 AC_SUBST(TCL_INC_SPEC)152 AC_SUBST(TCL_LIB_SPEC)153 154 142 if test -f "${exec_prefix}/lib/tclConfig.sh" ; then 155 143 . ${exec_prefix}/lib/tclConfig.sh … … 158 146 . ${exec_prefix}/lib/tkConfig.sh 159 147 fi 148 AC_SUBST(TCL_INC_SPEC) 149 AC_SUBST(TCL_LIB_SPEC) 160 150 AC_SUBST(TCL_VERSION) 151 AC_SUBST(TK_INC_SPEC) 152 AC_SUBST(TK_LIB_SPEC) 153 AC_SUBST(TK_XLIBSW) 161 154 AC_SUBST(TK_VERSION) 155 AC_SUBST(TCL_CFLAGS_DEBUG) 156 AC_SUBST(TCL_CFLAGS_OPTIMIZE) 157 AC_SUBST(TCL_STLIB_LD) 158 AC_SUBST(TCL_SHLIB_LD) 159 AC_SUBST(TCL_SHLIB_CFLAGS) 160 AC_SUBST(TCL_SHLIB_LDFLAGS) 161 AC_SUBST(TCL_SHLIB_SUFFIX) 162 162 163 163 164 AC_CONFIG_FILES([ -
trunk/gui/scripts/moleculeViewer.tcl
r1929 r2743 28 28 itk_option define -device device Device "" 29 29 30 constructor {tool args} { # defined below } 31 destructor { # defined below } 30 constructor {tool args} { 31 # defined below 32 } 33 destructor { 34 # defined below 35 } 32 36 33 37 public method add {dataobj {settings ""}} 34 38 public method get {} 35 39 public method delete {args} 36 public method parameters {title args} { # do nothing } 37 40 public method snap {w h} 41 public method parameters {title args} { 42 # do nothing 43 } 38 44 public method emblems {option} 39 45 public method download {option args} -
trunk/gui/scripts/nanovisviewer.tcl
r2734 r2743 19 19 # 20 20 # FIXME: 21 # 22 # 23 # 24 # 21 # Need to Add DX readers this client to examine the data before 22 # it's sent to the server. This will eliminate 90% of the insanity in 23 # computing the limits of all the volumes. I can rip out all the 24 # "receive data" "send transfer function" event crap. 25 25 # 26 26 # This means we can compute the transfer function (relative values) and 27 # 28 # 29 # 30 # 31 # 27 # draw the legend min/max values without waiting for the information to 28 # come from the server. This will also prevent the flashing that occurs 29 # when a new volume is drawn (using the default transfer function) and 30 # then when the correct transfer function has been sent and linked to 31 # the volume. 32 32 # 33 33 option add *NanovisViewer.width 4i widgetDefault … … 199 199 psi 0 200 200 zoom 1.0 201 pan-x 202 pan-y 201 pan-x 0 202 pan-y 0 203 203 } 204 204 set _limits(vmin) 0.0 … … 206 206 207 207 array set _settings [subst { 208 $this-pan-x 209 $this-pan-y 210 $this-phi 211 $this-psi 212 $this-theta 213 $this-volume 214 $this-xcutplane 215 $this-xcutposition 216 $this-ycutplane 217 $this-ycutposition 218 $this-zcutplane 219 $this-zcutposition 220 $this-zoom 208 $this-pan-x $_view(pan-x) 209 $this-pan-y $_view(pan-y) 210 $this-phi $_view(phi) 211 $this-psi $_view(psi) 212 $this-theta $_view(theta) 213 $this-volume 1 214 $this-xcutplane 0 215 $this-xcutposition 0 216 $this-ycutplane 0 217 $this-ycutposition 0 218 $this-zcutplane 0 219 $this-zcutposition 0 220 $this-zoom $_view(zoom) 221 221 }] 222 222 … … 680 680 ComputeTransferFunc $tf 681 681 # FIXME: Need to the send information as to what transfer functions 682 # 683 # 684 # 682 # to update so that we only update the transfer function 683 # as necessary. Right now, all transfer functions are 684 # updated. This makes moving the isomarker slider chunky. 685 685 if { ![info exists _activeTfs($tf)] || !$_activeTfs($tf) } { 686 686 set _activeTfs($tf) 1 … … 708 708 ReceiveEcho <<line "<read $info(-bytes) bytes" 709 709 if { $info(-type) == "image" } { 710 ReceiveEcho "for [image width $_image(plot)]x[image height $_image(plot)] image>" 710 ReceiveEcho "for [image width $_image(plot)]x[image height $_image(plot)] image>" 711 711 $_image(plot) configure -data $bytes 712 712 } elseif { $info(type) == "print" } { … … 990 990 phi 45 991 991 psi 0 992 zoom 993 pan-x 994 pan-y 992 zoom 1.0 993 pan-x 0 994 pan-y 0 995 995 } 996 996 if { $_first != "" } { … … 1611 1611 itcl::body Rappture::NanovisViewer::BuildViewTab {} { 1612 1612 foreach { key value } { 1613 grid 1614 axes 1615 outline 1616 volume 1617 legend 1618 particles 1619 lic 1613 grid 0 1614 axes 1 1615 outline 1 1616 volume 1 1617 legend 1 1618 particles 1 1619 lic 1 1620 1620 } { 1621 1621 set _settings($this-$key) $value … … 1683 1683 itcl::body Rappture::NanovisViewer::BuildVolumeTab {} { 1684 1684 foreach { key value } { 1685 light 1686 transp 1687 opacity 1688 thickness 1685 light 40 1686 transp 50 1687 opacity 100 1688 thickness 350 1689 1689 } { 1690 1690 set _settings($this-$key) $value … … 1845 1845 0,1 $itk_component(xCutScale) \ 1846 1846 0,2 $itk_component(yCutScale) \ 1847 0,3 $itk_component(zCutScale) \1847 0,3 $itk_component(zCutScale) 1848 1848 1849 1849 blt::table configure $inner r0 r1 c* -resize none -
trunk/gui/scripts/sequenceresult.tcl
r2736 r2743 1 1 2 # ---------------------------------------------------------------------- 2 3 # COMPONENT: sequenceresult - series of results forming an animation … … 27 28 inherit itk::Widget 28 29 29 constructor {args} { # defined below } 30 destructor { # defined below } 31 30 constructor {args} { 31 # defined below 32 } 33 destructor { 34 # defined below 35 } 32 36 public method add {dataobj {settings ""}} 33 37 public method get {} 34 38 public method delete {args} 35 39 public method scale {args} 36 public method parameters {title args} { # do nothing } 40 public method parameters {title args} { 41 # do nothing 42 } 37 43 public method download {option args} 38 44 … … 341 347 return; # No frames (i.e. no data). 342 348 } 343 # cancel any existing animation349 # Stop any existing animation. 344 350 pause 345 351 346 # at the end? then restart fresh352 # At the end? then restart fresh 347 353 if {$_pos >= [llength $_indices]-1} { 348 354 goto 0 349 355 } 350 356 351 # toggle the button to "pause" mode357 # Toggle the button to "pause" mode 352 358 $itk_component(play) configure \ 353 359 -bitmap [Rappture::icon pause] \ … … 356 362 global readyForNextFrame 357 363 set readyForNextFrame 1; # By default, always ready 358 # schedule the first frame364 # Schedule the first frame 359 365 set delay [expr {int(ceil(pow($_play(speed)/10.0+2,2.0)*15))}] 360 366 set _afterId [after $delay [itcl::code $this _playFrame]] -
trunk/gui/scripts/sidebarframe.tcl
r2547 r2743 198 198 # 199 199 # Note: Bugs in BLT 2.4 tabset/VNC server crashes the server 200 # 200 # when -outerpad is set to 0. 201 201 # 202 202 itk_component add tabs { -
trunk/gui/scripts/tool.tcl
r2647 r2743 204 204 -output ::Rappture::Tool::job(output) \ 205 205 -error ::Rappture::Tool::job(error) $cmd} result] 206 206 207 if { $status != 0 } { 207 208 foreach {code pid mesg} $::Rappture::Tool::job(control) break -
trunk/gui/scripts/videoparticle.tcl
r2028 r2743 9 9 # this file, and for a DISCLAIMER OF ALL WARRANTIES. 10 10 # ====================================================================== 11 11 s 12 12 package require Itk 13 13 package require BLT -
trunk/gui/scripts/vtkcontourviewer.tcl
r2671 r2743 15 15 package require BLT 16 16 package require Img 17 package require vtk 18 17 19 18 option add *VtkContourViewer.width 4i widgetDefault 20 19 option add *VtkContourViewer*cursor crosshair widgetDefault … … 146 145 itcl::body Rappture::VtkContourViewer::constructor {hostlist args} { 147 146 set _serverType "vtkvis" 147 package require vtk 148 148 149 149 # Draw legend event -
trunk/gui/scripts/vtkstreamlinesviewer.tcl
r2673 r2743 14 14 package require Itk 15 15 package require BLT 16 #package require Img 17 package require vtk 16 package require Img 18 17 19 18 option add *VtkStreamlinesViewer.width 4i widgetDefault … … 170 169 itcl::body Rappture::VtkStreamlinesViewer::constructor {hostlist args} { 171 170 set _serverType "vtkvis" 171 package require vtk 172 172 173 173 # Rebuild event -
trunk/gui/scripts/vtkviewer.tcl
r2671 r2743 15 15 package require BLT 16 16 #package require Img 17 package require vtk18 17 19 18 option add *VtkViewer.width 4i widgetDefault … … 65 64 public method scale {args} 66 65 67 protected variable _serverType "vtkvis"68 66 protected method Connect {} 69 67 protected method CurrentDatasets {args} … … 155 153 # ---------------------------------------------------------------------- 156 154 itcl::body Rappture::VtkViewer::constructor {hostlist args} { 155 set _serverType "vtkvis" 156 package require vtk 157 157 158 # Rebuild event 158 159 $_dispatcher register !rebuild -
trunk/gui/scripts/xylegend.tcl
r2699 r2743 451 451 update 452 452 # Step 1. Get the x-values for each curve, then sort them to get the 453 # unique values. 454 455 foreach node $nodes { 456 set elem [$_tree label $node] 453 # unique values. 454 455 set labels {} 456 foreach node $nodes { 457 set elem [$_tree label $node] 458 set label [$_graph element cget $elem -label] 457 459 $xcoords append [GetData $elem -x] 458 460 set elements [linsert $elements 0 $elem] 461 set labels [linsert $labels 0 $label] 459 462 } 460 463 # Sort the abscissas keeping unique values. … … 462 465 463 466 # Step 2. Now for each curve, generate a cubic spline of that curve 464 # 465 # 466 # 467 # and interpolate to get the corresponding y-values for each 468 # abscissa. Normally the abscissa are the same, so we're 469 # interpolation the knots. 467 470 468 471 set x [blt::vector create \#auto -command ""] … … 485 488 486 489 # Step 3. Create a new curve which is the average. Append it to the 487 # 490 # the end. 488 491 489 492 set count 0 … … 491 494 incr count 492 495 } 493 set elements [lsort -dictionary $elements]496 set labels [lsort -dictionary $labels] 494 497 set name "avg$count" 495 set label "Avg. [join $ elements ,]"498 set label "Avg. [join $labels ,]" 496 499 497 500 # Don't use the vector because we don't know when it will be cleaned up. … … 521 524 if { [info exists _diffelements($elem1)] && 522 525 [info exists _diffelements($elem2)] } { 523 array unset _diffelements; 524 return; 526 array unset _diffelements; # Toggle the difference. 527 return; 525 528 } 526 529 array unset _diffelements … … 564 567 } 565 568 569 itcl::body Rappture::XyLegend::UnmapHidden {} { 570 $_graph configure -unmaphiddenelements $_unmapHidden 571 } 572 566 573 itcl::body Rappture::XyLegend::SelectAll { } { 567 574 foreach node [$_tree children 0] { -
trunk/gui/scripts/xyprint.tcl
r2693 r2743 1281 1281 $itk_component(axis_combo) choices delete 0 end 1282 1282 foreach axis $names { 1283 if { $axis == "z" } { 1284 continue 1285 } 1283 1286 if { ![$_clone axis cget $axis -hide] } { 1284 1287 $itk_component(axis_combo) choices insert end $axis $axis -
trunk/gui/src/Makefile.in
r2717 r2743 16 16 CXX = @CXX@ 17 17 CC = @CC@ 18 CFLAGS_DEBUG = @ CFLAGS_DEBUG@ -Wall19 CFLAGS_OPTIMIZE = @ CFLAGS_OPTIMIZE@20 STLIB_LD = @ STLIB_LD@21 SHLIB_LD = @ SHLIB_LD@22 SHLIB_CFLAGS = @ SHLIB_CFLAGS@23 SHLIB_LDFLAGS = @ SHLIB_LDFLAGS@24 SHLIB_SUFFIX = @ SHLIB_SUFFIX@25 CFLAGS_DEFAULT = @ CFLAGS_DEFAULT@26 LIB_ SEARCH_DIRS = @LIB_SEARCH_DIRS@18 CFLAGS_DEBUG = @TCL_CFLAGS_DEBUG@ -Wall 19 CFLAGS_OPTIMIZE = @TCL_CFLAGS_OPTIMIZE@ 20 STLIB_LD = @TCL_STLIB_LD@ 21 SHLIB_LD = @TCL_SHLIB_LD@ 22 SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@ 23 SHLIB_LDFLAGS = @TCL_SHLIB_LDFLAGS@ 24 SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@ 25 CFLAGS_DEFAULT = @TCL_CFLAGS_DEFAULT@ 26 LIB_RUNTIME_DIR = @LIB_RUNTIME_DIR@ 27 27 CFLAGS = @CFLAGS@ -fPIC 28 28 TCL_VERSION = @TCL_VERSION@ -
trunk/lang/tcl/src/Makefile.in
r2651 r2743 28 28 TCL_VERSION = @TCL_VERSION@ 29 29 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 30 HAVE_FFMPEG = @HAVE_FFMPEG_LIBS@ 31 HAVE_NCURSES = @HAVE_LIBNCURSES@ 30 32 31 33 CC_SWITCHES = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 70 72 endif 71 73 72 FFMPEG = @HAVE_FFMPEG_LIBS@ 73 ifeq ($(FFMPEG),yes) 74 ifeq ($(HAVE_LIBCURSES),yes) 75 OBJS += RpCurses.o 76 LIBS += -lncurses 77 endif 78 79 ifeq ($(HAVE_FFMPEG),yes) 74 80 OBJS += RpVideoTclInterface.o 75 81 LIBS += -L../../../src/objects -lRpObjects
Note: See TracChangeset
for help on using the changeset viewer.
