Just a bit further cleanup by making background images.

Author: rmpowell77

CMakeLists.txt

@@ -196,8 +196,8 @@ add_executable (
   ${CMAKE_CURRENT_SOURCE_DIR}/src/AnimationPanel.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/AnimationView.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/AnimationView.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/BackgroundImage.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/BackgroundImage.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/BackgroundImages.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/BackgroundImages.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/CCOmniviewCanvas.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/CCOmniviewCanvas.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartApp.cpp

src/BackgroundImage.h

@@ -1,5 +1,5 @@
 /*
- * BackgroundImage.cpp
+ * BackgroundImages.cpp
  * Maintains the background image data
  */
 
@@ -20,9 +20,57 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "BackgroundImage.h"
+#include "BackgroundImages.h"
+#include "cc_image.h"
 #include <algorithm>
 
+class BackgroundImage {
+public:
+    BackgroundImage(wxImage const& image, int x, int y, int scaled_width, int scaled_height);
+
+    bool MouseClickIsHit(wxMouseEvent const& event, wxDC const& dc) const;
+    void OnMouseLeftDown(wxMouseEvent const& event, wxDC const& dc);
+    // returns left, top, width, height
+    std::array<int, 4> OnMouseLeftUp(wxMouseEvent const& event, wxDC const& dc);
+
+    void OnMouseMove(wxMouseEvent const& event, wxDC const& dc);
+    void OnPaint(wxDC& dc, bool drawPicAdjustDots, bool selected) const;
+
+private:
+    static constexpr auto kCircleSize = 6;
+
+    wxImage mImage;
+    wxBitmap mBitmap;
+    wxPoint mBitmapPoint;
+
+    // what type of background adjustments could we do
+    enum class BackgroundAdjustType {
+        kUpperLeft = 0,
+        kUpper,
+        kUpperRight,
+        kLeft,
+        kMove,
+        kRight,
+        kLowerLeft,
+        kLower,
+        kLowerRight,
+        kLast,
+    };
+    BackgroundAdjustType mBackgroundAdjustType;
+
+    struct CalculateScaleAndMove {
+    public:
+        CalculateScaleAndMove(wxPoint startClick, wxRect rect, BackgroundAdjustType adjustType);
+        
+        wxRect operator()(wxCoord x, wxCoord y, wxRect wxRect);
+        wxPoint mStartClick;
+        wxRect mRect;
+        float mAspectRatio;
+        BackgroundAdjustType mAdjustType;
+    };
+    std::unique_ptr<CalculateScaleAndMove> mScaleAndMove;
+};
+
 BackgroundImage::BackgroundImage(const wxImage& image, int x, int y, int scaled_width, int scaled_height)
     : mImage(image)
     , mBitmapPoint(x, y)
@@ -253,3 +301,72 @@ wxRect BackgroundImage::CalculateScaleAndMove::operator()(wxCoord x, wxCoord y,
             return rect;
     }
 }
+
+BackgroundImages::BackgroundImages() = default;
+BackgroundImages::~BackgroundImages() = default;
+
+void BackgroundImages::SetBackgroundImages(std::vector<CalChart::ImageData> const& images)
+{
+    mBackgroundImages.clear();
+    mWhichBackgroundIndex = -1;
+    for (auto&& image : images) {
+        // ugh...  not sure if there's a better way to pass data to image.
+        auto d = static_cast<unsigned char*>(malloc(sizeof(unsigned char) * image.image_width * image.image_height * 3));
+        std::copy(image.data.begin(), image.data.end(), d);
+        auto a = static_cast<unsigned char*>(nullptr);
+        if (image.alpha.size()) {
+            a = static_cast<unsigned char*>(malloc(sizeof(unsigned char) * image.image_width * image.image_height));
+            std::copy(image.alpha.begin(), image.alpha.end(), a);
+            wxImage img(image.image_width, image.image_height, d, a);
+            mBackgroundImages.emplace_back(img, image.left, image.top, image.scaled_width, image.scaled_height);
+        } else {
+            wxImage img(image.image_width, image.image_height, d);
+            mBackgroundImages.emplace_back(img, image.left, image.top, image.scaled_width, image.scaled_height);
+        }
+    }
+}
+
+void BackgroundImages::OnPaint(wxDC& dc) const
+{
+    for (auto i = 0; i < static_cast<int>(mBackgroundImages.size()); ++i) {
+        mBackgroundImages[i].OnPaint(dc, mAdjustBackgroundMode, mWhichBackgroundIndex == i);
+    }
+}
+
+void BackgroundImages::OnMouseLeftDown(wxMouseEvent const& event, wxDC const& dc)
+{
+    if (!mAdjustBackgroundMode) {
+        return;
+    }
+    mWhichBackgroundIndex = -1;
+    for (auto i = 0; i < static_cast<int>(mBackgroundImages.size()); ++i) {
+        if (mBackgroundImages[i].MouseClickIsHit(event, dc)) {
+            mWhichBackgroundIndex = i;
+        }
+    }
+    if (mWhichBackgroundIndex != -1) {
+        mBackgroundImages[mWhichBackgroundIndex].OnMouseLeftDown(event, dc);
+    }
+}
+
+std::optional<std::tuple<int, std::array<int, 4>>> BackgroundImages::OnMouseLeftUp(wxMouseEvent const& event, wxDC const& dc)
+{
+    if (!mAdjustBackgroundMode) {
+        return {};
+    }
+    if (mWhichBackgroundIndex >= 0 && mWhichBackgroundIndex < static_cast<int>(mBackgroundImages.size())) {
+        return { { mWhichBackgroundIndex, mBackgroundImages[mWhichBackgroundIndex].OnMouseLeftUp(event, dc) } };
+    }
+    return {};
+}
+
+void BackgroundImages::OnMouseMove(wxMouseEvent const& event, wxDC const& dc)
+{
+    if (!mAdjustBackgroundMode) {
+        return;
+    }
+    if (mWhichBackgroundIndex >= 0 && mWhichBackgroundIndex < static_cast<int>(mBackgroundImages.size())) {
+        mBackgroundImages[mWhichBackgroundIndex].OnMouseMove(event, dc);
+    }
+}
+

