Skip to content
Snippets Groups Projects
Commit 03e9bdda authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

+ ASSERT to prevent calling nullptr

parent e2861d1d
No related branches found
No related tags found
1 merge request!2186some more cleanup, and new clang-tidy configuration with all obligatory tests
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "GUI/Model/Beam/BeamAngleItems.h" #include "GUI/Model/Beam/BeamAngleItems.h"
#include "Base/Const/Units.h" #include "Base/Const/Units.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Descriptor/DistributionItems.h" #include "GUI/Model/Descriptor/DistributionItems.h"
BeamAzimuthalAngleItem::BeamAzimuthalAngleItem() BeamAzimuthalAngleItem::BeamAzimuthalAngleItem()
...@@ -31,6 +32,7 @@ void BeamAzimuthalAngleItem::readFrom(QXmlStreamReader* r) ...@@ -31,6 +32,7 @@ void BeamAzimuthalAngleItem::readFrom(QXmlStreamReader* r)
void BeamAzimuthalAngleItem::initDistribution(DistributionItem* newDistribution, void BeamAzimuthalAngleItem::initDistribution(DistributionItem* newDistribution,
const DistributionItem* currentDistribution) const DistributionItem* currentDistribution)
{ {
ASSERT(newDistribution);
double meanVal = 0.0; double meanVal = 0.0;
if (const auto* cd = dynamic_cast<const SymmetricResolutionItem*>(currentDistribution)) if (const auto* cd = dynamic_cast<const SymmetricResolutionItem*>(currentDistribution))
meanVal = cd->mean(); meanVal = cd->mean();
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
// ************************************************************************************************ // ************************************************************************************************
#include "GUI/Model/Beam/BeamWavelengthItem.h" #include "GUI/Model/Beam/BeamWavelengthItem.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Descriptor/DistributionItems.h" #include "GUI/Model/Descriptor/DistributionItems.h"
namespace { namespace {
...@@ -22,6 +23,7 @@ const double default_wl = 0.1; ...@@ -22,6 +23,7 @@ const double default_wl = 0.1;
void initDistribution(DistributionItem* newDistribution, void initDistribution(DistributionItem* newDistribution,
const DistributionItem* currentDistribution) const DistributionItem* currentDistribution)
{ {
ASSERT(newDistribution);
double meanVal = default_wl; double meanVal = default_wl;
if (const auto* cd = dynamic_cast<const SymmetricResolutionItem*>(currentDistribution)) if (const auto* cd = dynamic_cast<const SymmetricResolutionItem*>(currentDistribution))
meanVal = cd->mean(); meanVal = cd->mean();
......
...@@ -33,6 +33,7 @@ const QString BaseData("BaseData"); ...@@ -33,6 +33,7 @@ const QString BaseData("BaseData");
} // namespace Tag } // namespace Tag
void setAxisPresentationDefaults(BasicAxisItem* axisItem) void setAxisPresentationDefaults(BasicAxisItem* axisItem)
{ {
ASSERT(axisItem); ASSERT(axisItem);
...@@ -46,6 +47,7 @@ void setAxisPresentationDefaults(BasicAxisItem* axisItem) ...@@ -46,6 +47,7 @@ void setAxisPresentationDefaults(BasicAxisItem* axisItem)
void initDistribution(DistributionItem* newDistribution, void initDistribution(DistributionItem* newDistribution,
const DistributionItem* currentDistribution) const DistributionItem* currentDistribution)
{ {
ASSERT(newDistribution);
double meanVal = 0.0; double meanVal = 0.0;
if (const auto* cd = dynamic_cast<const SymmetricResolutionItem*>(currentDistribution)) if (const auto* cd = dynamic_cast<const SymmetricResolutionItem*>(currentDistribution))
meanVal = cd->mean(); meanVal = cd->mean();
......
...@@ -408,6 +408,7 @@ bool SpecularInstrumentItem::alignedWith(const DatafileItem* item) const ...@@ -408,6 +408,7 @@ bool SpecularInstrumentItem::alignedWith(const DatafileItem* item) const
Frame SpecularInstrumentItem::makeFrame() const Frame SpecularInstrumentItem::makeFrame() const
{ {
auto* axis_item = scanItem()->inclinationAxisItem(); auto* axis_item = scanItem()->inclinationAxisItem();
ASSERT(axis_item);
if (auto* pointwise_axis = dynamic_cast<PointwiseAxisItem*>(axis_item)) { if (auto* pointwise_axis = dynamic_cast<PointwiseAxisItem*>(axis_item)) {
if (!pointwise_axis->axis()) // workaround for loading project if (!pointwise_axis->axis()) // workaround for loading project
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment