[Octaviz-cvsupdate] octaviz/Scripts vtk_clear.m,1.2,1.3 vtk_figure.m,1.7,1.8 vtk_scalarbar.m,1.4,1.5 vtk_title.m,1.3,1.4

[Jonathan S. <jjs...@us...>]

Update of /cvsroot/octaviz/octaviz/Scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29919

Modified Files:
	vtk_clear.m vtk_figure.m vtk_scalarbar.m vtk_title.m 
Log Message:
updated prop commands and such

Index: vtk_clear.m
===================================================================
RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_clear.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vtk_clear.m	23 Oct 2004 18:47:58 -0000	1.2
+++ vtk_clear.m	31 Mar 2005 17:40:20 -0000	1.3
@@ -30,7 +30,7 @@
 
   ## clear the rendered actors, but not the axes or outline
   for i = 2:f.renderer.GetActors().GetNumberOfItems()
-    f.renderer.RemoveProp(f.renderer.GetActors().GetLastActor());
+    f.renderer.RemoveViewProp(f.renderer.GetActors().GetLastActor());
   end
 
   ## clear existing scalarbar and title, if they exist
@@ -38,7 +38,7 @@
   while i < f.renderer.GetProps().GetNumberOfItems();
     if ( f.renderer.GetProps().GetItemAsObject(i).IsA("vtkScalarBarActor") ||
 	f.renderer.GetProps().GetItemAsObject(i).IsA("vtkTextActor") )
-      f.renderer.RemoveProp( f.renderer.GetProps().GetItemAsObject(i) );
+      f.renderer.RemoveViewProp( f.renderer.GetProps().GetItemAsObject(i) );
       --i;
     endif
     ++i;

Index: vtk_title.m
===================================================================
RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_title.m,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vtk_title.m	7 Mar 2005 02:05:00 -0000	1.3
+++ vtk_title.m	31 Mar 2005 17:40:21 -0000	1.4
@@ -31,7 +31,7 @@
   nprops = f.renderer.GetProps().GetNumberOfItems();
   for i = 0:nprops-1;
     if ( f.renderer.GetProps().GetItemAsObject(i).IsA("vtkTextActor") )
-      f.renderer.RemoveProp( f.renderer.GetProps().GetItemAsObject(i) );
+      f.renderer.RemoveViewProp( f.renderer.GetProps().GetItemAsObject(i) );
       break
     endif
   endfor 

Index: vtk_scalarbar.m
===================================================================
RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_scalarbar.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vtk_scalarbar.m	23 Oct 2004 18:47:58 -0000	1.4
+++ vtk_scalarbar.m	31 Mar 2005 17:40:21 -0000	1.5
@@ -34,7 +34,7 @@
   nprops = f.renderer.GetProps().GetNumberOfItems();
   for i = 0:nprops-1;
     if ( f.renderer.GetProps().GetItemAsObject(i).IsA("vtkScalarBarActor") )
-      f.renderer.RemoveProp( f.renderer.GetProps().GetItemAsObject(i) );
+      f.renderer.RemoveViewProp( f.renderer.GetProps().GetItemAsObject(i) );
       break
     endif
   endfor 
@@ -46,6 +46,7 @@
   scalarBar.GetPositionCoordinate().SetValue(0.85, 0.05);
   scalarBar.SetWidth(0.15);
   scalarBar.SetHeight(0.9);
+  scalarBar.SetLabelFormat("%1.2g");
   f.renderer.AddActor2D(scalarBar);
 
   ## shadow unnecessary, and doesn't export to vector format correctly

Index: vtk_figure.m
===================================================================
RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_figure.m,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- vtk_figure.m	7 Mar 2005 02:05:00 -0000	1.7
+++ vtk_figure.m	31 Mar 2005 17:40:21 -0000	1.8
@@ -164,16 +164,16 @@
     axes.SetCamera(renderer.GetActiveCamera());
     axes.SetLabelFormat("%1.2g");
     axes.SetFlyModeToOuterEdges();
-    axes.SetFontFactor(1.0);
+    ##axes.SetFontFactor(1.0);  # redundant, set below
     axes.SetNumberOfLabels(5);
     axes.SetAxisTitleTextProperty(tprop);
     axes.SetAxisLabelTextProperty(tprop);
     axes.SetViewProp( outline_actor );
-	axes.GetXAxisActor2D().AdjustLabelsOn();
-	axes.GetYAxisActor2D().AdjustLabelsOn();
-	axes.GetZAxisActor2D().AdjustLabelsOn();
-	axes.SetInertia(10);
-	axes.ScalingOn();
+ 	axes.GetXAxisActor2D().AdjustLabelsOn();
+ 	axes.GetYAxisActor2D().AdjustLabelsOn();
+ 	axes.GetZAxisActor2D().AdjustLabelsOn();
+ 	axes.SetInertia(10);
+ 	axes.ScalingOn();
     renderer.AddActor(axes);
     
     ren_win = vtkRenderWindow;
@@ -185,7 +185,7 @@
     ## my display preferences; JJS 9/25/04
     ## certainly could create functions later to allow users to easily change them
     renderer.SetBackground( 0.4, 0.4, 0.4 );
-    axes.SetFontFactor(1.2);
+    axes.SetFontFactor(1.5);  # was 1.2, but sizing seems smaller in recent VTK version
     ren_win.SetSize(400,400);
     iren.SetInteractorStyle(vtkInteractorStyleTrackballCamera());