Changeset 3894 for branches/1.3
- Timestamp:
- Aug 26, 2013, 11:49:42 AM (11 years ago)
- Location:
- branches/1.3
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1.3
- Property svn:mergeinfo changed
/trunk merged: 3883-3886,3893
- Property svn:mergeinfo changed
-
branches/1.3/gui/scripts/field.tcl
r3887 r3894 763 763 global env 764 764 if { [info exists env(VTKVOLUME)] } { 765 set viewer "vtkvolume" 766 if { $viewer != "" } { 767 set _viewer $viewer 768 } 765 set _viewer "vtkvolume" 769 766 } 770 767 set type "opendx" … … 772 769 global env 773 770 if { [info exists env(VTKVOLUME)] } { 774 set viewer "vtkvolume" 775 if { $viewer != "" } { 776 set _viewer $viewer 777 } 771 set _viewer "vtkvolume" 778 772 } 779 773 set type "dx" … … 872 866 # off to the NanoVis visualizer. 873 867 # 874 set _viewer "nanovis" 868 set viewer [$_field get "about.view"] 869 if { $viewer != "" } { 870 set _viewer $viewer 871 } 872 if { $_viewer == "" } { 873 set _viewer "nanovis" 874 } 875 875 set _dim 3 876 876 set _comp2dims($cname) "3D" 877 if 0{877 if { $_viewer != "nanovis" } { 878 878 set vtkdata [$_field get -decode yes $cname.$type] 879 879 if { $vtkdata == "" } { … … 881 881 continue; # Ignore this component 882 882 } 883 if 0 { 884 set f [open /tmp/$_path.$cname.dx "w"] 885 puts -nonewline $f $vtkdata 886 close $f 887 } 883 888 set vtkdata [Rappture::DxToVtk $vtkdata] 884 889 if 0 { 885 890 set f [open /tmp/$_path.$cname.vtk "w"] 886 puts $f $vtkdata891 puts -nonewline $f $vtkdata 887 892 close $f 888 893 } … … 898 903 set _type "dx" 899 904 set _comp2dx($cname) $contents 900 }901 set viewer [$_field get "about.view"]902 if { $viewer != "" } {903 set _viewer $viewer904 905 } 905 906 set _comp2style($cname) [$_field get $cname.style] -
branches/1.3/packages/vizservers/nanovis/Command.cpp
r3877 r3894 766 766 } 767 767 768 static int 769 CutplaneVisibleOp(ClientData clientData, Tcl_Interp *interp, int objc, 770 Tcl_Obj *const *objv) 771 { 772 bool state; 773 if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) { 774 return TCL_ERROR; 775 } 776 777 std::vector<Volume *> ivol; 778 if (GetVolumes(interp, objc - 3, objv + 3, &ivol) != TCL_OK) { 779 return TCL_ERROR; 780 } 781 std::vector<Volume *>::iterator iter; 782 for (iter = ivol.begin(); iter != ivol.end(); iter++) { 783 (*iter)->cutplanesVisible(state); 784 } 785 return TCL_OK; 786 } 787 768 788 static Rappture::CmdSpec cutplaneOps[] = { 769 789 {"position", 1, CutplanePositionOp, 4, 0, "relval axis ?indices?",}, 770 790 {"state", 1, CutplaneStateOp, 4, 0, "bool axis ?indices?",}, 791 {"visible", 1, CutplaneVisibleOp, 3, 0, "bool ?indices?",}, 771 792 }; 772 793 static int nCutplaneOps = NumCmdSpecs(cutplaneOps); -
branches/1.3/packages/vizservers/nanovis/Volume.cpp
r3630 r3894 48 48 _numComponents(n), 49 49 _nonZeroMin(nonZeroMin), 50 _cutplanesVisible(true), 50 51 _tex(NULL), 51 52 _position(0,0,0), -
branches/1.3/packages/vizservers/nanovis/Volume.h
r3630 r3894 155 155 void disableCutplane(int index); 156 156 157 void cutplanesVisible(bool state) 158 { 159 _cutplanesVisible = state; 160 } 161 162 bool cutplanesVisible() const 163 { 164 return _cutplanesVisible; 165 } 166 157 167 void setCutplanePosition(int index, float location); 158 168 … … 387 397 double _nonZeroMin; 388 398 399 bool _cutplanesVisible; 389 400 std::vector<CutPlane> _plane; ///< cut planes 390 401 -
branches/1.3/packages/vizservers/nanovis/VolumeRenderer.cpp
r3630 r3894 281 281 282 282 for (int j = 0; j < volume->getCutplaneCount(); j++) { 283 if (!volume-> isCutplaneEnabled(j)) {283 if (!volume->cutplanesVisible() || !volume->isCutplaneEnabled(j)) { 284 284 continue; 285 285 }
Note: See TracChangeset
for help on using the changeset viewer.