style; pre-1.9.0

AlizaMedicalImaging · May 21, 2023 · 5808caf · 5808caf
1 parent 04daaaf
commit 5808caf
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 44 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -68,7 +68,7 @@ project(ALIZAMS)
 #
 #
 if(APPLE)
- set(ALIZAMS_OSX_BUNDLE_VERSION "1.8.4")
+ set(ALIZAMS_OSX_BUNDLE_VERSION "1.9.0")
 endif()
 
 # Qt major version, required.
@@ -311,7 +311,7 @@ endmacro()
 
 set(MDCM_MAJOR_VERSION 1)
 set(MDCM_MINOR_VERSION 3)
-set(MDCM_BUILD_VERSION 0)
+set(MDCM_BUILD_VERSION 1)
 set(MDCM_VERSION "${MDCM_MAJOR_VERSION}.${MDCM_MINOR_VERSION}.${MDCM_BUILD_VERSION}")
 set(MDCM_API_VERSION "${MDCM_MAJOR_VERSION}.${MDCM_MINOR_VERSION}")
 

diff --git a/GUI/mainwindow.cpp b/GUI/mainwindow.cpp
@@ -613,11 +613,9 @@ void MainWindow::open_args(const QStringList & l)
  delete pb;
  if (!message.isEmpty())
  {
- QMessageBox mbox;
- mbox.addButton(QMessageBox::Close);
- mbox.setIcon(QMessageBox::Information);
- mbox.setText(message);
- mbox.exec();
+ InfoDialog info;
+ info.set_text(message);
+ info.exec();
  }
  mutex.unlock();
 }
@@ -1387,11 +1385,9 @@ void MainWindow::dropEvent(QDropEvent * e)
  }
  if (!message.isEmpty())
  {
- QMessageBox mbox;
- mbox.addButton(QMessageBox::Close);
- mbox.setIcon(QMessageBox::Information);
- mbox.setText(message);
- mbox.exec();
+ InfoDialog info;
+ info.set_text(message);
+ info.exec();
  }
  mutex.unlock();
 }
@@ -1459,11 +1455,9 @@ void MainWindow::load_any()
  }
  if (!message.isEmpty())
  {
- QMessageBox mbox;
- mbox.addButton(QMessageBox::Close);
- mbox.setIcon(QMessageBox::Information);
- mbox.setText(message);
- mbox.exec();
+ InfoDialog info;
+ info.set_text(message);
+ info.exec();
  }
  mutex.unlock();
 }
@@ -1613,10 +1607,9 @@ void MainWindow::load_dicom_series2()
  delete pb;
  if (!message.isEmpty())
  {
- InfoDialog * info = new InfoDialog();
- info->set_text(message);
- info->exec();
- delete info;
+ InfoDialog info;
+ info.set_text(message);
+ info.exec();
  }
  qApp->processEvents();
  mutex.unlock();

diff --git a/alizams_version.h b/alizams_version.h
@@ -1,4 +1,4 @@
 #ifndef ALIZAMS_VERSION
-#define ALIZAMS_VERSION "1.8.4"
+#define ALIZAMS_VERSION "1.9.0"
 #endif
 
diff --git a/debian-10/changelog b/debian-10/changelog
@@ -1,5 +1,5 @@
-alizams (1.8.4-1) stable; urgency=low
+alizams (1.9.0-1) stable; urgency=low
 
  * Initial upload to Debian. Closes: #999999.
 
- -- Replace Maintainer <[email protected]> Wed, 27 Jul 2022 00:00:00 -0000
+ -- Replace Maintainer <[email protected]> Sat, 20 May 2023 00:00:00 -0000
diff --git a/debian-12-qt5/changelog b/debian-12-qt5/changelog
@@ -1,5 +1,5 @@
-alizams (1.8.4-1) stable; urgency=low
+alizams (1.9.0-1) stable; urgency=low
 
  * Initial upload to Debian. Closes: #999999.
 
- -- Replace Maintainer <[email protected]> Wed, 27 Jul 2022 00:00:00 -0000
+ -- Replace Maintainer <[email protected]> Sat, 20 May 2023 00:00:00 -0000
diff --git a/debian-12-qt6/changelog b/debian-12-qt6/changelog
@@ -1,5 +1,5 @@
-alizams (1.8.4-1) stable; urgency=low
+alizams (1.9.0-1) stable; urgency=low
 
  * Initial upload to Debian. Closes: #999999.
 
