added export command for clothoids/clothoid list/circle

ebertolazzi · Feb 2, 2022 · e158313 · e158313
1 parent f4a637f
commit e158313
Show file tree

Hide file tree

Showing 28 changed files with 770 additions and 227 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -84,10 +84,13 @@ find_library(
   NO_DEFAULT_PATH
 )
 if( UTILS )
-  message("Found Utils${ARTIFACTS_STATIC_SUFFIX}")
-  include_directories(${UPDIR}/Utils/lib/include)
+  message(STATUS "Found Utils${ARTIFACTS_STATIC_SUFFIX}")
+  ebertolazzi_copy_directory(
+    "${UPDIR}/Utils/lib"
+    "${CMAKE_CURRENT_SOURCE_DIR}/lib3rd"
+  )
 else()
-  message("NOT Found Utils${ARTIFACTS_STATIC_SUFFIX}")
+  message(STATUS "NOT Found Utils${ARTIFACTS_STATIC_SUFFIX} use submodule")
   add_subdirectory(./submodules/Utils)
   include_directories(./submodules/Utils/src)
   set( UTILS ebertolazzi_Utils_Static )
@@ -101,10 +104,10 @@ find_library(
   NO_DEFAULT_PATH
 )
 if( ROOTS )
-  message("Found quarticRootsFlocke${ARTIFACTS_STATIC_SUFFIX}")
+  message(STATUS "Found quarticRootsFlocke${ARTIFACTS_STATIC_SUFFIX}")
   include_directories(${UPDIR}/quarticRootsFlocke/lib/include)
 else()
-  message("NOT Found quarticRootsFlocke${ARTIFACTS_STATIC_SUFFIX}")
+  message(STATUS "NOT Found quarticRootsFlocke${ARTIFACTS_STATIC_SUFFIX}")
   add_subdirectory(./submodules/quarticRootsFlocke)
   include_directories(./submodules/quarticRootsFlocke/src)
   set( ROOTS ebertolazzi_quarticRootsFlocke_Static )

diff --git a/Clothoids.prj b/Clothoids.prj
@@ -1,13 +1,13 @@
 <deployment-project plugin="plugin.toolbox" plugin-version="1.0">
-  <configuration build-checksum="2248513199" file="/Users/enrico/Ricerca/develop/PINS/pins-mechatronix/LibSources/submodules/Clothoids/Clothoids.prj" location="/Users/enrico/Ricerca/develop/PINS/pins-mechatronix/LibSources/submodules/Clothoids" name="Clothoids" target="target.toolbox" target-name="Package Toolbox">
+  <configuration build-checksum="864919117" file="/Users/enrico/Ricerca/Software/REPOS/myReposGit/Clothoids/Clothoids.prj" location="/Users/enrico/Ricerca/Software/REPOS/myReposGit/Clothoids" name="Clothoids" target="target.toolbox" target-name="Package Toolbox">
     <param.appname>Clothoids</param.appname>
     <param.authnamewatermark>Enrico Bertolazzi</param.authnamewatermark>
     <param.email>enrico.bertolazzi@unitn.it</param.email>
     <param.company>Unversità degli Studi di Trento</param.company>
     <param.summary>Clothoids, a library for clothoids computation and more</param.summary>
     <param.description>A library for clothoids computation and more.</param.description>
     <param.screenshot>${PROJECT_ROOT}/toolbox/logo.png</param.screenshot>
-    <param.version>2.0.8</param.version>
+    <param.version>2.0.10</param.version>
     <param.output>${PROJECT_ROOT}/Clothoids.mltbx</param.output>
     <param.products.name />
     <param.products.id />
@@ -117,7 +117,7 @@ setup.m
     <fileset.depfun.excluded />
     <fileset.package />
     <build-deliverables>
-      <file location="${PROJECT_ROOT}" name="Clothoids.mltbx" optional="false">/Users/enrico/Ricerca/develop/PINS/pins-mechatronix/LibSources/submodules/Clothoids/Clothoids.mltbx</file>
+      <file location="${PROJECT_ROOT}" name="Clothoids.mltbx" optional="false">/Users/enrico/Ricerca/Software/REPOS/myReposGit/Clothoids/Clothoids.mltbx</file>
     </build-deliverables>
     <workflow />
     <matlab>
@@ -164,7 +164,7 @@ setup.m
       <vista>false</vista>
       <linux>false</linux>
       <solaris>false</solaris>
