Commit 1512063d authored by CABEL Tristan's avatar CABEL Tristan

Merge branch 'develop' of gitlab.inria.fr:dtk/dtk-visualization into develop

parents 3436836e e2a8820c
......@@ -174,8 +174,12 @@ void dtkVisualizationDecoratorAxes::setCanvas(dtkVisualizationCanvas *canvas)
d->marker->SetEnabled(d->show_axes_cb->checkState() == Qt::Checked);
d->cube_axes_actor->SetCamera(d->view->renderer()->GetActiveCamera());
d->cube_axes_actor->SetBounds(d->view->renderer()->ComputeVisiblePropBounds());
if(!d->dataset){
d->cube_axes_actor->SetBounds(d->view->renderer()->ComputeVisiblePropBounds());
} else {
d->cube_axes_actor->SetBounds(d->dataset->GetBounds());
}
}
void dtkVisualizationDecoratorAxes::unsetCanvas(void)
......
......@@ -316,6 +316,10 @@ void dtkVisualizationDecoratorSlices::unsetCanvas(void)
// d_func()->view->renderer()->RemoveActor(d->actor);
}
d->volume_slice_x->SetInteractor(nullptr);
d->volume_slice_y->SetInteractor(nullptr);
d->volume_slice_z->SetInteractor(nullptr);
d_func()->disableScalarBar();
d_func()->view = nullptr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment