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

mv code line, save fct arg

parent ba570bf5
No related branches found
No related tags found
1 merge request!1095Img3D: reduce dependence on GUI/Model; flatten namespace
Pipeline #77349 passed
...@@ -40,8 +40,8 @@ using Img3D::Particle3DContainer; ...@@ -40,8 +40,8 @@ using Img3D::Particle3DContainer;
namespace { namespace {
std::vector<std::vector<double>> generatePositions(IInterference* const iff, std::vector<std::vector<double>> generatePositions(IInterference* const iff, double layerSize,
double layerSize, double density) double density)
{ {
if (!iff) if (!iff)
return RandomPositionBuilder().generatePositions(layerSize, density); return RandomPositionBuilder().generatePositions(layerSize, density);
...@@ -105,12 +105,10 @@ RealspaceBuilder::RealspaceBuilder(std::function<QColor(const QString&)> fnColor ...@@ -105,12 +105,10 @@ RealspaceBuilder::RealspaceBuilder(std::function<QColor(const QString&)> fnColor
RealspaceBuilder::~RealspaceBuilder() = default; RealspaceBuilder::~RealspaceBuilder() = default;
void RealspaceBuilder::populate(Model* model, Item3D* item, const SceneGeometry& sceneGeometry, void RealspaceBuilder::populate(Model* model, Item3D* item,
const Img3D::CameraParams& cameraPosition) const const SceneGeometry& sceneGeometry) const
{ {
ASSERT(model);
ASSERT(item); ASSERT(item);
model->defCamPos = cameraPosition;
// depending on item type, visualize the full sample model, or only parts of it // depending on item type, visualize the full sample model, or only parts of it
if (const auto* p = dynamic_cast<MultiLayerItem*>(item)) if (const auto* p = dynamic_cast<MultiLayerItem*>(item))
......
...@@ -36,10 +36,7 @@ public: ...@@ -36,10 +36,7 @@ public:
RealspaceBuilder(std::function<QColor(const QString&)> fnColorFromMaterialName); RealspaceBuilder(std::function<QColor(const QString&)> fnColorFromMaterialName);
~RealspaceBuilder(); ~RealspaceBuilder();
void populate(Img3D::Model* model, Item3D* item, const SceneGeometry& sceneGeometry, void populate(Img3D::Model* model, Item3D* item, const SceneGeometry& sceneGeometry) const;
const Img3D::CameraParams& cameraPosition = Img3D::CameraParams({0, -200, 120},
{0, 0, 0},
{0, 0, 1})) const;
private: private:
std::unique_ptr<Img3D::BuilderUtils> m_builderUtils; std::unique_ptr<Img3D::BuilderUtils> m_builderUtils;
......
...@@ -130,9 +130,9 @@ void RealspaceWidget::updateScene() ...@@ -130,9 +130,9 @@ void RealspaceWidget::updateScene()
try { try {
m_cautionSign->clear(); m_cautionSign->clear();
m_realspaceModel->defCamPos = m_canvas->cam()->getPos();
if (m_displayedItem) if (m_displayedItem)
builder3D.populate(m_realspaceModel.get(), m_displayedItem, m_sceneGeometry, builder3D.populate(m_realspaceModel.get(), m_displayedItem, m_sceneGeometry);
m_canvas->cam()->getPos());
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
m_cautionSign->setCautionMessage(ex.what()); m_cautionSign->setCautionMessage(ex.what());
} catch (...) { } catch (...) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment