issue #2 merge Focus, focux.hpp, focus.hxx

dibyendumajumdar · May 8, 2020 · 5c442fb · 5c442fb
1 parent d294f1b
commit 5c442fb
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 68 deletions.
diff --git a/doc/texinfo/goptical.texi b/doc/texinfo/goptical.texi
@@ -1745,7 +1745,7 @@ Optical systems analysis tools
 @subheading Declaration
 
 @example
-#include <goptical/core/analysis/focus>
+#include <goptical/core/analysis/focus.cpp>
 
 namespace goptical @{
   namespace analysis @{

diff --git a/examples/curve_model/usercurve.cpp b/examples/curve_model/usercurve.cpp
@@ -44,7 +44,7 @@
 #include <goptical/core/trace/Params>
 
 #include <goptical/core/analysis/Spot>
-#include <goptical/core/analysis/Focus>
+#include <goptical/core/analysis/focus.hpp>
 
 #include <goptical/core/io/RendererPlplot>
 #include <goptical/core/io/RendererSvg>

diff --git a/include/goptical/core/analysis/Focus b/include/goptical/core/analysis/Focus
diff --git a/include/goptical/core/analysis/focus.hpp b/include/goptical/core/analysis/focus.hpp
@@ -63,9 +63,26 @@ namespace _goptical
       bool              _processed_focus;
       math::VectorPair3 _best_focus;
     };
+    void Focus::invalidate ()
+    {
+      _processed_focus = false;
+      _processed_trace = false;
+    }
+
+    const math::VectorPair3 &Focus::get_best_focus ()
+    {
+      process_focus ();
 
+      return _best_focus;
+    }
   }
 }
 
+namespace goptical {
+  namespace analysis {
+    using _goptical::analysis::Focus;
+  }
+} // namespace goptical
+
 #endif
 
diff --git a/include/goptical/core/analysis/focus.hxx b/include/goptical/core/analysis/focus.hxx
diff --git a/src/core/analysis_focus.cpp b/src/core/analysis_focus.cpp
@@ -24,7 +24,7 @@
 
 
 #include <goptical/core/math/VectorPair>
-#include <goptical/core/analysis/Focus>
+#include <goptical/core/analysis/focus.hpp>
 #include <goptical/core/trace/Tracer>
 #include <goptical/core/sys/Image>
 #include <goptical/core/trace/Ray>