Merge pull request #2640 from lindkvis/MohrsCiclePlotGuard

Mohrs circle plot guards
This commit is contained in:
Jacob Støren
2018-04-05 09:24:10 +02:00
committed by GitHub
2 changed files with 7 additions and 4 deletions

View File

@@ -90,7 +90,8 @@ void RiuSelectionChangedHandler::handleSelectionDeleted() const
RiuPvtPlotUpdater* pvtPlotUpdater = RiuMainWindow::instance()->pvtPlotPanel()->plotUpdater(); RiuPvtPlotUpdater* pvtPlotUpdater = RiuMainWindow::instance()->pvtPlotPanel()->plotUpdater();
pvtPlotUpdater->updateOnSelectionChanged(nullptr); pvtPlotUpdater->updateOnSelectionChanged(nullptr);
RiuMainWindow::instance()->mohrsCirclePlot()->clearPlot(); RiuMohrsCirclePlot* mohrsCirclePlot = RiuMainWindow::instance()->mohrsCirclePlot();
if (mohrsCirclePlot) mohrsCirclePlot->clearPlot();
updateResultInfo(nullptr); updateResultInfo(nullptr);
@@ -110,7 +111,8 @@ void RiuSelectionChangedHandler::handleItemAppended(const RiuSelectionItem* item
RiuPvtPlotUpdater* pvtPlotUpdater = RiuMainWindow::instance()->pvtPlotPanel()->plotUpdater(); RiuPvtPlotUpdater* pvtPlotUpdater = RiuMainWindow::instance()->pvtPlotPanel()->plotUpdater();
pvtPlotUpdater->updateOnSelectionChanged(item); pvtPlotUpdater->updateOnSelectionChanged(item);
RiuMainWindow::instance()->mohrsCirclePlot()->appendSelection(item); RiuMohrsCirclePlot* mohrsCirclePlot = RiuMainWindow::instance()->mohrsCirclePlot();
if (mohrsCirclePlot) mohrsCirclePlot->appendSelection(item);
updateResultInfo(item); updateResultInfo(item);
@@ -124,7 +126,8 @@ void RiuSelectionChangedHandler::handleSetSelectedItem(const RiuSelectionItem* i
{ {
RiuMainWindow::instance()->resultPlot()->deleteAllCurves(); RiuMainWindow::instance()->resultPlot()->deleteAllCurves();
RiuMainWindow::instance()->mohrsCirclePlot()->clearPlot(); RiuMohrsCirclePlot* mohrsCirclePlot = RiuMainWindow::instance()->mohrsCirclePlot();
if (mohrsCirclePlot) mohrsCirclePlot->clearPlot();
handleItemAppended(item); handleItemAppended(item);
} }

View File

@@ -74,7 +74,7 @@ void RiuTimeStepChangedHandler::handleTimeStepChanged(Rim3dView* changedView) co
pvtPlotUpdater->updateOnTimeStepChanged(changedView); pvtPlotUpdater->updateOnTimeStepChanged(changedView);
RiuMohrsCirclePlot* mohrsCirclePlot = RiuMainWindow::instance()->mohrsCirclePlot(); RiuMohrsCirclePlot* mohrsCirclePlot = RiuMainWindow::instance()->mohrsCirclePlot();
mohrsCirclePlot->updateOnTimeStepChanged(changedView); if (mohrsCirclePlot) mohrsCirclePlot->updateOnTimeStepChanged(changedView);
//tim.reportTimeMS("done"); //tim.reportTimeMS("done");
} }