Skip to content
Snippets Groups Projects
Commit 4f21560e authored by Pospelov, Gennady's avatar Pospelov, Gennady
Browse files

Check in 3D view against SampleModel which is going to die

parent 1b8a4553
No related branches found
No related tags found
No related merge requests found
...@@ -128,6 +128,8 @@ void RealSpaceCanvas::onChangeLayerSizeAction(double layerSizeChangeScale) ...@@ -128,6 +128,8 @@ void RealSpaceCanvas::onChangeLayerSizeAction(double layerSizeChangeScale)
void RealSpaceCanvas::onDataChanged(const QModelIndex& index) void RealSpaceCanvas::onDataChanged(const QModelIndex& index)
{ {
auto item = m_sampleModel->itemForIndex(index); auto item = m_sampleModel->itemForIndex(index);
if (!item)
return;
if (!(item->modelType() == Constants::PropertyType if (!(item->modelType() == Constants::PropertyType
&& (item->displayName() == SessionGraphicsItem::P_XPOS && (item->displayName() == SessionGraphicsItem::P_XPOS
...@@ -137,6 +139,9 @@ void RealSpaceCanvas::onDataChanged(const QModelIndex& index) ...@@ -137,6 +139,9 @@ void RealSpaceCanvas::onDataChanged(const QModelIndex& index)
void RealSpaceCanvas::updateScene() void RealSpaceCanvas::updateScene()
{ {
if (!m_currentSelection.isValid())
return;
QApplication::setOverrideCursor(Qt::WaitCursor); QApplication::setOverrideCursor(Qt::WaitCursor);
m_realSpaceModel.reset(new RealSpaceModel); m_realSpaceModel.reset(new RealSpaceModel);
...@@ -215,6 +220,9 @@ void RealSpaceCanvas::setConnected(SampleModel* model, bool makeConnected) ...@@ -215,6 +220,9 @@ void RealSpaceCanvas::setConnected(SampleModel* model, bool makeConnected)
Qt::UniqueConnection); Qt::UniqueConnection);
connect(model, &SampleModel::modelReset, this, &RealSpaceCanvas::resetScene, connect(model, &SampleModel::modelReset, this, &RealSpaceCanvas::resetScene,
Qt::UniqueConnection); Qt::UniqueConnection);
connect(model, &SampleModel::modelAboutToBeReset, this, [&](){ m_currentSelection = QModelIndex();},
Qt::UniqueConnection);
} else { } else {
disconnect(model, &SampleModel::rowsInserted, this, &RealSpaceCanvas::updateScene); disconnect(model, &SampleModel::rowsInserted, this, &RealSpaceCanvas::updateScene);
disconnect(model, &SampleModel::rowsRemoved, this, &RealSpaceCanvas::updateScene); disconnect(model, &SampleModel::rowsRemoved, this, &RealSpaceCanvas::updateScene);
......
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