Skip to content

Commit 57074fa

Browse files
MrStevnsMrStevns
committed
Implement TransformTool and TransformOptionsWidget
Which would be used for both settings related to selection tool and move tool.
1 parent 8512330 commit 57074fa

20 files changed

+314
-50
lines changed

‎app/app.pro

+5-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ HEADERS += \
124124
src/commandlineexporter.h \
125125
src/statusbar.h \
126126
src/elidedlabel.h \
127-
src/cameraoptionswidget.h
127+
src/cameraoptionswidget.h \
128+
src/transformoptionswidget.h
128129

129130
SOURCES += \
130131
src/addtransparencytopaperdialog.cpp \
@@ -177,9 +178,11 @@ SOURCES += \
177178
src/commandlineexporter.cpp \
178179
src/statusbar.cpp \
179180
src/elidedlabel.cpp \
180-
src/cameraoptionswidget.cpp
181+
src/cameraoptionswidget.cpp \
182+
src/transformoptionswidget.cpp
181183

182184
FORMS += \
185+
src/transformoptionswidget.ui \
183186
ui/strokeoptionswidget.ui \
184187
ui/addtransparencytopaperdialog.ui \
185188
ui/cameraoptionswidget.ui \

‎app/src/strokeoptionswidget.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ StrokeOptionsWidget::~StrokeOptionsWidget()
3131

3232
void StrokeOptionsWidget::initUI()
3333
{
34-
QSettings settings(PENCIL2D, PENCIL2D);
35-
3634
ui->sizeSlider->init(tr("Width"), SpinSlider::EXPONENT, SpinSlider::INTEGER, StrokeTool::WIDTH_MIN, StrokeTool::WIDTH_MAX);
3735
ui->featherSlider->init(tr("Feather"), SpinSlider::LOG, SpinSlider::INTEGER, StrokeTool::FEATHER_MIN, StrokeTool::FEATHER_MAX);
3836

@@ -286,6 +284,7 @@ void StrokeOptionsWidget::setAA(int x)
286284

287285
void StrokeOptionsWidget::setStabilizerLevel(int x)
288286
{
287+
QSignalBlocker b(ui->inpolLevelsCombo);
289288
ui->inpolLevelsCombo->setCurrentIndex(qBound(0, x, ui->inpolLevelsCombo->count() - 1));
290289
}
291290

‎app/src/tooloptionwidget.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ GNU General Public License for more details.
2323
#include "cameraoptionswidget.h"
2424
#include "bucketoptionswidget.h"
2525
#include "strokeoptionswidget.h"
26+
#include "transformoptionswidget.h"
2627
#include "spinslider.h"
2728
#include "editor.h"
2829
#include "util.h"
@@ -52,9 +53,11 @@ void ToolOptionWidget::initUI()
5253
mBucketOptionsWidget = new BucketOptionsWidget(editor(), this);
5354
mCameraOptionsWidget = new CameraOptionsWidget(editor(), this);
5455
mStrokeOptionsWidget = new StrokeOptionsWidget(editor(), this);
56+
mTransformOptionsWidget = new TransformOptionsWidget(editor(), this);
5557
ui->scrollAreaWidgetContents->layout()->addWidget(mBucketOptionsWidget);
5658
ui->scrollAreaWidgetContents->layout()->addWidget(mCameraOptionsWidget);
5759
ui->scrollAreaWidgetContents->layout()->addWidget(mStrokeOptionsWidget);
60+
ui->scrollAreaWidgetContents->layout()->addWidget(mTransformOptionsWidget);
5861
ui->scrollAreaWidgetContents->layout()->addItem(new QSpacerItem(0, 0, QSizePolicy::MinimumExpanding, QSizePolicy::Expanding));
5962

6063
makeConnectionToEditor(editor());
@@ -86,6 +89,8 @@ void ToolOptionWidget::setWidgetVisibility(BaseTool* tool)
8689
mCameraOptionsWidget->updateUI();
8790
mStrokeOptionsWidget->setVisible(tool->category() == STROKETOOL);
8891
mStrokeOptionsWidget->updateUI();
92+
mTransformOptionsWidget->setVisible(tool->category() == TRANSFORMTOOL);
93+
mTransformOptionsWidget->updateUI();
8994
}
9095

