Merge branch 'develop' into qtnz2

Author: timosachsenberg

cmake/package_deb.cmake

@@ -74,7 +74,7 @@ set(CPACK_COMPONENTS_ALL applications doc library share ${THIRDPARTY_COMPONENT_G
 ## Autogeneration with SHLIBDEPS will add to this variable. For now we include most things statically and require the standard Qt package and libc6 only.
 ## (only available in Ubuntu >=17.10). For older Ubuntu, dependencies can be installed from a thirdparty repo.
 set(CPACK_DEBIAN_PACKAGE_DEPENDS 
-  "libqt6svg6 (>= 6.2.2), libc6 (>= 2.28), libqt6widgets6t64 (>= 6.2.2) | libqt6widget6 (>= 6.2.2), libqt6gui6t64 (>= 6.2.2) | libqt6gui6 (>= 6.2.2), libqt6core6t64 (>= 6.2.2) | libqt6core6 (>= 6.2.2), libyaml-cpp0.7 | libyaml-cpp0.8")
+  "libqt6svg6 (>= 6.2.2), libc6 (>= 2.28), libqt6widgets6t64 (>= 6.2.2) | libqt6widgets6 (>= 6.2.2), libqt6gui6t64 (>= 6.2.2) | libqt6gui6 (>= 6.2.2), libqt6core6t64 (>= 6.2.2) | libqt6core6 (>= 6.2.2), libyaml-cpp0.7 | libyaml-cpp0.8")
 
 SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
 SET(CPACK_DEBIAN_PACKAGE_SECTION "science")

cmake/package_general.cmake

@@ -99,7 +99,7 @@ elseif(APPLE)
   set(POST_EXCLUDE "")
 else()
   set(PRE_EXCLUDE "")
-  set(POST_EXCLUDE ".*/ld-linux-.*" ".*/linux-vdso.*" ".*/libm\\..*" ".*/libc\\..*" ".*/libpthread\\..*" ".*/libdl\\..*" ".*/libQt6.*")
+  set(POST_EXCLUDE ".*/ld-linux-.*" ".*/linux-vdso.*" ".*/libm\\..*" ".*/libc\\..*" ".*/libpthread\\..*" ".*/libdl\\..*" ".*/libstdc\\+\\+\\..*" ".*/libgcc_s.*" ".*/libgomp\\..*" ".*/libQt6.*")
 endif()
 
 # TODO check if we can reduce the permissions

src/openms_gui/source/VISUAL/LayerDataBase.cpp

@@ -119,12 +119,28 @@ namespace OpenMS
 
   float LayerDataBase::getMinIntensity() const
   {
-    return getRange().getMinIntensity();
+    if (!getRange().RangeIntensity::isEmpty())
+    {
+      return getRange().getMinIntensity();
+    }
+    else
+    {
+      OPENMS_LOG_WARN << "No data in range to get min intensity from. Returning 0.0." << std::endl;
+      return 0.0f;
+    }
   }
 
   float LayerDataBase::getMaxIntensity() const
   {
-    return getRange().getMaxIntensity();
+    if (!getRange().RangeIntensity::isEmpty())
+    {
+      return getRange().getMaxIntensity();
+    }
+    else
+    {
+      OPENMS_LOG_WARN << "No data in range to get max intensity from. Returning 0.0." << std::endl;
+      return 0.0f;
+    }
   }
 
   LayerAnnotatorBase::LayerAnnotatorBase(const FileTypeList& supported_types, const String& file_dialog_text, QWidget* gui_lock) :