-      <osver>11.6</osver>
+      <osver>12.1</osver>
       <os32>false</os32>
       <os64>true</os64>
       <arch>maci64</arch>

diff --git a/docs/api-cpp/file_Fresnel.cc.html b/docs/api-cpp/file_Fresnel.cc.html
@@ -113,8 +113,8 @@ <h2>Namespaces<a class="headerlink" href="#namespaces" title="Permalink to this
 <h2>Functions<a class="headerlink" href="#functions" title="Permalink to this headline">¶</a>
 </h2>
 <ul class="simple">
-<li><p><a class="reference internal" href="function_a00119_1aee78c857e298d1605987e48534793843.html#exhale-function-a00119-1aee78c857e298d1605987e48534793843"><span class="std std-ref">Function G2lib::FresnelCS(real_type, real_type&amp;, real_type&amp;)</span></a></p></li>
 <li><p><a class="reference internal" href="function_a00119_1a4d0a558dc1e34cf736febb3c4de4c662.html#exhale-function-a00119-1a4d0a558dc1e34cf736febb3c4de4c662"><span class="std std-ref">Function G2lib::FresnelCS(int_type, real_type, real_type *, real_type *)</span></a></p></li>
+<li><p><a class="reference internal" href="function_a00119_1aee78c857e298d1605987e48534793843.html#exhale-function-a00119-1aee78c857e298d1605987e48534793843"><span class="std std-ref">Function G2lib::FresnelCS(real_type, real_type&amp;, real_type&amp;)</span></a></p></li>
 <li><p><a class="reference internal" href="function_a00119_1a675e182a0894c0adb4295c034d155bb1.html#exhale-function-a00119-1a675e182a0894c0adb4295c034d155bb1"><span class="std std-ref">Function G2lib::GeneralizedFresnelCS(int_type, real_type, real_type, real_type, real_type *, real_type *)</span></a></p></li>
 <li><p><a class="reference internal" href="function_a00119_1a67f7c38f4ad0d8256c2f4d0f92501bf2.html#exhale-function-a00119-1a67f7c38f4ad0d8256c2f4d0f92501bf2"><span class="std std-ref">Function G2lib::GeneralizedFresnelCS(real_type, real_type, real_type, real_type&amp;, real_type&amp;)</span></a></p></li>
 </ul>

diff --git a/docs/api-matlab/class_a00076.html b/docs/api-matlab/class_a00076.html
@@ -299,8 +299,34 @@ <h2>Class Documentation<a class="headerlink" href="#class-documentation" title="
 </dl>
 
 <dl class="cpp function">
