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

Fix selection/undo issues when switching Presets

Browse source
This commit is contained in:
manongjohn 2021-11-11 17:42:42 -05:00
parent 46608f07ea
commit 88d6b4b1e1
2 changed files with 56 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
toonz/sources/tnztools/perspectivetool.cpp
View file

@ -208,14 +208,14 @@ PerspectiveObjectUndo::PerspectiveObjectUndo(
std::vector<PerspectiveObject *> objs, PerspectiveTool *tool)
: m_tool(tool) {
if (!m_tool) return;
m_undoData = m_tool->copyPerspectiveSet(objs);
m_undoData = m_tool->copyPerspectiveSet(objs, false);
}
//----------------------------------------------------------------------------------------------------------
void PerspectiveObjectUndo::setRedoData(std::vector<PerspectiveObject *> objs) {
if (!m_tool) return;
m_redoData = m_tool->copyPerspectiveSet(objs);
m_redoData = m_tool->copyPerspectiveSet(objs, false);
}
//----------------------------------------------------------------------------------------------------------
@ -564,7 +564,14 @@ TPropertyGroup *PerspectiveTool::getProperties(int idx) {
bool PerspectiveTool::onPropertyChanged(std::string propertyName) {
if (m_propertyUpdating) return true;
std::set<int> selectedObjects = m_selection.getSelectedObjects();
std::set<int>::iterator it;
if (propertyName == m_preset.getName()) {
for (it = selectedObjects.begin(); it != selectedObjects.end(); it++)
m_perspectiveObjs[*it]->setActive(false);
m_selection.selectNone();
if (m_preset.getValue() != CUSTOM_WSTR)
loadPreset();
else // Chose <custom>, go back to last preset
@ -585,13 +592,14 @@ bool PerspectiveTool::onPropertyChanged(std::string propertyName) {
return true;
}
std::set<int> selectedObjects = m_selection.getSelectedObjects();
std::set<int>::iterator it;
if (propertyName != m_type.getName() && selectedObjects.size() &&
m_preset.getValue() != CUSTOM_WSTR) {
m_preset.setValue(CUSTOM_WSTR);
m_lastPreset = copyPerspectiveSet(m_perspectiveObjs);
for (it = selectedObjects.begin(); it != selectedObjects.end(); it++)
m_perspectiveObjs[*it]->setActive(false);
loadLastPreset();
m_propertyUpdating = true;
@ -916,9 +924,16 @@ void PerspectiveTool::leftButtonDrag(const TPointD &pos, const TMouseEvent &e) {
if (m_selection.isEmpty() || m_mainControlIndex < 0) return;
std::set<int> selectedObjects = m_selection.getSelectedObjects();
std::set<int>::iterator it;
if (m_preset.getValue() != CUSTOM_WSTR) {
m_preset.setValue(CUSTOM_WSTR);
m_lastPreset = copyPerspectiveSet(m_perspectiveObjs);
for (it = selectedObjects.begin(); it != selectedObjects.end(); it++)
m_perspectiveObjs[*it]->setActive(false);
loadLastPreset();
m_propertyUpdating = true;
@ -1048,8 +1063,6 @@ void PerspectiveTool::leftButtonDrag(const TPointD &pos, const TMouseEvent &e) {
}
if (applyToSelection) {
std::set<int> selectedObjects = m_selection.getSelectedObjects();
std::set<int>::iterator it;
for (it = selectedObjects.begin(); it != selectedObjects.end(); it++) {
PerspectiveObject *obj = m_perspectiveObjs[*it];
if (m_isShifting)
@ -1188,9 +1201,16 @@ void PerspectiveTool::onDeactivate() {
void PerspectiveTool::deleteSelectedObjects() {
if (m_selection.isEmpty()) return;
std::set<int> selectedObjects = m_selection.getSelectedObjects();
std::set<int>::iterator it;
if (m_preset.getValue() != CUSTOM_WSTR) {
m_preset.setValue(CUSTOM_WSTR);
m_lastPreset = copyPerspectiveSet(m_perspectiveObjs);
for (it = selectedObjects.begin(); it != selectedObjects.end(); it++)
m_perspectiveObjs[*it]->setActive(false);
loadLastPreset();
m_propertyUpdating = true;
@ -1200,8 +1220,6 @@ void PerspectiveTool::deleteSelectedObjects() {
m_undo = new PerspectiveObjectUndo(m_perspectiveObjs, this);
std::set<int> selectedObjects = m_selection.getSelectedObjects();
std::set<int>::reverse_iterator rit = selectedObjects.rbegin();
for (; rit != selectedObjects.rend(); rit++) {
m_lastPreset.erase(m_lastPreset.begin() + *rit);
@ -1220,8 +1238,25 @@ void PerspectiveTool::deleteSelectedObjects() {
//----------------------------------------------------------------------------------------------
void PerspectiveTool::setPerspectiveObjects(
std::vector<PerspectiveObject *> objs) {
m_perspectiveObjs = objs;
m_selection.selectNone();
m_lastPreset = copyPerspectiveSet(m_perspectiveObjs);
m_mainControlIndex = -1;
if (m_preset.getValue() != CUSTOM_WSTR) {
m_preset.setValue(CUSTOM_WSTR);
m_propertyUpdating = true;
getApplication()->getCurrentTool()->notifyToolChanged();
m_propertyUpdating = false;
}
}
//----------------------------------------------------------------------------------------------
std::vector<PerspectiveObject *> PerspectiveTool::copyPerspectiveSet(
std::vector<PerspectiveObject *> perspectiveSet) {
std::vector<PerspectiveObject *> perspectiveSet, bool keepStatus) {
std::vector<PerspectiveObject *> copy;
std::vector<PerspectiveObject *>::iterator it;
@ -1254,6 +1289,7 @@ std::vector<PerspectiveObject *> PerspectiveTool::copyPerspectiveSet(
newObject->setHorizon(currentObject->isHorizon());
newObject->setParallel(currentObject->isParallel());
newObject->setShowAdvancedControls(PerspectiveToolAdvancedControls);
if (keepStatus) newObject->setActive(currentObject->isActive());
copy.push_back(newObject);
}
@ -1329,6 +1365,13 @@ void PerspectiveTool::removePreset() {
initPresets();
std::set<int> selectedObjects = m_selection.getSelectedObjects();
std::set<int>::iterator it;
for (it = selectedObjects.begin(); it != selectedObjects.end(); it++)
m_perspectiveObjs[*it]->setActive(false);
m_selection.selectNone();
// No parameter change, and set the preset value to custom
m_preset.setValue(CUSTOM_WSTR);
loadLastPreset();

9
toonz/sources/tnztools/perspectivetool.h
View file

@ -19,6 +19,7 @@ class SceneViewer;
class PerspectiveTool;
//--------------------------------------------------------------
enum PerspectiveType { Undefined, VanishingPoint, Line };
//************************************************************************
@ -417,17 +418,13 @@ public:
void deleteSelectedObjects();
void setPerspectiveObjects(std::vector<PerspectiveObject *> objs) {
m_perspectiveObjs = objs;
m_selection.selectNone();
m_mainControlIndex = -1;
}
void setPerspectiveObjects(std::vector<PerspectiveObject *> objs);
std::vector<PerspectiveObject *> getPerspectiveObjects() {
return m_perspectiveObjs;
}
std::vector<PerspectiveObject *> copyPerspectiveSet(
std::vector<PerspectiveObject *> perspectiveSet);
std::vector<PerspectiveObject *> perspectiveSet, bool keepStatus = true);
void invalidateControl(int controlIndex);