Support for storing custom colors, increased version to 1.8

Added check for TIFF tiles Added storing custom colors Increased version to 1.8
computationalpathologygroup · May 5, 2018 · f2c990d · f2c990d
1 parent 9456de1
commit f2c990d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git a/ASAP/CMakeLists.txt b/ASAP/CMakeLists.txt
@@ -1,8 +1,3 @@
-cmake_minimum_required(VERSION 2.8.9)
-CMAKE_POLICY(SET CMP0020 NEW)
-CMAKE_POLICY(SET CMP0043 NEW)
-CMAKE_POLICY(SET CMP0053 NEW)
-
 PROJECT(PathologyWorkstation)
 INCLUDE_DIRECTORIES(
   ${PathologyWorkstation_SOURCE_DIR}/../

diff --git a/ASAP/annotation/AnnotationWorkstationExtensionPlugin.cpp b/ASAP/annotation/AnnotationWorkstationExtensionPlugin.cpp
@@ -88,11 +88,21 @@ AnnotationWorkstationExtensionPlugin::AnnotationWorkstationExtensionPlugin() :
     connect(_treeWidget, SIGNAL(itemExpanded(QTreeWidgetItem*)), this, SLOT(resizeOnExpand()));
   }
   _settings = new QSettings(QSettings::IniFormat, QSettings::UserScope, "DIAG", "ASAP", this);
+
+  for (int i = 0; i < QColorDialog::customCount(); ++i) {
+    QColor customColor = _settings->value("annotationCustomColor" + QString(i), QColor("white")).value<QColor>();
+    QColorDialog::setCustomColor(i, customColor);
+  }
+
   qRegisterMetaTypeStreamOperators<QtAnnotation*>("QtAnnotation*");
   qRegisterMetaTypeStreamOperators<QtAnnotationGroup*>("QtAnnotationGroup*");
 }
 
 AnnotationWorkstationExtensionPlugin::~AnnotationWorkstationExtensionPlugin() {
+  for (int i = 0; i < QColorDialog::customCount(); ++i) {
+    QColor customColor = QColorDialog::customColor(i);
+    _settings->setValue("annotationCustomColor" + QString(i), customColor);
+  }
   clear();
 }
 

diff --git a/ASAP/visualization/VisualizationWorkstationExtensionPlugin.cpp b/ASAP/visualization/VisualizationWorkstationExtensionPlugin.cpp
@@ -53,7 +53,7 @@ bool VisualizationWorkstationExtensionPlugin::initialize(PathologyViewer* viewer
 }
 
 QDockWidget* VisualizationWorkstationExtensionPlugin::getDockWidget() {
-  _dockWidget = new QDockWidget("Cancer detection visualization");
+  _dockWidget = new QDockWidget("Overlays");
   QUiLoader loader;
   QFile file(":/VisualizationWorkstationExtensionPlugin_ui/VisualizationWorkstationExtensionPlugin.ui");
   file.open(QFile::ReadOnly);

diff --git a/ASAP/visualization/resources/VisualizationWorkstationExtensionPlugin.ui b/ASAP/visualization/resources/VisualizationWorkstationExtensionPlugin.ui
@@ -71,7 +71,7 @@ QLabel {
     <item>
      <widget class="QPushButton" name="OpenResultPushButton">
       <property name="text">
-       <string>Open result image</string>
+       <string>Open image for overlay</string>
       </property>
      </widget>
     </item>

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,9 +1,13 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.9)
+CMAKE_POLICY(SET CMP0020 NEW)
+CMAKE_POLICY(SET CMP0043 NEW)
+CMAKE_POLICY(SET CMP0053 NEW)
+CMAKE_POLICY(SET CMP0071 NEW)
 PROJECT(DIAGPathology)
 
 SET(CURRENT_MAJOR_VERSION 1)
-SET(CURRENT_MINOR_VERSION 7)
-SET(CURRENT_PATCH_VERSION 4)
+SET(CURRENT_MINOR_VERSION 8)
+SET(CURRENT_PATCH_VERSION 0)
 set(ASAP_VERSION ${CURRENT_MAJOR_VERSION}.${CURRENT_MINOR_VERSION}.${CURRENT_PATCH_VERSION})
 
 include (GenerateExportHeader)

diff --git a/io/multiresolutionimageinterface/TIFFImage.cpp b/io/multiresolutionimageinterface/TIFFImage.cpp
@@ -43,6 +43,10 @@ bool TIFFImage::initializeType(const std::string& imagePath) {
       return false;
     }
   }
+  if (TIFFIsTiled(_tiff) == 0) {
+    cleanup();
+    return false;
+  }
   unsigned int cType = 0, dType = 0, planarconfig=0, bitsPerSample = 0;
   TIFFGetField(_tiff, TIFFTAG_PHOTOMETRIC, &cType);