Merge branch 'master' of github.com:OpenCPN/OpenCPN

davidsanner · May 10, 2024 · 3d816b0 · 3d816b0
2 parents 978e26b + f484e01
commit 3d816b0
Show file tree

Hide file tree

Showing 13 changed files with 3,925 additions and 118 deletions.
diff --git a/glutil/console.cpp b/glutil/console.cpp
@@ -1,11 +1,8 @@
-/******************************************************************************
- *
- * Project:  OpenCPN
- *
- * Purpose:  Simple CLI application to check OpenGL capabilities.
- *
- ***************************************************************************
+ /** \file console.cpp  Simple CLI application to check OpenGL capabilities. */
+
+ /**************************************************************************
  *   Copyright (C) 2022 Alec Leamas                                        *
+ *   Copyright (C) 2024 Pavel Kalian                                       *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -117,7 +114,7 @@ class GLUtilApp : public wxApp {
 
   void OnInitCmdLine(wxCmdLineParser& parser) override {
     parser.AddSwitch("h", "help", "Print help");
-    parser.AddSwitch("v", "verbose", "Verbose output"); // Actually not used, but prevents wxWidgets from asserting 
+    parser.AddSwitch("v", "verbose", "Verbose output"); // Actually not used, but prevents wxWidgets from asserting
     parser.AddSwitch("d", "debug", "Debug output");
     parser.AddParam("<command>", wxCMD_LINE_VAL_STRING,
                     wxCMD_LINE_PARAM_OPTIONAL);

diff --git a/plugins/grib_pi/CMakeLists.txt b/plugins/grib_pi/CMakeLists.txt
@@ -103,6 +103,10 @@ set(SRC_GRIB
     src/GribSettingsDialog.h
     src/GribRequestDialog.cpp
     src/GribRequestDialog.h
+    src/XyGribPanel.h
+    src/XyGribPanel.cpp
+    src/XyGribModelDef.h
+    src/XyGribModelDef.cpp
     src/icons.h
     src/msg.h
     src/email.h

diff --git a/plugins/grib_pi/XyGribPanel.fbp b/plugins/grib_pi/XyGribPanel.fbp