Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[8905] trunk/octave-forge/main/geometry
|
From: <jpi...@us...> - 2011-11-01 10:46:05
|
Revision: 8905
http://octave.svn.sourceforge.net/octave/?rev=8905&view=rev
Author: jpicarbajal
Date: 2011-11-01 10:45:54 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
geometry. Adding @svg
Modified Paths:
--------------
trunk/octave-forge/main/geometry/devel/@svg/getpath.m
trunk/octave-forge/main/geometry/devel/@svg/loadpaths.m
trunk/octave-forge/main/geometry/devel/@svg/svg.m
trunk/octave-forge/main/geometry/inst/io/@svg/getpath.m
trunk/octave-forge/main/geometry/inst/io/@svg/loadpaths.m
trunk/octave-forge/main/geometry/inst/io/@svg/svg.m
Added Paths:
-----------
trunk/octave-forge/main/geometry/inst/io/@svg/
Modified: trunk/octave-forge/main/geometry/devel/@svg/getpath.m
===================================================================
--- trunk/octave-forge/main/geometry/devel/@svg/getpath.m 2011-11-01 10:16:55 UTC (rev 8904)
+++ trunk/octave-forge/main/geometry/devel/@svg/getpath.m 2011-11-01 10:45:54 UTC (rev 8905)
@@ -45,12 +45,12 @@
paths = [];
if any (tf)
stuff = {ids{tf}};
- %{
+
for i = 1: numel(stuff)
paths{i} = obj.Path.(ids{i}).data;
endfor
- %}
+
% Variation
% paths = cellfun(@(s) obj.Path.(s).data, stuff,'UniformOutput',false);
@@ -61,8 +61,8 @@
% paths = cellfun(@(s) getfield(obj.Path,s).data, stuff,'UniformOutput',false);
% Yet yet another
- dummy = @(s) obj.Path.(s).data;
- paths = cellfun(dummy, stuff,'UniformOutput',false);
+% dummy = @(s) obj.Path.(s).data;
+% paths = cellfun(dummy, stuff,'UniformOutput',false);
if numel(paths) == 1
paths = paths{1};
Modified: trunk/octave-forge/main/geometry/devel/@svg/loadpaths.m
===================================================================
--- trunk/octave-forge/main/geometry/devel/@svg/loadpaths.m 2011-11-01 10:16:55 UTC (rev 8904)
+++ trunk/octave-forge/main/geometry/devel/@svg/loadpaths.m 2011-11-01 10:45:54 UTC (rev 8905)
@@ -93,32 +93,3 @@
Paths.(svgpathid).data = pathdata;
end
endfunction
-
-%!test
-%! figure(1)
-%! hold on
-%! paths = getSVGPaths_py ('../drawing.svg');
-%!
-%! % Get path ids
-%! ids = fieldnames(paths);
-%! npath = numel(ids);
-%!
-%! t = linspace (0, 1, 64);
-%!
-%! for i = 1:npath
-%! x = []; y = [];
-%! data = paths.(ids(i)).data;
-%!
-%! for j = 1:numel(data)
-%! x = cat (2, x, polyval (data{j}(1,:),t));
-%! y = cat (2, y, polyval (data{j}(2,:),t));
-%! end
-%!
-%! plot(x,y,'-');
-%! end
-%! axis ij
-%! if strcmpi(input('You should see drawing.svg [y/n] ','s'),'n')
-%! error ("didn't get what was expected.");
-%! end
-%! close
-
Modified: trunk/octave-forge/main/geometry/devel/@svg/svg.m
===================================================================
--- trunk/octave-forge/main/geometry/devel/@svg/svg.m 2011-11-01 10:16:55 UTC (rev 8904)
+++ trunk/octave-forge/main/geometry/devel/@svg/svg.m 2011-11-01 10:45:54 UTC (rev 8905)
@@ -56,14 +56,12 @@
endfunction
%!test
-%! dc = svg('../inst/drawing5.svg');
-%! dc.path
-%! dc.Path
+%! dc = svg('/home/juanpi/Resources/3rdPartyCode/octave-forge/main/geometry/inst/io/drawing5.svg');
%! dc.getpath()
%! dc.pathid
%! dc.getpath('path3756')
%!
-%! dc = svg('../inst/drawing.svg');
+%! dc = svg('/home/juanpi/Resources/3rdPartyCode/octave-forge/main/geometry/inst/io/drawing.svg');
%! ids = dc.pathid;
-%! dc.path({ids{[1 3]}})
+%! dc.getpath({ids{[1 3]}})
Modified: trunk/octave-forge/main/geometry/inst/io/@svg/getpath.m
===================================================================
--- trunk/octave-forge/main/geometry/devel/@svg/getpath.m 2011-10-24 11:25:44 UTC (rev 8848)
+++ trunk/octave-forge/main/geometry/inst/io/@svg/getpath.m 2011-11-01 10:45:54 UTC (rev 8905)
@@ -45,12 +45,12 @@
paths = [];
if any (tf)
stuff = {ids{tf}};
- %{
+
for i = 1: numel(stuff)
paths{i} = obj.Path.(ids{i}).data;
endfor
- %}
+
% Variation
% paths = cellfun(@(s) obj.Path.(s).data, stuff,'UniformOutput',false);
@@ -61,8 +61,8 @@
% paths = cellfun(@(s) getfield(obj.Path,s).data, stuff,'UniformOutput',false);
% Yet yet another
- dummy = @(s) obj.Path.(s).data;
- paths = cellfun(dummy, stuff,'UniformOutput',false);
+% dummy = @(s) obj.Path.(s).data;
+% paths = cellfun(dummy, stuff,'UniformOutput',false);
if numel(paths) == 1
paths = paths{1};
Modified: trunk/octave-forge/main/geometry/inst/io/@svg/loadpaths.m
===================================================================
--- trunk/octave-forge/main/geometry/devel/@svg/loadpaths.m 2011-10-24 11:25:44 UTC (rev 8848)
+++ trunk/octave-forge/main/geometry/inst/io/@svg/loadpaths.m 2011-11-01 10:45:54 UTC (rev 8905)
@@ -93,32 +93,3 @@
Paths.(svgpathid).data = pathdata;
end
endfunction
-
-%!test
-%! figure(1)
-%! hold on
-%! paths = getSVGPaths_py ('../drawing.svg');
-%!
-%! % Get path ids
-%! ids = fieldnames(paths);
-%! npath = numel(ids);
-%!
-%! t = linspace (0, 1, 64);
-%!
-%! for i = 1:npath
-%! x = []; y = [];
-%! data = paths.(ids(i)).data;
-%!
-%! for j = 1:numel(data)
-%! x = cat (2, x, polyval (data{j}(1,:),t));
-%! y = cat (2, y, polyval (data{j}(2,:),t));
-%! end
-%!
-%! plot(x,y,'-');
-%! end
-%! axis ij
-%! if strcmpi(input('You should see drawing.svg [y/n] ','s'),'n')
-%! error ("didn't get what was expected.");
-%! end
-%! close
-
Modified: trunk/octave-forge/main/geometry/inst/io/@svg/svg.m
===================================================================
--- trunk/octave-forge/main/geometry/devel/@svg/svg.m 2011-10-24 11:25:44 UTC (rev 8848)
+++ trunk/octave-forge/main/geometry/inst/io/@svg/svg.m 2011-11-01 10:45:54 UTC (rev 8905)
@@ -56,14 +56,12 @@
endfunction
%!test
-%! dc = svg('../inst/drawing5.svg');
-%! dc.path
-%! dc.Path
+%! dc = svg('../drawing5.svg');
%! dc.getpath()
%! dc.pathid
%! dc.getpath('path3756')
%!
-%! dc = svg('../inst/drawing.svg');
+%! dc = svg('../drawing.svg');
%! ids = dc.pathid;
-%! dc.path({ids{[1 3]}})
+%! dc.getpath({ids{[1 3]}})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