src/BackgroundImage.cpp src/BackgroundImages.cppsrc/BackgroundImage.cpp renamed to src/BackgroundImages.cpp

@@ -0,0 +1,57 @@
+#pragma once
+/*
+ * BackgroundImage.h
+ * Maintains the background image data
+ */
+/*
+ Copyright (C) 1995-2011  Garrick Brian Meeker, Richard Michael Powell
+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <array>
+#include <memory>
+#include <wx/dc.h>
+#include <wx/event.h>
+
+namespace CalChart {
+    class ImageData;
+}
+
+class BackgroundImage;
+
+class BackgroundImages {
+public:
+    BackgroundImages();
+    ~BackgroundImages();
+
+    void SetBackgroundImages(std::vector<CalChart::ImageData> const& images);
+
+    auto GetAdjustBackgroundMode() const { return mAdjustBackgroundMode; }
+    void SetAdjustBackgroundMode(bool adjustBackgroundMode) { mAdjustBackgroundMode = adjustBackgroundMode; }
+
+    std::optional<std::size_t> GetCurrentIndex() const { return mWhichBackgroundIndex == -1 ? std::optional<std::size_t>{} : mWhichBackgroundIndex; }
+
+    void OnMouseLeftDown(wxMouseEvent const& event, wxDC const& dc);
+    std::optional<std::tuple<int, std::array<int, 4>>> OnMouseLeftUp(wxMouseEvent const& event, wxDC const& dc);
+    void OnMouseMove(wxMouseEvent const& event, wxDC const& dc);
+
+    void OnPaint(wxDC& dc) const;
+
+private:
+    std::vector<BackgroundImage> mBackgroundImages;
+    bool mAdjustBackgroundMode{};
+    int mWhichBackgroundIndex = -1;
+
+};

src/BackgroundImages.h

@@ -367,6 +367,12 @@ void CalChartDoc::SetDrawBackground(bool drawBackground)
     UpdateAllViews();
 }
 
+void CalChartDoc::SetCurrentMove(CalChart::MoveMode move)
+{
+    mCurrentMove = move;
+    UpdateAllViews();
+}
+
 const ShowMode& CalChartDoc::GetShowMode() const { return mShow->GetShowMode(); }
 
 int CalChartDoc::PrintToPS(std::ostream& buffer, bool overview,

src/CalChartDoc.cpp

@@ -175,6 +175,8 @@ class CalChartDoc : public wxDocument {
     void SetDrawPaths(bool drawPaths);
     auto GetDrawBackground() const { return mDrawBackground; }
     void SetDrawBackground(bool drawBackground);
+    auto GetCurrentMove() const { return mCurrentMove; }
+    void SetCurrentMove(CalChart::MoveMode move);
 
     CalChart::ShowMode const& GetShowMode() const;
     // nullptr if there is no animation
@@ -254,6 +256,7 @@ class CalChartDoc : public wxDocument {
     std::unique_ptr<CalChart::Show> mShow;
     std::unique_ptr<CalChart::Animation> mAnimation;
     CalChart::Select mSelect = CalChart::Select::Box;
+    CalChart::MoveMode mCurrentMove = CalChart::MoveMode::Normal;
     int mCurrentReferencePoint{};
     bool mDrawPaths{};
     bool mDrawBackground{};