Menu
▾
▴
[Octaviz-cvsupdate] octaviz/Scripts vtk_blackonwhite.m, 1.2, 1.3 vtk_clear.m, 1.3, 1.4 vtk_figure.m, 1.9, 1.10 vtk_parse_params.m, 1.4, 1.5 vtk_plot.m, 1.3, 1.4 vtk_title.m, 1.4, 1.5
|
From: Jonathan S. <jjs...@us...> - 2006-12-29 04:45:32
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15711 Modified Files: vtk_blackonwhite.m vtk_clear.m vtk_figure.m vtk_parse_params.m vtk_plot.m vtk_title.m Log Message: cleaning up some of the function scripts Index: vtk_plot.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_plot.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vtk_plot.m 25 Dec 2006 20:12:50 -0000 1.3 +++ vtk_plot.m 29 Dec 2006 04:45:27 -0000 1.4 @@ -125,7 +125,7 @@ f = vtk_figure(0); w.SetInteractor(f.interactor); - f.renderer.RemoveAllProps(); + f.renderer.RemoveAllViewProps(); f.renderer.AddActor2D(xyplot); vtk_update(f); Index: vtk_parse_params.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_parse_params.m,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- vtk_parse_params.m 25 Dec 2006 20:12:50 -0000 1.4 +++ vtk_parse_params.m 29 Dec 2006 04:45:27 -0000 1.5 @@ -28,12 +28,12 @@ %% Properties begin with the first string parameter. Each property needs a value. %% Get the types - no_params = length(varargin) + no_params = length(varargin); num_type = zeros(1,no_params); str_type = zeros(1,no_params); for i = 1:no_params - num_type(i) = isnumeric(varargin{i}) + num_type(i) = isnumeric(varargin{i}); str_type(i) = ischar(varargin{i}); end Index: vtk_figure.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_figure.m,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- vtk_figure.m 21 Apr 2005 17:04:23 -0000 1.9 +++ vtk_figure.m 29 Dec 2006 04:45:27 -0000 1.10 @@ -169,7 +169,8 @@ axes.SetAxisTitleTextProperty(tprop); axes.SetAxisLabelTextProperty(tprop); axes.SetViewProp( outline_actor ); - ##axes.GetXAxisActor2D().AdjustLabelsOn(); # discovered a case where the axis label is off by ~25% when this is used; JJS 4/5/05 + ## discovered a case where the axis label is off by ~25% when AdjustLabels is used; JJS 4/5/05 + ##axes.GetXAxisActor2D().AdjustLabelsOn(); ##axes.GetYAxisActor2D().AdjustLabelsOn(); ##axes.GetZAxisActor2D().AdjustLabelsOn(); axes.SetInertia(10); Index: vtk_clear.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_clear.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vtk_clear.m 31 Mar 2005 17:40:20 -0000 1.3 +++ vtk_clear.m 29 Dec 2006 04:45:27 -0000 1.4 @@ -35,10 +35,10 @@ ## clear existing scalarbar and title, if they exist i=0; - while i < f.renderer.GetProps().GetNumberOfItems(); - if ( f.renderer.GetProps().GetItemAsObject(i).IsA("vtkScalarBarActor") || - f.renderer.GetProps().GetItemAsObject(i).IsA("vtkTextActor") ) - f.renderer.RemoveViewProp( f.renderer.GetProps().GetItemAsObject(i) ); + while i < f.renderer.GetViewProps().GetNumberOfItems(); + if ( f.renderer.GetViewProps().GetItemAsObject(i).IsA("vtkScalarBarActor") || + f.renderer.GetViewProps().GetItemAsObject(i).IsA("vtkTextActor") ) + f.renderer.RemoveViewProp( f.renderer.GetViewProps().GetItemAsObject(i) ); --i; endif ++i; Index: vtk_blackonwhite.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_blackonwhite.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vtk_blackonwhite.m 9 Sep 2005 19:53:13 -0000 1.2 +++ vtk_blackonwhite.m 29 Dec 2006 04:45:27 -0000 1.3 @@ -35,20 +35,20 @@ f.axes.GetAxisTitleTextProperty.ShadowOff ## change color of title (assume it is the only textactor) - nprops = f.renderer.GetProps.GetNumberOfItems; + nprops = f.renderer.GetViewProps.GetNumberOfItems; for i = 0:nprops-1; - if ( f.renderer.GetProps.GetItemAsObject(i).IsA("vtkTextActor") ) - f.renderer.GetProps.GetItemAsObject(i).GetTextProperty.SetColor(0,0,0) + if ( f.renderer.GetViewProps.GetItemAsObject(i).IsA("vtkTextActor") ) + f.renderer.GetViewProps.GetItemAsObject(i).GetTextProperty.SetColor(0,0,0) break endif endfor ## change color of text of color bar, if it exists - nprops = f.renderer.GetProps.GetNumberOfItems; + nprops = f.renderer.GetViewProps.GetNumberOfItems; for i = 0:nprops-1; - if ( f.renderer.GetProps.GetItemAsObject(i).IsA("vtkScalarBarActor") ) - f.renderer.GetProps.GetItemAsObject(i).GetTitleTextProperty.SetColor(0,0,0) - f.renderer.GetProps.GetItemAsObject(i).GetLabelTextProperty.SetColor(0,0,0) + if ( f.renderer.GetViewProps.GetItemAsObject(i).IsA("vtkScalarBarActor") ) + f.renderer.GetViewProps.GetItemAsObject(i).GetTitleTextProperty.SetColor(0,0,0) + f.renderer.GetViewProps.GetItemAsObject(i).GetLabelTextProperty.SetColor(0,0,0) break endif endfor Index: vtk_title.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_title.m,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- vtk_title.m 31 Mar 2005 17:40:21 -0000 1.4 +++ vtk_title.m 29 Dec 2006 04:45:27 -0000 1.5 @@ -28,10 +28,10 @@ ## clear existing title, if it exists ## assume there is no other "vtkTextActor" in the renderer - nprops = f.renderer.GetProps().GetNumberOfItems(); + nprops = f.renderer.GetViewProps().GetNumberOfItems(); for i = 0:nprops-1; - if ( f.renderer.GetProps().GetItemAsObject(i).IsA("vtkTextActor") ) - f.renderer.RemoveViewProp( f.renderer.GetProps().GetItemAsObject(i) ); + if ( f.renderer.GetViewProps().GetItemAsObject(i).IsA("vtkTextActor") ) + f.renderer.RemoveViewProp( f.renderer.GetViewProps().GetItemAsObject(i) ); break endif endfor |
