razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Save and restore Pinch Tool's Corner, Manual and Size settings

Browse source
This commit is contained in:
manongjohn 2023-09-23 12:20:55 -04:00
parent a570eb8442
commit af62c0f063
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/include/tools/pinchtool.h
View file

@ -37,6 +37,7 @@ class StrokeDeformation;
class DVAPI PinchTool : public TTool {
Q_DECLARE_TR_FUNCTIONS(PinchTool)
bool m_firstTime;
TMouseEvent m_lastMouseEvent;
ToonzExt::StrokeDeformation *m_deformation;
ToonzExt::ContextStatus m_status;
@ -88,6 +89,7 @@ public:
bool keyDown(QKeyEvent *) override;
bool onPropertyChanged(std::string propertyName) override;
void onActivate() override;
void onDeactivate() override;

28
toonz/sources/tnztools/pinchtool.cpp
View file

@ -32,6 +32,7 @@
#include "tstream.h"
#include "tstrokeutil.h"
#include "tthreadmessage.h"
#include "tenv.h"
#include "tools/pinchtool.h"
#include "toonz/tobjecthandle.h"
@ -49,6 +50,10 @@
#include <memory>
#include <algorithm>
TEnv::DoubleVar PinchCorner("PinchToolCorner", 160.0);
TEnv::IntVar PinchManual("PinchToolManual", 0);
TEnv::DoubleVar PinchSize("PinchToolSize", 500.0);
using namespace ToolUtils;
using namespace ToonzExt;
@ -78,7 +83,8 @@ PinchTool::PinchTool()
160.0) // W_ToolOptions_PinchCorner
, m_autoOrManual("Manual", false) // W_ToolOptions_PinchManual
, m_deformation(new ToonzExt::StrokeDeformation)
, m_selector(500, 10, 1000) {
, m_selector(500, 10, 1000)
, m_firstTime(false) {
bind(TTool::Vectors);
m_toolRange.setNonLinearSlider();
@ -563,7 +569,27 @@ bool PinchTool::moveCursor(const TPointD &pos) {
//-----------------------------------------------------------------------------
bool PinchTool::onPropertyChanged(std::string propertyName) {
if (propertyName == m_toolRange.getName())
PinchSize = m_toolRange.getValue();
else if (propertyName == m_toolCornerSize.getName())
PinchCorner = m_toolCornerSize.getValue();
else if (propertyName == m_autoOrManual.getName())
PinchManual = (int)m_autoOrManual.getValue();
else
return false;
return true;
}
//-----------------------------------------------------------------------------
void PinchTool::onActivate() {
if (!m_firstTime) {
m_firstTime = true;
m_toolRange.setValue(PinchSize);
m_toolCornerSize.setValue(PinchCorner);
m_autoOrManual.setValue(PinchManual ? 1 : 0);
}
// getApplication()->editImageOrSpline();
// TNotifier::instance()->attach(this);
// per sicurezza