From 425f75e6e1dda45f0e4b5e66f18d9f83cf66fdc2 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 14 May 2024 14:03:10 +0200
Subject: [PATCH] assert
---
GUI/View/Scene/MaskGraphicsScene.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/GUI/View/Scene/MaskGraphicsScene.cpp b/GUI/View/Scene/MaskGraphicsScene.cpp
index 3c7247755a2..084fafbb901 100644
--- a/GUI/View/Scene/MaskGraphicsScene.cpp
+++ b/GUI/View/Scene/MaskGraphicsScene.cpp
@@ -13,6 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Scene/MaskGraphicsScene.h"
+#include "Base/Util/Assert.h"
#include "GUI/Model/Data/Data2DItem.h"
#include "GUI/Model/Mask/MasksSet.h"
#include "GUI/Model/Mask/PointItem.h"
@@ -205,6 +206,7 @@ void MaskGraphicsScene::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
void MaskGraphicsScene::drawForeground(QPainter* painter, const QRectF&)
{
+ ASSERT(m_plot);
if (m_mouse_position == QPointF())
return;
@@ -286,6 +288,7 @@ void MaskGraphicsScene::updateOverlays()
IOverlay* MaskGraphicsScene::registerOverlay(OverlayItem* item)
{
+ ASSERT(m_plot);
ASSERT(item);
IOverlay* overlay = m_mask2overlay[item];
@@ -354,6 +357,7 @@ void MaskGraphicsScene::makeViewAtMousePosSelected(QGraphicsSceneMouseEvent* eve
void MaskGraphicsScene::processRectangleOrEllipseItem(QGraphicsSceneMouseEvent* event)
{
+ ASSERT(m_plot);
const QPointF click_pos = event->buttonDownScenePos(Qt::LeftButton);
const QPointF mouse_pos = event->scenePos();
@@ -405,6 +409,7 @@ void MaskGraphicsScene::processRectangleOrEllipseItem(QGraphicsSceneMouseEvent*
void MaskGraphicsScene::processPolygonItem(QGraphicsSceneMouseEvent* event)
{
+ ASSERT(m_plot);
ASSERT(m_mode == Canvas2DMode::POLYGON);
if (!m_active_mask) {
@@ -452,6 +457,7 @@ void MaskGraphicsScene::processLineItem(QGraphicsSceneMouseEvent* event)
void MaskGraphicsScene::processVerticalLineItem(const QPointF& pos)
{
+ ASSERT(m_plot);
LineItem* item = new VerticalLineItem;
addLine(item);
item->setPos(m_plot->fromSceneX(pos.x()));
@@ -459,6 +465,7 @@ void MaskGraphicsScene::processVerticalLineItem(const QPointF& pos)
void MaskGraphicsScene::processHorizontalLineItem(const QPointF& pos)
{
+ ASSERT(m_plot);
LineItem* item = new HorizontalLineItem;
addLine(item);
item->setPos(m_plot->fromSceneY(pos.y()));
@@ -492,6 +499,7 @@ void MaskGraphicsScene::processFullframeItem(QGraphicsSceneMouseEvent* event)
bool MaskGraphicsScene::isValidMouseClick(QGraphicsSceneMouseEvent* event) const
{
+ ASSERT(m_plot);
return (event->buttons() & Qt::LeftButton)
&& m_plot->viewportRectangle().contains(event->scenePos());
}
--
GitLab