Changeset 2743


Ignore:
Timestamp:
Dec 27, 2011 2:38:51 PM (10 years ago)
Author:
gah
Message:
 
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/gui/configure.in

    r2400 r2743  
    2929AC_PROG_CC
    3030
    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
    4133
    4234gui_with_tcl=""
     
    148140AC_SUBST(TCLSH)
    149141
    150 AC_SUBST(TCL_VERSION)
    151 AC_SUBST(TCL_INC_SPEC)
    152 AC_SUBST(TCL_LIB_SPEC)
    153 
    154142if test -f "${exec_prefix}/lib/tclConfig.sh" ; then
    155143  . ${exec_prefix}/lib/tclConfig.sh
     
    158146  . ${exec_prefix}/lib/tkConfig.sh     
    159147fi
     148AC_SUBST(TCL_INC_SPEC)
     149AC_SUBST(TCL_LIB_SPEC)
    160150AC_SUBST(TCL_VERSION)
     151AC_SUBST(TK_INC_SPEC)
     152AC_SUBST(TK_LIB_SPEC)
     153AC_SUBST(TK_XLIBSW)
    161154AC_SUBST(TK_VERSION)
     155AC_SUBST(TCL_CFLAGS_DEBUG)
     156AC_SUBST(TCL_CFLAGS_OPTIMIZE)
     157AC_SUBST(TCL_STLIB_LD)
     158AC_SUBST(TCL_SHLIB_LD)
     159AC_SUBST(TCL_SHLIB_CFLAGS)
     160AC_SUBST(TCL_SHLIB_LDFLAGS)
     161AC_SUBST(TCL_SHLIB_SUFFIX)
     162
    162163
    163164AC_CONFIG_FILES([
  • trunk/gui/scripts/moleculeViewer.tcl

    r1929 r2743  
    2828    itk_option define -device device Device ""
    2929
    30     constructor {tool args} { # defined below }
    31     destructor { # defined below }
     30    constructor {tool args} {
     31        # defined below
     32    }
     33    destructor {
     34        # defined below
     35    }
    3236
    3337    public method add {dataobj {settings ""}}
    3438    public method get {}
    3539    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    }
    3844    public method emblems {option}
    3945    public method download {option args}
  • trunk/gui/scripts/nanovisviewer.tcl

    r2734 r2743  
    1919#
    2020# FIXME:
    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.
     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.
    2525#
    2626#       This means we can compute the transfer function (relative values) and
    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. 
     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. 
    3232#
    3333option add *NanovisViewer.width 4i widgetDefault
     
    199199        psi     0
    200200        zoom    1.0
    201         pan-x        0
    202         pan-y        0
     201        pan-x   0
     202        pan-y   0
    203203    }
    204204    set _limits(vmin) 0.0
     
    206206
    207207    array set _settings [subst {
    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)
     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)
    221221    }]
    222222
     
    680680        ComputeTransferFunc $tf
    681681        # FIXME: Need to the send information as to what transfer functions
    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.
     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.
    685685        if { ![info exists _activeTfs($tf)] || !$_activeTfs($tf) } {
    686686            set _activeTfs($tf) 1
     
    708708    ReceiveEcho <<line "<read $info(-bytes) bytes"
    709709    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>"       
    711711        $_image(plot) configure -data $bytes
    712712    } elseif { $info(type) == "print" } {
     
    990990                phi     45
    991991                psi     0
    992                 zoom        1.0
    993                 pan-x        0
    994                 pan-y        0
     992                zoom    1.0
     993                pan-x   0
     994                pan-y   0
    995995            }
    996996            if { $_first != "" } {
     
    16111611itcl::body Rappture::NanovisViewer::BuildViewTab {} {
    16121612    foreach { key value } {
    1613         grid                0
    1614         axes                1
    1615         outline                1
    1616         volume                1
    1617         legend                1
    1618         particles        1
    1619         lic                1
     1613        grid            0
     1614        axes            1
     1615        outline         1
     1616        volume          1
     1617        legend          1
     1618        particles       1
     1619        lic             1
    16201620    } {
    16211621        set _settings($this-$key) $value
     
    16831683itcl::body Rappture::NanovisViewer::BuildVolumeTab {} {
    16841684    foreach { key value } {
    1685         light                40
    1686         transp                50
    1687         opacity                100
    1688         thickness        350
     1685        light           40
     1686        transp          50
     1687        opacity         100
     1688        thickness       350
    16891689    } {
    16901690        set _settings($this-$key) $value
     
    18451845        0,1 $itk_component(xCutScale) \
    18461846        0,2 $itk_component(yCutScale) \
    1847         0,3 $itk_component(zCutScale) \
     1847        0,3 $itk_component(zCutScale)
    18481848
    18491849    blt::table configure $inner r0 r1 c* -resize none
  • trunk/gui/scripts/sequenceresult.tcl

    r2736 r2743  
     1
    12# ----------------------------------------------------------------------
    23#  COMPONENT: sequenceresult - series of results forming an animation
     
    2728    inherit itk::Widget
    2829
    29     constructor {args} { # defined below }
    30     destructor { # defined below }
    31 
     30    constructor {args} {
     31        # defined below
     32    }
     33    destructor {
     34        # defined below
     35    }
    3236    public method add {dataobj {settings ""}}
    3337    public method get {}
    3438    public method delete {args}
    3539    public method scale {args}
    36     public method parameters {title args} { # do nothing }
     40    public method parameters {title args} {
     41        # do nothing
     42    }
    3743    public method download {option args}
    3844
     
    341347        return;                         # No frames (i.e. no data).
    342348    }
    343     # cancel any existing animation
     349    # Stop any existing animation.
    344350    pause
    345351
    346     # at the end? then restart fresh
     352    # At the end? then restart fresh
    347353    if {$_pos >= [llength $_indices]-1} {
    348354        goto 0
    349355    }
    350356
    351     # toggle the button to "pause" mode
     357    # Toggle the button to "pause" mode
    352358    $itk_component(play) configure \
    353359        -bitmap [Rappture::icon pause] \
     
    356362    global readyForNextFrame
    357363    set readyForNextFrame 1;            # By default, always ready
    358     # schedule the first frame
     364    # Schedule the first frame
    359365    set delay [expr {int(ceil(pow($_play(speed)/10.0+2,2.0)*15))}]
    360366    set _afterId [after $delay [itcl::code $this _playFrame]]
  • trunk/gui/scripts/sidebarframe.tcl

    r2547 r2743  
    198198    #
    199199    # Note:  Bugs in BLT 2.4 tabset/VNC server crashes the server
    200     #             when -outerpad is set to 0.
     200    #        when -outerpad is set to 0.
    201201    #
    202202    itk_component add tabs {
  • trunk/gui/scripts/tool.tcl

    r2647 r2743  
    204204                -output ::Rappture::Tool::job(output) \
    205205                -error ::Rappture::Tool::job(error) $cmd} result]
     206
    206207            if { $status != 0 } {
    207208                foreach {code pid mesg} $::Rappture::Tool::job(control) break
  • trunk/gui/scripts/videoparticle.tcl

    r2028 r2743  
    99# this file, and for a DISCLAIMER OF ALL WARRANTIES.
    1010# ======================================================================
    11 
     11s
    1212package require Itk
    1313package require BLT
  • trunk/gui/scripts/vtkcontourviewer.tcl

    r2671 r2743  
    1515package require BLT
    1616package require Img
    17 package require vtk
    18 
     17                                       
    1918option add *VtkContourViewer.width 4i widgetDefault
    2019option add *VtkContourViewer*cursor crosshair widgetDefault
     
    146145itcl::body Rappture::VtkContourViewer::constructor {hostlist args} {
    147146    set  _serverType "vtkvis"
     147    package require vtk
    148148
    149149    # Draw legend event
  • trunk/gui/scripts/vtkstreamlinesviewer.tcl

    r2673 r2743  
    1414package require Itk
    1515package require BLT
    16 #package require Img
    17 package require vtk
     16package require Img
    1817
    1918option add *VtkStreamlinesViewer.width 4i widgetDefault
     
    170169itcl::body Rappture::VtkStreamlinesViewer::constructor {hostlist args} {
    171170    set _serverType "vtkvis"
     171    package require vtk
    172172
    173173    # Rebuild event
  • trunk/gui/scripts/vtkviewer.tcl

    r2671 r2743  
    1515package require BLT
    1616#package require Img
    17 package require vtk
    1817
    1918option add *VtkViewer.width 4i widgetDefault
     
    6564    public method scale {args}
    6665
    67     protected variable _serverType "vtkvis"
    6866    protected method Connect {}
    6967    protected method CurrentDatasets {args}
     
    155153# ----------------------------------------------------------------------
    156154itcl::body Rappture::VtkViewer::constructor {hostlist args} {
     155    set _serverType "vtkvis"
     156    package require vtk
     157
    157158    # Rebuild event
    158159    $_dispatcher register !rebuild
  • trunk/gui/scripts/xylegend.tcl

    r2699 r2743  
    451451    update
    452452    # 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]
    457459        $xcoords append [GetData $elem -x]
    458460        set elements [linsert $elements 0 $elem]
     461        set labels [linsert $labels 0 $label]
    459462    }
    460463    # Sort the abscissas keeping unique values.
     
    462465
    463466    # Step 2. Now for each curve, generate a cubic spline of that curve
    464     #              and interpolate to get the corresponding y-values for each
    465     #              abscissa.  Normally the abscissa are the same, so we're
    466     #              interpolation the knots.
     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.
    467470
    468471    set x [blt::vector create \#auto -command ""]
     
    485488
    486489    # Step 3.  Create a new curve which is the average. Append it to the
    487     #               the end.
     490    #          the end.
    488491
    489492    set count 0
     
    491494        incr count
    492495    }
    493     set elements [lsort -dictionary $elements]
     496    set labels [lsort -dictionary $labels]
    494497    set name "avg$count"
    495     set label "Avg. [join $elements ,]"
     498    set label "Avg. [join $labels ,]"
    496499
    497500    # Don't use the vector because we don't know when it will be cleaned up.
     
    521524    if { [info exists _diffelements($elem1)] &&
    522525         [info exists _diffelements($elem2)] } {
    523         array unset _diffelements;        # Toggle the difference.
    524         return;                               
     526        array unset _diffelements;      # Toggle the difference.
     527        return;                         
    525528    }
    526529    array unset _diffelements
     
    564567}
    565568
     569itcl::body Rappture::XyLegend::UnmapHidden {} {
     570    $_graph configure -unmaphiddenelements $_unmapHidden
     571}
     572
    566573itcl::body Rappture::XyLegend::SelectAll { } {
    567574    foreach node [$_tree children 0] {
  • trunk/gui/scripts/xyprint.tcl

    r2693 r2743  
    12811281    $itk_component(axis_combo) choices delete 0 end
    12821282    foreach axis $names {
     1283        if { $axis == "z" } {
     1284            continue
     1285        }
    12831286        if { ![$_clone axis cget $axis -hide] } {
    12841287            $itk_component(axis_combo) choices insert end $axis $axis
  • trunk/gui/src/Makefile.in

    r2717 r2743  
    1616CXX             = @CXX@
    1717CC              = @CC@
    18 CFLAGS_DEBUG    = @CFLAGS_DEBUG@ -Wall
    19 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@
     18CFLAGS_DEBUG    = @TCL_CFLAGS_DEBUG@ -Wall
     19CFLAGS_OPTIMIZE = @TCL_CFLAGS_OPTIMIZE@
     20STLIB_LD        = @TCL_STLIB_LD@
     21SHLIB_LD        = @TCL_SHLIB_LD@
     22SHLIB_CFLAGS    = @TCL_SHLIB_CFLAGS@
     23SHLIB_LDFLAGS   = @TCL_SHLIB_LDFLAGS@
     24SHLIB_SUFFIX    = @TCL_SHLIB_SUFFIX@
     25CFLAGS_DEFAULT  = @TCL_CFLAGS_DEFAULT@
     26LIB_RUNTIME_DIR = @LIB_RUNTIME_DIR@
    2727CFLAGS          = @CFLAGS@ -fPIC
    2828TCL_VERSION     = @TCL_VERSION@
  • trunk/lang/tcl/src/Makefile.in

    r2651 r2743  
    2828TCL_VERSION     = @TCL_VERSION@
    2929TCL_LIB_SPEC    = @TCL_LIB_SPEC@
     30HAVE_FFMPEG     = @HAVE_FFMPEG_LIBS@
     31HAVE_NCURSES    = @HAVE_LIBNCURSES@
    3032
    3133CC_SWITCHES     = $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     
    7072endif
    7173
    72 FFMPEG          = @HAVE_FFMPEG_LIBS@
    73 ifeq ($(FFMPEG),yes)
     74ifeq ($(HAVE_LIBCURSES),yes)
     75   OBJS += RpCurses.o
     76   LIBS += -lncurses
     77endif
     78
     79ifeq ($(HAVE_FFMPEG),yes)
    7480    OBJS += RpVideoTclInterface.o
    7581    LIBS += -L../../../src/objects -lRpObjects
Note: See TracChangeset for help on using the changeset viewer.