Merge pull request #4698 from manongjohn/flip_and_rotate_toolbar_options

Flip and rotate toolbar options

toonz/sources/include/tools/tooloptions.h

@@ -254,6 +254,10 @@ class ArrowToolOptionsBox final : public ToolOptionsBox {
 
   ToolOptionCheckbox *m_globalKey;
 
+  // Flip buttons
+  QPushButton *m_hFlipButton, *m_vFlipButton, *m_leftRotateButton,
+      *m_rightRotateButton;
+
   // enables adjusting value by dragging on the label
   void connectLabelAndField(ClickableLabel *label, MeasuredValueField *field);
 
@@ -282,6 +286,11 @@ protected slots:
   void onCurrentStageObjectComboActivated(int index);
 
   void onCurrentAxisChanged(int);
+
+  void onFlipHorizontal();
+  void onFlipVertical();
+  void onRotateLeft();
+  void onRotateRight();
 };
 
 //=============================================================================
@@ -378,6 +387,9 @@ class SelectionToolOptionsBox final : public ToolOptionsBox,
   ToolOptionPopupButton *m_joinStyle;
   ToolOptionIntSlider *m_miterField;
 
+  QPushButton *m_hFlipButton, *m_vFlipButton, *m_leftRotateButton,
+      *m_rightRotateButton;
+
 public:
   SelectionToolOptionsBox(QWidget *parent, TTool *tool,
                           TPaletteHandle *pltHandle, ToolHandle *toolHandle);
@@ -391,6 +403,10 @@ protected slots:
   void onScaleXValueChanged(bool addToUndo = true);
   void onScaleYValueChanged(bool addToUndo = true);
   void onSetSaveboxCheckboxChanged(bool);
+  void onFlipHorizontal();
+  void onFlipVertical();
+  void onRotateLeft();
+  void onRotateRight();
 };
 
 //=============================================================================

toonz/sources/tnztools/CMakeLists.txt

