Changeset 5255 for branches/1.3


Ignore:
Timestamp:
Apr 17, 2015, 10:19:09 PM (5 years ago)
Author:
ldelgass
Message:

bring flowvisviewer closer in line with trunk/1.4 branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3/gui/scripts/flowvisviewer.tcl

    r5254 r5255  
    7171    public method updateTransferFunctions {}
    7272
    73     protected method Connect {}
    74     protected method CurrentVolumeIds {{what -all}}
    75     protected method Disconnect {}
    76     protected method Resize {}
    77     protected method ResizeLegend {}
    78     protected method AdjustSetting {what {value ""}}
    79     protected method InitSettings { args }
    80     protected method Pan {option x y}
    81     protected method Rebuild {}
    82     protected method ReceiveData { args }
    83     protected method ReceiveImage { args }
    84     protected method ReceiveLegend { tf vmin vmax size }
    85     protected method Rotate {option x y}
    86     protected method SendDataObjs {}
    87     protected method SendTransferFuncs {}
    88     protected method Slice {option args}
    89     protected method SlicerTip {axis}
    90     protected method Zoom {option}
    91 
    9273    # soon to be removed.
    9374    protected method Flow {option args}
     
    9576    protected method Pause {}
    9677
    97 
    9878    # The following methods are only used by this class.
    99 
    10079    private method AddIsoMarker { x y }
     80    private method AdjustSetting {what {value ""}}
    10181    private method BuildCameraTab {}
    10282    private method BuildCutplanesTab {}
     
    10484    private method BuildVolumeTab {}
    10585    private method ComputeTransferFunc { tf }
     86    private method Connect {}
     87    private method CurrentVolumeIds {{what -all}}
     88    private method Disconnect {}
    10689    private method EventuallyResize { w h }
    10790    private method EventuallyGoto { nSteps }
    10891    private method EventuallyResizeLegend { }
     92    private method GetFlowInfo { widget }
    10993    private method GetMovie { widget width height }
    11094    private method GetPngImage { widget width height }
     95    private method InitSettings { args }
    11196    private method NameTransferFunc { dataobj comp }
     97    private method Pan {option x y}
    11298    private method PanCamera {}
    11399    private method ParseLevelsOption { tf levels }
    114100    private method ParseMarkersOption { tf markers }
     101    private method QuaternionToView { q } {
     102        foreach { _view(qw) _view(qx) _view(qy) _view(qz) } $q break
     103    }
     104    private method Rebuild {}
     105    private method ReceiveData { args }
     106    private method ReceiveImage { args }
     107    private method ReceiveLegend { tf vmin vmax size }
     108    private method Resize {}
     109    private method ResizeLegend {}
     110    private method Rotate {option x y}
     111    private method SendDataObjs {}
    115112    private method SendFlowCmd { dataobj comp nbytes extents }
     113    private method SendTransferFuncs {}
     114    private method SetOrientation { side }
     115    private method Slice {option args}
     116    private method SlicerTip {axis}
     117    private method ViewToQuaternion {} {
     118        return [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
     119    }
    116120    private method WaitIcon { option widget }
     121    private method Zoom {option}
     122    private method arrows { tag name }
     123    private method box { tag name }
     124    private method millisecs2str { value }
     125    private method particles { tag name }
    117126    private method str2millisecs { value }
    118     private method millisecs2str { value }
    119     private method GetFlowInfo { widget }
    120     private method particles { tag name }
    121     private method box { tag name }
    122127    private method streams { tag name }
    123     private method arrows { tag name }
    124     private method SetOrientation { side }
    125128
    126129    private variable _arcball ""
     
    224227    }
    225228    set _arcball [blt::arcball create 100 100]
    226     set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
    227     $_arcball quaternion $q
     229    $_arcball quaternion [ViewToQuaternion]
    228230
    229231    set _limits(vmin) 0.0
     
    980982        set _settings($this-ypan)  $_view(ypan)
    981983        set _settings($this-zoom)  $_view(zoom)
    982         set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
     984        set q [ViewToQuaternion]
    983985        $_arcball quaternion $q
    984986        SendCmd "camera orient $q"
     
    12631265    set _settings($this-zoom)  $_view(zoom)
    12641266
    1265     set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
     1267    set q [ViewToQuaternion]
    12661268    $_arcball quaternion $q
    12671269    SendCmd "camera orient $q"
     
    13731375                }
    13741376            }
    1375             set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
     1377            set q [ViewToQuaternion]
    13761378            $_arcball quaternion $q
    13771379            SendCmd "camera orient $q"
     
    14301432
    14311433                set q [$_arcball rotate $x $y $_click(x) $_click(y)]
    1432                 foreach { _view(qw) _view(qx) _view(qy) _view(qz) } $q break
     1434                QuaternionToView $q
    14331435                set _settings($this-qw) $_view(qw)
    14341436                set _settings($this-qx) $_view(qx)
     
    26162618                "qx" - "qy" - "qz" - "qw" {
    26172619                    set _view($who) $_settings($this-$who)
    2618                     set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
     2620                    set q [ViewToQuaternion]
    26192621                    $_arcball quaternion $q
    26202622                    SendCmd "camera orient $q"
     
    30083010        set _view($name) $value
    30093011    }
    3010     set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
     3012    set q [ViewToQuaternion]
    30113013    $_arcball quaternion $q
    30123014    SendCmd "camera orient $q"
Note: See TracChangeset for help on using the changeset viewer.