Changeset 6252


Ignore:
Timestamp:
Apr 6, 2016, 11:28:26 AM (9 years ago)
Author:
dkearney
Message:

Merging r6210 through r6251 from trunk to blt4-trunk branch

Location:
branches/blt4_trunk
Files:
17 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/blt4_trunk

  • branches/blt4_trunk/configure

    r6210 r6252  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for Rappture 1.7.
     3# Generated by GNU Autoconf 2.69 for Rappture 1.9.
    44#
    55# Report bugs to <rappture@nanohub.org>.
    … …  
    581581PACKAGE_NAME='Rappture'
    582582PACKAGE_TARNAME='rappture'
    583 PACKAGE_VERSION='1.7'
    584 PACKAGE_STRING='Rappture 1.7'
     583PACKAGE_VERSION='1.9'
     584PACKAGE_STRING='Rappture 1.9'
    585585PACKAGE_BUGREPORT='rappture@nanohub.org'
    586586PACKAGE_URL=''
    … …  
    13971397  # This message is too long to be a string in the A/UX 3.1 sh.
    13981398  cat <<_ACEOF
    1399 \`configure' configures Rappture 1.7 to adapt to many kinds of systems.
     1399\`configure' configures Rappture 1.9 to adapt to many kinds of systems.
    14001400
    14011401Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    14621462if test -n "$ac_init_help"; then
    14631463  case $ac_init_help in
    1464      short | recursive ) echo "Configuration of Rappture 1.7:";;
     1464     short | recursive ) echo "Configuration of Rappture 1.9:";;
    14651465   esac
    14661466  cat <<\_ACEOF
    … …  
    15821582if $ac_init_version; then
    15831583  cat <<\_ACEOF
    1584 Rappture configure 1.7
     1584Rappture configure 1.9
    15851585generated by GNU Autoconf 2.69
    15861586
    … …  
    24022402running configure, to aid debugging if configure makes a mistake.
    24032403
    2404 It was created by Rappture $as_me 1.7, which was
     2404It was created by Rappture $as_me 1.9, which was
    24052405generated by GNU Autoconf 2.69.  Invocation command line was
    24062406
    … …  
    1073410734# values after options handling.
    1073510735ac_log="
    10736 This file was extended by Rappture $as_me 1.7, which was
     10736This file was extended by Rappture $as_me 1.9, which was
    1073710737generated by GNU Autoconf 2.69.  Invocation command line was
    1073810738
    … …  
    1079610796ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    1079710797ac_cs_version="\\
    10798 Rappture config.status 1.7
     10798Rappture config.status 1.9
    1079910799configured by $0, generated by GNU Autoconf 2.69,
    1080010800  with options \\"\$ac_cs_config\\"

  • branches/blt4_trunk/configure.in

    r6210 r6252  
    11
    2 AC_INIT([Rappture],[1.7],[rappture@nanohub.org])
     2AC_INIT([Rappture],[1.9],[rappture@nanohub.org])
    33AC_CONFIG_AUX_DIR(cf)
    44AC_CONFIG_HEADER(src/core/config.h)

  • branches/blt4_trunk/gui/configure

    r6210 r6252  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for RapptureGUI 1.7.
     3# Generated by GNU Autoconf 2.69 for RapptureGUI 1.9.
    44#
    55# Report bugs to <rappture@nanohub.org>.
    … …  
    580580PACKAGE_NAME='RapptureGUI'
    581581PACKAGE_TARNAME='rappturegui'
    582 PACKAGE_VERSION='1.7'
    583 PACKAGE_STRING='RapptureGUI 1.7'
     582PACKAGE_VERSION='1.9'
     583PACKAGE_STRING='RapptureGUI 1.9'
    584584PACKAGE_BUGREPORT='rappture@nanohub.org'
    585585PACKAGE_URL=''
    … …  
    12281228  # This message is too long to be a string in the A/UX 3.1 sh.
    12291229  cat <<_ACEOF
    1230 \`configure' configures RapptureGUI 1.7 to adapt to many kinds of systems.
     1230\`configure' configures RapptureGUI 1.9 to adapt to many kinds of systems.
    12311231
    12321232Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    12941294if test -n "$ac_init_help"; then
    12951295  case $ac_init_help in
    1296      short | recursive ) echo "Configuration of RapptureGUI 1.7:";;
     1296     short | recursive ) echo "Configuration of RapptureGUI 1.9:";;
    12971297   esac
    12981298  cat <<\_ACEOF
    … …  
    13851385if $ac_init_version; then
    13861386  cat <<\_ACEOF
    1387 RapptureGUI configure 1.7
     1387RapptureGUI configure 1.9
    13881388generated by GNU Autoconf 2.69
    13891389
    … …  
    14401440running configure, to aid debugging if configure makes a mistake.
    14411441
    1442 It was created by RapptureGUI $as_me 1.7, which was
     1442It was created by RapptureGUI $as_me 1.9, which was
    14431443generated by GNU Autoconf 2.69.  Invocation command line was
    14441444
    … …  
    37013701# values after options handling.
    37023702ac_log="
    3703 This file was extended by RapptureGUI $as_me 1.7, which was
     3703This file was extended by RapptureGUI $as_me 1.9, which was
    37043704generated by GNU Autoconf 2.69.  Invocation command line was
    37053705
    … …  
    37543754ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    37553755ac_cs_version="\\
    3756 RapptureGUI config.status 1.7
     3756RapptureGUI config.status 1.9
    37573757configured by $0, generated by GNU Autoconf 2.69,
    37583758  with options \\"\$ac_cs_config\\"

  • branches/blt4_trunk/gui/configure.in

    r6210 r6252  
    11
    2 AC_INIT([RapptureGUI],[1.7],[rappture@nanohub.org])
     2AC_INIT([RapptureGUI],[1.9],[rappture@nanohub.org])
    33AC_CONFIG_AUX_DIR(cf)
    44#------------------------------------------------------------------------

  • branches/blt4_trunk/gui/scripts/flowvisviewer.tcl

    r6210 r6252  
    133133    private variable _dataset2style    ;# maps dataobj-component to transfunc
    134134    private variable _style2datasets   ;# maps tf back to list of
    135                                        ;# dataobj-components using the tf.
     135                                        # dataobj-components using the tf.
    136136    private variable _dataset2flow     ;# Maps dataobj-component to a flow.
    137137
    … …  
    224224    set _arcball [blt::arcball create 100 100]
    225225    $_arcball quaternion [ViewToQuaternion]
    226 
    227     set _reset 1
    228226
    229227    array set _settings [subst {
    … …  
    567565
    568566    eval itk_initialize $args
    569 
    570567    Connect
    571568}
    … …  
    693690        set args $_dlist
    694691    }
    695 
    696692    # Delete all specified dataobjs
    697693    set changed 0
    … …  
    16481644        # Have to defer creation of isomarkers until we have data limits
    16491645        if { [info exists style(-markers)] &&
    1650              [llength $style(-markers)] > 0  } {
     1646             [llength $style(-markers)] > 0 } {
    16511647            ParseMarkersOption $tf $style(-markers)
    16521648        } else {

  • branches/blt4_trunk/gui/scripts/mapviewer.tcl

    r6210 r6252  
    934934# ----------------------------------------------------------------------
    935935# USAGE: select clear
    936 # USAGE: select feature <args...>
    937 # USAGE: select annotation <args...>
     936# USAGE: select feature add|delete|set <featureIDList> <layerName>
     937# USAGE: select mode <boolean>
    938938#
    939939# Clients use this method to notify the map widget of a selection event
    … …  
    942942itcl::body Rappture::MapViewer::select {option {args ""}} {
    943943    switch $option {
    944         "annotation" {
    945             SendCmd "select annotation $args"
    946         }
    947944        "clear" {
     945            if {[llength $args] > 0} {
     946                error "wrong # args: should be \"select clear\""
     947            }
    948948            SendCmd "select clear"
    949949        }
    950950        "feature" {
    951             SendCmd "select feature $args"
     951            if {[llength $args] != 3} {
     952                error "wrong #args: should be \"select feature <op> <featureIDList> <layerName>\""
     953            }
     954            set op [lindex $args 0]
     955            set layer [lindex $args end]
     956            if {![info exists _layers($layer)]} {
     957                puts stderr "Unknown layer \"$layer\""
     958                return
     959            }
     960            switch $op {
     961                "add" {
     962                    SendCmd "select fadd [lrange $args 1 end]"
     963                }
     964                "delete" {
     965                    SendCmd "select fdelete [lrange $args 1 end]"
     966                }
     967                "set" {
     968                    SendCmd "select feature [lrange $args 1 end]"
     969                }
     970                default {
     971                    puts stderr "Unknown select feature op \"$op\""
     972                }
     973            }
     974        }
     975        "mode" {
     976            if {[llength $args] != 1} {
     977                error "wrong # args: should be \"select mode <boolean>\""
     978            }
     979            if {![string is boolean $args]} {
     980                error "argument to \"select mode\" must be boolean"
     981            }
     982            SendCmd "select mode $args"
    952983        }
    953984        default {

  • branches/blt4_trunk/gui/scripts/nanovisviewer.tcl

    r6210 r6252  
    602602        }
    603603        controls {
    604             set popup .nanovisdownload
     604            set popup .nanovisviewerdownload
    605605            if { ![winfo exists $popup] } {
    606606                set inner [BuildDownloadPopup $popup [lindex $args 0]]
    … …  
    618618        }
    619619        now {
    620             set popup .nanovisdownload
     620            set popup .nanovisviewerdownload
    621621            if { [winfo exists $popup] } {
    622622                $popup deactivate

  • branches/blt4_trunk/gui/scripts/vtkglyphviewer.tcl

    r6210 r6252  
    554554}
    555555
    556 set rotate_delay 100
    557 
    558556itcl::body Rappture::VtkGlyphViewer::EventuallyRotate { q } {
    559557    QuaternionToView $q
    560558    if { !$_rotatePending } {
    561559        set _rotatePending 1
    562         global rotate_delay
    563         $_dispatcher event -after $rotate_delay !rotate
     560        $_dispatcher event -after 100 !rotate
    564561    }
    565562}

  • branches/blt4_trunk/gui/scripts/vtkheightmapviewer.tcl

    r6210 r6252  
    453453}
    454454
    455 set rotate_delay 100
    456 
    457455itcl::body Rappture::VtkHeightmapViewer::EventuallyRotate { q } {
    458456    QuaternionToView $q
    459457    if { !$_rotatePending } {
    460458        set _rotatePending 1
    461         global rotate_delay
    462         $_dispatcher event -after $rotate_delay !rotate
     459        $_dispatcher event -after 100 !rotate
    463460    }
    464461}

  • branches/blt4_trunk/gui/scripts/vtkimageviewer.tcl

    r6210 r6252  
    443443}
    444444
    445 set rotate_delay 100
    446 
    447445itcl::body Rappture::VtkImageViewer::EventuallyRotate { q } {
    448446    QuaternionToView $q
    449447    if { !$_rotatePending } {
    450448        set _rotatePending 1
    451         global rotate_delay
    452         $_dispatcher event -after $rotate_delay !rotate
     449        $_dispatcher event -after 100 !rotate
    453450    }
    454451}

  • branches/blt4_trunk/gui/scripts/vtkisosurfaceviewer.tcl

    r6210 r6252  
    572572}
    573573
    574 set rotate_delay 100
    575 
    576574itcl::body Rappture::VtkIsosurfaceViewer::EventuallyRotate { q } {
    577575    QuaternionToView $q
    578576    if { !$_rotatePending } {
    579577        set _rotatePending 1
    580         global rotate_delay
    581         $_dispatcher event -after $rotate_delay !rotate
     578        $_dispatcher event -after 100 !rotate
    582579    }
    583580}
    … …  
    595592    if { !$_contourList(updatePending) } {
    596593        set _contourList(updatePending) 1
    597         global rotate_delay
    598         $_dispatcher event -after $rotate_delay !contours
     594        $_dispatcher event -after 100 !contours
    599595    }
    600596}

  • branches/blt4_trunk/gui/scripts/vtkstreamlinesviewer.tcl

    r6210 r6252  
    7676    private method CurrentDatasets {args}
    7777    private method Disconnect {}
     78    private method DoRescale {}
     79    private method DoReseed {}
    7880    private method DoResize {}
    79     private method DoReseed {}
    8081    private method DoRotate {}
    8182    private method EnterLegend { x y }
     83    private method EventuallyRescale { length }
     84    private method EventuallyReseed { numPoints }
    8285    private method EventuallyResize { w h }
    83     private method EventuallyReseed { numPoints }
    8486    private method EventuallyRotate { q }
    8587    private method EventuallySetCutplane { axis args }
    … …  
    136138    private variable _resizePending 0
    137139    private variable _legendPending 0
     140    private variable _rescalePending 0
    138141    private variable _reseedPending 0
    139142    private variable _rotatePending 0
    … …  
    142145    private variable _curFldName ""
    143146    private variable _curFldLabel ""
    144     private variable _field      ""
     147    private variable _field ""
     148    private variable _streamlinesLength 0
    145149    private variable _numSeeds 200
    146150    private variable _colorMode "vmag"; # Mode of colormap (vmag or scalar)
    … …  
    175179    $_dispatcher register !legend
    176180    $_dispatcher dispatch $this !legend "[itcl::code $this RequestLegend]; list"
     181
     182    # Rescale streamlines event
     183    $_dispatcher register !rescale
     184    $_dispatcher dispatch $this !rescale "[itcl::code $this DoRescale]; list"
    177185
    178186    # Reseed event
    … …  
    469477}
    470478
     479itcl::body Rappture::VtkStreamlinesViewer::DoRescale {} {
     480    foreach dataset [CurrentDatasets -visible] {
     481        SendCmd "streamlines length $_streamlinesLength $dataset"
     482    }
     483    set _rescalePending 0
     484}
     485
    471486itcl::body Rappture::VtkStreamlinesViewer::DoReseed {} {
    472487    foreach dataset [CurrentDatasets -visible] {
    473         foreach {dataobj comp} [split $dataset -] break
    474488        # This command works for either random or fmesh seeds
    475489        SendCmd "streamlines seed numpts $_numSeeds $dataset"
    … …  
    488502}
    489503
     504itcl::body Rappture::VtkStreamlinesViewer::EventuallyRescale { length } {
     505    set _streamlinesLength $length
     506    if { !$_rescalePending } {
     507        set _rescalePending 1
     508        $_dispatcher event -after 600 !rescale
     509    }
     510}
     511
    490512itcl::body Rappture::VtkStreamlinesViewer::EventuallyReseed { numPoints } {
    491513    set _numSeeds $numPoints
    … …  
    496518}
    497519
    498 set rotate_delay 100
    499 
    500520itcl::body Rappture::VtkStreamlinesViewer::EventuallyRotate { q } {
    501521    QuaternionToView $q
    502522    if { !$_rotatePending } {
    503523        set _rotatePending 1
    504         global rotate_delay
    505         $_dispatcher event -after $rotate_delay !rotate
     524        $_dispatcher event -after 100 !rotate
    506525    }
    507526}
    … …  
    14261445            }
    14271446            set length [expr { $sval * ($xlen + $ylen + $zlen) } ]
    1428             SendCmd "streamlines length $length"
     1447            EventuallyRescale $length
    14291448        }
    14301449        "-streamlineslighting" {

  • branches/blt4_trunk/gui/scripts/vtksurfaceviewer.tcl

    r6210 r6252  
    444444}
    445445
    446 set rotate_delay 100
    447 
    448446itcl::body Rappture::VtkSurfaceViewer::EventuallyRotate { q } {
    449447    QuaternionToView $q
    450448    if { !$_rotatePending } {
    451449        set _rotatePending 1
    452         global rotate_delay
    453         $_dispatcher event -after $rotate_delay !rotate
     450        $_dispatcher event -after 100 !rotate
    454451    }
    455452}

  • branches/blt4_trunk/gui/scripts/vtkvolumeviewer.tcl

    r6210 r6252  
    497497}
    498498
    499 set rotate_delay 100
    500 
    501499itcl::body Rappture::VtkVolumeViewer::EventuallyRotate { q } {
    502500    QuaternionToView $q
    503501    if { !$_rotatePending } {
    504502        set _rotatePending 1
    505         global rotate_delay
    506         $_dispatcher event -after $rotate_delay !rotate
     503        $_dispatcher event -after 100 !rotate
    507504    }
    508505}

  • branches/blt4_trunk/lang/tcl/scripts/task.tcl

    r6210 r6252  
    122122itcl::body Rappture::Task::GetSignal {code} {
    123123    set signals {
    124         HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV
     124        xxx HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV
    125125        USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN
    126126        TTOU URG XCPU XFSZ VTALRM PROF WINCH POLL PWR SYS

  • branches/blt4_trunk/src/core/config.h.in

    r4146 r6252  
    240240/* Define to the one symbol short name of this package. */
    241241#undef PACKAGE_TARNAME
     242
     243/* Define to the home page for this package. */
     244#undef PACKAGE_URL
    242245
    243246/* Define to the version of this package. */
Note: See TracChangeset for help on using the changeset viewer.