Description: When user saves a camitk file, file extension .camitk is added to the name When the user saved a new extension file or a new workspace file, the extension .camitk was not automatically added to the filename. When the user tried to open the saved file, it was not visible due to the wrong filename extensions Forwarded: https://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK/-/merge_requests/251 Author: Manik Bhattacharjee --- a/sdk/actions/application/file/SaveWorkspace.cpp +++ b/sdk/actions/application/file/SaveWorkspace.cpp @@ -67,6 +67,9 @@ Action::ApplyStatus SaveWorkspace::apply QString filename = QFileDialog::getSaveFileName(nullptr, tr("Save Workspace As..."), suggestedName, "CamiTK file (*.camitk);;"); if (!filename.isEmpty()) { + if (!filename.endsWith(".camitk")) { + filename += ".camitk"; + } // save the workspace bool saveStatus = Application::saveWorkspace(filename); if (saveStatus) { --- a/sdk/actions/devstudio/actions/presenter/CamiTKExtensionEditor.cpp +++ b/sdk/actions/devstudio/actions/presenter/CamiTKExtensionEditor.cpp @@ -195,10 +195,14 @@ void CamiTKExtensionEditor::saveClicked( if (reply == QMessageBox::No) { // Ask the user for an alternative name - QString fileName = QFileDialog::getSaveFileName(this, tr("Save File As..."), directory, tr("CamiTK Extension Files (*.camitk)")); + QString suggestedName = directory + "/" + extensionPresenter->getExtensionName().toLower().replace(" ","_") + ".camitk"; + QString fileName = QFileDialog::getSaveFileName(this, tr("Save File As..."), suggestedName, tr("CamiTK Extension Files (*.camitk)")); if (!fileName.isEmpty()) { Application::setLastUsedDirectory(QFileInfo(fileName).absoluteDir()); + if (!fileName.endsWith(".camitk")) { + fileName += ".camitk"; + } camitkFilePath = fileName; // Recursively call saveToFile with the alternative name saveClicked(); --- a/sdk/actions/devstudio/actions/presenter/CamiTKExtensionModelPresenter.cpp +++ b/sdk/actions/devstudio/actions/presenter/CamiTKExtensionModelPresenter.cpp @@ -246,4 +246,9 @@ bool CamiTKExtensionModelPresenter::isPy // -------------------- saveExtensionFile -------------------- void CamiTKExtensionModelPresenter::saveExtensionFile(const QFile& file) { camitkExtensionModel.save(QFileInfo(file).absoluteFilePath()); +} + +// -------------------- getExtensionName -------------------- +QString CamiTKExtensionModelPresenter::getExtensionName() { + return camitkExtensionModel.getModel()["name"]; } \ No newline at end of file --- a/sdk/actions/devstudio/actions/presenter/CamiTKExtensionModelPresenter.h +++ b/sdk/actions/devstudio/actions/presenter/CamiTKExtensionModelPresenter.h @@ -71,6 +71,9 @@ public: /// save the data model void saveExtensionFile(const QFile& file); + /// get current extension name + QString getExtensionName(); + /// make the presenter emit the show message signal void emitShowMessage(const QString& message, int durationMilliseconds = 2000, bool warning = false);