9196
void ToolOptionWidget::onLayerChanged(int layerIndex)

‎app/src/tooloptionwidget.h

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class BaseTool;
3030
class BucketOptionsWidget;
3131
class CameraOptionsWidget;
3232
class StrokeOptionsWidget;
33+
class TransformOptionsWidget;
3334

3435
class ToolOptionWidget : public BaseDockWidget
3536
{
@@ -56,6 +57,7 @@ public slots:
5657
BucketOptionsWidget* mBucketOptionsWidget = nullptr;
5758
CameraOptionsWidget* mCameraOptionsWidget = nullptr;
5859
StrokeOptionsWidget* mStrokeOptionsWidget = nullptr;
60+
TransformOptionsWidget* mTransformOptionsWidget = nullptr;
5961
};
6062

6163
#endif // TOOLOPTIONDOCKWIDGET_H

‎app/src/transformoptionswidget.cpp

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
/*
2+
3+
Pencil2D - Traditional Animation Software
4+
Copyright (C) 2005-2007 Patrick Corrieri & Pascal Naidon
5+
Copyright (C) 2012-2020 Matthew Chiawen Chang
6+
7+
This program is free software; you can redistribute it and/or
8+
modify it under the terms of the GNU General Public License
9+
as published by the Free Software Foundation; version 2 of the License.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
*/
17+
#include "transformoptionswidget.h"
18+
#include "ui_transformoptionswidget.h"
19+
20+
#include "editor.h"
21+
#include "toolmanager.h"
22+
#include "transformtool.h""
23+
24+
TransformOptionsWidget::TransformOptionsWidget(Editor* editor, QWidget *parent) :
25+
QWidget(parent),
26+
ui(new Ui::TransformOptionsWidget), mEditor(editor)
27+
{
28+
ui->setupUi(this);
29+
initUI();
30+
}
31+
32+
TransformOptionsWidget::~TransformOptionsWidget()
33+
{
34+
delete ui;
35+
}
36+
37+
void TransformOptionsWidget::initUI()
38+
{
39+
makeConnectionsFromUIToModel();
40+
}
41+
42+
void TransformOptionsWidget::updateUI()
43+
{
44+
if (!isVisible()) {
45+
return;
46+
}
47+
48+
BaseTool* currentTool = mEditor->tools()->currentTool();
49+
if (currentTool->category() != TRANSFORMTOOL) { return; }
50+
51+
updateToolConnections(currentTool);
52+
const TransformSettings* selectP = static_cast<const TransformSettings*>(currentTool->settings());
53+
54+
if (currentTool->isPropertyEnabled(TransformSettings::SHOWSELECTIONINFO_ON)) {
55+
setShowSelectionInfo(selectP->showSelectionInfo());
56+
}
57+
}
58+
59+
void TransformOptionsWidget::updateToolConnections(BaseTool* tool)
60+
{
61+
if (mTransformTool) {
62+
disconnect(mTransformTool, nullptr, this, nullptr);
63+
}
64+
65+
mTransformTool = static_cast<TransformTool*>(tool);
66+
67+
makeConnectionFromModelToUI(mTransformTool);
68+
}
69+
70+
void TransformOptionsWidget::makeConnectionsFromUIToModel()
71+
{
72+
connect(ui->showSelectionInfoCheckBox, &QCheckBox::clicked, this, [=](bool isOn) {
73+
mTransformTool->setShowSelectionInfo(isOn);
74+
});
75+
}
76+
77+
void TransformOptionsWidget::makeConnectionFromModelToUI(TransformTool* transformTool)
78+
{
79+
connect(transformTool, &TransformTool::showSelectionInfoChanged, this, &TransformOptionsWidget::setShowSelectionInfo);
80+
}
81+
82+
void TransformOptionsWidget::setShowSelectionInfo(bool isOn)
83+
{
84+
QSignalBlocker b(ui->showSelectionInfoCheckBox);
85+
ui->showSelectionInfoCheckBox->setChecked(isOn);
86+
}

