Decreased number of decimal digits in the Organ Settings dialog Grand…

…Orgue#1627
oleg68 · Oct 28, 2023 · 8fe37a7 · 8fe37a7
1 parent ea5d050
commit 8fe37a7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+- Decreased number of decimal digits in the Organ Settings dialog https://github.com/GrandOrgue/grandorgue/issues/1627
 - Improved concurrency handling
 - Added deregistering organs in the temporary directory that do not more exist https://github.com/GrandOrgue/grandorgue/issues/1660
 - Fixed error messages after multiple runs of GrandOrgue ftom Appimage with a demo organ https://github.com/GrandOrgue/grandorgue/issues/1660

diff --git a/src/grandorgue/dialogs/GOOrganDialog.cpp b/src/grandorgue/dialogs/GOOrganDialog.cpp
@@ -83,6 +83,7 @@ static const unsigned RELEASE_LENGTH_MAX = 3000;
 static const unsigned RELEASE_LENGTH_STEP = 50;
 static const unsigned RELEASE_LENGTH_MAX_INDEX
   = RELEASE_LENGTH_MAX / RELEASE_LENGTH_STEP;
+static const wxSize EDIT_SIZE = wxSize(50, -1);
 
 GOOrganDialog::GOOrganDialog(
   GODocumentBase *doc, wxWindow *parent, GOOrganController *organController)
@@ -148,7 +149,8 @@ GOOrganDialog::GOOrganDialog(
     wxDefaultSpan,
     wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxBOTTOM,
     5);
-  m_Amplitude = new wxTextCtrl(this, ID_EVENT_AMPLITUDE, wxEmptyString);
+  m_Amplitude = new wxTextCtrl(
+    this, ID_EVENT_AMPLITUDE, wxEmptyString, wxDefaultPosition, EDIT_SIZE);
   gb->Add(m_Amplitude, wxGBPosition(0, 1), wxDefaultSpan, wxEXPAND);
   m_AmplitudeSpin = new wxSpinButton(this, ID_EVENT_AMPLITUDE_SPIN);
   m_AmplitudeSpin->SetRange(0, 1000);
@@ -160,7 +162,8 @@ GOOrganDialog::GOOrganDialog(
     wxDefaultSpan,
     wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxBOTTOM,
     5);
-  m_Gain = new wxTextCtrl(this, ID_EVENT_GAIN, wxEmptyString);
+  m_Gain = new wxTextCtrl(
+    this, ID_EVENT_GAIN, wxEmptyString, wxDefaultPosition, EDIT_SIZE);
   gb->Add(m_Gain, wxGBPosition(1, 1), wxDefaultSpan, wxEXPAND);
   m_GainSpin = new wxSpinButton(this, ID_EVENT_GAIN_SPIN);
   m_GainSpin->SetRange(-120, 40);
@@ -172,7 +175,8 @@ GOOrganDialog::GOOrganDialog(
     wxDefaultSpan,
     wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxBOTTOM,
     5);
-  m_ManualTuning = new wxTextCtrl(this, ID_EVENT_MANUAL_TUNING, wxEmptyString);
+  m_ManualTuning = new wxTextCtrl(
+    this, ID_EVENT_MANUAL_TUNING, wxEmptyString, wxDefaultPosition, EDIT_SIZE);
   gb->Add(m_ManualTuning, wxGBPosition(2, 1), wxDefaultSpan, wxEXPAND);
   m_ManualTuningSpin = new wxSpinButton(this, ID_EVENT_MANUAL_TUNING_SPIN);
   m_ManualTuningSpin->SetRange(-1800, 1800);
@@ -183,8 +187,12 @@ GOOrganDialog::GOOrganDialog(
     wxDefaultSpan,
     wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxBOTTOM,
     5);
