Issue #649: It is too hard to select curve control buttons. (#652)

Author: rmpowell77

LATEST_RELEASE_NOTES.md

@@ -1,4 +1,4 @@
-## Release notes for 3.7.3
+## Release notes for 3.8.0
 
 Bugs addressed in this release:
 
@@ -30,4 +30,5 @@ Other changes:
 * [#640](../../issues/640) Clean up some of the CalChartAngles.h clang-tidy errors
 * [#643](../../issues/643) Remove sheet as point friend
 * [#645](../../issues/645) Adopt wxUI Menu widely
+* [#649](../../issues/649) It is too hard to select curve control buttons.
 

resources/tb_curve.xbm

@@ -3,17 +3,17 @@
 static unsigned char tb_curve_bits[] = {
    0x00, 0x00,
    0x00, 0x00,
+   0xC4, 0x1F,
+   0x3E, 0x20,
+   0x04, 0x40,
+   0x00, 0x40,
+   0x00, 0x40,
+   0x00, 0x30,
+   0xC0, 0x0F,
    0x30, 0x00,
-   0xF8, 0x0F,
-   0xF8, 0x1F,
-   0x30, 0x18,
-   0x00, 0x18,
-   0xF0, 0x1F,
-   0xF8, 0x0F,
-   0x18, 0x00,
-   0x18, 0x0C,
-   0xF8, 0x1F,
-   0xF0, 0x1F,
-   0x00, 0x0C,
-   0x00, 0x00,
+   0x08, 0x00,
+   0x04, 0x20,
+   0x04, 0x70,
+   0x08, 0x2E,
+   0xF0, 0x01,
    0x00, 0x00};

src/CalChartFrame.cpp

@@ -347,7 +347,7 @@ CalChartFrame::CalChartFrame(wxDocument* doc, wxView* view, CalChart::Configurat
     // view->GetDocumentManager()->FileHistoryUseMenu(file_menu);
 
     // Add a toolbar
-    mSelectAndMoveToolBar = CreateSelectAndMoves(this, mConfig.Get_FeatureCurves(), wxID_ANY, wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW);
+    mSelectAndMoveToolBar = CreateSelectAndMoves(this, wxID_ANY, wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW);
     mSelectAndMoveToolBar->SetFont(ResizeFont(mSelectAndMoveToolBar->GetFont(), GetToolBarFontSize()));
     mMarcherToolBar = CreateDotModifiers(this, wxID_ANY, wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW);
     mMarcherToolBar->SetFont(ResizeFont(mMarcherToolBar->GetFont(), GetToolBarFontSize()));
@@ -829,8 +829,7 @@ void CalChartFrame::OnCmd_swap(wxCommandEvent&)
 
 void CalChartFrame::OnCmd_curve(wxCommandEvent&)
 {
-    mSelectAndMoveToolBar->ToggleTool(CALCHART__curve, true);
-    mCanvas->SetDrawingCurve(true);
+    mCanvas->SetDrawingCurve(mSelectAndMoveToolBar->GetToolToggled(CALCHART__curve));
 }
 
 void CalChartFrame::OnCmd_move(wxCommandEvent&)
@@ -1233,12 +1232,6 @@ void CalChartFrame::ToolBarSetCurrentMove(CalChart::MoveMode type)
     mSelectAndMoveToolBar->ToggleTool(CALCHART__move + toUType(type), true);
 }
 
-// call by the canvas to inform that the curve draw is done.  Don't call back to canvas
-void CalChartFrame::ToolBarUnsetDrawingCurve()
-{
-    mSelectAndMoveToolBar->ToggleTool(CALCHART__curve, false);
-}
-
 void CalChartFrame::SetMode()
 {
     if (GetShow()) {

src/CalChartFrame.h

@@ -153,7 +153,6 @@ class CalChartFrame : public wxDocChildFrame {
     void SetCurrentSelect(CalChart::Select type);
     void SetCurrentMove(CalChart::MoveMode type);
     void ToolBarSetCurrentMove(CalChart::MoveMode type);
-    void ToolBarUnsetDrawingCurve();
     float ToolBarSetZoom(float zoom); // set to an amount, returns what it was set to.
     void zoom_callback(wxCommandEvent&);
     void zoom_callback_textenter(wxCommandEvent&);

src/CalChartToolBar.cpp

@@ -94,18 +94,18 @@ std::vector<ToolBarEntry> GetSymbolsToolBar()
     return tb;
 }
 
-std::vector<ToolBarEntry> GetHalfOfMainToolBar(bool withFeatureCurves)
+std::vector<ToolBarEntry> GetHalfOfMainToolBar()
 {
-    static auto const tb = [withFeatureCurves] {
+    static auto const tb = [] {
         auto result = std::vector<ToolBarEntry>{
             { wxITEM_NORMAL, wxT(""), ScaleButtonBitmap(wxBitmap(BITMAP_NAME(tb_left))), wxT("Previous stuntsheet"), CALCHART__prev_ss, {} },
             { wxITEM_NORMAL, wxT(""), ScaleButtonBitmap(wxBitmap(BITMAP_NAME(tb_right))), wxT("Next stuntsheet"), CALCHART__next_ss, true },
             { wxITEM_RADIO, wxT(""), ScaleButtonBitmap(wxBitmap(BITMAP_NAME(tb_box))), wxT("Select points with box"), CALCHART__box, {} },
             { wxITEM_RADIO, wxT(""), ScaleButtonBitmap(wxBitmap(BITMAP_NAME(tb_poly))), wxT("Select points with polygon"), CALCHART__poly, {} },
             { wxITEM_RADIO, wxT(""), ScaleButtonBitmap(wxBitmap(BITMAP_NAME(tb_lasso))), wxT("Select points with lasso"), CALCHART__lasso, {} },
             { wxITEM_RADIO, wxT(""), ScaleButtonBitmap(wxBitmap(BITMAP_NAME(tb_swap))), wxT("Swap points"), CALCHART__swap, true },
+            { wxITEM_CHECK, wxT(""), ScaleButtonBitmap(wxBitmap(BITMAP_NAME(tb_curve))), wxT("Draw and Edit Curves"), CALCHART__curve, true },
             { wxITEM_RADIO, wxT(""), ScaleButtonBitmap(wxBitmap(BITMAP_NAME(tb_mv))), wxT("Translate points"), CALCHART__move, {} },
-
             { wxITEM_RADIO, wxT(""), ScaleButtonBitmap(wxBitmap(BITMAP_NAME(tb_shape_line))), wxT("Shape points in a line"), CALCHART__shape_line, {} },
             { wxITEM_RADIO, wxT(""), ScaleButtonBitmap(wxBitmap(BITMAP_NAME(tb_shape_x))), wxT("Shape points in an x"), CALCHART__shape_x, {} },
             { wxITEM_RADIO, wxT(""), ScaleButtonBitmap(wxBitmap(BITMAP_NAME(tb_shape_cross))), wxT("Shape points in a cross"), CALCHART__shape_cross, {} },
@@ -119,10 +119,6 @@ std::vector<ToolBarEntry> GetHalfOfMainToolBar(bool withFeatureCurves)
             { wxITEM_RADIO, wxT(""), ScaleButtonBitmap(wxBitmap(BITMAP_NAME(tb_siz))), wxT("Resize block"), CALCHART__size, {} },
             { wxITEM_RADIO, wxT(""), ScaleButtonBitmap(wxBitmap(BITMAP_NAME(tb_gen))), wxT("Genius move"), CALCHART__genius, true },
         };
-        if (withFeatureCurves) {
-            result.push_back(
-                ToolBarEntry{ wxITEM_RADIO, "", ScaleButtonBitmap(wxBitmap(BITMAP_NAME(tb_curve))), wxT("Draw curve"), CALCHART__curve, true });
-        }
         return result;
     }();
     return tb;
@@ -171,10 +167,10 @@ auto CreateAuiToolBar(wxAuiToolBar* tb, T toolbarBits)
     return tb;
 }
 
-wxAuiToolBar* CreateSelectAndMoves(wxWindow* parent, bool withFeatureCurves, wxWindowID id, long style)
+wxAuiToolBar* CreateSelectAndMoves(wxWindow* parent, wxWindowID id, long style)
 {
 
-    return CreateAuiToolBar(new wxAuiToolBar(parent, id, wxDefaultPosition, wxDefaultSize, style), GetHalfOfMainToolBar(withFeatureCurves));
+    return CreateAuiToolBar(new wxAuiToolBar(parent, id, wxDefaultPosition, wxDefaultSize, style), GetHalfOfMainToolBar());
 }
 
 wxAuiToolBar* CreateDotModifiers(wxWindow* parent, wxWindowID id, long style)

src/CalChartToolBar.h

@@ -31,5 +31,5 @@ struct ToolBarEntry;
 
 std::vector<wxBitmap> GetSymbolsBitmap();
 
-wxAuiToolBar* CreateSelectAndMoves(wxWindow* parent, bool withFeatureCurves, wxWindowID id = wxID_ANY, long style = 0);
+wxAuiToolBar* CreateSelectAndMoves(wxWindow* parent, wxWindowID id = wxID_ANY, long style = 0);
 wxAuiToolBar* CreateDotModifiers(wxWindow* parent, wxWindowID id = wxID_ANY, long style = 0);

src/CalChartView.h

@@ -124,7 +124,7 @@ class CalChartView : public wxView {
     [[nodiscard]] auto GetCurrentMove() const { return mShow->GetCurrentMove(); }
     void SetCurrentMove(CalChart::MoveMode move) { mShow->SetCurrentMove(move); }
     [[nodiscard]] auto IsDrawingCurve() const { return mShow->IsDrawingCurve(); }
-    void SetDrawingCurve(bool drawingCurve) const { return mShow->SetDrawingCurve(drawingCurve); }
+    void SetDrawingCurve(bool drawingCurve) const { mShow->SetDrawingCurve(drawingCurve); }
 
     [[nodiscard]] auto GetCurrentCurve(size_t index) const { return mShow->GetCurrentCurve(index); }
     [[nodiscard]] auto GetCurrentNumberCurves() const { return mShow->GetCurrentNumberCurves(); }