v0.6 to include VF anchorage charts + marker

Signed-off-by: Rasbats <miker@members.swis.net>
Rasbats · Sep 20, 2017 · fb303aa · fb303aa
1 parent 241d71f
commit fb303aa
Show file tree

Hide file tree

Showing 23 changed files with 17,966 additions and 1,622 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ SET(TITLE_NAME vfkaps)
 SET(CPACK_PACKAGE_CONTACT "Mike Rossiter")
 
 SET(VERSION_MAJOR "0")
-SET(VERSION_MINOR "5")
+SET(VERSION_MINOR "6")
 
 #SET(CMAKE_BUILD_TYPE Debug)
 SET( wxWidgets_USE_DEBUG OFF)
@@ -26,17 +26,30 @@ SET( wxWidgets_USE_STATIC OFF)
 INCLUDE("cmake/PluginConfigure.cmake")
 
 SET(SRC_vfkaps
-        src/vfkaps_pi.h
-        src/vfkaps_pi.cpp
-        src/icons.h
-        src/icons.cpp
-		src/vfkapsgui.h
-	    src/vfkapsgui.cpp
-	    src/vfkapsgui_impl.cpp
-	    src/vfkapsgui_impl.h
-	    src/vfkapsOverlayFactory.cpp
-        src/vfkapsOverlayFactory.h
-	    src/ocpn_plugin.h
+        	src/vfkaps_pi.h
+        	src/vfkaps_pi.cpp
+        	src/icons.h
+        	src/icons.cpp
+			src/vfkapsgui.h
+	    	src/vfkapsgui.cpp
+	    	src/vfkapsgui_impl.cpp
+	    	src/vfkapsgui_impl.h
+	    	src/vfkapsOverlayFactory.cpp
+        	src/vfkapsOverlayFactory.h
+	    	src/ocpn_plugin.h
+			src/tinyxml.cpp
+			src/tinyxml.h
+			src/tinyxmlerror.cpp
+			src/tinyxmlparser.cpp
+
+        	src/wxJSON/jsonval.cpp
+        	src/wxJSON/jsonreader.cpp
+			src/wxJSON/jsonwriter.cpp
+
+			src/wx/json_defs.h
+			src/wx/jsonval.h
+        	src/wx/jsonreader.h
+			src/wx/jsonwriter.h
 	)
 
 

diff --git a/src/ocpn_plugin.h b/src/ocpn_plugin.h
@@ -38,6 +38,7 @@
 
 
 #include <wx/xml/xml.h>
+#include <wx/event.h>
 
 #ifdef ocpnUSE_SVG
 #include "wxsvg/include/wxSVG/svg.h"
@@ -50,14 +51,15 @@ class wxGLContext;
 //    PlugIns conforming to API Version less then the most modern will also
 //    be correctly supported.
 #define API_VERSION_MAJOR           1
-#define API_VERSION_MINOR           13
+#define API_VERSION_MINOR           14
 
 //    Fwd Definitions
 class       wxFileConfig;
 class       wxNotebook;
 class       wxFont;
 class       wxAuiManager;
 class       wxScrolledWindow;
+class       wxGLCanvas;
 
 //---------------------------------------------------------------------------------------------------------
 //
@@ -515,6 +517,14 @@ class DECL_EXP opencpn_plugin_113 : public opencpn_plugin_112
     virtual void OnToolbarToolUpCallback(int id);
 };
 
+class DECL_EXP opencpn_plugin_114 : public opencpn_plugin_113
+{
+public:
+  opencpn_plugin_114(void *pmgr);
+  virtual ~opencpn_plugin_114();
+
+};
+
 //------------------------------------------------------------------
 //      Route and Waypoint PlugIn support
 //
@@ -782,6 +792,41 @@ class DECL_EXP PlugInChartBaseGL : public PlugInChartBase
 };
 
 
+// ----------------------------------------------------------------------------
+// PlugInChartBaseExtended
+//  Derived from PlugInChartBase, add extended chart support methods
+// ----------------------------------------------------------------------------
+
+class DECL_EXP PlugInChartBaseExtended : public PlugInChartBase
+{
+public:
+    PlugInChartBaseExtended();
+    virtual ~PlugInChartBaseExtended();
+
+    virtual int RenderRegionViewOnGL( const wxGLContext &glc, const PlugIn_ViewPort& VPoint,
+                                      const wxRegion &Region, bool b_use_stencil );
+
+    virtual wxBitmap &RenderRegionViewOnDCNoText(  const PlugIn_ViewPort& VPoint, const wxRegion &Region);
+    virtual bool RenderRegionViewOnDCTextOnly( wxMemoryDC &dc, const PlugIn_ViewPort& VPoint, const wxRegion &Region);
+
+    virtual int RenderRegionViewOnGLNoText( const wxGLContext &glc, const PlugIn_ViewPort& VPoint,
+                                            const wxRegion &Region, bool b_use_stencil );
+
+    virtual int RenderRegionViewOnGLTextOnly( const wxGLContext &glc, const PlugIn_ViewPort& VPoint,
+                                              const wxRegion &Region, bool b_use_stencil );
+
+    virtual ListOfPI_S57Obj *GetObjRuleListAtLatLon(float lat, float lon, float select_radius, PlugIn_ViewPort *VPoint);
+    virtual wxString CreateObjDescriptions( ListOfPI_S57Obj* obj_list );
+
+    virtual int GetNoCOVREntries();
+    virtual int GetNoCOVRTablePoints(int iTable);
+    virtual int  GetNoCOVRTablenPoints(int iTable);
+    virtual float *GetNoCOVRTableHead(int iTable);
+
+    virtual void ClearPLIBTextList();
+
+};
+
 
 
 
@@ -1166,4 +1211,10 @@ class DECL_EXP OCPN_downloadEvent: public wxEvent
 
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_DOWNLOAD_EVENT;
 
+// API 1.14 Extra canvas Support
+
+/* Allow drawing of objects onto other OpenGL canvases */
+extern DECL_EXP void PlugInAISDrawGL( wxGLCanvas* glcanvas, const PlugIn_ViewPort& vp );
+extern DECL_EXP bool PlugInSetFontColor(const wxString TextElement, const wxColour color);
+
 #endif //_PLUGIN_H_