Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[8822] trunk/octave-forge/main/geometry
|
From: <jpi...@us...> - 2011-10-21 18:45:42
|
Revision: 8822
http://octave.svn.sourceforge.net/octave/?rev=8822&view=rev
Author: jpicarbajal
Date: 2011-10-21 18:45:35 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
geometry. All *2d functions
Modified Paths:
--------------
trunk/octave-forge/main/geometry/doc/NEWS
Added Paths:
-----------
trunk/octave-forge/main/geometry/geom2d/inst/circles2d.m
trunk/octave-forge/main/geometry/geom2d/inst/ellipses2d.m
Removed Paths:
-------------
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circles2d.m
trunk/octave-forge/main/geometry/matGeom_raw/geom2d/ellipses2d.m
Modified: trunk/octave-forge/main/geometry/doc/NEWS
===================================================================
--- trunk/octave-forge/main/geometry/doc/NEWS 2011-10-21 18:40:53 UTC (rev 8821)
+++ trunk/octave-forge/main/geometry/doc/NEWS 2011-10-21 18:45:35 UTC (rev 8822)
@@ -115,6 +115,17 @@
orthogonalLine.m
parallelLine.m
projPointOnLine.m
-
+ drawCenteredEdge.m
+ drawCircle.m
+ drawCircleArc.m
+ drawEllipse.m
+ drawEllipseArc.m
+ drawLabels.m
+ drawOrientedBox.m
+ drawParabola.m
+ drawRect.m
+ drawShape.m
+ circles2d.m
+ ellipses2d.m
===============================================================================
Copied: trunk/octave-forge/main/geometry/geom2d/inst/circles2d.m (from rev 8818, trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circles2d.m)
===================================================================
--- trunk/octave-forge/main/geometry/geom2d/inst/circles2d.m (rev 0)
+++ trunk/octave-forge/main/geometry/geom2d/inst/circles2d.m 2011-10-21 18:45:35 UTC (rev 8822)
@@ -0,0 +1,64 @@
+%% Copyright (c) 2011, INRA
+%% 2008-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% All rights reserved.
+%% (simplified BSD License)
+%%
+%% Redistribution and use in source and binary forms, with or without
+%% modification, are permitted provided that the following conditions are met:
+%%
+%% 1. Redistributions of source code must retain the above copyright notice, this
+%% list of conditions and the following disclaimer.
+%%
+%% 2. Redistributions in binary form must reproduce the above copyright notice,
+%% this list of conditions and the following disclaimer in the documentation
+%% and/or other materials provided with the distribution.
+%%
+%% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+%% AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+%% IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+%% ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+%% LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+%% CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+%% SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+%% INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+%% CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+%% ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+%% POSSIBILITY OF SUCH DAMAGE.
+%%
+%% The views and conclusions contained in the software and documentation are
+%% those of the authors and should not be interpreted as representing official
+%% policies, either expressed or implied, of copyright holder.
+
+%% -*- texinfo -*-
+%% @deftypefn {Function File} circles2d ()
+%% Description of functions operating on circles
+%%
+%% Circles are represented by their center and their radius:
+%% C = [xc yc r];
+%% One sometimes considers orientation of circle, by adding an extra
+%% boolean value in 4-th position, with value TRUE for direct (i.e.
+%% turning Counter-clockwise) circles.
+%%
+%% Circle arcs are represented by their center, their radius, the starting
+%% angle and the angle extent, both in degrees:
+%% CA = [xc yc r theta0 dtheta];
+%%
+%% Ellipses are represented by their center, their 2 semi-axis length, and
+%% their angle (in degrees) with Ox direction.
+%% E = [xc yc A B theta];
+%%
+%% @seealso{ellipses2d, createCircle, createDirectedCircle, enclosingCircle
+%% isPointInCircle, isPointOnCircle
+%% intersectLineCircle, intersectCircles, radicalAxis
+%% circleAsPolygon, circleArcAsCurve
+%% drawCircle, drawCircleArc}
+%% @end deftypefn
+
+function circles2d(varargin)
+
+ help('circles2d');
+
+endfunction
+
Copied: trunk/octave-forge/main/geometry/geom2d/inst/ellipses2d.m (from rev 8818, trunk/octave-forge/main/geometry/matGeom_raw/geom2d/ellipses2d.m)
===================================================================
--- trunk/octave-forge/main/geometry/geom2d/inst/ellipses2d.m (rev 0)
+++ trunk/octave-forge/main/geometry/geom2d/inst/ellipses2d.m 2011-10-21 18:45:35 UTC (rev 8822)
@@ -0,0 +1,50 @@
+%% Copyright (c) 2011, INRA
+%% 2008-2011, David Legland <dav...@gr...>
+%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%%
+%% All rights reserved.
+%% (simplified BSD License)
+%%
+%% Redistribution and use in source and binary forms, with or without
+%% modification, are permitted provided that the following conditions are met:
+%%
+%% 1. Redistributions of source code must retain the above copyright notice, this
+%% list of conditions and the following disclaimer.
+%%
+%% 2. Redistributions in binary form must reproduce the above copyright notice,
+%% this list of conditions and the following disclaimer in the documentation
+%% and/or other materials provided with the distribution.
+%%
+%% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+%% AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+%% IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+%% ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+%% LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+%% CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+%% SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+%% INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+%% CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+%% ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+%% POSSIBILITY OF SUCH DAMAGE.
+%%
+%% The views and conclusions contained in the software and documentation are
+%% those of the authors and should not be interpreted as representing official
+%% policies, either expressed or implied, of copyright holder.
+
+%% -*- texinfo -*-
+%% @deftypefn {Function File} ellipses2d ()
+%% Description of functions operating on ellipses.
+%%
+%% Ellipses are represented by their center, the length of their 2
+%% semi-axes length, and their angle from the Ox direction (in degrees).
+%% E = [XC YC A B THETA];
+%%
+%% @seealso{circles2d, inertiaEllipse, isPointInEllipse, ellipseAsPolygon
+%% drawEllipse, drawEllipseArc}
+%% @end deftypefn
+
+function ellipses2d(varargin)
+
+ help('ellipses2d');
+
+endfunction
Deleted: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circles2d.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circles2d.m 2011-10-21 18:40:53 UTC (rev 8821)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/circles2d.m 2011-10-21 18:45:35 UTC (rev 8822)
@@ -1,65 +0,0 @@
-%% Copyright (c) 2011, INRA
-%% 2007-2011, David Legland <dav...@gr...>
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-%%
-%% All rights reserved.
-%% (simplified BSD License)
-%%
-%% Redistribution and use in source and binary forms, with or without
-%% modification, are permitted provided that the following conditions are met:
-%%
-%% 1. Redistributions of source code must retain the above copyright notice, this
-%% list of conditions and the following disclaimer.
-%%
-%% 2. Redistributions in binary form must reproduce the above copyright notice,
-%% this list of conditions and the following disclaimer in the documentation
-%% and/or other materials provided with the distribution.
-%%
-%% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-%% AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-%% IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-%% ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-%% LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-%% CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-%% SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-%% INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-%% CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-%% ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-%% POSSIBILITY OF SUCH DAMAGE.
-%%
-%% The views and conclusions contained in the software and documentation are
-%% those of the authors and should not be interpreted as representing official
-%% policies, either expressed or implied, of copyright holder.
-
-
-function circles2d(varargin)
-%CIRCLES2D Description of functions operating on circles
-%
-% Circles are represented by their center and their radius:
-% C = [xc yc r];
-% One sometimes considers orientation of circle, by adding an extra
-% boolean value in 4-th position, with value TRUE for direct (i.e.
-% turning Counter-clockwise) circles.
-%
-% Circle arcs are represented by their center, their radius, the starting
-% angle and the angle extent, both in degrees:
-% CA = [xc yc r theta0 dtheta];
-%
-% Ellipses are represented by their center, their 2 semi-axis length, and
-% their angle (in degrees) with Ox direction.
-% E = [xc yc A B theta];
-%
-% See also:
-% ellipses2d, createCircle, createDirectedCircle, enclosingCircle
-% isPointInCircle, isPointOnCircle
-% intersectLineCircle, intersectCircles, radicalAxis
-% circleAsPolygon, circleArcAsCurve
-% drawCircle, drawCircleArc
-%
-% ------
-% Author: David Legland
-% e-mail: dav...@gr...
-% Created: 2008-10-13, using Matlab 7.4.0.287 (R2007a)
-% Copyright 2010 INRA - Cepia Software Platform.
-
-help('circles2d');
Deleted: trunk/octave-forge/main/geometry/matGeom_raw/geom2d/ellipses2d.m
===================================================================
--- trunk/octave-forge/main/geometry/matGeom_raw/geom2d/ellipses2d.m 2011-10-21 18:40:53 UTC (rev 8821)
+++ trunk/octave-forge/main/geometry/matGeom_raw/geom2d/ellipses2d.m 2011-10-21 18:45:35 UTC (rev 8822)
@@ -1,52 +0,0 @@
-%% Copyright (c) 2011, INRA
-%% 2007-2011, David Legland <dav...@gr...>
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
-%%
-%% All rights reserved.
-%% (simplified BSD License)
-%%
-%% Redistribution and use in source and binary forms, with or without
-%% modification, are permitted provided that the following conditions are met:
-%%
-%% 1. Redistributions of source code must retain the above copyright notice, this
-%% list of conditions and the following disclaimer.
-%%
-%% 2. Redistributions in binary form must reproduce the above copyright notice,
-%% this list of conditions and the following disclaimer in the documentation
-%% and/or other materials provided with the distribution.
-%%
-%% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-%% AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-%% IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-%% ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-%% LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-%% CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-%% SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-%% INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-%% CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-%% ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-%% POSSIBILITY OF SUCH DAMAGE.
-%%
-%% The views and conclusions contained in the software and documentation are
-%% those of the authors and should not be interpreted as representing official
-%% policies, either expressed or implied, of copyright holder.
-
-
-function ellipses2d(varargin)
-%ELLIPSES2D Description of functions operating on ellipses
-%
-% Ellipses are represented by their center, the length of their 2
-% semi-axes length, and their angle from the Ox direction (in degrees).
-% E = [XC YC A B THETA];
-%
-% See also:
-% circles2d, inertiaEllipse, isPointInEllipse, ellipseAsPolygon
-% drawEllipse, drawEllipseArc
-%
-% ------
-% Author: David Legland
-% e-mail: dav...@gr...
-% Created: 2008-10-13, using Matlab 7.4.0.287 (R2007a)
-% Copyright 2010 INRA - Cepia Software Platform.
-
-help('ellipses2d');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
