From a9453d7d4aae20f948e4436bfbb84c1243c00080 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Wed, 28 Sep 2022 14:14:21 +0200
Subject: [PATCH] ba3d geo -> const/mutable
---
GUI/ba3d/model/object.cpp | 2 +-
GUI/ba3d/model/object.h | 4 ++--
GUI/ba3d/view/canvas.h | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/GUI/ba3d/model/object.cpp b/GUI/ba3d/model/object.cpp
index 189dc3415ff..388a0f61e58 100644
--- a/GUI/ba3d/model/object.cpp
+++ b/GUI/ba3d/model/object.cpp
@@ -98,7 +98,7 @@ void Object::releaseGeometry()
m_geo.reset();
}
-const Geometry& Object::geo()
+const Geometry& Object::geo() const
{
if (!m_geo)
m_geo = geometryStore().getGeometry(gky);
diff --git a/GUI/ba3d/model/object.h b/GUI/ba3d/model/object.h
index bf1a4bc2c41..603be34369f 100644
--- a/GUI/ba3d/model/object.h
+++ b/GUI/ba3d/model/object.h
@@ -44,7 +44,7 @@ public:
void setColor(QColor color) { m_color = color; }
bool valid() const { return !isNull; }
- const Geometry& geo();
+ const Geometry& geo() const;
const QMatrix4x4& matrix() const { return m_matrix; }
protected:
@@ -54,7 +54,7 @@ private:
QColor m_color;
Model* model;
GeometricID::Key gky;
- GeometryHandle m_geo; // retrieved on demand
+ mutable GeometryHandle m_geo; // retrieved on demand
QMatrix4x4 m_matrix;
void releaseGeometry(); // can be released whenever
diff --git a/GUI/ba3d/view/canvas.h b/GUI/ba3d/view/canvas.h
index 4ca779b8a49..fac00d6c04d 100644
--- a/GUI/ba3d/view/canvas.h
+++ b/GUI/ba3d/view/canvas.h
@@ -58,6 +58,7 @@ public:
Camera* cam() { return camera; }
+// void drawObject(const Object
private:
QRect viewport;
float aspectRatio, colorBgR, colorBgG, colorBgB;
--
GitLab