-  m_AutoTuningCorrection
-    = new wxTextCtrl(this, ID_EVENT_AUTO_TUNING_CORRECTION, wxEmptyString);
+  m_AutoTuningCorrection = new wxTextCtrl(
+    this,
+    ID_EVENT_AUTO_TUNING_CORRECTION,
+    wxEmptyString,
+    wxDefaultPosition,
+    EDIT_SIZE);
   gb->Add(m_AutoTuningCorrection, wxGBPosition(3, 1), wxDefaultSpan, wxEXPAND);
   m_AutoTuningCorrectionSpin
     = new wxSpinButton(this, ID_EVENT_AUTO_TUNING_CORRECTION_SPIN);
@@ -197,7 +205,8 @@ GOOrganDialog::GOOrganDialog(
     wxDefaultSpan,
     wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxBOTTOM,
     5);
-  m_Delay = new wxTextCtrl(this, ID_EVENT_DELAY, wxEmptyString);
+  m_Delay = new wxTextCtrl(
+    this, ID_EVENT_DELAY, wxEmptyString, wxDefaultPosition, EDIT_SIZE);
   gb->Add(m_Delay, wxGBPosition(4, 1), wxDefaultSpan, wxEXPAND);
   m_DelaySpin = new wxSpinButton(this, ID_EVENT_DELAY_SPIN);
   m_DelaySpin->SetRange(0, 10000);
@@ -209,8 +218,8 @@ GOOrganDialog::GOOrganDialog(
     wxDefaultSpan,
     wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxBOTTOM,
     5);
-  m_ReleaseLength
-    = new wxTextCtrl(this, ID_EVENT_RELEASE_LENGTH, wxEmptyString);
+  m_ReleaseLength = new wxTextCtrl(
+    this, ID_EVENT_RELEASE_LENGTH, wxEmptyString, wxDefaultPosition, EDIT_SIZE);
   gb->Add(m_ReleaseLength, wxGBPosition(5, 1), wxDefaultSpan, wxEXPAND);
   m_ReleaseLengthSpin = new wxSpinButton(this, ID_EVENT_RELEASE_LENGTH_SPIN);
   m_ReleaseLengthSpin->SetRange(0, RELEASE_LENGTH_MAX_INDEX);
@@ -222,7 +231,8 @@ GOOrganDialog::GOOrganDialog(
     wxDefaultSpan,
     wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxBOTTOM,
     5);
-  m_AudioGroup = new wxComboBox(this, ID_EVENT_AUDIO_GROUP, wxEmptyString);
+  m_AudioGroup = new wxComboBox(
+    this, ID_EVENT_AUDIO_GROUP, wxEmptyString, wxDefaultPosition, EDIT_SIZE);
   m_AudioGroup->Append(wxEmptyString);
   std::vector<wxString> audio_groups
     = m_OrganController->GetSettings().GetAudioGroups();
@@ -606,17 +616,17 @@ void GOOrganDialog::Load() {
   unsigned releaseLength = m_Last->node->GetEffectiveReleaseTail();
 
   if (entries.size() == 1)
-    m_Amplitude->ChangeValue(wxString::Format(wxT("%f"), amplitude));
+    m_Amplitude->ChangeValue(wxString::Format(wxT("%.1f"), amplitude));
   m_AmplitudeSpin->SetValue(amplitude);
   if (entries.size() == 1)
-    m_Gain->ChangeValue(wxString::Format(wxT("%f"), gain));
+    m_Gain->ChangeValue(wxString::Format(wxT("%.1f"), gain));
   m_GainSpin->SetValue(gain);
   if (entries.size() == 1)
-    m_ManualTuning->ChangeValue(wxString::Format(wxT("%f"), manualTuning));
+    m_ManualTuning->ChangeValue(wxString::Format(wxT("%.1f"), manualTuning));
   m_ManualTuningSpin->SetValue(manualTuning);
   if (entries.size() == 1)
     m_AutoTuningCorrection->ChangeValue(
-      wxString::Format(wxT("%f"), autoTuningCorrection));
+      wxString::Format(wxT("%.1f"), autoTuningCorrection));
   m_AutoTuningCorrectionSpin->SetValue(autoTuningCorrection);
   if (entries.size() == 1)
     m_Delay->ChangeValue(wxString::Format(wxT("%u"), delay));