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

Merge remote-tracking branch 'upstream/master' into stop_motion_improvements

Browse source
This commit is contained in:
Jeremy Bullock 2020-04-15 16:12:57 -06:00
commit 962b2cd89e
6 changed files with 136 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/include/toonzqt/flipconsole.h
View file

@ -283,6 +283,8 @@ public:
void pressButton(EGadget buttonId);
void showHideAllParts(bool);
void showHidePlaybar(bool);
void showHideFrameSlider(bool);
void enableProgressBar(bool enable);
void setProgressBarStatus(const std::vector<UCHAR> *status);

22
toonz/sources/toonz/columncommand.cpp
View file

@ -467,7 +467,7 @@ void cloneSubXsheets(TXsheet *xsh) {
// PasteColumnsUndo
//-----------------------------------------------------------------------------
class PasteColumnsUndo final : public TUndo {
class PasteColumnsUndo : public TUndo {
std::set<int> m_indices;
StageObjectsData *m_data;
QMap<TFxPort *, TFx *> m_columnLinks;
@ -1349,3 +1349,23 @@ ColumnsStatusCommand
c16(MI_LockSelectedColumns, CMD_LOCK, TARGET_SELECTED),
c17(MI_UnlockSelectedColumns, CMD_UNLOCK, TARGET_SELECTED);
} // namespace
//=============================================================================
// ConvertToVectorUndo
//-----------------------------------------------------------------------------
// Same in functionality to PasteColumnsUndo; think of it perhaps like
// pasting the newly created vector column.
class ConvertToVectorUndo final : public PasteColumnsUndo {
public:
ConvertToVectorUndo(std::set<int> indices) : PasteColumnsUndo(indices) {};
QString getHistoryString() override {
return QObject::tr("Convert to Vectors");
}
};
void ColumnCmd::addConvertToVectorUndo(std::set<int> &newColumnIndices)
{
TUndoManager::manager()->add(new ConvertToVectorUndo(newColumnIndices));
}

3
toonz/sources/toonz/columncommand.h
View file

@ -32,6 +32,9 @@ bool canResequence(int index);
void cloneChild(int index);
void clearCells(int index);
//! Adds an undo object for converting layer to vector.
void addConvertToVectorUndo(std::set<int> &newColumnIndices);
} // namespace
#endif

8
toonz/sources/toonz/vectorizerpopup.cpp
View file

@ -46,6 +46,7 @@
#include "tcolorstyles.h"
#include "tstroke.h"
#include "tpersistset.h"
#include "columncommand.h"
// Qt includes
#include <QFrame>
@ -950,6 +951,7 @@ bool VectorizerPopup::apply() {
SLOT(onFinished()), Qt::QueuedConnection);
assert(ret);
std::set<int> newColumnIndices;
int newIndexColumn = c1 + 1;
for (auto const level : levels) {
TXshSimpleLevel *sl = dynamic_cast<TXshSimpleLevel *>(level);
@ -1017,9 +1019,11 @@ bool VectorizerPopup::apply() {
}
}
}
newColumnIndices.insert(newIndexColumn);
newIndexColumn += 1;
} else if (vl) {
std::vector<TFrameId> gomi;
newColumnIndices.insert(scene->getXsheet()->getFirstFreeColumnIndex());
scene->getXsheet()->exposeLevel(
0, scene->getXsheet()->getFirstFreeColumnIndex(), vl, gomi);
}
@ -1027,6 +1031,10 @@ bool VectorizerPopup::apply() {
if (m_vectorizer->isCanceled()) break;
}
// Add undo object
if (!m_vectorizer->isCanceled())
ColumnCmd::addConvertToVectorUndo(newColumnIndices);
m_progressDialog->close();
delete m_vectorizer;

115
toonz/sources/toonz/viewerpane.cpp
View file

