Changeset 4652 for branches/1.3


Ignore:
Timestamp:
Oct 17, 2014, 1:59:12 PM (5 years ago)
Author:
gah
Message:

update for ssl3 bug

Location:
branches/1.3/gui/scripts
Files:
2 edited

Legend:

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

    r4571 r4652  
    490490    package require http
    491491    package require tls
    492     http::register https 443 ::tls::socket
     492    http::register https 443 [list ::tls::socket -tls1 1]
    493493
    494494    set report $details(stackTrace)
  • branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

    r4533 r4652  
    105105    private method SetLegendTip { x y }
    106106    private method SetObjectStyle { dataobj comp }
     107    private method SetCurrentFieldName { dataobj }
    107108    private method SetOrientation { side }
    108109    private method Slice {option args}
     
    10001001    set _first ""
    10011002    SendCmd "dataset visible 0"
     1003    eval scale $_dlist
    10021004    foreach dataobj [get -objects] {
    10031005        if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
    10041006            set _first $dataobj
     1007            SetCurrentFieldName $dataobj
    10051008        }
    10061009        set _obj2datasets($dataobj) ""
     
    10381041    }
    10391042
    1040     if { $_first != "" } {
    1041         $itk_component(field) choices delete 0 end
    1042         $itk_component(fieldmenu) delete 0 end
    1043         array unset _fields
    1044         set _curFldName ""
    1045         foreach cname [$_first components] {
    1046             foreach fname [$_first fieldnames $cname] {
    1047                 if { [info exists _fields($fname)] } {
    1048                     continue
    1049                 }
    1050                 foreach { label units components } \
    1051                     [$_first fieldinfo $fname] break
    1052                 $itk_component(field) choices insert end "$fname" "$label"
    1053                 $itk_component(fieldmenu) add radiobutton -label "$label" \
    1054                     -value $label -variable [itcl::scope _curFldLabel] \
    1055                     -selectcolor red \
    1056                     -activebackground $itk_option(-plotbackground) \
    1057                     -activeforeground $itk_option(-plotforeground) \
    1058                     -font "Arial 8" \
    1059                     -command [itcl::code $this Combo invoke]
    1060                 set _fields($fname) [list $label $units $components]
    1061                 if { $_curFldName == "" } {
    1062                     set _curFldName $fname
    1063                     set _curFldLabel $label
    1064                 }
    1065             }
    1066         }
    1067         $itk_component(field) value $_curFldLabel
    1068 
    1069         if { ![info exists _limits($_curFldName)] } {
    1070             SendCmd "dataset maprange all"
    1071         } else {
    1072             set limits $_limits($_curFldName)
    1073             SendCmd "dataset maprange explicit $limits $_curFldName"
    1074             if { $limits != $_currentLimits } {
    1075                 set _currentLimits $limits
    1076                 EventuallyChangeContourLevels
    1077             }
    1078         }
    1079     }
    10801043    InitSettings -cutplanesvisible -isosurfacevisible -outline
    10811044    if { $_reset } {
     
    26242587    set _contourList(values) $values
    26252588}
     2589
     2590itcl::body Rappture::VtkIsosurfaceViewer::SetCurrentFieldName { dataobj } {
     2591    set _first $dataobj
     2592    $itk_component(field) choices delete 0 end
     2593    $itk_component(fieldmenu) delete 0 end
     2594    array unset _fields
     2595    set _curFldName ""
     2596    foreach cname [$_first components] {
     2597        foreach fname [$_first fieldnames $cname] {
     2598            if { [info exists _fields($fname)] } {
     2599                continue
     2600            }
     2601            foreach { label units components } \
     2602                [$_first fieldinfo $fname] break
     2603            $itk_component(field) choices insert end "$fname" "$label"
     2604            $itk_component(fieldmenu) add radiobutton -label "$label" \
     2605                -value $label -variable [itcl::scope _curFldLabel] \
     2606                -selectcolor red \
     2607                -activebackground $itk_option(-plotbackground) \
     2608                -activeforeground $itk_option(-plotforeground) \
     2609                -font "Arial 8" \
     2610                -command [itcl::code $this Combo invoke]
     2611            set _fields($fname) [list $label $units $components]
     2612            if { $_curFldName == "" } {
     2613                set _curFldName $fname
     2614                set _curFldLabel $label
     2615            }
     2616        }
     2617    }
     2618    $itk_component(field) value $_curFldLabel
     2619    if { ![info exists _limits($_curFldName)] } {
     2620        SendCmd "dataset maprange all"
     2621    } else {
     2622        set limits $_limits($_curFldName)
     2623        SendCmd "dataset maprange explicit $limits $_curFldName"
     2624        if { $limits != $_currentLimits } {
     2625            set _currentLimits $limits
     2626            EventuallyChangeContourLevels
     2627        }
     2628    }
     2629}
Note: See TracChangeset for help on using the changeset viewer.