@@ -9,6 +9,8 @@ set(MOC_HEADERS
     tooloptionscontrols.h
     toonzrasterbrushtool.h
     viewtools.h
+    selectiontool.h
+    edittool.h
     controlpointeditortool.h
     ../include/tools/imagegrouping.h
     ../include/tools/screenpicker.h
@@ -25,7 +27,6 @@ set(HEADERS
     rasterselectiontool.h
     rgbpickertool.h
     rulertool.h
-    selectiontool.h
     setsaveboxtool.h
     shifttracetool.h
     stylepickertool.h

toonz/sources/tnztools/edittool.cpp

@@ -1,5 +1,6 @@
 
 
+#include "edittool.h"
 #include "tools/tool.h"
 #include "tools/cursors.h"
 #include "tproperty.h"
@@ -636,134 +637,6 @@ bool hasVisibleChildColumn(const TStageObject *obj, const TXsheet *xsh) {
 }  // namespace
 //-----------------------------------------------------------------------------
 
-//=============================================================================
-// EditTool
-//-----------------------------------------------------------------------------
-
-class EditTool final : public TTool {
-  Q_DECLARE_TR_FUNCTIONS(EditTool)
-
-  DragTool *m_dragTool;
-
-  bool m_firstTime;
-
-  enum {
-    None        = -1,
-    Translation = 1,
-    Rotation,
-    Scale,
-    ScaleX,
-    ScaleY,
-    ScaleXY,
-    Center,
-    ZTranslation,
-    Shear,
-  };
-
-  // DragInfo m_dragInfo;
-
-  TPointD m_lastPos;
-  TPointD m_curPos;
-  TPointD m_firstPos;
-  TPointD m_curCenter;
-
-  bool m_active;
-  bool m_keyFrameAdded;
-  int m_what;
-  int m_highlightedDevice;
-
-  double m_oldValues[2];
-
-  double m_currentScaleFactor;
-  FxGadgetController *m_fxGadgetController;
-
-  bool m_isAltPressed;
-
-  TEnumProperty m_scaleConstraint;
-  TEnumProperty m_autoSelect;
-  TBoolProperty m_globalKeyframes;
-
-  TBoolProperty m_lockCenterX;
-  TBoolProperty m_lockCenterY;
-  TBoolProperty m_lockPositionX;
-  TBoolProperty m_lockPositionY;
-  TBoolProperty m_lockRotation;
-  TBoolProperty m_lockShearH;
-  TBoolProperty m_lockShearV;
-  TBoolProperty m_lockScaleH;
-  TBoolProperty m_lockScaleV;
-  TBoolProperty m_lockGlobalScale;
-
-  TBoolProperty m_showEWNSposition;
-  TBoolProperty m_showZposition;
-  TBoolProperty m_showSOposition;
-  TBoolProperty m_showRotation;
-  TBoolProperty m_showGlobalScale;
-  TBoolProperty m_showHVscale;
-  TBoolProperty m_showShear;
-  TBoolProperty m_showCenterPosition;
-
-  TEnumProperty m_activeAxis;
-
-  TPropertyGroup m_prop;
-
-  void drawMainHandle();
-  void onEditAllLeftButtonDown(TPointD &pos, const TMouseEvent &e);
-
-public:
-  EditTool();
-  ~EditTool();
-
-  ToolType getToolType() const override { return TTool::ColumnTool; }
-
-  bool doesApply() const;  // ritorna vero se posso deformare l'oggetto corrente
-  void saveOldValues();
-  bool transformEnabled() const;
-
-  const TStroke *getSpline() const;
-
-  void rotate();
-  void move();
-  void moveCenter();
-  void scale();
-  void isoScale();
-  void squeeze();
-  void shear(const TPointD &pos, bool single);
-
-  void updateTranslation() override;
-
-  void leftButtonDown(const TPointD &pos, const TMouseEvent &) override;
-  void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override;
-  void leftButtonUp(const TPointD &pos, const TMouseEvent &) override;
-
-  void mouseMove(const TPointD &, const TMouseEvent &e) override;
-
-  void draw() override;
-
-  void transform(const TAffine &aff);
-
-  void onActivate() override;
-  void onDeactivate() override;
-  bool onPropertyChanged(std::string propertyName) override;
-
-  void computeBBox();
-
-  int getCursorId() const override;
-
-  TPropertyGroup *getProperties(int targetType) override { return &m_prop; }
-
-  void updateMatrix() override {
-    setMatrix(
-        getCurrentObjectParentMatrix2());  // getCurrentObjectParentMatrix());
-  }
-
-  void drawText(const TPointD &p, double unit, std::string text);
-
-  QString updateEnabled(int rowIndex, int columnIndex) override;
-};
-
-//-----------------------------------------------------------------------------
-
 EditTool::EditTool()
     : TTool("T_Edit")
     , m_active(false)

toonz/sources/tnztools/edittool.h

@@ -0,0 +1,147 @@
+#pragma once
+
+#ifndef EDITTOOL_INCLUDED
+#define EDITTOOL_INCLUDED
+
+#include "tool.h"
+#include "tproperty.h"
+#include "edittoolgadgets.h"
+
+// For Qt translation support
+#include <QCoreApplication>
+
+using EditToolGadgets::DragTool;
+
+//=============================================================================
+// EditTool
+//-----------------------------------------------------------------------------
+
+class EditTool final : public QObject, public TTool {
+  Q_OBJECT
+
+  DragTool* m_dragTool;
+
+  bool m_firstTime;
+
+  enum {
+    None        = -1,
+    Translation = 1,
+    Rotation,
+    Scale,
+    ScaleX,
+    ScaleY,
+    ScaleXY,
+    Center,
+    ZTranslation,
+    Shear,
+  };
+
+  // DragInfo m_dragInfo;
+
+  TPointD m_lastPos;
+  TPointD m_curPos;
+  TPointD m_firstPos;
+  TPointD m_curCenter;
+
+  bool m_active;
+  bool m_keyFrameAdded;
+  int m_what;
+  int m_highlightedDevice;
+
+  double m_oldValues[2];
+
+  double m_currentScaleFactor;
+  FxGadgetController* m_fxGadgetController;
+
+  bool m_isAltPressed;
+
+  TEnumProperty m_scaleConstraint;
+  TEnumProperty m_autoSelect;
+  TBoolProperty m_globalKeyframes;
+
+  TBoolProperty m_lockCenterX;
+  TBoolProperty m_lockCenterY;
+  TBoolProperty m_lockPositionX;
+  TBoolProperty m_lockPositionY;
+  TBoolProperty m_lockRotation;
+  TBoolProperty m_lockShearH;
+  TBoolProperty m_lockShearV;
+  TBoolProperty m_lockScaleH;
+  TBoolProperty m_lockScaleV;
+  TBoolProperty m_lockGlobalScale;
+
+  TBoolProperty m_showEWNSposition;
+  TBoolProperty m_showZposition;
+  TBoolProperty m_showSOposition;
+  TBoolProperty m_showRotation;
+  TBoolProperty m_showGlobalScale;
+  TBoolProperty m_showHVscale;
+  TBoolProperty m_showShear;
+  TBoolProperty m_showCenterPosition;
+
+  TEnumProperty m_activeAxis;
+
+  TPropertyGroup m_prop;
+
+  void drawMainHandle();
+  void onEditAllLeftButtonDown(TPointD& pos, const TMouseEvent& e);
+
+public:
+  EditTool();
+  ~EditTool();
+
+  ToolType getToolType() const override { return TTool::ColumnTool; }
+
+  bool doesApply() const;  // ritorna vero se posso deformare l'oggetto corrente
+  void saveOldValues();
+  bool transformEnabled() const;
+
+  const TStroke* getSpline() const;
+
+  void rotate();
+  void move();
+  void moveCenter();
+  void scale();
+  void isoScale();
+  void squeeze();
+  void shear(const TPointD& pos, bool single);
+
+  void updateTranslation() override;
+
+  void leftButtonDown(const TPointD& pos, const TMouseEvent&) override;
+  void leftButtonDrag(const TPointD& pos, const TMouseEvent&) override;
+  void leftButtonUp(const TPointD& pos, const TMouseEvent&) override;
+
+  void mouseMove(const TPointD&, const TMouseEvent& e) override;
+
+  void draw() override;
+
+  void transform(const TAffine& aff);
+
+  void onActivate() override;
+  void onDeactivate() override;
+  bool onPropertyChanged(std::string propertyName) override;
+
+  void computeBBox();
+
+  int getCursorId() const override;
+
+  TPropertyGroup* getProperties(int targetType) override { return &m_prop; }
+
+  void updateMatrix() override {
+    setMatrix(
+        getCurrentObjectParentMatrix2());  // getCurrentObjectParentMatrix());
+  }
+
+  void drawText(const TPointD& p, double unit, std::string text);
+
+  QString updateEnabled(int rowIndex, int columnIndex) override;
+
+signals:
+  void clickFlipHorizontal();
+  void clickFlipVertical();
+  void clickRotateLeft();
+  void clickRotateRight();
+};
+
+#endif  // EDITTOOL_INCLUDED

toonz/sources/tnztools/selectiontool.h

@@ -322,8 +322,8 @@ DragSelectionTool::DragTool *createNewScaleTool(
 // SelectionTool
 //-----------------------------------------------------------------------------
 
-class SelectionTool : public TTool, public TSelection::View {
-  Q_DECLARE_TR_FUNCTIONS(SelectionTool)
+class SelectionTool : public QObject, public TTool, public TSelection::View {
+  Q_OBJECT
 
 protected:
   bool m_firstTime;
@@ -467,6 +467,12 @@ class SelectionTool : public TTool, public TSelection::View {
   bool isEventAcceptable(QEvent *e) override;
 
   virtual bool isSelectionEditable() { return true; }
+
+signals:
+  void clickFlipHorizontal();
+  void clickFlipVertical();
+  void clickRotateLeft();
+  void clickRotateRight();
 };
 
 #endif  // SELECTIONTOOL_INCLUDED