Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dashboard UI configuration #3548

Merged
merged 3 commits into from Dec 24, 2023
Merged

Dashboard UI configuration #3548

merged 3 commits into from Dec 24, 2023

Conversation

nohal
Copy link
Collaborator

@nohal nohal commented Dec 18, 2023

Replaced the dashboard code with the fork mentioned in #3547 and fixed it to actually build with -fpermissive not enabled

@nohal nohal changed the title Dashboard UI configration Dashboard UI configuration Dec 18, 2023
@nohal nohal merged commit 614224e into OpenCPN:master Dec 24, 2023
2 checks passed
@Hakansv
Copy link
Contributor

Hakansv commented Dec 25, 2023

On Win10:
One issue noted:
Dashboard satellite instrument GPS.cpp have got to distinct background color for the signal to noise rectangles and info text.
One temporary hack to set it back is to use the former color scheme for the rectangles. We may not need to make this background color user adjustable?
+++ b/plugins/dashboard_pi/src/gps.cpp
@@ -363,7 +363,7 @@ void DashboardInstrument_GPS::DrawForeground(wxGCDC* dc) {
cl = GetColourSchemeFont(m_Properties->m_DataFont.GetColour());
else
cl = GetColourSchemeFont(g_pFontData->GetColour());

  • //GetGlobalColor(_T("DASHL"), &cl);
  • GetGlobalColor(_T("DASHL"), &cl);

First picture this commit, second after the "hack" above.
bild
bild

@Hakansv
Copy link
Contributor

Hakansv commented Dec 25, 2023

Another note:
When build it locally I need to clean out trailing whitespace and EOF extra blank lines.
Is it possible to clean that before next possible master load?

libs/SQLiteCpp/include/SQLiteCpp/ExecuteMany.h:59: trailing whitespace.
+ * \brief Convenience function to reset a statement and call bind_exec to
libs/SQLiteCpp/include/SQLiteCpp/SQLiteCpp.h:46: new blank line at EOF.
libs/SQLiteCpp/include/SQLiteCpp/SQLiteCppExport.h:26: trailing whitespace.
+    #endif
libs/SQLiteCpp/include/SQLiteCpp/SQLiteCppExport.h:27: trailing whitespace.
+#else
libs/SQLiteCpp/include/SQLiteCpp/Statement.h:596: trailing whitespace.
+     *
libs/SQLiteCpp/include/SQLiteCpp/Statement.h:687: trailing whitespace.
+     *
libs/SQLiteCpp/include/SQLiteCpp/Statement.h:694: trailing whitespace.
+     *
libs/SQLiteCpp/include/SQLiteCpp/VariadicBind.h:87: trailing whitespace.
+ *
plugins/dashboard_pi/src/altitude.cpp:188: trailing whitespace.
+  else
plugins/dashboard_pi/src/altitude.cpp:354: trailing whitespace.
+      //GetGlobalColor(_T("DASHF"), &cl);
plugins/dashboard_pi/src/altitude.cpp:357: trailing whitespace.
+  }
plugins/dashboard_pi/src/dashboard_pi.cpp:8: trailing whitespace.
+ *
plugins/dashboard_pi/src/dashboard_pi.cpp:531: trailing whitespace.
+
plugins/dashboard_pi/src/dashboard_pi.cpp:967: trailing whitespace.
+    if (m_NMEA0183.LastSentenceIDReceived == _T("DBT")) {
plugins/dashboard_pi/src/dashboard_pi.cpp:991: trailing whitespace.
+        }
plugins/dashboard_pi/src/dashboard_pi.cpp:3397: trailing whitespace.
+    g_USFontTitle = *g_pUSFontTitle;
plugins/dashboard_pi/src/dashboard_pi.cpp:3509: trailing whitespace.
+            pConf->Read(wxString::Format(_T("Instrument%d"), i + 1), &id, -1);
plugins/dashboard_pi/src/dashboard_pi.cpp:3680: trailing whitespace.
+                  }
plugins/dashboard_pi/src/dashboard_pi.cpp:4571: trailing whitespace.
+    m_pFontPickerSmall->SetSelectedColour(wxColour(0, 0, 0));
plugins/dashboard_pi/src/dashboard_pi.cpp:4704: trailing whitespace.
+      cont->m_pDashboardWindow->SetInstrumentList(cont->m_aInstrumentList, &(cont->m_aInstrumentPropertyList));
plugins/dashboard_pi/src/dashboard_pi.cpp:4770: trailing whitespace.
+        {
plugins/dashboard_pi/src/dashboard_pi.cpp:4785: trailing whitespace.
+    delete Edit;
plugins/dashboard_pi/src/dashboard_pi.cpp:4802: trailing whitespace.
+  // item.SetImage(0);           // image 0, by default
plugins/dashboard_pi/src/dashboard_pi.cpp:4817: trailing whitespace.
+          }
plugins/dashboard_pi/src/dashboard_pi.cpp:4844: trailing whitespace.
+  // item.SetImage(0);           // image 0, by default
plugins/dashboard_pi/src/dashboard_pi.cpp:4976: trailing whitespace.
+
plugins/dashboard_pi/src/dashboard_pi.cpp:5937: trailing whitespace.
+  SetSize(minsize);
plugins/dashboard_pi/src/dashboard_pi.cpp:6086: new blank line at EOF.
plugins/dashboard_pi/src/dashboard_pi.h:8: trailing whitespace.
+ *
plugins/dashboard_pi/src/dashboard_pi.h:355: trailing whitespace.
+  void OnDashboarddefaultFont(wxCommandEvent& event);
plugins/dashboard_pi/src/depth.cpp:293: trailing whitespace.
+     dc->SetFont(g_pFontLabel->GetChosenFont());
plugins/dashboard_pi/src/dial.cpp:347: trailing whitespace.
+      dc->SetFont(g_pFontLabel->GetChosenFont());
plugins/dashboard_pi/src/wind_history.cpp:402: trailing whitespace.
+  {
plugins/grib_pi/src/GribOverlayFactory.cpp:646: trailing whitespace.
+

@nohal nohal deleted the bc_dashboard branch January 6, 2024 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants