Changeset 1132
- Timestamp:
- Aug 27, 2008 3:59:56 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.in
r1047 r1132 22 22 tarfile = rappture-$(os)-$(machine)-$(build_date).tar.gz 23 23 24 ENABLE_GUI = @ENABLE_GUI@ 24 ENABLE_GUI = @ENABLE_GUI@ 25 26 TARGETS = src 25 27 26 28 ifneq ($(ENABLE_GUI),) 27 GUI = gui29 TARGETS += gui lang test examples lib 28 30 endif 29 31 30 .PHONY: src gui lang test examples lib31 32 32 all: src gui examples test lib lang 33 .PHONY: $(TARGETS) 34 35 all: $(TARGETS) 33 36 34 37 src: … … 46 49 47 50 install: 48 $(MAKE) -C examples install 49 $(MAKE) -C gui install 50 $(MAKE) -C lib install 51 $(MAKE) -C src install 52 $(MAKE) -C lang install 51 for i in $(TARGETS) ; do \ 52 $(MAKE) -C $$i install || exit 1 ;\ 53 done 53 54 54 55 clean: -
trunk/configure
r1122 r1132 9726 9726 9727 9727 9728 . ${exec_prefix}/lib/tclConfig.sh 9729 . ${exec_prefix}/lib/tkConfig.sh 9728 if test -f "${exec_prefix}/lib/tclConfig.sh" ; then 9729 . ${exec_prefix}/lib/tclConfig.sh 9730 fi 9731 if test -f "${exec_prefix}/lib/tclConfig.sh" ; then 9732 . ${exec_prefix}/lib/tkConfig.sh 9733 fi 9730 9734 9731 9735 -
trunk/configure.in
r1121 r1132 24 24 AC_PROG_MAKE_SET 25 25 26 dnl find and test the C compiler 26 # Check for C, C++, and FORTRAN 27 27 AC_PROG_CC 28 AC_PROG_F77 29 AC_LANG_C 30 28 AC_PROG_CXX 29 # Avoid g95 31 30 AC_PROG_INSTALL 32 31 AC_PROG_RANLIB … … 34 33 AC_PROG_MKDIR_P 35 34 35 AC_PROG_F77([g77 gfortran f77 fort77 f90 xlf xlf90 fl32]) 36 37 AC_LANG_C 38 36 39 AC_HEADER_STDC 37 40 AC_CHECK_FUNC(atol,,AC_MSG_ERROR(oops! no atol ?!?)) 38 41 39 AC_PROG_CXX40 42 AC_LANG_CPLUSPLUS 41 43 … … 46 48 AC_CHECK_HEADERS(vector,,AC_MSG_WARN(STL classes missing ?)) 47 49 48 AC_PROG_F77([g77 gfortran f77 fort77 f90 xlf xlf90 fl32])49 50 50 51 SC_CONFIG_CFLAGS … … 368 369 AC_SUBST(SHLIB_SUFFIX) 369 370 370 . ${exec_prefix}/lib/tclConfig.sh 371 . ${exec_prefix}/lib/tkConfig.sh 371 if test -f "${exec_prefix}/lib/tclConfig.sh" ; then 372 . ${exec_prefix}/lib/tclConfig.sh 373 fi 374 if test -f "${exec_prefix}/lib/tclConfig.sh" ; then 375 . ${exec_prefix}/lib/tkConfig.sh 376 fi 372 377 AC_SUBST(TCL_VERSION) 373 378 AC_SUBST(TK_VERSION) -
trunk/gui/scripts/xylegend.tcl
r1130 r1132 29 29 private variable tree_ "" 30 30 private variable diff_ "" 31 private variable focus_ -1 31 32 private variable diffelements_ 32 33 … … 35 36 36 37 public method Activate {} 38 public method Average {} 39 public method Check {} 37 40 public method Deactivate {} 41 public method Delete { args } 42 public method Difference {} 43 public method Editor { option args } 38 44 public method Hide { args } 45 public method Lower { args } 46 public method Raise { args } 47 public method Rename {} 39 48 public method Show { args } 40 49 public method Toggle { args } 41 public method Raise { args }42 public method Lower { args }43 public method Check {}44 public method Difference {}45 public method Delete { args }46 public method Average {}47 50 private method GetData { elem what } 48 51 private method Add { elem label {flags ""}} … … 90 93 -boxcolor grey50 -checkcolor black -activebackground grey90 91 94 $itk_component(legend) column configure "treeView" -justify left \ 92 -weight 1.0 -text "" -pad 0 -borderwidth 0 95 -weight 1.0 -text "" -pad 0 -borderwidth 0 93 96 $itk_component(legend) column configure "show" -style "check" -pad {0 0} \ 94 97 -edit yes … … 110 113 difference "" 111 114 delete "" 115 rename "" 112 116 } 113 117 foreach { but icon} $commands { … … 118 122 -activebackground grey90 119 123 } 120 grid $controls.hide -column 0 -row 0 121 grid $controls.show -column 0 -row 1 124 grid $controls.hide -column 0 -row 0 -sticky w 125 grid $controls.show -column 0 -row 1 -sticky w 122 126 grid $controls.toggle -column 0 -row 2 -sticky w 123 127 grid $controls.raise -column 0 -row 3 -sticky w … … 125 129 grid $controls.difference -column 1 -row 0 -sticky w 126 130 grid $controls.average -column 1 -row 1 -sticky w 127 grid $controls.delete -column 1 -row 2 -sticky w 131 grid $controls.rename -column 1 -row 2 -sticky w 132 grid $controls.delete -column 1 -row 3 -sticky w 128 133 129 134 grid columnconfigure $controls 0 -weight 1 … … 149 154 $itk_component(legend) configure -selectcommand \ 150 155 [itcl::code $this Check] 156 157 itk_component add editor { 158 Rappture::Editor $itk_interior.editor \ 159 -activatecommand [itcl::code $this Editor activate] \ 160 -validatecommand [itcl::code $this Editor validate] \ 161 -applycommand [itcl::code $this Editor apply] 162 } 151 163 Check 152 164 eval itk_initialize $args … … 331 343 itcl::body Rappture::XyLegend::Check {} { 332 344 set nodes [$itk_component(legend) curselection] 333 foreach n { hide show toggle raise lower average difference delete } { 345 foreach n { hide show toggle raise lower 346 rename average difference delete } { 334 347 $itk_component(controls).$n configure -state disabled 335 348 } … … 339 352 break 340 353 } 354 } 355 if { [$itk_component(legend) index focus] != -1 } { 356 $itk_component(controls).rename configure -state normal 341 357 } 342 358 if { [$tree_ degree 0] > 1 && [llength $nodes] > 0 } { … … 542 558 } 543 559 } 560 561 itcl::body Rappture::XyLegend::Rename {} { 562 Editor popup 563 } 564 565 # ---------------------------------------------------------------------- 566 # USAGE: Editor popup 567 # USAGE: Editor activate 568 # USAGE: Editor validate <value> 569 # USAGE: Editor apply <value> 570 # USAGE: Editor menu <rootx> <rooty> 571 # 572 # Used internally to handle the various functions of the pop-up 573 # editor for the value of this gauge. 574 # ---------------------------------------------------------------------- 575 itcl::body Rappture::XyLegend::Editor {option args} { 576 switch -- $option { 577 popup { 578 $itk_component(editor) activate 579 } 580 activate { 581 set focus_ [$itk_component(legend) index focus] 582 if { $focus_ == -1 } { 583 return; 584 } 585 set label [$itk_component(legend) entry cget $focus_ -label] 586 foreach { l r t b } [$itk_component(legend) bbox $focus_] break 587 set info(text) $label 588 set info(x) [expr $l + [winfo rootx $itk_component(legend)]] 589 set info(y) [expr $r + [winfo rooty $itk_component(legend)]] 590 set info(w) [expr $r - $l] 591 set info(h) [expr $b - $t] 592 return [array get info] 593 } 594 validate { 595 if {[llength $args] != 1} { 596 error "wrong # args: should be \"editor validate value\"" 597 } 598 } 599 apply { 600 if {[llength $args] != 1} { 601 error "wrong # args: should be \"editor apply value\"" 602 } 603 set label [lindex $args 0] 604 $itk_component(legend) entry configure $focus_ -label $label 605 } 606 menu { 607 eval tk_popup $itk_component(emenu) $args 608 } 609 default { 610 error "bad option \"$option\": should be popup, activate, validate, apply, and menu" 611 } 612 } 613 } -
trunk/packages/vizservers/start_viz.sh.in
r1131 r1132 40 40 cd ${dir} 41 41 42 # Don't let nanoscale runand the visualization servers run away.42 # Don't let nanoscale and the visualization servers run away. 43 43 # Limit cpu time to 20 minutes. 44 44 minutes=20
Note: See TracChangeset
for help on using the changeset viewer.