‎app/src/transformoptionswidget.h

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/*
2+
3+
Pencil2D - Traditional Animation Software
4+
Copyright (C) 2005-2007 Patrick Corrieri & Pascal Naidon
5+
Copyright (C) 2012-2020 Matthew Chiawen Chang
6+
7+
This program is free software; you can redistribute it and/or
8+
modify it under the terms of the GNU General Public License
9+
as published by the Free Software Foundation; version 2 of the License.
10+
11+
This program is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
*/
17+
#ifndef TRANSFORMOPTIONSWIDGET_H
18+
#define TRANSFORMOPTIONSWIDGET_H
19+
20+
#include <QWidget>
21+
22+
#include "toolsettings.h"
23+
24+
class TransformTool;
25+
class Editor;
26+
namespace Ui {
27+
class TransformOptionsWidget;
28+
}
29+
30+
class TransformOptionsWidget : public QWidget
31+
{
32+
Q_OBJECT
33+
34+
public:
35+
explicit TransformOptionsWidget(Editor* editor, QWidget *parent = nullptr);
36+
~TransformOptionsWidget();
37+
38+
void initUI();
39+
void updateUI();
40+
void makeConnectionsFromUIToModel();
41+
void makeConnectionFromModelToUI(TransformTool* transformTool);
42+
43+
private:
44+
45+
void updateToolConnections(BaseTool* tool);
46+
void setShowSelectionInfo(bool isOn);
47+
48+
Ui::TransformOptionsWidget *ui;
49+
50+
TransformTool* mTransformTool = nullptr;
51+
Editor* mEditor = nullptr;
52+
};
53+
54+
#endif // TRANSFORMOPTIONSWIDGET_H

‎app/src/transformoptionswidget.ui

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>TransformOptionsWidget</class>
4+
<widget class="QWidget" name="TransformOptionsWidget">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>400</width>
10+
<height>300</height>
11+
</rect>
12+
</property>
13+
<property name="windowTitle">
14+
<string>Form</string>
15+
</property>
16+
<layout class="QVBoxLayout" name="verticalLayout">
17+
<property name="leftMargin">
18+
<number>0</number>
19+
</property>
20+
<property name="topMargin">
21+
<number>0</number>
22+
</property>
23+
<property name="rightMargin">
24+
<number>0</number>
25+
</property>
26+
<property name="bottomMargin">
27+
<number>0</number>
28+
</property>
29+
<item>
30+
<layout class="QVBoxLayout" name="verticalLayout_2">
31+
<property name="topMargin">
32+
<number>0</number>
33+
</property>
34+
<item>
35+
<widget class="QCheckBox" name="showSelectionInfoCheckBox">
36+
<property name="toolTip">
37+
<string>Enable or disable feathering</string>
38+
</property>
39+
<property name="text">
40+
<string>Show Size and Diff.</string>
41+
</property>
42+
</widget>
43+
</item>
44+
</layout>
45+
</item>
46+
</layout>
47+
</widget>
48+
<resources/>
49+
<connections/>
50+
</ui>

‎core_lib/core_lib.pro

+2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ HEADERS += \
8989
src/tool/strokeinterpolator.h \
9090
src/tool/stroketool.h \
9191
src/tool/toolsettings.h \
92+
src/tool/transformtool.h \
9293
src/util/blitrect.h \
9394
src/util/cameraeasingtype.h \
9495
src/util/camerafieldoption.h \
@@ -176,6 +177,7 @@ SOURCES += src/graphics/bitmap/bitmapimage.cpp \
176177
src/tool/smudgetool.cpp \
177178
src/tool/strokeinterpolator.cpp \
178179
src/tool/stroketool.cpp \
180+
src/tool/transformtool.cpp \
179181
src/util/blitrect.cpp \
180182
src/util/cameraeasingtype.cpp \
181183
src/util/fileformat.cpp \

‎core_lib/src/interface/scribblearea.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -1033,12 +1033,10 @@ void ScribbleArea::paintSelectionVisuals(QPainter &painter)
10331033

10341034
TransformParameters params = { currentSelectionRect, editor()->view()->getView(), selectMan->selectionTransform() };
10351035

1036-
// TODO: this should not use SELECT tool specifically.. we need to fetch this from SELECT or move tool respectively
1037-
// consider creating a TRANSFORM tool category.
10381036
mSelectionPainter.paint(painter,
10391037
object,
10401038
mEditor->currentLayerIndex(),
1041-
static_cast<const SelectionSettings*>(editor()->tools()->getTool(SELECT)->settings()),
1039+
static_cast<const TransformSettings*>(editor()->tools()->getTool(TRANSFORMTOOL)->settings()),
10421040
params);
10431041
emit selectionUpdated();
10441042
}

