Manik Bhattacharjee pushed to branch master at Debian Med / camitk
Commits: d2c270b8 by Manik Bhattacharjee at 2026-01-20T19:00:42+01:00 Ignore blhc false positive - - - - - f86fd891 by Manik Bhattacharjee at 2026-01-20T19:19:27+01:00 Adding patch to fix minor UI issue - - - - - 6783c201 by Manik Bhattacharjee at 2026-01-21T02:15:34+01:00 Updating changelog for incusion in unstable - - - - - 4 changed files: - debian/changelog - + debian/patches/0003-force-camitk-extension-on-save.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +camitk (6.0.0-2) unstable; urgency=medium + + * Installation from experimental tested successfully, minor UI issue fixed + in new patch, hopefully ready to switch to unstable + + -- Manik Bhattacharjee <[email protected]> Tue, 20 Jan 2026 19:20:04 +0100 + camitk (6.0.0-1) experimental; urgency=medium * New upstream version 6.0.0 (Closes: #1117520) ===================================== debian/patches/0003-force-camitk-extension-on-save.patch ===================================== @@ -0,0 +1,62 @@ +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: yes +Author: Manik Bhattacharjee <[email protected]> + +--- 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); + ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ 0001-disable-graph-generation-in-api.patch 0002-disable-python-binding-library-test.patch +0003-force-camitk-extension-on-save.patch ===================================== debian/rules ===================================== @@ -84,6 +84,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) # this can be considered as blhc false positive : just ignore them @echo 'blhc: ignore-line-regexp: .*camitk-test-tmp.*' @echo 'blhc: ignore-line-regexp: .*CamiTKExtensionCheck.*' + @echo 'blhc: ignore-line-regexp: .*CMakeCXXCompilerABI.cpp.*' # Use the CamiTK test suite # Note: all tests require an X server, xvfb-run is needed to have a virtual one # Another way: xvfb-run --auto-servernum $(MAKE) -C camitk-build ARGS="-V" test View it on GitLab: https://salsa.debian.org/med-team/camitk/-/compare/b4ab4e6a8d39984f879d1586b9d9aa5d37f4599e...6783c20115eef18f3516386136df2c402504e4a8 -- View it on GitLab: https://salsa.debian.org/med-team/camitk/-/compare/b4ab4e6a8d39984f879d1586b9d9aa5d37f4599e...6783c20115eef18f3516386136df2c402504e4a8 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