@ -66,12 +66,11 @@
#include "viewerpane.h"
enum CV_Parts {
CVPARTS_None = 0,
CVPARTS_TOOLBAR = 0x1,
CVPARTS_TOOLOPTIONS = 0x2,
CVPARTS_FLIPCONSOLE = 0x4,
CVPARTS_End = 0x8,
CVPARTS_ALL = CVPARTS_TOOLBAR | CVPARTS_TOOLOPTIONS | CVPARTS_FLIPCONSOLE
CVPARTS_None = 0,
CVPARTS_PLAYBAR = 0x1,
CVPARTS_FRAMESLIDER = 0x4,
CVPARTS_End = 0x8,
CVPARTS_ALL = CVPARTS_PLAYBAR | CVPARTS_FRAMESLIDER
};
using namespace DVGui;
@ -182,7 +181,6 @@ SceneViewerPanel::SceneViewerPanel(QWidget *parent, Qt::WFlags flags)
->getFrameRate());
updateFrameRange(), updateFrameMarkers();
setLayout(mainLayout);
m_visiblePartsFlag = CVPARTS_ALL;
@ -198,62 +196,69 @@ SceneViewerPanel::SceneViewerPanel(QWidget *parent, Qt::WFlags flags)
*/
void SceneViewerPanel::updateShowHide() {
// flip console
m_flipConsole->showHideAllParts(m_visiblePartsFlag & CVPARTS_FLIPCONSOLE);
update();
// flip console
m_flipConsole->showHidePlaybar(m_visiblePartsFlag & CVPARTS_PLAYBAR);
m_flipConsole->showHideFrameSlider(m_visiblePartsFlag & CVPARTS_FRAMESLIDER);
update();
}
//-----------------------------------------------------------------------------
/*! showing the show/hide commands
*/
void SceneViewerPanel::contextMenuEvent(QContextMenuEvent* event) {
QMenu* menu = new QMenu(this);
addShowHideContextMenu(menu);
menu->exec(event->globalPos());
void SceneViewerPanel::contextMenuEvent(QContextMenuEvent *event) {
QMenu *menu = new QMenu(this);
addShowHideContextMenu(menu);
menu->exec(event->globalPos());
}
//-----------------------------------------------------------------------------
void SceneViewerPanel::addShowHideContextMenu(QMenu* menu) {
QMenu* showHideMenu = menu->addMenu(tr("GUI Show / Hide"));
// actions
void SceneViewerPanel::addShowHideContextMenu(QMenu *menu) {
QMenu *showHideMenu = menu->addMenu(tr("GUI Show / Hide"));
QAction* flipConsoleSHAct = showHideMenu->addAction(tr("Console"));
flipConsoleSHAct->setCheckable(true);
flipConsoleSHAct->setChecked(m_visiblePartsFlag & CVPARTS_FLIPCONSOLE);
flipConsoleSHAct->setData((UINT)CVPARTS_FLIPCONSOLE);
// actions
QAction *playbarSHAct = showHideMenu->addAction(tr("Playback Toolbar"));
QAction *frameSliderSHAct = showHideMenu->addAction(tr("Frame Slider"));
QActionGroup* showHideActGroup = new QActionGroup(this);
showHideActGroup->setExclusive(false);
showHideActGroup->addAction(flipConsoleSHAct);
playbarSHAct->setCheckable(true);
playbarSHAct->setChecked(m_visiblePartsFlag & CVPARTS_PLAYBAR);
playbarSHAct->setData((UINT)CVPARTS_PLAYBAR);
connect(showHideActGroup, SIGNAL(triggered(QAction*)), this,
SLOT(onShowHideActionTriggered(QAction*)));
frameSliderSHAct->setCheckable(true);
frameSliderSHAct->setChecked(m_visiblePartsFlag & CVPARTS_FRAMESLIDER);
frameSliderSHAct->setData((UINT)CVPARTS_FRAMESLIDER);
showHideMenu->addSeparator();
showHideMenu->addAction(CommandManager::instance()->getAction(MI_ViewCamera));
showHideMenu->addAction(CommandManager::instance()->getAction(MI_ViewTable));
showHideMenu->addAction(CommandManager::instance()->getAction(MI_FieldGuide));
showHideMenu->addAction(CommandManager::instance()->getAction(MI_SafeArea));
showHideMenu->addAction(CommandManager::instance()->getAction(MI_ViewBBox));
showHideMenu->addAction(
CommandManager::instance()->getAction(MI_ViewColorcard));
showHideMenu->addAction(CommandManager::instance()->getAction(MI_ViewRuler));
QActionGroup *showHideActGroup = new QActionGroup(this);
showHideActGroup->setExclusive(false);
showHideActGroup->addAction(playbarSHAct);
showHideActGroup->addAction(frameSliderSHAct);
connect(showHideActGroup, SIGNAL(triggered(QAction *)), this,
SLOT(onShowHideActionTriggered(QAction *)));
showHideMenu->addSeparator();
showHideMenu->addAction(CommandManager::instance()->getAction(MI_ViewCamera));
showHideMenu->addAction(CommandManager::instance()->getAction(MI_ViewTable));
showHideMenu->addAction(CommandManager::instance()->getAction(MI_FieldGuide));
showHideMenu->addAction(CommandManager::instance()->getAction(MI_SafeArea));
showHideMenu->addAction(CommandManager::instance()->getAction(MI_ViewBBox));
showHideMenu->addAction(
CommandManager::instance()->getAction(MI_ViewColorcard));
showHideMenu->addAction(CommandManager::instance()->getAction(MI_ViewRuler));
}
//-----------------------------------------------------------------------------
/*! slot function for show/hide the parts
*/
void SceneViewerPanel::onShowHideActionTriggered(QAction* act) {
CV_Parts part = (CV_Parts)act->data().toUInt();
assert(part < CVPARTS_End);
void SceneViewerPanel::onShowHideActionTriggered(QAction *act) {
CV_Parts part = (CV_Parts)act->data().toUInt();
assert(part < CVPARTS_End);
m_visiblePartsFlag ^= part;
m_visiblePartsFlag ^= part;
updateShowHide();
updateShowHide();
}
void SceneViewerPanel::onDrawFrame(
@ -323,8 +328,8 @@ void SceneViewerPanel::showEvent(QShowEvent *event) {
ret = ret && connect(sceneHandle, SIGNAL(nameSceneChanged()), this,
SLOT(changeWindowTitle()));
ret =
ret && connect(sceneHandle, SIGNAL(preferenceChanged(const QString&)),
m_flipConsole, SLOT(onPreferenceChanged(const QString&)));
ret && connect(sceneHandle, SIGNAL(preferenceChanged(const QString &)),
m_flipConsole, SLOT(onPreferenceChanged(const QString &)));
ret = ret && connect(levelHandle, SIGNAL(xshLevelSwitched(TXshLevel *)), this,
SLOT(onXshLevelSwitched(TXshLevel *)));
ret = ret && connect(levelHandle, SIGNAL(xshLevelChanged()), this,
@ -387,8 +392,8 @@ void SceneViewerPanel::hideEvent(QHideEvent *event) {
disconnect(app->getCurrentTool(), SIGNAL(toolSwitched()), m_sceneViewer,
SLOT(onToolSwitched()));
disconnect(app->getCurrentScene(), SIGNAL(preferenceChanged(const QString&)),
m_flipConsole, SLOT(onPreferenceChanged(const QString&)));
disconnect(app->getCurrentScene(), SIGNAL(preferenceChanged(const QString &)),
m_flipConsole, SLOT(onPreferenceChanged(const QString &)));
m_flipConsole->setActive(false);
}
@ -612,7 +617,7 @@ void SceneViewerPanel::changeWindowTitle() {
name + tr(" :: Frame: ") + tr(std::to_string(frame + 1).c_str());
int col = app->getCurrentColumn()->getColumnIndex();
if (col < 0) {
parentWidget()->setWindowTitle(name);
parentWidget()->setWindowTitle(name);
return;
}
TXsheet *xsh = app->getCurrentXsheet()->getXsheet();
@ -623,7 +628,7 @@ void SceneViewerPanel::changeWindowTitle() {
m_sceneViewer->getNormalZoomScale().inv();
if (m_sceneViewer->getIsFlippedX()) aff = aff * TScale(-1, 1);
if (m_sceneViewer->getIsFlippedY()) aff = aff * TScale(1, -1);
name = name + tr(" :: Zoom : ") +
name = name + tr(" :: Zoom : ") +
QString::number(tround(100.0 * sqrt(aff.det()))) + "%";
if (m_sceneViewer->getIsFlippedX() || m_sceneViewer->getIsFlippedY()) {
name = name + tr(" (Flipped)");
@ -651,7 +656,7 @@ void SceneViewerPanel::changeWindowTitle() {
m_sceneViewer->getNormalZoomScale().inv();
if (m_sceneViewer->getIsFlippedX()) aff = aff * TScale(-1, 1);
if (m_sceneViewer->getIsFlippedY()) aff = aff * TScale(1, -1);
name = name + tr(" :: Zoom : ") +
name = name + tr(" :: Zoom : ") +
QString::number(tround(100.0 * sqrt(aff.det()))) + "%";
if (m_sceneViewer->getIsFlippedX() || m_sceneViewer->getIsFlippedY()) {
name = name + tr(" (Flipped)");
@ -830,16 +835,16 @@ void SceneViewerPanel::setFlipVButtonChecked(bool checked) {
//-----------------------------------------------------------------------------
void SceneViewerPanel::setVisiblePartsFlag(UINT flag) {
m_visiblePartsFlag = flag;
updateShowHide();
m_visiblePartsFlag = flag;
updateShowHide();
}
// SaveLoadQSettings
void SceneViewerPanel::save(QSettings& settings) const {
settings.setValue("visibleParts", m_visiblePartsFlag);
void SceneViewerPanel::save(QSettings &settings) const {
settings.setValue("visibleParts", m_visiblePartsFlag);
}
void SceneViewerPanel::load(QSettings& settings) {
m_visiblePartsFlag = settings.value("visibleParts", CVPARTS_ALL).toUInt();
updateShowHide();
void SceneViewerPanel::load(QSettings &settings) {
m_visiblePartsFlag = settings.value("visibleParts", CVPARTS_ALL).toUInt();
updateShowHide();
}

50
toonz/sources/toonzqt/flipconsole.cpp
View file

@ -429,7 +429,9 @@ enum {
eShowDefineLoadBox = 0x400,
eShowUseLoadBox = 0x800,
eShowViewerControls = 0x1000,
eShowHowMany = 0x2000
eShowSound = 0x2000,
eShowLocator = 0x4000,
eShowHowMany = 0x8000
};
FlipConsole::FlipConsole(QVBoxLayout *mainLayout, std::vector<int> gadgetsMask,
@ -542,6 +544,18 @@ void FlipConsole::showHideAllParts(bool isShow) {
//-----------------------------------------------------------------------------
void FlipConsole::showHidePlaybar(bool isShow) {
m_playToolBarContainer->setVisible(isShow);
}
//-----------------------------------------------------------------------------
void FlipConsole::showHideFrameSlider(bool isShow) {
m_frameSliderFrame->setVisible(isShow);
}
//-----------------------------------------------------------------------------
void showEvent(QShowEvent *);
void hideEvent(QHideEvent *);
@ -992,10 +1006,20 @@ void FlipConsole::applyCustomizeMask() {
enableButton(eDefineSubCamera, m_customizeMask & eShowDefineSubCamera);
enableButton(eDefineLoadBox, m_customizeMask & eShowDefineLoadBox);
enableButton(eUseLoadBox, m_customizeMask & eShowUseLoadBox);
if (m_subcamSep)
m_subcamSep->setVisible(m_customizeMask & eShowDefineSubCamera ||
m_customizeMask & eShowDefineLoadBox ||
m_customizeMask & eShowUseLoadBox);
if (m_subcamSep) {
int count = m_gadgetsMask.size();
bool hasDefineLoadBox =
std::find(m_gadgetsMask.begin(), m_gadgetsMask.end(), eDefineLoadBox) ==
m_gadgetsMask.end();
bool hasUseLoadBox = std::find(m_gadgetsMask.begin(), m_gadgetsMask.end(),
eUseLoadBox) == m_gadgetsMask.end();
bool hasDefineSubCam = std::find(m_gadgetsMask.begin(), m_gadgetsMask.end(),
eDefineSubCamera) == m_gadgetsMask.end();
m_subcamSep->setVisible(
(hasDefineSubCam && m_customizeMask & eShowDefineSubCamera) ||
(hasDefineLoadBox && m_customizeMask & eShowDefineLoadBox) ||
(hasUseLoadBox && m_customizeMask & eShowUseLoadBox));
}
enableButton(eWhiteBg, m_customizeMask & eShowBg);
enableButton(eBlackBg, m_customizeMask & eShowBg);
@ -1016,6 +1040,9 @@ void FlipConsole::applyCustomizeMask() {
enableButton(eNext, m_customizeMask & eShowVcr);
enableButton(eLast, m_customizeMask & eShowVcr);
enableButton(eSound, m_customizeMask & eShowSound);
enableButton(eLocator, m_customizeMask & eShowLocator);
if (m_vcrSep) m_vcrSep->setVisible(m_customizeMask & eShowVcr);
enableButton(eMatte, m_customizeMask & eShowcolorFilter);
@ -1094,8 +1121,6 @@ void FlipConsole::createCustomizeMenu(bool withCustomWidget) {
hasButton(m_gadgetsMask, eBlackBg) ||
hasButton(m_gadgetsMask, eCheckBg))
addMenuItem(eShowBg, tr("Background Colors"), menu);
if (hasButton(m_gadgetsMask, eRate))
addMenuItem(eShowFramerate, tr("Framerate"), menu);
addMenuItem(eShowVcr, tr("Playback Controls"), menu);
@ -1103,11 +1128,17 @@ void FlipConsole::createCustomizeMenu(bool withCustomWidget) {
hasButton(m_gadgetsMask, eBlue) || hasButton(m_gadgetsMask, eMatte))
addMenuItem(eShowcolorFilter, tr("Color Channels"), menu);
if (withCustomWidget) addMenuItem(eShowCustom, tr("Set Key"), menu);
if (hasButton(m_gadgetsMask, eSound))
addMenuItem(eShowSound, tr("Sound"), menu);
if (hasButton(m_gadgetsMask, eHisto))
addMenuItem(eShowHisto, tr("Histogram"), menu);
if (hasButton(m_gadgetsMask, eLocator))
addMenuItem(eShowLocator, tr("Locator"), menu);
if (withCustomWidget) addMenuItem(eShowCustom, tr("Set Key"), menu);
if (hasButton(m_gadgetsMask, eFilledRaster))
addMenuItem(eFilledRaster, tr("Display Areas as Filled"), menu);
@ -1118,6 +1149,9 @@ void FlipConsole::createCustomizeMenu(bool withCustomWidget) {
hasButton(m_gadgetsMask, eResetView))
addMenuItem(eShowViewerControls, tr("Viewer Controls"), menu);
if (hasButton(m_gadgetsMask, eRate))
addMenuItem(eShowFramerate, tr("Framerate"), menu);
bool ret = connect(menu, SIGNAL(triggered(QAction *)), this,
SLOT(onCustomizeButtonPressed(QAction *)));
assert(ret);