‎core_lib/src/managers/toolmanager.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ BaseTool* ToolManager::getTool(ToolType eToolType)
102102
BaseTool* ToolManager::getTool(ToolCategory eToolCategory)
103103
{
104104
switch (eToolCategory) {
105+
case ToolCategory::TRANSFORMTOOL:
105106
case ToolCategory::STROKETOOL: {
106107
if (currentTool()->category() == eToolCategory) {
107108
return currentTool();

‎core_lib/src/selectionpainter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SelectionPainter::SelectionPainter()
2626
void SelectionPainter::paint(QPainter& painter,
2727
const Object* object,
2828
int layerIndex,
29-
const SelectionSettings* toolProperties,
29+
const TransformSettings* toolProperties,
3030
TransformParameters& tParams)
3131
{
3232
Layer* layer = object->getLayer(layerIndex);

‎core_lib/src/selectionpainter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class SelectionPainter
3939
public:
4040
SelectionPainter();
4141

42-
void paint(QPainter& painter, const Object* object, int layerIndex, const SelectionSettings* toolProperties, TransformParameters& transformParameters);
42+
void paint(QPainter& painter, const Object* object, int layerIndex, const TransformSettings* toolProperties, TransformParameters& transformParameters);
4343

4444
private:
4545
void paintSelectionInfo(QPainter& painter, const QTransform& mergedTransform, const QTransform& viewTransform, const QRectF& selectionRect, const QPolygonF& projectedPolygonF);

‎core_lib/src/tool/movetool.cpp

+4-15
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ GNU General Public License for more details.
3535
#include "mathutils.h"
3636
#include "vectorimage.h"
3737

38-
MoveTool::MoveTool(QObject* parent) : BaseTool(parent)
38+
MoveTool::MoveTool(QObject* parent) : TransformTool(parent)
3939
{
4040
}
4141

@@ -44,21 +44,15 @@ ToolType MoveTool::type() const
4444
return MOVE;
4545
}
4646

47-
void MoveTool::createSettings(ToolSettings*)
48-
{
49-
mSettings = new SelectionSettings();
50-
BaseTool::createSettings(mSettings);
51-
}
52-
5347
void MoveTool::loadSettings()
5448
{
5549
mRotationIncrement = mEditor->preference()->getInt(SETTING::ROTATION_INCREMENT);
5650
QSettings settings(PENCIL2D, PENCIL2D);
5751

58-
mPropertyUsed[SelectionSettings::SHOWSELECTIONINFO_ON] = { Layer::BITMAP, Layer::VECTOR };
52+
mPropertyUsed[TransformSettings::SHOWSELECTIONINFO_ON] = { Layer::BITMAP, Layer::VECTOR };
5953
QHash<int, PropertyInfo> info;
6054

61-
info[SelectionSettings::SHOWSELECTIONINFO_ON] = false;
55+
info[TransformSettings::SHOWSELECTIONINFO_ON] = false;
6256
mSettings->load(typeName(), settings, info);
6357

6458
connect(mEditor->preference(), &PreferenceManager::optionChanged, this, &MoveTool::updateSettings);
@@ -328,7 +322,7 @@ void MoveTool::applyTransformation()
328322

329323
bool MoveTool::leavingThisTool()
330324
{
331-
BaseTool::leavingThisTool();
325+
TransformTool::leavingThisTool();
332326

333327
if (currentPaintableLayer())
334328
{
@@ -342,11 +336,6 @@ bool MoveTool::isActive() const {
342336
(mEditor->select()->somethingSelected() || mEditor->overlays()->getMoveMode() != MoveMode::NONE);
343337
}
344338

345-
void MoveTool::setShowSelectionInfo(bool b)
346-
{
347-
mSettings->setBaseValue(SelectionSettings::SHOWSELECTIONINFO_ON, b);
348-
}
349-
350339
Layer* MoveTool::currentPaintableLayer()
351340
{
352341
Layer* layer = mEditor->layers()->currentLayer();

0 commit comments

Comments
 (0)