Wide variety of changes to make modernize CalChart.

Working towards a more unified syntax for easier reading.

Consolidating many of the ancillary data objects for the Show into the Doc to allow greater understanding on what is part of the larger show instead of transient state.
Making FieldCanvas easier to understand by changing wording and objects to be consistent (ie, lasso is a type of shape, and how to check if something is in a polygon is a freestanding object).

using auto in more places as a more modern programming technique.

Changing naming convention of files to CamelCase style that is consistent with the name of the class they are containing inside.

Author: rmpowell77

CMakeLists.txt

@@ -55,37 +55,45 @@ FLEX_TARGET (
 add_library (
   calchart_core
   STATIC
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/animate.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/animate.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimation.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimation.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimationErrors.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimationSheet.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimationSheet.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimationCommand.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimationCommand.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimationCompile.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartAnimationCompile.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartCoord.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartCoord.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartMovePointsTool.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartMovePointsTool.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartSelectTool.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartSelectTool.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartShapes.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartShapes.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/CalChartTypes.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/animate_types.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/animatecommand.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/animatecommand.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/animatecompile.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/animatecompile.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_continuity.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_continuity.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_coord.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_coord.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_drawcommand.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_fileformat.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_image.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_image.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_parse_errors.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_point.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_point.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_shapes.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_shapes.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_sheet.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_sheet.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_show.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_show.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_text.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_text.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cc_types.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cont.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/cont.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/e7_transition_solver.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/e7_transition_solver.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/core/linmath.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/math_utils.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/math_utils.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/core/modes.cpp
@@ -188,6 +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/CCOmniviewCanvas.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/CCOmniviewCanvas.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartApp.cpp
@@ -202,6 +212,8 @@ add_executable (
   ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartPreferences.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartSizes.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartSizes.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartSplash.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartSplash.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartToolBar.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartToolBar.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/CalChartView.cpp
@@ -228,6 +240,8 @@ add_executable (
   ${CMAKE_CURRENT_SOURCE_DIR}/src/FieldControlsToolBar.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/FieldThumbnailBrowser.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/FieldThumbnailBrowser.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/HostAppInterface.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/HostAppInterface.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/PointPicker.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/PointPicker.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesContCellSetup.cpp
@@ -244,20 +258,18 @@ add_executable (
   ${CMAKE_CURRENT_SOURCE_DIR}/src/PreferencesUtils.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/PrintContinuityEditor.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/PrintContinuityEditor.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PrintPostScriptDialog.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/PrintPostScriptDialog.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/SetupInstruments.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/SetupInstruments.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/SetupMarchers.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/SetupMarchers.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/TopFrame.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/TopFrame.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/TransitionSolverFrame.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/TransitionSolverFrame.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/TransitionSolverProgressFrame.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/TransitionSolverProgressFrame.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/TransitionSolverView.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/TransitionSolverView.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/background_image.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/background_image.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/basic_ui.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/basic_ui.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/cc_omniview_constants.h
@@ -268,24 +280,14 @@ add_executable (
   ${CMAKE_CURRENT_SOURCE_DIR}/src/draw.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/draw.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/draw_utils.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/field_canvas_shapes.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/field_canvas_shapes.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/ghost_module.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/ghost_module.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/linmath.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/GhostModule.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/mode_dialog.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/mode_dialog.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/mode_dialog_canvas.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/mode_dialog_canvas.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/platconf.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/precomp.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/precomp.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/print_ps_dialog.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/print_ps_dialog.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/setup_wizards.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/setup_wizards.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/single_instance_ipc.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/single_instance_ipc.h
   ${CMAKE_CURRENT_SOURCE_DIR}/src/ui_enums.h
   ${CalChartDocs}
   ${CalChartResources}

calchart_cmd/main.cpp

@@ -8,8 +8,8 @@
 
 #include "cc_show.h"
 #include "cc_sheet.h"
-#include "animate.h"
-#include "animatecompile.h"
+#include "CalChartAnimation.h"
+#include "CalChartAnimationCompile.h"
 #include "print_ps.h"
 #include "modes.h"
 #include "cont.h"

src/AnimationCanvas.cpp

@@ -23,7 +23,7 @@
 #include "AnimationCanvas.h"
 #include "AnimationView.h"
 #include "basic_ui.h"
-#include "cc_coord.h"
+#include "CalChartCoord.h"
 #include "confgr.h"
 #include "ui_enums.h"
 

src/AnimationErrorsPanel.cpp

@@ -19,9 +19,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "CalChartAnimationErrors.h"
 #include "AnimationErrorsPanel.h"
 #include "CalChartView.h"
-#include "animate_types.h"
 #include "basic_ui.h"
 
 #include <wx/artprov.h>
@@ -85,7 +85,7 @@ void AnimationErrorsPanel::OnSelectionChanged(wxTreeListEvent& event)
     }
 
     if (auto error = mErrorLookup.find(event.GetItem()); error != mErrorLookup.end()) {
-        mView->GoToSheetAndSetSelection(std::get<0>(error->second), std::get<1>(error->second));
+        mView->GoToSheetAndSetSelectionList(std::get<0>(error->second), std::get<1>(error->second));
     }
 }
 
@@ -96,7 +96,7 @@ void AnimationErrorsPanel::OnItemActivated(wxTreeListEvent& event)
     }
 
     if (auto error = mErrorLookup.find(event.GetItem()); error != mErrorLookup.end()) {
-        mView->GoToSheetAndSetSelection(std::get<0>(error->second), std::get<1>(error->second));
+        mView->GoToSheetAndSetSelectionList(std::get<0>(error->second), std::get<1>(error->second));
     }
 }
 

src/AnimationErrorsPanel.h

@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "animatecompile.h"
+#include "CalChartAnimationCompile.h"
 
 #include <map>
 #include <vector>

src/AnimationView.cpp

@@ -25,9 +25,8 @@
 #include "CalChartApp.h"
 #include "CalChartSizes.h"
 #include "CalChartView.h"
-#include "animate.h"
-#include "animate_types.h"
-#include "cc_shapes.h"
+#include "CalChartAnimation.h"
+#include "CalChartShapes.h"
 #include "cc_sheet.h"
 #include "confgr.h"
 #include "draw.h"
@@ -38,18 +37,6 @@
 #include <wx/filename.h>
 #include <wx/stdpaths.h>
 
-template <typename Float>
-static auto NormalizeAngle(Float angle)
-{
-    while (angle > 2 * M_PI) {
-        angle -= (Float)(2 * M_PI);
-    }
-    while (angle < 0.0) {
-        angle += (Float)(2 * M_PI);
-    }
-    return angle;
-}
-
 AnimationView::AnimationView(CalChartView* view, wxWindow* frame)
     : mView(view)
 {
@@ -107,12 +94,12 @@ void AnimationView::OnDrawDots(wxDC& dc, CalChartConfiguration const& config)
 {
     auto checkForCollision = mDrawCollisionWarning;
     for (auto info : mAnimation->GetAllAnimateInfo()) {
-        if (checkForCollision && info.mCollision) {
-            if (info.mCollision == CalChart::Coord::COLLISION_WARNING) {
+        if (checkForCollision && (info.mCollision != CalChart::Coord::CollisionType::none)) {
+            if (info.mCollision == CalChart::Coord::CollisionType::warning) {
                 auto brushAndPen = config.Get_CalChartBrushAndPen(COLOR_POINT_ANIM_COLLISION_WARNING);
                 dc.SetBrush(brushAndPen.first);
                 dc.SetPen(brushAndPen.second);
-            } else if (info.mCollision == CalChart::Coord::COLLISION_INTERSECT) {
+            } else if (info.mCollision == CalChart::Coord::CollisionType::intersect) {
                 auto brushAndPen = config.Get_CalChartBrushAndPen(COLOR_POINT_ANIM_COLLISION);
                 dc.SetBrush(brushAndPen.first);
                 dc.SetPen(brushAndPen.second);
@@ -308,12 +295,13 @@ void AnimationView::SelectMarchersInBox(wxPoint const& mouseStart, wxPoint const
 
     auto x_off = mView->GetShowMode().Offset().x;
     auto y_off = mView->GetShowMode().Offset().y;
-    Lasso lasso(Coord(mouseStartTranslated.x - x_off, mouseStartTranslated.y - y_off));
-    lasso.Append(Coord(mouseStartTranslated.x - x_off, mouseEndTranslated.y - y_off));
-    lasso.Append(Coord(mouseEndTranslated.x - x_off, mouseEndTranslated.y - y_off));
-    lasso.Append(Coord(mouseEndTranslated.x - x_off, mouseStartTranslated.y - y_off));
-    lasso.End();
-    mView->SelectWithLasso(&lasso, altDown);
+    auto polygon = CalChart::RawPolygon_t{
+        Coord(mouseStartTranslated.x - x_off, mouseStartTranslated.y - y_off),
+        Coord(mouseStartTranslated.x - x_off, mouseEndTranslated.y - y_off),
+        Coord(mouseEndTranslated.x - x_off, mouseEndTranslated.y - y_off),
+        Coord(mouseEndTranslated.x - x_off, mouseStartTranslated.y - y_off),
+    };
+    mView->SelectWithinPolygon(polygon, altDown);
 }
 
 // Keystroke command toggles the timer, but the timer