OpenToonz - An open-source full-featured 2D animation creation software
C
Add NAA FullColor Level Auto-Converting feature(Can be enabled in Preference)
Abel Youb0897895b048
diff --git a/toonz/sources/include/toonz/preferences.h b/toonz/sources/include/toonz/preferences.hindex 1aa2b8209..1ffd0b4d5 100644--- a/toonz/sources/include/toonz/preferences.h+++ b/toonz/sources/include/toonz/preferences.h@@ -249,6 +249,7 @@ public:// Loading tabint getDefaultImportPolicy() { return getIntValue(importPolicy); }int getDefaultRenamePolicy() { return getIntValue(renamePolicy); }+ int getDefaultConvertPolicy() { return getIntValue(convertPolicy); }bool isAutoExposeEnabled() const { return getBoolValue(autoExposeEnabled); }bool isSubsceneFolderEnabled() const {return getBoolValue(subsceneFolderEnabled);diff --git a/toonz/sources/include/toonz/preferencesitemids.h b/toonz/sources/include/toonz/preferencesitemids.hindex 2737a91b6..83cad22d2 100644--- a/toonz/sources/include/toonz/preferencesitemids.h+++ b/toonz/sources/include/toonz/preferencesitemids.h@@ -52,6 +52,7 @@ enum PreferencesItemId {// LoadingimportPolicy,renamePolicy,+ convertPolicy,autoExposeEnabled,subsceneFolderEnabled,removeSceneNumberFromLoadedLevelName,diff --git a/toonz/sources/include/toonz/tscenehandle.h b/toonz/sources/include/toonz/tscenehandle.hindex b15f49218..5ee650ce8 100644--- a/toonz/sources/include/toonz/tscenehandle.h+++ b/toonz/sources/include/toonz/tscenehandle.h@@ -63,6 +63,9 @@ public:void notifyRenamePolicyChanged(int policy) {emit renamePolicyChanged(policy);}+ void notifyConvertPolicyChanged(int policy) {+ emit convertPolicyChanged(policy);+ }void setDirtyFlag(bool dirtyFlag) {if (m_dirtyFlag == dirtyFlag) return;@@ -88,6 +91,7 @@ signals:void pixelUnitSelected(bool on);void importPolicyChanged(int policy);void renamePolicyChanged(int policy);+ void convertPolicyChanged(int policy);};#endif // TSCENEHANDLE_Hdiff --git a/toonz/sources/include/toonzqt/imageutils.h b/toonz/sources/include/toonzqt/imageutils.hindex 0dabc3dfe..ed80be4f5 100644--- a/toonz/sources/include/toonzqt/imageutils.h+++ b/toonz/sources/include/toonzqt/imageutils.h@@ -104,6 +104,8 @@ void DVAPI convert(const TFrameId &tmplFId = TFrameId() //!< frame format template); //!< Converts a saved level to fullcolor, and saves the result.+bool DVAPI isAAImage(TFilePath path);+void DVAPI convertNaa2Tlv(const TFilePath &source, //!< Level path to convert from.const TFilePath &dest, //!< Level path to convert to.diff --git a/toonz/sources/toonz/iocommand.cpp b/toonz/sources/toonz/iocommand.cppindex e904f0104..123c24e98 100644--- a/toonz/sources/toonz/iocommand.cpp+++ b/toonz/sources/toonz/iocommand.cpp@@ -34,6 +34,7 @@#include "toonzqt/swatchviewer.h"#include "toonzqt/tselectionhandle.h"#include "toonzqt/dvdialog.h"+#include "toonzqt/imageutils.h"// ToonzLib includes#include "toonz/palettecontroller.h"@@ -67,6 +68,7 @@#include "toonz/imagestyles.h"#include "toutputproperties.h"#include "toonz/studiopalette.h"+#include "convert2tlv.h"// TnzCore includes#include "tofflinegl.h"@@ -92,6 +94,7 @@// #define USE_SQLITE_HDPOOLusing namespace DVGui;+using namespace ImageUtils;//-----------------------------------------------------------------------------namespace {@@ -1206,26 +1209,6 @@ inline TPaletteP dirtyWhite(const TPaletteP &plt) {}} // namespace-//-----------------------------------------------------------------------------// Per ora e' usato solo per i formato "tzp" e "tzu".-IoCmd::ConvertingPopup::ConvertingPopup(QWidget *parent, QString fileName)- : QDialog(parent) {- setModal(true);- setWindowFlags(Qt::Dialog | Qt::WindowTitleHint);- setMinimumSize(70, 50);- QVBoxLayout *mainLayout = new QVBoxLayout;- mainLayout->setMargin(5);- mainLayout->setSpacing(0);-- QLabel *label = new QLabel(QString(- QObject::tr("Converting %1 images to tlv format...").arg(fileName)));- mainLayout->addWidget(label);-- setLayout(mainLayout);-}--IoCmd::ConvertingPopup::~ConvertingPopup() {}//===========================================================================// IoCmd::saveSceneIfNeeded(message)@@ -1386,9 +1369,9 @@ void IoCmd::newScene() {app->getCurrentObject()->setIsSpline(false);app->getCurrentColumn()->setColumnIndex(0);- //CleanupParameters *cp = scene->getProperties()->getCleanupParameters();- //CleanupParameters::GlobalParameters.assign(cp);- //CleanupSettingsModel::onSceneSwitched()+ // CleanupParameters *cp = scene->getProperties()->getCleanupParameters();+ // CleanupParameters::GlobalParameters.assign(cp);+ // CleanupSettingsModel::onSceneSwitched()// updateCleanupSettingsPopup();@@ -1516,8 +1499,8 @@ bool IoCmd::saveScene(const TFilePath &path, int flags) {#endif}- // Don't store current cleanup parameters to scene's parameters' cache if autosave- // (would save to scene file) .+ // Don't store current cleanup parameters to scene's parameters' cache if+ // autosave (would save to scene file) .if (!isAutosave) {CleanupParameters::GlobalParameters.assign(scene->getProperties()->getCleanupParameters());@@ -1525,7 +1508,7 @@ bool IoCmd::saveScene(const TFilePath &path, int flags) {// Must wait for current save to finish, just in casewhile (TApp::instance()->isSaveInProgress());-+TApp::instance()->setSaveInProgress(true);try {scene->save(scenePath, xsheet);@@ -1745,7 +1728,7 @@ bool IoCmd::saveAll(int flags) {// if anything is wrong, return falseQMainWindow *parent = TApp::instance()->getMainWindow();- QLabel *Label = new QLabel("Saving...", parent);+ QLabel *Label = new QLabel("Saving...", parent);Label->setStyleSheet("font-size: 20px;""background-color: black; color: white; "@@ -1757,10 +1740,10 @@ bool IoCmd::saveAll(int flags) {// NOTE: saveScene already check saveInProgressbool result = saveScene(flags);-+saveNonSceneFiles();- //End Label Notice+ // End Label Noticeif (result) {Label->setText("Saved All");Label->setStyleSheet(@@ -1775,7 +1758,7 @@ bool IoCmd::saveAll(int flags) {"font-weight: bold; padding: 5px;");}Label->adjustSize();-+QTimer::singleShot(2500, Label, &QLabel::deleteLater);return result;}@@ -1870,7 +1853,7 @@ bool IoCmd::loadScene(ToonzScene &scene, const TFilePath &scenePath,bool IoCmd::loadScene(const TFilePath &path, bool updateRecentFile,bool checkSaveOldScene) {RenderingSuspender suspender;-+// - Check if old Scene savedif (checkSaveOldScene)if (!saveSceneIfNeeded(QApplication::tr("Load Scene"))) return false;@@ -1919,8 +1902,9 @@ bool IoCmd::loadScene(const TFilePath &path, bool updateRecentFile,msg = QObject::tr("It is not possible to load the scene %1 because it does not ""belong to any project.\n"- "Please delete scenes.xml if this scene dones't belong to any project.")- .arg(QString::fromStdWString(scenePath.getWideString()));+ "Please delete scenes.xml if this scene dones't belong to any "+ "project.")+ .arg(QString::fromStdWString(scenePath.getWideString()));DVGui::warning(msg);}if (sceneProject && !sceneProject->isCurrent()) {@@ -1941,12 +1925,12 @@ bool IoCmd::loadScene(const TFilePath &path, bool updateRecentFile,newScene();return false;}- if (ret == 2)- pm->setCurrentProjectPath(sceneProject->getProjectPath());+ if (ret == 2) pm->setCurrentProjectPath(sceneProject->getProjectPath());// else importScene = true;- // Import Scene Later because of difference of currentProject and sceneProject+ // Import Scene Later because of difference of currentProject and+ // sceneProject}-+// - Start to load sceneQApplication::setOverrideCursor(Qt::WaitCursor);@@ -2011,16 +1995,16 @@ bool IoCmd::loadScene(const TFilePath &path, bool updateRecentFile,app->getCurrentScene()->notifyNameSceneChange();app->getCurrentFrame()->setFrame(0);app->getCurrentColumn()->setColumnIndex(0);-+app->getCurrentXsheet()->notifyXsheetSoundChanged();app->getCurrentObject()->setIsSpline(false);Previewer::clearAll();PreviewFxManager::instance()->reset();// updateCleanupSettingsPopup();- /*- CleanupParameterの更新 -*/ //CleanupSettingsModel::onSceneSwitched()- //CleanupParameters *cp = scene->getProperties()->getCleanupParameters();- //CleanupParameters::GlobalParameters.assign(cp);+ /*- CleanupParameterの更新 -*/ // CleanupSettingsModel::onSceneSwitched()+ // CleanupParameters *cp = scene->getProperties()->getCleanupParameters();+ // CleanupParameters::GlobalParameters.assign(cp);CacheFxCommand::instance()->onSceneLoaded();#ifdef USE_SQLITE_HDPOOL@@ -2132,7 +2116,7 @@ bool IoCmd::loadScene(const TFilePath &path, bool updateRecentFile,2); // "All Icons & Images"printf("%s:%s loadScene() completed :\n", __FILE__, __FUNCTION__);-+// Load current Level's paletteapp->getPaletteController()->editLevelPalette();return true;@@ -2462,26 +2446,27 @@ int IoCmd::loadResources(LoadResourceArguments &args, bool updateRecentFile,LoadResourceArguments::IMPORT);}- std::vector<TFilePath> paths;int all = 0; // Turn on to allow all duplicate- std::vector<LoadResourceArguments::ResourceData> rds;//Resources to be loaded+ std::vector<LoadResourceArguments::ResourceData>+ rds; // Resources to be loaded// Loop for all the resources to import (Include subScene)for (int r = 0; r < rCount; ++r) {if (importDialog.aborted()) break;LoadResourceArguments::ResourceData rd(args.resourceDatas[r]);- TFilePath& path = rd.m_path;- QString origName = path.withoutParentDir().getQString();+ TFilePath &path = rd.m_path;+ QString origName = path.withoutParentDir().getQString();- if (!path.isLevelName())+ if (!path.isLevelName())path = TFilePath(path.getLevelNameW()).withParentDir(path.getParentDir());- // duplicate check- auto isDuplicate = [&rd](const IoCmd::LoadResourceArguments::ResourceData& existingRd) {+ // duplicate check+ auto isDuplicate =+ [&rd](const IoCmd::LoadResourceArguments::ResourceData &existingRd) {return existingRd.m_path == rd.m_path;- };- if (std::find_if(rds.begin(), rds.end(), isDuplicate) != rds.end()) {+ };+ if (std::find_if(rds.begin(), rds.end(), isDuplicate) != rds.end()) {if (!all) {QString question =QObject::tr(@@ -2489,11 +2474,11 @@ int IoCmd::loadResources(LoadResourceArguments &args, bool updateRecentFile,"xsheet.\n\nAllow duplicate?").arg(origName).arg(QString::fromStdString(path.getName()));- QString Yes = QObject::tr("Allow");+ QString Yes = QObject::tr("Allow");QString YesAll = QObject::tr("Allow All Dups");- QString No = QObject::tr("No");- QString NoAll = QObject::tr("No to All Dups");- int ret = DVGui::MsgBox(question, Yes, YesAll, No, NoAll, 0);+ QString No = QObject::tr("No");+ QString NoAll = QObject::tr("No to All Dups");+ int ret = DVGui::MsgBox(question, Yes, YesAll, No, NoAll, 0);switch (ret) {case 2:all = 1; // YesAll@@ -2504,8 +2489,7 @@ int IoCmd::loadResources(LoadResourceArguments &args, bool updateRecentFile,case 3:continue;}- }- else if (all == 2)+ } else if (all == 2)continue;}@@ -2514,7 +2498,7 @@ int IoCmd::loadResources(LoadResourceArguments &args, bool updateRecentFile,break;else {progressDialog->setLabelText(- DVGui::ProgressDialog::tr("Importing \"%1\"...")+ DVGui::ProgressDialog::tr("Importing \"%1\"...").arg(path.getQString()));progressDialog->setValue(r);@@ -2533,7 +2517,7 @@ int IoCmd::loadResources(LoadResourceArguments &args, bool updateRecentFile,if (ret == ResourceImportDialog::A_CANCEL) break;}- // SCENE FILE+ // SCENE FILEif (isScene) {TFilePath oldDstFolder = importDialog.getDstFolder();TFilePath dstFolder = (Preferences::instance()->isSubsceneFolderEnabled())@@ -2545,7 +2529,7 @@ int IoCmd::loadResources(LoadResourceArguments &args, bool updateRecentFile,// load the scene as subXsheettry {- auto xl = loadChildLevel(scene, path, row0, col0, importDialog);+ auto xl = loadChildLevel(scene, path, row0, col0, importDialog);if (dstFolder != TFilePath())app->getCurrentScene()->notifyCastFolderAdded(scene->getLevelSet()->getDefaultFolder() + dstFolder);@@ -2556,7 +2540,8 @@ int IoCmd::loadResources(LoadResourceArguments &args, bool updateRecentFile,// register the loaded level to argsargs.loadedLevels.push_back(xl);app->getCurrentXsheet()->notifyXsheetSoundChanged();- } catch (...){}+ } catch (...) {+ }importDialog.setIsLastResource(isLastResource);importDialog.setDstFolder(oldDstFolder);@@ -2565,48 +2550,47 @@ int IoCmd::loadResources(LoadResourceArguments &args, bool updateRecentFile,continue;}- // LEVEL FILE- else {- try {- path = importDialog.process(scene, 0, path);- }- catch (std::string msg) {- error(QString::fromStdString(msg));- continue;- }- if (importDialog.aborted()) break;- }-- rd.m_path = path;- rds.push_back(rd);+ // LEVEL FILE+ else {+ try {+ path = importDialog.process(scene, 0, path);+ } catch (std::string msg) {+ error(QString::fromStdString(msg));+ continue;}+ if (importDialog.aborted()) break;+ }- if(args.renamePolicy != LoadResourceArguments::RenamePolicy::NEVER)- renameResources(rds);--- if (progressDialog)- progressDialog->setMaximum(rds.size());+ rd.m_path = path;+ rds.push_back(rd);+ }++ if (args.renamePolicy != LoadResourceArguments::RenamePolicy::NEVER)+ renameResources(rds);+ if (args.convertPolicy != LoadResourceArguments::ConvertPolicy::NEVER)+ convertNAARaster2TLV(rds);++ if (progressDialog) progressDialog->setMaximum(rds.size());// LOAD IMPORTED FILEfor (int i = 0; i < rds.size(); ++i) {- TXshLevel* xl = 0;- TFilePath path = rds[i].m_path;+ TXshLevel *xl = 0;+ TFilePath path = rds[i].m_path;- if (progressDialog) {- if (progressDialog->wasCanceled())- break;- else {- progressDialog->setLabelText(- DVGui::ProgressDialog::tr("Loading \"%1\"...")- .arg(path.getQString()));- progressDialog->setValue(i);+ if (progressDialog) {+ if (progressDialog->wasCanceled())+ break;+ else {+ progressDialog->setLabelText(+ DVGui::ProgressDialog::tr("Loading \"%1\"...")+ .arg(path.getQString()));+ progressDialog->setValue(i);- QCoreApplication::processEvents();- }+ QCoreApplication::processEvents();+ }}- // LOAD PSD FILE+ // LOAD PSD FILEif (path.getType() == "psd") {- static PsdSettingsPopup* popup = 0;+ static PsdSettingsPopup *popup = 0;if (!popup) {popup = new PsdSettingsPopup();}@@ -2620,44 +2604,42 @@ int IoCmd::loadResources(LoadResourceArguments &args, bool updateRecentFile,if (updateRecentFile)RecentFiles::instance()->addFilePath(toQString(scene->decodeFilePath(path)), RecentFiles::Level);- continue;- }- // LOAD OTHER FILE- try {- // reuse TFrameIds retrieved by FileBrowser, m_frameIdSet- xl = ::loadResource(- scene, rds[i], args.castFolder, row0, col0, row1, col1, args.expose,- rds[i].m_frameIdSet,- args.xFrom, args.xTo, args.levelName, args.step, args.inc,- args.frameCount, args.doesFileActuallyExist);- if (updateRecentFile) {- RecentFiles::instance()->addFilePath(- toQString(scene->decodeFilePath(path)), RecentFiles::Level);- }- } catch (TException& e) {- error(QString::fromStdWString(e.getMessage()));+ continue;+ }+ // LOAD OTHER FILE+ try {+ // reuse TFrameIds retrieved by FileBrowser, m_frameIdSet+ xl = ::loadResource(scene, rds[i], args.castFolder, row0, col0, row1,+ col1, args.expose, rds[i].m_frameIdSet, args.xFrom,+ args.xTo, args.levelName, args.step, args.inc,+ args.frameCount, args.doesFileActuallyExist);+ if (updateRecentFile) {+ RecentFiles::instance()->addFilePath(+ toQString(scene->decodeFilePath(path)), RecentFiles::Level);}+ } catch (TException &e) {+ error(QString::fromStdWString(e.getMessage()));+ }- // if load success- if (!xl)continue;- isSoundLevel = isSoundLevel || xl->getType() == SND_XSHLEVEL;- // register the loaded level to args- args.loadedLevels.push_back(xl);- // increment the number of loaded resources- ++loadedCount;-- // load the image data of all frames to cache at the beginning- if (args.cachingBehavior != LoadResourceArguments::ON_DEMAND) {- TXshSimpleLevel* simpleLevel = xl->getSimpleLevel();- if (simpleLevel && (simpleLevel->getType() == TZP_XSHLEVEL ||- simpleLevel->getType() == OVL_XSHLEVEL)) {- bool cacheImagesAsWell =- (args.cachingBehavior ==- LoadResourceArguments::ALL_ICONS_AND_IMAGES);- simpleLevel->loadAllIconsAndPutInCache(cacheImagesAsWell);- }- }+ // if load success+ if (!xl) continue;+ isSoundLevel = isSoundLevel || xl->getType() == SND_XSHLEVEL;+ // register the loaded level to args+ args.loadedLevels.push_back(xl);+ // increment the number of loaded resources+ ++loadedCount;++ // load the image data of all frames to cache at the beginning+ if (args.cachingBehavior != LoadResourceArguments::ON_DEMAND) {+ TXshSimpleLevel *simpleLevel = xl->getSimpleLevel();+ if (simpleLevel && (simpleLevel->getType() == TZP_XSHLEVEL ||+ simpleLevel->getType() == OVL_XSHLEVEL)) {+ bool cacheImagesAsWell = (args.cachingBehavior ==+ LoadResourceArguments::ALL_ICONS_AND_IMAGES);+ simpleLevel->loadAllIconsAndPutInCache(cacheImagesAsWell);}+ }+ }if (loadedCount) app->getCurrentFrame()->setFrameIndex(row0);@@ -2778,16 +2760,147 @@ bool IoCmd::importLipSync(TFilePath levelPath, QList<TFrameId> frameList,.arg(toQString(levelPath)));return false;}+}- return true;+// Use double value DPI as policy+// 0:Image DPI , -1:CameraDPI , other:value of dpi+void IoCmd::convertNAARaster2TLV(+ std::vector<LoadResourceArguments::ResourceData> &rds, bool askUser,+ double dpi, bool appendPalette) {+ struct locals {+ static bool checkConvertPolicy(const TFilePath &path) {+ switch (Preferences::instance()->getIntValue(convertPolicy)) {+ case 0:+ break; // Ask every time+ case 1:+ return true; // Always convert+ case 2:+ return false; // Never convert+ }++ QString label = QObject::tr(+ "%1\n\nis an image sequence that can be converted "+ "into a TLV format "+ "\nWould you like to convert it?")+ .arg(path.getQString());++ QString checkBoxLabel = QObject::tr("Always do this action.");+ QStringList buttons;+ buttons << QObject::tr("Yes") << QObject::tr("No, use as is");++ DVGui::MessageAndCheckboxDialog *convertDialog =+ DVGui::createMsgandCheckbox(DVGui::QUESTION, label, checkBoxLabel,+ buttons, 1, Qt::Unchecked);++ int ret = convertDialog->exec();+ int checked = convertDialog->getChecked();++ if (checked) {+ Preferences::instance()->setValue(convertPolicy, ret);+ TApp::instance()->getCurrentScene()->notifyImportPolicyChanged(ret);+ }++ return ret == 1;+ }++ static bool getRange(const TFilePath &path, int &from, int &to,+ TFilePath &first) {+ TLevelP levelTmp;+ TLevelReaderP lrTmp = TLevelReaderP(path);+ if (lrTmp) {+ levelTmp = lrTmp->loadInfo();+ TLevel::Table *t = levelTmp->getTable();+ if (!t->empty()) {+ TFrameId start = t->begin()->first;+ TFrameId end = t->rbegin()->first;+ if (start.getNumber() >= 0 && end.getNumber() >= 0) {+ from = start.getNumber();+ to = end.getNumber();+ first = lrTmp->getFrameReader(start)->getFilePath();+ return true;+ }+ }+ }+ return false;+ }+ }; // Locals++ static const QStringList rasterExts = {"png", "jpg", "jpeg", "bmp", "tga"};+ TApp *app = TApp::instance();+ ToonzScene *scene = app->getCurrentScene()->getScene();+ for (auto &rd : rds) {+ TFilePath &path = rd.m_path;+ if (path.getDots() == ".." &&+ rasterExts.contains(QString::fromStdString(path.getType()).toLower())) {+ if (!path.isAbsolute()) path = scene->decodeFilePath(path);+ TFilePath dstPath =+ path.getParentDir() + TFilePath(path.getName()).withType("tlv");+ int from, to;+ TFilePath first;+ if (!locals::getRange(path, from, to, first)) continue;+ if (ImageUtils::isAAImage(first)) continue;+ if (askUser && !locals::checkConvertPolicy(path)) continue;+ if (TSystem::doesExistFileOrLevel(dstPath)) {+ OverwriteDialog dialog;+ dstPath = dstPath.withName(dialog.execute(scene, dstPath, false));++ switch (dialog.getChoice()) {+ case OverwriteDialog::RENAME:+ case OverwriteDialog::KEEP_OLD:+ continue;+ case OverwriteDialog::OVERWRITE:+ TSystem::removeFileOrLevel(dstPath);+ TSystem::removeFileOrLevel(dstPath.withType("tpl"));+ break;+ default:+ continue;+ }+ }+ IoCmd::ConvertingPopup convertingPopup(TApp::instance()->getMainWindow(),+ path);+ /*convertingPopup.show();+ ImageUtils::convertNaa2Tlv(path, dstPath, from, to,+ convertingPopup.getNotifier(), 0, true, dpi); convertingPopup.hide(); path+ = convertingPopup.getResultPath();*/+ Convert2Tlv converter(path, TFilePath(), dstPath.getParentDir(),+ QString::fromStdWString(dstPath.getWideName()),+ from, to, false, TFilePath(), 20, 0, 50, false,+ true, dpi);++ std::string e;+ converter.init(e);+ if (!e.empty()) {+ DVGui::warning(QString("%1\nFailed to Convert\n%2")+ .arg(QString::fromStdString(e))+ .arg(path.getQString()));+ continue;+ }+ int count = converter.getFramesToConvertCount();+ if (count) {+ convertingPopup.setMaximum(count);+ convertingPopup.show();+ for (int i = 0; i < count; ++i) {+ converter.convertNext(e);+ convertingPopup.setValue(i);+ if (convertingPopup.wasCanceled()) {+ converter.abort();+ break;+ }+ }+ convertingPopup.hide();+ if (!convertingPopup.wasCanceled()) path = scene->codeFilePath(dstPath);+ }+ }+ }}-void IoCmd::renameResources(std::vector<LoadResourceArguments::ResourceData>& rds, bool askUser) {- struct locals {- // call when loading levels- static bool matchSequencePattern(const TFilePath& path) {- QRegularExpression pattern(- R"(+void IoCmd::renameResources(+ std::vector<LoadResourceArguments::ResourceData> &rds, bool askUser) {+ struct locals {+ // call when loading levels+ static bool matchSequencePattern(const TFilePath &path) {+ QRegularExpression pattern(+ R"(^ # Match the start of the string.*? # Optional prefix\d+ # allow aFilePrefix<number>.ext@@ -2795,124 +2908,130 @@ void IoCmd::renameResources(std::vector<LoadResourceArguments::ResourceData>& rd(png|jpg|jpeg|bmp|tga|tiff) # Image extensions$ # Match the end of the string)",-QRegularExpression::CaseInsensitiveOption |-QRegularExpression::ExtendedPatternSyntaxOption);- return pattern.match(QString::fromStdString(path.getLevelName()))- .hasMatch();- };+ QRegularExpression::CaseInsensitiveOption |+ QRegularExpression::ExtendedPatternSyntaxOption);+ return pattern.match(QString::fromStdString(path.getLevelName()))+ .hasMatch();+ };++ static bool checkRenamePolicy(const TFilePath &path) {+ switch (Preferences::instance()->getIntValue(renamePolicy)) {+ case 0:+ break;+ case 1:+ return true;+ case 2:+ return false;+ }+ QString label = QObject::tr(+ "Image sequence detected, but the filenames are "+ "missing a separator: \n"+ "OpenToonz requires a separator (such as an "+ "underscore (_) or dot (.) \n"+ "between the name and the frame number to recognize "+ "sequences properly.\n"+ "Example: A0001.png → A.0001.png\n"+ "\nWould you like OpenToonz to automatically add a "+ "dot to fix the sequence format?\n"+ "\n%1 (and similar files)")+ .arg(path.getQString());++ QString checkBoxLabel = QObject::tr("Always do this action.");- static bool checkRenamePolicy(const TFilePath& path) {- switch (Preferences::instance()->getIntValue(renamePolicy)) {- case 0:- break;- case 1:- return true;- case 2:- return false;- }- QString label =- QObject::tr(- "Image sequence detected, but the filenames are missing a separator: \n"- "OpenToonz requires a separator (such as an underscore (_) or dot (.) \n"- "between the name and the frame number to recognize sequences properly.\n"- "Example: A0001.png → A.0001.png\n"- "\nWould you like OpenToonz to automatically add a dot to fix the sequence format?\n"- "\n%1 (and similar files)")- .arg(path.getQString());-- QString checkBoxLabel = QObject::tr("Always do this action.");-- QStringList buttons;- buttons << QObject::tr("Yes, add dot")- << QObject::tr("No, treat as single frame");-- DVGui::MessageAndCheckboxDialog* renameDialog =- DVGui::createMsgandCheckbox(DVGui::QUESTION, label, checkBoxLabel,- buttons, 1, Qt::Unchecked);- int ret = renameDialog->exec();- int checked = renameDialog->getChecked();- if (checked) {- Preferences::instance()->setValue(renamePolicy, ret);- TApp::instance()->getCurrentScene()->notifyImportPolicyChanged(ret);- }- return ret == 1;- };+ QStringList buttons;+ buttons << QObject::tr("Yes, add dot")+ << QObject::tr("No, treat as single frame");- static bool isSharingSameParam(const TFilePath& path1,- const TFilePath& path2) {- std::wstring str1 = path1.getWideName(); // base name- std::wstring str2 = path2.getWideName();+ DVGui::MessageAndCheckboxDialog *renameDialog =+ DVGui::createMsgandCheckbox(DVGui::QUESTION, label, checkBoxLabel,+ buttons, 1, Qt::Unchecked);+ int ret = renameDialog->exec();+ int checked = renameDialog->getChecked();+ if (checked) {+ Preferences::instance()->setValue(renamePolicy, ret);+ TApp::instance()->getCurrentScene()->notifyImportPolicyChanged(ret);+ }+ return ret == 1;+ };- str1.erase(std::remove_if(str1.begin(), str1.end(), ::iswdigit),- str1.end());- str2.erase(std::remove_if(str2.begin(), str2.end(), ::iswdigit),- str2.end());+ static bool isSharingSameParam(const TFilePath &path1,+ const TFilePath &path2) {+ std::wstring str1 = path1.getWideName(); // base name+ std::wstring str2 = path2.getWideName();- return str1 == str2;- }+ str1.erase(std::remove_if(str1.begin(), str1.end(), ::iswdigit),+ str1.end());+ str2.erase(std::remove_if(str2.begin(), str2.end(), ::iswdigit),+ str2.end());++ return str1 == str2;+ }- static TFilePath getLevelPath(TFilePath path) {- std::wstring levelBaseName = path.getWideName();+ static TFilePath getLevelPath(TFilePath path) {+ std::wstring levelBaseName = path.getWideName();- int i = levelBaseName.size();- while (i > 0 && std::iswdigit(levelBaseName[i - 1])) {- --i;- }- levelBaseName = levelBaseName.substr(0, i);+ int i = levelBaseName.size();+ while (i > 0 && std::iswdigit(levelBaseName[i - 1])) {+ --i;+ }+ levelBaseName = levelBaseName.substr(0, i);- if (!levelBaseName.size())- levelBaseName = path.getParentDir().getWideName();- return path.withName(levelBaseName).withFrame();- }- }; // locals-- TApp* app = TApp::instance();- ToonzScene* scene = app->getCurrentScene()->getScene();- for (auto rd = rds.begin(); rd != rds.end();++rd) {- TFilePath& path = rd->m_path;- if (!locals::matchSequencePattern(path))continue;- if (askUser &&- !locals::checkRenamePolicy(path)) continue;- TFilePath levelPath = scene->decodeFilePath(locals::getLevelPath(path));- bool keepOld = false;- if (TSystem::doesExistFileOrLevel(levelPath)) {- OverwriteDialog dialog;- levelPath = levelPath.withName(dialog.execute(scene, levelPath, false));- if (dialog.getChoice() == OverwriteDialog::OVERWRITE)- TSystem::removeFileOrLevel(levelPath);- else if (dialog.getChoice() == OverwriteDialog::KEEP_OLD)- keepOld = true;- }- TFilePath ¤tPath = rd->m_path;- TFilePathSet files;- files.push_back(scene->decodeFilePath(currentPath));- auto nextRd = rd;- nextRd++;- for (; nextRd != rds.end();) {- if ((currentPath.getParentDir() == nextRd->m_path.getParentDir()) &&- (locals::isSharingSameParam(currentPath, nextRd->m_path))) {- if(!keepOld)files.push_back(scene->decodeFilePath(nextRd->m_path));- nextRd = rds.erase(nextRd);- }- else break;- }- if (keepOld) {- currentPath = levelPath; continue;- }- if (files.empty())continue;- if (TSystem::renameImageSequence(+ if (!levelBaseName.size())+ levelBaseName = path.getParentDir().getWideName();+ return path.withName(levelBaseName).withFrame();+ }+ }; // locals++ TApp *app = TApp::instance();+ ToonzScene *scene = app->getCurrentScene()->getScene();+ for (auto rd = rds.begin(); rd != rds.end(); ++rd) {+ TFilePath &path = rd->m_path;+ if (!locals::matchSequencePattern(path)) continue;+ if (askUser && !locals::checkRenamePolicy(path)) continue;+ TFilePath levelPath = scene->decodeFilePath(locals::getLevelPath(path));+ bool keepOld = false;+ if (TSystem::doesExistFileOrLevel(levelPath)) {+ OverwriteDialog dialog;+ levelPath = levelPath.withName(dialog.execute(scene, levelPath, false));+ if (dialog.getChoice() == OverwriteDialog::OVERWRITE)+ TSystem::removeFileOrLevel(levelPath);+ else if (dialog.getChoice() == OverwriteDialog::KEEP_OLD)+ keepOld = true;+ }+ TFilePath ¤tPath = rd->m_path;+ TFilePathSet files;+ files.push_back(scene->decodeFilePath(currentPath));+ auto nextRd = rd;+ nextRd++;+ for (; nextRd != rds.end();) {+ if ((currentPath.getParentDir() == nextRd->m_path.getParentDir()) &&+ (locals::isSharingSameParam(currentPath, nextRd->m_path))) {+ if (!keepOld) files.push_back(scene->decodeFilePath(nextRd->m_path));+ nextRd = rds.erase(nextRd);+ } else+ break;+ }+ if (keepOld) {+ currentPath = levelPath;+ continue;+ }+ if (files.empty()) continue;+ if (TSystem::renameImageSequence(files, levelPath,- currentPath.getWideName().substr(0,- currentPath.getWideName().find_last_not_of(L"0123456789") + 1)- .size())) {- QCoreApplication::processEvents();- currentPath = levelPath;- } else {- // Failed to rename Files- DVGui::warning(QString("Failed to rename files!\n%1").arg(rd->m_path.getQString()));- break;- }+ currentPath.getWideName()+ .substr(0, currentPath.getWideName().find_last_not_of(+ L"0123456789") ++ 1)+ .size())) {+ QCoreApplication::processEvents();+ currentPath = levelPath;+ } else {+ // Failed to rename Files+ DVGui::warning(+ QString("Failed to rename files!\n%1").arg(rd->m_path.getQString()));+ break;}+ }}//===========================================================================@@ -3090,12 +3209,13 @@ public:DVGui::warning(QObject::tr("No Current Scene"));return; // non dovrebbe succedere mai}- //TFilePath levelPath = sl->getPath();- //levelPath = scene->decodeFilePath(levelPath);- //if (!levelPath.isAbsolute() && (scene->isUntitled() || scene->getSceneName().empty())) {- // error(QObject::tr("Save the scene first") + levelPath.getQString());- // return;- //}+ // TFilePath levelPath = sl->getPath();+ // levelPath = scene->decodeFilePath(levelPath);+ // if (!levelPath.isAbsolute() && (scene->isUntitled() ||+ // scene->getSceneName().empty())) {+ // error(QObject::tr("Save the scene first") + levelPath.getQString());+ // return;+ // }// reset the undo before save levelif (Preferences::instance()->getBoolValue(resetUndoOnSavingLevel))diff --git a/toonz/sources/toonz/iocommand.h b/toonz/sources/toonz/iocommand.hindex 4f566b96d..f23e3c3ef 100644--- a/toonz/sources/toonz/iocommand.h+++ b/toonz/sources/toonz/iocommand.h@@ -15,6 +15,10 @@// Qt includes#include <QDialog>+// TnzQt includes+#include "toonzqt/dvdialog.h"+#include "toonzqt/imageutils.h"+// boost includes#include <boost/optional.hpp>@@ -33,10 +37,8 @@ class TCamera;class TPropertyGroup;class TXsheet;-namespace DVGui {-class ProgressDialog;-}-+using namespace DVGui;+using namespace ImageUtils;//====================================================/*! \file iocommand.h@@ -105,17 +107,21 @@ struct LoadResourceArguments {};enum class RenamePolicy {- ASK_USER,- RENAME,- NEVER,+ ASK_USER,+ RENAME,+ NEVER,};++ enum class ConvertPolicy {+ ASK_USER,+ CONVERT,+ NEVER,+ };+public:std::vector<ResourceData>resourceDatas; //!< [\p In/Out] Data identifying a single resource.- // reuse TFrameIds retrieved by FileBrowser- std::vector<std::vector<TFrameId>> frameIdsSet;-TFilePath castFolder; //!< [\p In] Cast panel folder where the resources//! will be inserted.@@ -130,7 +136,9 @@ public:ImportPolicy importPolicy; //!< [\p In] Policy adopted for resources//! external to current scene.- RenamePolicy renamePolicy;+ RenamePolicy renamePolicy;+ ConvertPolicy convertPolicy; // Convert Raster to TLV+bool expose; //!< [\p In] Whether resources must be exposed in the//! xsheet.@@ -162,6 +170,8 @@ public:Preferences::instance()->getDefaultImportPolicy())), renamePolicy(static_cast<RenamePolicy>(Preferences::instance()->getDefaultRenamePolicy()))+ , convertPolicy(static_cast<ConvertPolicy>(+ Preferences::instance()->getDefaultConvertPolicy())), expose(Preferences::instance()->isAutoExposeEnabled()), xFrom(-1), xTo(-1)@@ -177,10 +187,46 @@ public://-------------------------------------------------------------------------class ConvertingPopup final : public QDialog {+class ConvertingPopup final : public ProgressDialog {+private:+ FrameTaskNotifier *m_notifier = nullptr;+ TFilePath m_path;+public:- ConvertingPopup(QWidget *parent, QString fileName);- ~ConvertingPopup();+ ConvertingPopup(QWidget *parent, TFilePath fp)+ : ProgressDialog(QString(QObject::tr("Converting %1 to tlv format...")+ .arg(fp.getQString())),+ "Cancel", 0, 1, parent)+ , m_path(fp) {};+ ConvertingPopup(QWidget *parent, QString str)+ : ProgressDialog(str, "Cancel", 0, 1, parent) {}+ ~ConvertingPopup() {+ if (m_notifier) delete m_notifier;+ };+ void setPath(TFilePath filePath) {+ ProgressDialog::setLabelText(QObject::tr("Converting %1 to tlv format...")+ .arg(filePath.getQString()));+ };+ FrameTaskNotifier *getNotifier() {+ if (m_notifier) delete m_notifier;+ m_notifier = new FrameTaskNotifier();+ m_notifier->setParent(this);++ connect(m_notifier, &FrameTaskNotifier::frameCompleted, this,+ [this](int f) { setValue(f); });++ connect(m_notifier, &FrameTaskNotifier::levelCompleted, this,+ [this](const TFilePath &fp) {+ m_path = fp;+ });++ connect(m_notifier, &FrameTaskNotifier::error, this,+ [this]() { setLabelText(tr("Error occurred.")); });++ return m_notifier;+ }++ TFilePath getResultPath() { return m_path; };};//------------------------------------------------------------------------@@ -205,9 +251,8 @@ enum SaveSceneFlags {// se fp esiste gia': se (flags&SILENTLY_OVERWRITE) != 0 sovrascrive// silenziosamente, altrimenti// chiede il permesso all'utente-// se l'xsheet corrente non e' l'xsheet principale: se (flags&SAVE_SUBXSHEET) ==-// 0 salva comunque-// tutta la scena, altrimenti solo il sottoxsheet+// se l'xsheet corrente non e' l'xsheet principale: se (flags&SAVE_SUBXSHEET)+// == 0 salva comunque tutta la scena, altrimenti solo il sottoxsheetbool saveScene(const TFilePath &fp, int flags);bool saveScene(int flags = 0);@@ -246,8 +291,13 @@ int loadResourceFolders(); //!< Loads the specified folders in current xsheet.//! \return The actually loaded levels count.-void renameResources(std::vector<LoadResourceArguments::ResourceData>& rds,- bool askUser = true);+void renameResources(std::vector<LoadResourceArguments::ResourceData> &rds,+ bool askUser = true);++void convertNAARaster2TLV(std::vector<LoadResourceArguments::ResourceData> &rds,+ bool askUser = true, double dpi = 0,+ bool appendPalette = true);+bool exposeLevel(TXshSimpleLevel *sl, int row, int col, bool insert = false,bool overWrite = false);bool exposeLevel(TXshSimpleLevel *sl, int row, int col,@@ -256,8 +306,8 @@ bool exposeLevel(TXshSimpleLevel *sl, int row, int col,// se e' necessario salvare la scena chiede il permesso all'utente// (save,discard,cancel).-// Ritorna false se l'utente ha risposto Cancel o se il salvataggio della scena-// e' fallito per qualche motivo+// Ritorna false se l'utente ha risposto Cancel o se il salvataggio della+// scena e' fallito per qualche motivobool saveSceneIfNeeded(QString msg);//! Create and expose column with comment in \b commentList.diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cppindex 5b1e3a3fd..d8d01efca 100644--- a/toonz/sources/toonz/preferencespopup.cpp+++ b/toonz/sources/toonz/preferencespopup.cpp@@ -967,6 +967,14 @@ void PreferencesPopup::onRenamePolicyExternallyChanged(int policy) {}//-----------------------------------------------------------------------------+void PreferencesPopup::onConvertPolicyExternallyChanged(int policy) {+ QComboBox* convertPolicyCombo = getUI<QComboBox*>(importPolicy);+ // update preferences data accordingly+ convertPolicyCombo->setCurrentIndex(policy);+}++//-----------------------------------------------------------------------------+QWidget* PreferencesPopup::createUI(PreferencesItemId id,const QList<ComboBoxItem>& comboItems) {PreferencesItem item = m_pref->getItem(id);@@ -1254,6 +1262,7 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {// Loading{importPolicy, tr("Default File Import Behavior:")},{renamePolicy, tr("Normalize Imported Image Sequences:")},+ {convertPolicy, tr("Convert Imported NAA Image Sequences to TLV:")},{autoExposeEnabled, tr("Expose Loaded Levels in Xsheet")},{autoRemoveUnusedLevels,tr("Automatically Remove Unused Levels From Scene Cast")},@@ -1459,6 +1468,10 @@ QList<ComboBoxItem> PreferencesPopup::getComboItemList({{tr("Always ask before renaming"), 0},{tr("Normalize sequence names automatically"), 1},{tr("Keep original filenames"), 2}}},+ {convertPolicy,+ {{tr("Always ask before converting"), 0},+ {tr("Convert raster level automatically"), 1},+ {tr("Do not convert"), 2}}},{rasterLevelCachingBehavior,{{tr("On Demand"), 0},{tr("All Icons"), 1},@@ -1841,6 +1854,7 @@ QWidget* PreferencesPopup::createLoadingPage() {insertUI(importPolicy, lay, getComboItemList(importPolicy));insertUI(renamePolicy, lay, getComboItemList(renamePolicy));+ insertUI(convertPolicy, lay, getComboItemList(convertPolicy));QGridLayout* autoExposeLay = insertGroupBoxUI(autoExposeEnabled, lay);{ insertUI(autoRemoveUnusedLevels, autoExposeLay); }insertUI(subsceneFolderEnabled, lay);@@ -1880,6 +1894,9 @@ QWidget* PreferencesPopup::createLoadingPage() {ret = ret && connect(TApp::instance()->getCurrentScene(),SIGNAL(importPolicyChanged(int)), this,SLOT(onImportPolicyExternallyChanged(int)));+ ret = ret && connect(TApp::instance()->getCurrentScene(),+ SIGNAL(convertPolicyChanged(int)), this,+ SLOT(onConvertPolicyExternallyChanged(int)));ret = ret && connect(TApp::instance()->getCurrentScene(),SIGNAL(renamePolicyChanged(int)), this,SLOT(onRenamePolicyExternallyChanged(int)));diff --git a/toonz/sources/toonz/preferencespopup.h b/toonz/sources/toonz/preferencespopup.hindex 5390e198d..77fce3180 100644--- a/toonz/sources/toonz/preferencespopup.h+++ b/toonz/sources/toonz/preferencespopup.h@@ -179,6 +179,7 @@ private slots:void onLevelFormatEdited();void onImportPolicyExternallyChanged(int policy);void onRenamePolicyExternallyChanged(int policy);+ void onConvertPolicyExternallyChanged(int policy);};//**********************************************************************************diff --git a/toonz/sources/toonzlib/preferences.cpp b/toonz/sources/toonzlib/preferences.cppindex 1960c7ba0..ae86e27e5 100644--- a/toonz/sources/toonzlib/preferences.cpp+++ b/toonz/sources/toonzlib/preferences.cpp@@ -458,7 +458,8 @@ void Preferences::definePreferenceItems() {// Loadingdefine(importPolicy, "importPolicy", QMetaType::Int, 0); // Always ask- define(renamePolicy, "renamePolicy", QMetaType::Int, 0); // Always ask+ define(renamePolicy, "renamePolicy", QMetaType::Int, 0); // Always ask+ define(convertPolicy, "convertPolicy", QMetaType::Int, 0); // Always askdefine(autoExposeEnabled, "autoExposeEnabled", QMetaType::Bool, true);define(subsceneFolderEnabled, "subsceneFolderEnabled", QMetaType::Bool, true);define(removeSceneNumberFromLoadedLevelName,diff --git a/toonz/sources/toonzqt/imageutils.cpp b/toonz/sources/toonzqt/imageutils.cppindex f3e7bd662..9bb69879e 100644--- a/toonz/sources/toonzqt/imageutils.cpp+++ b/toonz/sources/toonzqt/imageutils.cpp@@ -639,11 +639,74 @@ void convert(const TFilePath &source, const TFilePath &dest,//=============================================================================+bool isAAImage(TFilePath path){+ QImage img(path.getQString());+ if (img.isNull())return false;++ uint16_t width = img.width();+ uint16_t height = img.height();+ uint32_t lonelyPixelCount = 0;+ uint32_t totalPixels = width * height;++ std::unordered_map<uint32_t, uint32_t> colorCount;++ const QRgb* imgData = reinterpret_cast<const QRgb*>(img.bits());++ for (int y = 0; y < height; ++y) {+ for (int x = 0; x < width; ++x) {+ QRgb color = imgData[y * width + x];+ colorCount[color]++;+ }+ }++ uint32_t maxCount = 0;+ QRgb mostCommonColor = 0;+ for (const auto& pair : colorCount) {+ if (pair.second > maxCount) {+ maxCount = pair.second;+ mostCommonColor = pair.first;+ }+ }++ for (int y = 1; y < height - 1; ++y) {+ int xcount = 0;+ for (int x = 1; x < width - 1; ++x) {+ QRgb centerColor = imgData[y * width + x];++ if (centerColor == mostCommonColor) {+ ++xcount;+ continue;+ }++ int diffCount = 0;++ if (imgData[y * width + (x - 1)] != centerColor) ++diffCount;+ if (imgData[y * width + (x + 1)] != centerColor) ++diffCount;+ if (imgData[(y - 1) * width + x] != centerColor) ++diffCount;+ if (imgData[(y + 1) * width + x] != centerColor) ++diffCount;++ if (diffCount == 4) {+ lonelyPixelCount++;+ }+ }+ if (xcount == width - 2)+ totalPixels -= width;+ }+++ double ratio = double(lonelyPixelCount) / (totalPixels + 1);++ const double value = 0.05 / 100;+ return ratio > value;+}+void convertNaa2Tlv(const TFilePath &source, const TFilePath &dest,const TFrameId &from, const TFrameId &to,FrameTaskNotifier *frameNotifier, TPalette *palette,bool removeUnusedStyles, double dpi) {- std::string dstExt = dest.getType(), srcExt = source.getType();+ //std::string dstExt = dest.getType(), srcExt = source.getType();+ if(TSystem::doesExistFileOrLevel(dest.withType("tpl")))+ TSystem::deleteFile(dest.withType("tpl"));// Load source level structureTLevelReaderP lr(source);@@ -704,7 +767,7 @@ void convertNaa2Tlv(const TFilePath &source, const TFilePath &dest,frameNotifier->notifyFrameCompleted(100 * (f + 1) / frames.size());}-+if (removeUnusedStyles) converter.removeUnusedStyles(usedStyleIds);}