- -- Replace Maintainer <[email protected]> Wed, 27 Jul 2022 00:00:00 -0000
+ -- Replace Maintainer <[email protected]> Sat, 20 May 2023 00:00:00 -0000
diff --git a/dicom/dicomutils.cpp b/dicom/dicomutils.cpp
@@ -3539,7 +3539,7 @@ bool DicomUtils::read_slices(
 
 bool DicomUtils::read_slices_uihgrid(
  const mdcm::DataSet & ds, ImageVariant * ivariant,
- const bool ok3d, const bool skip_texture,
+ const bool ok3d,
  float tolerance)
 {
  if (!ivariant) return false;
@@ -3801,7 +3801,7 @@ bool DicomUtils::read_slices_uihgrid(
 
 bool DicomUtils::read_slices_rtdose(
  const QString & filename_, ImageVariant * ivariant,
- const bool ok3d, const bool skip_texture,
+ const bool ok3d,
  float tolerance)
 {
  if (!ivariant) return false;
@@ -8226,7 +8226,6 @@ QString DicomUtils::read_series(
  ds,
  ivariant,
  ok3d,
- ivariant->di->skip_texture,
  tolerance);
  if (slices_ok) ivariant->iod_supported = true;
  else geometry_from_image = true;
@@ -8259,7 +8258,6 @@ QString DicomUtils::read_series(
  images_ipp.at(j),
  ivariant,
  ok3d,
- ivariant->di->skip_texture,
  0.01f);
  if (slices_ok)
  {
@@ -14619,9 +14617,9 @@ QString DicomUtils::read_dicom(
  {
  if (!message_.isEmpty()) message_.append(QChar('\n'));
  message_.append(QString(
- "Could not find series referenced in RTSTRUCT, "
- "try to use DICOM scanner from the directory containing both, "
- "RTSTRUCT and referenced series"));
+ "The series referenced in the Grayscale Soft Copy presentation "
+ "could not be found. Try using a DICOM scanner from a "
+ "folder containing both the RTSTRUCT and the referenced series."));
  mdcm::Reader reader;
 #ifdef _WIN32
 #if (defined(_MSC_VER) && defined(MDCM_WIN32_UNC))
@@ -14694,8 +14692,9 @@ QString DicomUtils::read_dicom(
  {
  if (!message_.isEmpty()) message_.append(QChar('\n'));
  message_.append(QString(
- "Could not find or load series referenced in Grayscale Softcopy Presentation, "
- "try to use DICOM scanner from folder containing both, GSPS and referenced series"));
+ "The series referenced in the Grayscale Soft Copy presentation "
+ "could not be found or opened. Try using a DICOM scanner from a "
+ "folder containing both the GSPS series and the referenced series."));
  }
  }
  if (!color_softcopy_pr_files.empty() ||

diff --git a/dicom/dicomutils.h b/dicom/dicomutils.h
@@ -251,11 +251,11 @@ class DicomUtils
  float);
  static bool read_slices_uihgrid(
  const mdcm::DataSet&, ImageVariant*,
- const bool, const bool,
+ const bool,
  float);
  static bool read_slices_rtdose(
  const QString&, ImageVariant*,
- const bool, const bool,
+ const bool,
  float);
  static void read_dimension_index_sq(
  const mdcm::DataSet&, DimIndexSq&);

diff --git a/fedora-34/alizams.spec b/fedora-34/alizams.spec
@@ -1,5 +1,5 @@
 Name: alizams
-Version: 1.8.4
+Version: 1.9.0
 Release: 1%{?dist}
 Summary: Aliza MS DICOM Viewer
 License: GPLv3

diff --git a/package/archive/usr/share/man/man1/alizams.1 b/package/archive/usr/share/man/man1/alizams.1
@@ -1,4 +1,4 @@
-.TH ALIZAMS "1" "Jul 2022" "AlizaMS version: 1.8" "User Commands"
+.TH ALIZAMS "1" "May 2023" "AlizaMS version: 1.9" "User Commands"
 .SH NAME
 alizams \- Medical Imaging
 .SH SYNOPSIS

diff --git a/package/archive/usr/share/metainfo/alizams.metainfo.xml b/package/archive/usr/share/metainfo/alizams.metainfo.xml
@@ -43,11 +43,11 @@
  </screenshots>
 
  <releases>
- <release version="1.8.3" date="2022-07-27">
+ <release version="1.9.0" date="2023-05-20">
  <description>
- <p>Release 1.8.3</p>
+ <p>Release 1.9.0</p>
  </description>
- <url>https://github.com/AlizaMedicalImaging/AlizaMS/releases/tag/v1.8.3</url>
+ <url>https://github.com/AlizaMedicalImaging/AlizaMS/releases/tag/v1.9.0</url>
  </release>
  </releases>