From 2eec0baf4425e7cfd1527ced0a5b756af946341f Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 11 Apr 2023 14:51:20 +0200
Subject: [PATCH] throw -> ASSERT
---
GUI/Model/Data/IntensityDataItem.cpp | 4 ++--
GUI/Model/Data/SpecularDataItem.cpp | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/GUI/Model/Data/IntensityDataItem.cpp b/GUI/Model/Data/IntensityDataItem.cpp
index 66c6f56ba73..8105edf4df3 100644
--- a/GUI/Model/Data/IntensityDataItem.cpp
+++ b/GUI/Model/Data/IntensityDataItem.cpp
@@ -14,6 +14,7 @@
#include "GUI/Model/Data/IntensityDataItem.h"
#include "Base/Axis/IAxis.h"
+#include "Base/Util/Assert.h"
#include "Device/Coord/ICoordSystem.h"
#include "Device/Data/Datafield.h"
#include "GUI/Model/Axis/AmplitudeAxisItem.h"
@@ -76,8 +77,7 @@ IntensityDataItem::~IntensityDataItem() = default;
void IntensityDataItem::setDatafield(Datafield* data)
{
if (data != nullptr) {
- if (data->rank() != 2)
- throw Error("Error in IntensityDataItem::setDatafield: cannot handle non-2D data");
+ ASSERT(data->rank() == 2);
DataItem::setDatafield(data);
updateAxesZoomLevel();
updateAxesLabels();
diff --git a/GUI/Model/Data/SpecularDataItem.cpp b/GUI/Model/Data/SpecularDataItem.cpp
index 15f721033d0..2e8626cb60a 100644
--- a/GUI/Model/Data/SpecularDataItem.cpp
+++ b/GUI/Model/Data/SpecularDataItem.cpp
@@ -71,8 +71,7 @@ SpecularDataItem::SpecularDataItem()
void SpecularDataItem::setDatafield(Datafield* data)
{
if (data != nullptr) {
- if (data->rank() != 1)
- throw Error("Error in SpecularDataItem::setDatafield: cannot handle non-1D data");
+ ASSERT(data->rank() == 1);
DataItem::setDatafield(data);
updateAxesZoomLevel();
} else
--
GitLab