Extract canvas tool UI planning

2026-06-03 11:20:56 +02:00
parent 58afa672c7
commit 2087505921
8 changed files with 456 additions and 29 deletions
--- a/tools/pano_cli/main.cpp
+++ b/tools/pano_cli/main.cpp
@@ -1,6 +1,7 @@
 #include "app_core/app_preferences.h"
 #include "app_core/app_status.h"
 #include "app_core/brush_ui.h"
+#include "app_core/canvas_tool_ui.h"
 #include "app_core/document_animation.h"
 #include "app_core/document_export.h"
 #include "app_core/document_cloud.h"
@@ -284,6 +285,11 @@ struct PlanHistoryOperationArgs {
    int memory_bytes = 0;
 };

+struct PlanCanvasToolArgs {
+    std::string kind = "draw";
+    bool current_mode_draw = false;
+};
+
 struct PlanQuickOperationArgs {
    std::string kind = "brush";
    int current_index = 0;
@@ -623,6 +629,64 @@ const char* brush_ui_operation_name(pp::app::BrushUiOperation operation) noexcep
    return "stroke-settings-changed";
 }

+const char* canvas_tool_operation_name(pp::app::CanvasToolOperation operation) noexcept
+{
+    switch (operation) {
+    case pp::app::CanvasToolOperation::select_mode:
+        return "select-mode";
+    case pp::app::CanvasToolOperation::toggle_picking:
+        return "toggle-picking";
+    case pp::app::CanvasToolOperation::toggle_touch_lock:
+        return "toggle-touch-lock";
+    }
+
+    return "select-mode";
+}
+
+const char* canvas_tool_mode_name(pp::app::CanvasToolMode mode) noexcept
+{
+    switch (mode) {
+    case pp::app::CanvasToolMode::draw:
+        return "draw";
+    case pp::app::CanvasToolMode::erase:
+        return "erase";
+    case pp::app::CanvasToolMode::line:
+        return "line";
+    case pp::app::CanvasToolMode::camera:
+        return "camera";
+    case pp::app::CanvasToolMode::grid:
+        return "grid";
+    case pp::app::CanvasToolMode::copy:
+        return "copy";
+    case pp::app::CanvasToolMode::cut:
+        return "cut";
+    case pp::app::CanvasToolMode::fill:
+        return "fill";
+    case pp::app::CanvasToolMode::mask_free:
+        return "mask-free";
+    case pp::app::CanvasToolMode::mask_line:
+        return "mask-line";
+    case pp::app::CanvasToolMode::flood_fill:
+        return "bucket";
+    }
+
+    return "draw";
+}
+
+const char* canvas_tool_transform_action_name(pp::app::CanvasToolTransformAction action) noexcept
+{
+    switch (action) {
+    case pp::app::CanvasToolTransformAction::none:
+        return "none";
+    case pp::app::CanvasToolTransformAction::copy:
+        return "copy";
+    case pp::app::CanvasToolTransformAction::cut:
+        return "cut";
+    }
+
+    return "none";
+}
+
 const char* grid_ui_operation_name(pp::app::GridUiOperation operation) noexcept
 {
    switch (operation) {
@@ -940,6 +1004,7 @@ void print_help()
        << "  plan-layer-operation --kind add|duplicate|select|reorder|remove|opacity|visibility|alpha-lock|blend-mode|highlight [--layer-count N] [--index N] [--from-index N] [--to-index N] [--source-index N] [--name NAME] [--opacity N] [--blend-mode N] [--enabled]\n"
        << "  plan-animation-operation --kind add|duplicate|remove|duration|move|goto|next|prev|onion [--frame-count N] [--total-duration N] [--current-frame N] [--selected-frame N] [--current-duration N] [--delta N] [--offset N] [--onion-size N]\n"
        << "  plan-brush-operation --kind color|tip|pattern|dual|preset|settings [--path FILE] [--thumb FILE] [--r N] [--g N] [--b N] [--a N] [--no-brush]\n"
+        << "  plan-canvas-tool --kind draw|erase|line|camera|grid|copy|cut|fill|mask-free|mask-line|bucket|pick|touch-lock [--current-mode-draw]\n"
        << "  plan-grid-operation --kind pick|load|reload|clear|render|commit [--path FILE] [--no-heightmap] [--no-canvas] [--float32] [--float16] [--texture-resolution N] [--samples N]\n"
        << "  plan-history-operation --kind undo|redo|clear [--undo-count N] [--redo-count N] [--memory-bytes N]\n"
        << "  plan-quick-operation --kind brush|color|restore|reset [--current-index N] [--slot-index N] [--brush-index N] [--color-index N] [--slot-count N] [--fire-event]\n"
@@ -2981,6 +3046,119 @@ int plan_brush_operation(int argc, char** argv)
    return 0;
 }

+pp::foundation::Status parse_plan_canvas_tool_args(
+    int argc,
+    char** argv,
+    PlanCanvasToolArgs& args)
+{
+    for (int i = 2; i < argc; ++i) {
+        const std::string_view key(argv[i]);
+        if (key == "--kind") {
+            if (i + 1 >= argc) {
+                return pp::foundation::Status::invalid_argument("missing value for option");
+            }
+            args.kind = argv[++i];
+        } else if (key == "--current-mode-draw") {
+            args.current_mode_draw = true;
+        } else {
+            return pp::foundation::Status::invalid_argument("unknown option");
+        }
+    }
+
+    return pp::foundation::Status::success();
+}
+
+pp::foundation::Result<pp::app::CanvasToolPlan> make_canvas_tool_plan(const PlanCanvasToolArgs& args)
+{
+    if (args.kind == "pick") {
+        return pp::foundation::Result<pp::app::CanvasToolPlan>::success(
+            pp::app::plan_canvas_tool_pick_toggle(args.current_mode_draw));
+    }
+    if (args.kind == "touch-lock") {
+        return pp::foundation::Result<pp::app::CanvasToolPlan>::success(
+            pp::app::plan_canvas_tool_touch_lock_toggle());
+    }
+    if (args.kind == "draw") {
+        return pp::foundation::Result<pp::app::CanvasToolPlan>::success(
+            pp::app::plan_canvas_tool_select(pp::app::CanvasToolMode::draw));
+    }
+    if (args.kind == "erase") {
+        return pp::foundation::Result<pp::app::CanvasToolPlan>::success(
+            pp::app::plan_canvas_tool_select(pp::app::CanvasToolMode::erase));
+    }
+    if (args.kind == "line") {
+        return pp::foundation::Result<pp::app::CanvasToolPlan>::success(
+            pp::app::plan_canvas_tool_select(pp::app::CanvasToolMode::line));
+    }
+    if (args.kind == "camera") {
+        return pp::foundation::Result<pp::app::CanvasToolPlan>::success(
+            pp::app::plan_canvas_tool_select(pp::app::CanvasToolMode::camera));
+    }
+    if (args.kind == "grid") {
+        return pp::foundation::Result<pp::app::CanvasToolPlan>::success(
+            pp::app::plan_canvas_tool_select(pp::app::CanvasToolMode::grid));
+    }
+    if (args.kind == "copy") {
+        return pp::foundation::Result<pp::app::CanvasToolPlan>::success(
+            pp::app::plan_canvas_tool_select(pp::app::CanvasToolMode::copy));
+    }
+    if (args.kind == "cut") {
+        return pp::foundation::Result<pp::app::CanvasToolPlan>::success(
+            pp::app::plan_canvas_tool_select(pp::app::CanvasToolMode::cut));
+    }
+    if (args.kind == "fill") {
+        return pp::foundation::Result<pp::app::CanvasToolPlan>::success(
+            pp::app::plan_canvas_tool_select(pp::app::CanvasToolMode::fill));
+    }
+    if (args.kind == "mask-free") {
+        return pp::foundation::Result<pp::app::CanvasToolPlan>::success(
+            pp::app::plan_canvas_tool_select(pp::app::CanvasToolMode::mask_free));
+    }
+    if (args.kind == "mask-line") {
+        return pp::foundation::Result<pp::app::CanvasToolPlan>::success(
+            pp::app::plan_canvas_tool_select(pp::app::CanvasToolMode::mask_line));
+    }
+    if (args.kind == "bucket") {
+        return pp::foundation::Result<pp::app::CanvasToolPlan>::success(
+            pp::app::plan_canvas_tool_select(pp::app::CanvasToolMode::flood_fill));
+    }
+
+    return pp::foundation::Result<pp::app::CanvasToolPlan>::failure(
+        pp::foundation::Status::invalid_argument("unknown canvas tool kind"));
+}
+
+int plan_canvas_tool(int argc, char** argv)
+{
+    PlanCanvasToolArgs args;
+    const auto status = parse_plan_canvas_tool_args(argc, argv, args);
+    if (!status.ok()) {
+        print_error("plan-canvas-tool", status.message);
+        return 2;
+    }
+
+    const auto plan = make_canvas_tool_plan(args);
+    if (!plan) {
+        print_error("plan-canvas-tool", plan.status().message);
+        return 2;
+    }
+
+    const auto& value = plan.value();
+    std::cout << "{\"ok\":true,\"command\":\"plan-canvas-tool\""
+              << ",\"state\":{\"kind\":\"" << json_escape(args.kind)
+              << "\",\"currentModeDraw\":" << json_bool(args.current_mode_draw)
+              << "},\"plan\":{\"operation\":\"" << canvas_tool_operation_name(value.operation)
+              << "\",\"mode\":\"" << canvas_tool_mode_name(value.mode)
+              << "\",\"transformAction\":\"" << canvas_tool_transform_action_name(value.transform_action)
+              << "\",\"selectsToolbarButton\":" << json_bool(value.selects_toolbar_button)
+              << ",\"updatesCanvasMode\":" << json_bool(value.updates_canvas_mode)
+              << ",\"togglesPicking\":" << json_bool(value.toggles_picking)
+              << ",\"togglesTouchLock\":" << json_bool(value.toggles_touch_lock)
+              << ",\"requiresDrawMode\":" << json_bool(value.requires_draw_mode)
+              << ",\"noOp\":" << json_bool(value.no_op)
+              << "}}\n";
+    return 0;
+}
+
 pp::foundation::Status parse_plan_grid_operation_args(
    int argc,
    char** argv,
@@ -5725,6 +5903,10 @@ int main(int argc, char** argv)
        return plan_brush_operation(argc, argv);
    }

+    if (command == "plan-canvas-tool") {
+        return plan_canvas_tool(argc, argv);
+    }
+
    if (command == "plan-grid-operation") {
        return plan_grid_operation(argc, argv);
    }