From: <jpi...@us...> - 2011-10-06 22:01:18
|
Revision: 8697 http://octave.svn.sourceforge.net/octave/?rev=8697&view=rev Author: jpicarbajal Date: 2011-10-06 22:01:10 +0000 (Thu, 06 Oct 2011) Log Message: ----------- geometry. Adding example svg Modified Paths: -------------- trunk/octave-forge/main/geometry/DESCRIPTION trunk/octave-forge/main/geometry/INDEX trunk/octave-forge/main/geometry/doc/NEWS trunk/octave-forge/main/geometry/geom2d/inst/drawBezierCurve.m trunk/octave-forge/main/geometry/geom2d/inst/drawLine.m Added Paths: ----------- trunk/octave-forge/main/geometry/inst/drawing.svg trunk/octave-forge/main/geometry/inst/drawing2.svg trunk/octave-forge/main/geometry/inst/drawing3.svg Modified: trunk/octave-forge/main/geometry/DESCRIPTION =================================================================== --- trunk/octave-forge/main/geometry/DESCRIPTION 2011-10-06 21:48:57 UTC (rev 8696) +++ trunk/octave-forge/main/geometry/DESCRIPTION 2011-10-06 22:01:10 UTC (rev 8697) @@ -1,6 +1,6 @@ Name: Geometry -Version: 1.2.0 -Date: 2011-10-xx +Version: 1.1.1 +Date: 2011-10-06 Author: David Legland <dav...@gr...>, Juan Pablo Carbajal <car...@if...> Maintainer: Juan Pablo Carbajal <car...@if...> Title: Computational Geometry Modified: trunk/octave-forge/main/geometry/INDEX =================================================================== --- trunk/octave-forge/main/geometry/INDEX 2011-10-06 21:48:57 UTC (rev 8696) +++ trunk/octave-forge/main/geometry/INDEX 2011-10-06 22:01:10 UTC (rev 8697) @@ -20,6 +20,13 @@ clipPoints drawBezierCurve drawBox + clipRay + intersectBoxes + intersectLines + linePosition + mergeBoxes + randomPointInBox + drawLine Input svgload svgnormalize Modified: trunk/octave-forge/main/geometry/doc/NEWS =================================================================== --- trunk/octave-forge/main/geometry/doc/NEWS 2011-10-06 21:48:57 UTC (rev 8696) +++ trunk/octave-forge/main/geometry/doc/NEWS 2011-10-06 22:01:10 UTC (rev 8697) @@ -32,7 +32,7 @@ vectorAngle.m =============================================================================== -geometry-1.1.1 Release Date: 2011-10-xx Release Manager: Juan Pablo Carbajal +geometry-1.1.1 Release Date: 2011-10-06 Release Manager: Juan Pablo Carbajal =============================================================================== * Continue to add geom2d from matGeom (boxes and clips) Modified: trunk/octave-forge/main/geometry/geom2d/inst/drawBezierCurve.m =================================================================== --- trunk/octave-forge/main/geometry/geom2d/inst/drawBezierCurve.m 2011-10-06 21:48:57 UTC (rev 8696) +++ trunk/octave-forge/main/geometry/geom2d/inst/drawBezierCurve.m 2011-10-06 22:01:10 UTC (rev 8697) @@ -34,7 +34,7 @@ %% -*- texinfo -*- %% @deftypefn {Function File} drawBezierCurve (@var{points}) %% @deftypefnx {Command} {Function File} drawBezierCurve (@var{pp}) -%% @deftypefnx {Command} {Function File} drawBezierCurve (@ldots, @var{param}, @var{value}, ...) +%% @deftypefnx {Command} {Function File} drawBezierCurve (..., @var{param}, @var{value}, ...) %% @deftypefnx {Command} {Function File} {@var{h} =}drawBezierCurve (...) %% Draw a cubic bezier curve defined by the control points @var{points}. %% Modified: trunk/octave-forge/main/geometry/geom2d/inst/drawLine.m =================================================================== --- trunk/octave-forge/main/geometry/geom2d/inst/drawLine.m 2011-10-06 21:48:57 UTC (rev 8696) +++ trunk/octave-forge/main/geometry/geom2d/inst/drawLine.m 2011-10-06 22:01:10 UTC (rev 8697) @@ -48,7 +48,7 @@ %% axis([0 100 0 100]); %% drawLine([30 40 10 20]); %% drawLine([30 40 20 -10], 'color', 'm', 'linewidth', 2); -%% @ed example +%% @end example %% %% @seealso{lines2d, createLine, drawEdge} %% @end deftypefn Added: trunk/octave-forge/main/geometry/inst/drawing.svg =================================================================== --- trunk/octave-forge/main/geometry/inst/drawing.svg (rev 0) +++ trunk/octave-forge/main/geometry/inst/drawing.svg 2011-10-06 22:01:10 UTC (rev 8697) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + version="1.1" + width="744.09448" + height="1052.3622" + id="svg2"> + <defs + id="defs4" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <path + d="M 454.28571,522.36218 390.86384,658.59578 321.30892,525.38901 172.14463,507.16973 277.33815,399.85592 248.57141,252.36218 c 0,0 84.49011,68.02306 134.56809,66.88318 50.07797,-1.13988 90.20153,-101.44976 131.38547,-72.93685 41.18394,28.51291 -22.02586,148.64989 -22.02586,148.64989 l 109.96741,102.41628 z" + id="path2985" + style="fill:none;stroke:#000000" /> + <g + id="g2989"> + <path + d="m 150.51428,680.01932 -13.37143,59.35955 -13.37143,-59.35955 -59.359547,-13.37143 59.359547,-13.37143 13.37143,-59.35955 13.37143,59.35955 59.35955,13.37143 z" + id="path3006" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0" /> + <path + d="M 136.45714,80.70504 103.56449,80.720755 93.385152,49.442837 119.98663,30.096305 146.60659,49.41741 z" + id="path3008" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0" /> + </g> +</svg> Added: trunk/octave-forge/main/geometry/inst/drawing2.svg =================================================================== --- trunk/octave-forge/main/geometry/inst/drawing2.svg (rev 0) +++ trunk/octave-forge/main/geometry/inst/drawing2.svg 2011-10-06 22:01:10 UTC (rev 8697) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + version="1.1" + width="744.09448" + height="1052.3622" + id="svg2"> + <defs + id="defs4" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + id="layer1"> + <path + d="M 96.974644,325.05235 L 288.90363,215.95588 478.81231,415.96608 296.98485,521.02194 305.06607,367.47876 222.23356,359.39754 84.852814,401.82394 z" + id="path2985" + style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + <path + d="m 292.94424,56.351773 224.25386,26.263967 -16.16244,117.17769 -86.87312,-8.08122 34.34519,-56.56854 -80.8122,-6.06091 -123.23861,28.28427 z" + id="path2987" + style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + <path + d="M 446.48742,739.21489 333.35034,628.09811 123.23861,745.27581 64.649763,945.28601 214.15234,769.51947 m 58.58885,157.5838 117.17769,-105.05587 -80.8122,-44.44671 64.64976,-48.48732 139.40105,145.46196 20.20305,-129.29952 z" + id="path2989" + style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + </g> +</svg> Added: trunk/octave-forge/main/geometry/inst/drawing3.svg =================================================================== --- trunk/octave-forge/main/geometry/inst/drawing3.svg (rev 0) +++ trunk/octave-forge/main/geometry/inst/drawing3.svg 2011-10-06 22:01:10 UTC (rev 8697) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + version="1.1" + width="744.09448" + height="1052.3622" + id="svg2"> + <defs + id="defs4" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + id="layer1"> + <path + d="M 74.285714,489.50504 C 237.9415,-167.46345 673.34728,1081.7548 631.42857,492.36218" + id="path2985" + style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + </g> +</svg> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |