Menu
▾
▴
[Octaviz-cvsupdate] octaviz/Scripts vtk_arrows3.m, 1.4, 1.5 vtk_cone3.m, 1.3, 1.4 vtk_contour.m, 1.1, 1.2 vtk_contourf.m, 1.1, 1.2 vtk_line3.m, 1.5, 1.6 vtk_mesh.m, 1.7, 1.8 vtk_meshc.m, 1.2, 1.3 vtk_parse_params.m, 1.3, 1.4 vtk_pcolor.m, 1.1, 1.2 vtk_plot.m, 1.2, 1.3 vtk_plot3.m, 1.6, 1.7 vtk_poly3.m, 1.1, 1.2 vtk_surf.m, 1.5, 1.6 vtk_surfc.m, 1.4, 1.5 vtk_trimesh.m, 1.7, 1.8 vtk_trisurf.m, 1.9, 1.10
|
From: Dragan T. <dr...@us...> - 2006-12-25 20:12:59
|
Update of /cvsroot/octaviz/octaviz/Scripts In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30548/Scripts Modified Files: vtk_arrows3.m vtk_cone3.m vtk_contour.m vtk_contourf.m vtk_line3.m vtk_mesh.m vtk_meshc.m vtk_parse_params.m vtk_pcolor.m vtk_plot.m vtk_plot3.m vtk_poly3.m vtk_surf.m vtk_surfc.m vtk_trimesh.m vtk_trisurf.m Log Message: Fixed segfaults due to the reference counting in octave_value (octave 2.9.x) Fixed varargin issue (hope so) Fixed (somewhat) the build system. This version should not be used for anything but testing. Index: vtk_plot.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_plot.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vtk_plot.m 20 Oct 2004 05:25:56 -0000 1.2 +++ vtk_plot.m 25 Dec 2006 20:12:50 -0000 1.3 @@ -30,7 +30,7 @@ function vtk_plot( varargin ) valid_props = ";MarkerColor;MarkerSize;LineColor;"; - [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, all_va_args); + [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, varargin{:}); if ( no_numerical_params == 0 | no_numerical_params > 2 ) error("Syntax is vtk_plot(X[,Y])"); Index: vtk_pcolor.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_pcolor.m,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- vtk_pcolor.m 5 Dec 2004 05:23:11 -0000 1.1 +++ vtk_pcolor.m 25 Dec 2006 20:12:50 -0000 1.2 @@ -33,7 +33,7 @@ valid_props = ";;"; - [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, all_va_args); + [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, varargin{:}); if ( no_numerical_params < 3 | no_numerical_params > 3 ) error("Syntax is vtk_surf( x, y, c )"); Index: vtk_cone3.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_cone3.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vtk_cone3.m 7 Mar 2005 02:05:00 -0000 1.3 +++ vtk_cone3.m 25 Dec 2006 20:12:50 -0000 1.4 @@ -32,7 +32,7 @@ function vtk_cone3(varargin) valid_props = ";Color;Height;Radius;"; - [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, all_va_args); + [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, varargin{:}); if ( no_numerical_params < 6 ) error("Syntax is vtk_plot3(x,y,z,nx,ny,nz)"); Index: vtk_line3.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_line3.m,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- vtk_line3.m 7 Mar 2005 02:05:00 -0000 1.5 +++ vtk_line3.m 25 Dec 2006 20:12:50 -0000 1.6 @@ -44,7 +44,7 @@ function vtk_line3(varargin) valid_props = ";Color;Radius;Opacity;"; - [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, all_va_args); + [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, varargin{:}); if ( no_numerical_params < 3 ) error("Syntax is vtk_plot3(x,y,z)"); Index: vtk_surf.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_surf.m,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- vtk_surf.m 28 Nov 2004 03:25:26 -0000 1.5 +++ vtk_surf.m 25 Dec 2006 20:12:50 -0000 1.6 @@ -44,7 +44,7 @@ valid_props = ";Opacity;Color;"; - [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, all_va_args); + [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, varargin{:}); if ( no_numerical_params < 1 | no_numerical_params > 4 ) error("Syntax is vtk_surf( x, (y), (z), (c) )"); Index: vtk_plot3.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_plot3.m,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- vtk_plot3.m 7 Mar 2005 02:05:00 -0000 1.6 +++ vtk_plot3.m 25 Dec 2006 20:12:50 -0000 1.7 @@ -43,7 +43,7 @@ function vtk_plot3(varargin) valid_props = ";MarkerColor;MarkerSize;Opacity;"; - [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, all_va_args); + [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, varargin{:}); if ( no_numerical_params < 3 ) error("Syntax is vtk_plot3(x,y,z)"); Index: vtk_contourf.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_contourf.m,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- vtk_contourf.m 24 Jul 2005 04:35:31 -0000 1.1 +++ vtk_contourf.m 25 Dec 2006 20:12:50 -0000 1.2 @@ -35,7 +35,7 @@ valid_props = ";NConts;"; - [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, all_va_args); + [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, varargin{:}); if ( first_prop_index > 0 ) properties = struct(varargin{first_prop_index:length(varargin)}); ncts = properties.NConts; # number of contours; Index: vtk_surfc.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_surfc.m,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- vtk_surfc.m 24 Jul 2005 04:35:31 -0000 1.4 +++ vtk_surfc.m 25 Dec 2006 20:12:50 -0000 1.5 @@ -34,7 +34,7 @@ valid_props = ";Opacity;Color;NConts;"; - [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, all_va_args); + [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, varargin{:}); if ( no_numerical_params < 1 | no_numerical_params > 4 ) error("Syntax is vtk_surfc( x, (y), (z), (c) )"); Index: vtk_trimesh.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_trimesh.m,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- vtk_trimesh.m 7 Mar 2005 02:05:00 -0000 1.7 +++ vtk_trimesh.m 25 Dec 2006 20:12:50 -0000 1.8 @@ -40,7 +40,7 @@ ## evaluate input arguments valid_props = ";BallRadius;LineRadius;Fancy;"; - [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, all_va_args); + [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, varargin{:}); if ( no_numerical_params < 2 | no_numerical_params > 5 ) error("Syntax is trimesh( t, x, y, z, c )"); Index: vtk_parse_params.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_parse_params.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vtk_parse_params.m 20 Oct 2004 05:25:56 -0000 1.3 +++ vtk_parse_params.m 25 Dec 2006 20:12:50 -0000 1.4 @@ -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_trisurf.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_trisurf.m,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- vtk_trisurf.m 11 May 2005 05:11:49 -0000 1.9 +++ vtk_trisurf.m 25 Dec 2006 20:12:50 -0000 1.10 @@ -37,7 +37,7 @@ function f = vtk_trisurf( varargin ) valid_props = ";Opacity;Color;Interpolation;"; - [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, all_va_args); + [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, varargin{:}); if ( first_prop_index > 0 ) properties = struct(varargin{first_prop_index:length(varargin)}); else Index: vtk_poly3.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_poly3.m,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- vtk_poly3.m 27 Oct 2004 05:34:45 -0000 1.1 +++ vtk_poly3.m 25 Dec 2006 20:12:50 -0000 1.2 @@ -30,7 +30,7 @@ function vtk_poly3(varargin) valid_props = ";Color;Opacity;"; - [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, all_va_args); + [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, varargin{:}); if ( no_numerical_params < 3 ) error("Syntax is vtk_poly3(x,y,z)"); Index: vtk_contour.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_contour.m,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- vtk_contour.m 24 Jul 2005 04:35:31 -0000 1.1 +++ vtk_contour.m 25 Dec 2006 20:12:50 -0000 1.2 @@ -33,7 +33,7 @@ valid_props = ";NConts;"; - [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, all_va_args); + [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, varargin{:}); if ( first_prop_index > 0 ) properties = struct(varargin{first_prop_index:length(varargin)}); ncts = properties.NConts; # number of contours; Index: vtk_mesh.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_mesh.m,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- vtk_mesh.m 4 Dec 2004 21:37:50 -0000 1.7 +++ vtk_mesh.m 25 Dec 2006 20:12:50 -0000 1.8 @@ -43,7 +43,7 @@ valid_props = ";BallRadius;LineRadius;Fancy;"; - [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, all_va_args); + [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, varargin{:}); if ( no_numerical_params < 1 | no_numerical_params > 4 ) error("Syntax is vtk_mesh( x, (y), (z), (c) )"); Index: vtk_meshc.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_meshc.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vtk_meshc.m 24 Jul 2005 04:35:31 -0000 1.2 +++ vtk_meshc.m 25 Dec 2006 20:12:50 -0000 1.3 @@ -34,7 +34,7 @@ valid_props = ";BallRadius;LineRadius;Fancy;NConts;"; - [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, all_va_args); + [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, varargin{:}); if ( no_numerical_params < 1 | no_numerical_params > 4 ) error("Syntax is vtk_meshc( x, (y), (z), (c) )"); Index: vtk_arrows3.m =================================================================== RCS file: /cvsroot/octaviz/octaviz/Scripts/vtk_arrows3.m,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- vtk_arrows3.m 7 Mar 2005 02:05:00 -0000 1.4 +++ vtk_arrows3.m 25 Dec 2006 20:12:50 -0000 1.5 @@ -32,7 +32,7 @@ function vtk_arrows3(varargin) valid_props = ";Color;TipLength;TipRadius;ShaftRadius;"; - [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, all_va_args); + [no_numerical_params, first_prop_index, line_spec_index] = vtk_parse_params(valid_props, varargin{:}); if ( no_numerical_params < 6 ) error("Syntax is vtk_plot3(x,y,z,nx,ny,nz)"); |