-<dt class="sig sig-object cpp" id="_CPPv4N9CircleArc11plotPolygonE2in2in">
-<span id="_CPPv3N9CircleArc11plotPolygonE2in2in"></span><span id="_CPPv2N9CircleArc11plotPolygonE2in2in"></span><span id="CircleArc::plotPolygon__in.in"></span><span class="target" id="a00076_1a801cd2ae5a0ccc6d346e23228d8c48c9"></span><span class="n"><span class="pre">function</span></span><span class="w"> </span><span class="sig-name descname"><span class="n"><span class="pre">plotPolygon</span></span></span><span class="sig-paren">(</span><span class="n"></span><span class="w"> </span><span class="n sig-param"><span class="pre">self</span></span>, <span class="n"></span><span class="w"> </span><span class="n sig-param"><span class="pre">varargin</span></span><span class="sig-paren">)</span><a class="headerlink" href="#_CPPv4N9CircleArc11plotPolygonE2in2in" title="Permalink to this definition">¶</a><br>
+<dt class="sig sig-object cpp">
+<span class="target" id="a00076_1a3573c17b1cd862ecb229373c7d8aafe2"></span><span class="sig-name descname"><span class="pre">function</span> <span class="pre">export</span> <span class="pre">(in</span> <span class="sig-paren">)</span></span>
+</dt>
+<dd>
+<p>Export circle parameters</p>
+<p><strong>Usage:</strong></p>
+<p></p>
+<div class="highlight-matlab notranslate">
+<div class="highlight"><pre><span></span><span class="n">S</span><span class="w"> </span><span class="p">=</span><span class="w"> </span><span class="n">ref</span><span class="p">.</span><span class="n">export</span><span class="p">();</span><span class="w"></span>
+</pre></div>
+</div>
+
+<p></p>
+<ul class="simple">
+<li><p><code class="docutils literal notranslate"><span class="pre">S.x0</span></code>, <code class="docutils literal notranslate"><span class="pre">S.y0</span></code>: initial point of the circle arc</p></li>
+<li><p><code class="docutils literal notranslate"><span class="pre">S.x1</span></code>, <code class="docutils literal notranslate"><span class="pre">S.y1</span></code>: final point of the circle arc</p></li>
+<li><p><code class="docutils literal notranslate"><span class="pre">S.theta0</span></code>: initial angle of the circle arc</p></li>
+<li><p><code class="docutils literal notranslate"><span class="pre">S.theta1</span></code>: final angle of the circle arc</p></li>
+<li><p><code class="docutils literal notranslate"><span class="pre">S.kappa</span></code>: curvature of the circle arc</p></li>
+<li><p><code class="docutils literal notranslate"><span class="pre">S.L</span></code>: length of the clothoid arc </p></li>
+</ul>
+
+</dd>
+</dl>
+
+<dl class="cpp function">
+<dt class="sig sig-object cpp" id="_CPPv4N9CircleArc12plot_polygonE2in2in">
+<span id="_CPPv3N9CircleArc12plot_polygonE2in2in"></span><span id="_CPPv2N9CircleArc12plot_polygonE2in2in"></span><span id="CircleArc::plot_polygon__in.in"></span><span class="target" id="a00076_1af1649361c69b9f803799fb5b3f29c6d0"></span><span class="n"><span class="pre">function</span></span><span class="w"> </span><span class="sig-name descname"><span class="n"><span class="pre">plot_polygon</span></span></span><span class="sig-paren">(</span><span class="n"></span><span class="w"> </span><span class="n sig-param"><span class="pre">self</span></span>, <span class="n"></span><span class="w"> </span><span class="n sig-param"><span class="pre">varargin</span></span><span class="sig-paren">)</span><a class="headerlink" href="#_CPPv4N9CircleArc12plot_polygonE2in2in" title="Permalink to this definition">¶</a><br>
 </dt>
 <dd>
 <p>Plot the polygon of the NURBS for the arc</p>
@@ -320,6 +346,13 @@ <h2>Class Documentation<a class="headerlink" href="#class-documentation" title="
 </dd>
 </dl>
 
+<dl class="cpp function">
+<dt class="sig sig-object cpp" id="_CPPv4N9CircleArc11plotPolygonE2in2in">
+<span id="_CPPv3N9CircleArc11plotPolygonE2in2in"></span><span id="_CPPv2N9CircleArc11plotPolygonE2in2in"></span><span id="CircleArc::plotPolygon__in.in"></span><span class="target" id="a00076_1a801cd2ae5a0ccc6d346e23228d8c48c9"></span><span class="n"><span class="pre">function</span></span><span class="w"> </span><span class="sig-name descname"><span class="n"><span class="pre">plotPolygon</span></span></span><span class="sig-paren">(</span><span class="n"></span><span class="w"> </span><span class="n sig-param"><span class="pre">self</span></span>, <span class="n"></span><span class="w"> </span><span class="n sig-param"><span class="pre">varargin</span></span><span class="sig-paren">)</span><a class="headerlink" href="#_CPPv4N9CircleArc11plotPolygonE2in2in" title="Permalink to this definition">¶</a><br>
+</dt>
+<dd></dd>
+</dl>
+
 <dl class="cpp function">
 <dt class="sig sig-object cpp" id="_CPPv4N9CircleArc10obj_handleE2in">
 <span id="_CPPv3N9CircleArc10obj_handleE2in"></span><span id="_CPPv2N9CircleArc10obj_handleE2in"></span><span id="CircleArc::obj_handle__in"></span><span class="target" id="a00092_1a1453250354e19f9d9fe16a0deef75c18"></span><span class="n"><span class="pre">function</span></span><span class="w"> </span><span class="sig-name descname"><span class="n"><span class="pre">obj_handle</span></span></span><span class="sig-paren">(</span><span class="n"></span><span class="w"> </span><span class="n sig-param"><span class="pre">self</span></span><span class="sig-paren">)</span><a class="headerlink" href="#_CPPv4N9CircleArc10obj_handleE2in" title="Permalink to this definition">¶</a><br>