From 0c80e7079b3e93cbcf6975d4ff1bbb7caa6851db Mon Sep 17 00:00:00 2001 From: Spiros Tsalikis Date: Wed, 12 Apr 2023 12:53:11 -0400 Subject: [PATCH] ENH: Remove use of chart() in ctkVTKScalarsToColorsView/Widget --- .../Cpp/ctkVTKScalarsToColorsViewTest2.cpp | 4 +-- .../VTK/Widgets/ctkVTKScalarsToColorsView.cpp | 19 ++++++++----- .../VTK/Widgets/ctkVTKScalarsToColorsView.h | 5 ++-- .../Widgets/ctkVTKScalarsToColorsWidget.cpp | 28 ++++++++++--------- 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/Libs/Visualization/VTK/Widgets/Testing/Cpp/ctkVTKScalarsToColorsViewTest2.cpp b/Libs/Visualization/VTK/Widgets/Testing/Cpp/ctkVTKScalarsToColorsViewTest2.cpp index 7999712ebe..c6bd0f31ea 100644 --- a/Libs/Visualization/VTK/Widgets/Testing/Cpp/ctkVTKScalarsToColorsViewTest2.cpp +++ b/Libs/Visualization/VTK/Widgets/Testing/Cpp/ctkVTKScalarsToColorsViewTest2.cpp @@ -107,11 +107,11 @@ int ctkVTKScalarsToColorsViewTest2(int argc, char * argv [] ) ctkVTKScalarsToColorsView view(0); // add transfer function item vtkPlot* ctfPlot = view.addColorTransferFunction(ctf); - view.chart()->SetPlotCorner(ctfPlot, 1); + view.chartXY()->SetPlotCorner(ctfPlot, 1); ctfPlot->SetOpacity(0.7); // add histogram item view.addPlot(histogramPlot); - view.chart()->SetBarWidthFraction(1.); + view.chartXY()->SetBarWidthFraction(1.); view.setAxesToChartBounds(); view.show(); diff --git a/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.cpp b/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.cpp index 657e31a018..515e824da2 100644 --- a/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.cpp +++ b/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.cpp @@ -27,6 +27,7 @@ // VTK includes #include +#include #include #include #include @@ -75,9 +76,12 @@ ctkVTKScalarsToColorsViewPrivate::ctkVTKScalarsToColorsViewPrivate(ctkVTKScalars void ctkVTKScalarsToColorsViewPrivate::init() { Q_Q(ctkVTKScalarsToColorsView); - vtkChartXY* chart = q->chart(); - chart->SetAutoAxes(false); - chart->SetHiddenAxisBorder(0); + vtkChartXY* chart = q->chartXY(); + if (chart) + { + chart->SetAutoAxes(false); + chart->SetHiddenAxisBorder(0); + } this->showBorders(true); QObject::connect(q, SIGNAL(boundsChanged()), q, SLOT(onBoundsChanged())); q->onChartUpdated(); @@ -87,7 +91,7 @@ void ctkVTKScalarsToColorsViewPrivate::init() void ctkVTKScalarsToColorsViewPrivate::showBorders(bool visible) { Q_Q(ctkVTKScalarsToColorsView); - vtkChartXY* chart = q->chart(); + vtkChart* chart = q->abstractChart(); for (int i = 0; i < 4; ++i) { chart->GetAxis(i)->SetVisible(true); @@ -283,10 +287,11 @@ ::addPiecewiseFunctionControlPoints(vtkPiecewiseFunction* piecewiseTF) QList ctkVTKScalarsToColorsView::plots()const { QList res; - const vtkIdType count = this->chart()->GetNumberOfPlots(); + vtkChart* chart = this->abstractChart(); + const vtkIdType count = chart->GetNumberOfPlots(); for(vtkIdType i = 0; i < count; ++i) { - res << this->chart()->GetPlot(i); + res << chart->GetPlot(i); } return res; } @@ -506,7 +511,7 @@ ::setPiecewiseFunctionToPlots(vtkPiecewiseFunction* piecewiseTF) bool ctkVTKScalarsToColorsView ::areBordersVisible()const { - return this->chart()->GetAxis(0)->GetVisible(); + return this->abstractChart()->GetAxis(0)->GetVisible(); } // ---------------------------------------------------------------------------- diff --git a/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.h b/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.h index 5d0e4731f6..107f7128eb 100644 --- a/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.h +++ b/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.h @@ -130,10 +130,11 @@ template QList ctkVTKScalarsToColorsView::plots()const { QList res; - const vtkIdType count = this->chart()->GetNumberOfPlots(); + vtkChart* chart = this->abstractChart(); + const vtkIdType count = chart->GetNumberOfPlots(); for(vtkIdType i = 0; i < count; ++i) { - vtkPlot* plot = this->chart()->GetPlot(i); + vtkPlot* plot = chart->GetPlot(i); if (T::SafeDownCast(plot) != 0) { res << T::SafeDownCast(plot); diff --git a/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsWidget.cpp b/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsWidget.cpp index 415b164de4..d1988aa390 100644 --- a/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsWidget.cpp +++ b/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsWidget.cpp @@ -31,6 +31,7 @@ // VTK includes #include +#include #include #include #include @@ -333,14 +334,15 @@ void ctkVTKScalarsToColorsWidget::setCurrentControlPointsItem(vtkControlPointsIt } this->qvtkReconnect(d->CurrentControlPointsItem, item, vtkCommand::ModifiedEvent, this, SLOT(updateCurrentPoint())); + vtkChart* chart = d->View->abstractChart(); this->qvtkReconnect(d->CurrentControlPointsItem ? - d->CurrentControlPointsItem->GetXAxis() : d->View->chart()->GetAxis(0), - item ? item->GetXAxis() : d->View->chart()->GetAxis(0), + d->CurrentControlPointsItem->GetXAxis() : chart->GetAxis(0), + item ? item->GetXAxis() : chart->GetAxis(0), vtkCommand::ModifiedEvent, this, SLOT(onAxesModified())); this->qvtkReconnect(d->CurrentControlPointsItem ? - d->CurrentControlPointsItem->GetYAxis() : d->View->chart()->GetAxis(1), - item ? item->GetYAxis() : d->View->chart()->GetAxis(1), + d->CurrentControlPointsItem->GetYAxis() : chart->GetAxis(1), + item ? item->GetYAxis() : chart->GetAxis(1), vtkCommand::ModifiedEvent, this, SLOT(onAxesModified())); d->CurrentControlPointsItem = item; @@ -420,7 +422,7 @@ void ctkVTKScalarsToColorsWidget::updateCurrentPoint() d->CurrentControlPointsItem->GetControlPoint(pointId, point); vtkAxis* xAxis = d->CurrentControlPointsItem ? - d->CurrentControlPointsItem->GetXAxis() : d->View->chart()->GetAxis(vtkAxis::BOTTOM); + d->CurrentControlPointsItem->GetXAxis() : d->View->abstractChart()->GetAxis(vtkAxis::BOTTOM); Q_ASSERT(xAxis); if (xAxis && (xAxis->GetMinimumLimit() > point[0] || xAxis->GetMaximumLimit() < point[0])) { @@ -544,7 +546,7 @@ void ctkVTKScalarsToColorsWidget::xRange(double* range)const { Q_D(const ctkVTKScalarsToColorsWidget); vtkAxis* xAxis = d->CurrentControlPointsItem ? - d->CurrentControlPointsItem->GetXAxis() : d->View->chart()->GetAxis(vtkAxis::BOTTOM); + d->CurrentControlPointsItem->GetXAxis() : d->View->abstractChart()->GetAxis(vtkAxis::BOTTOM); Q_ASSERT(xAxis); range[0] = xAxis->GetMinimum(); range[1] = xAxis->GetMaximum(); @@ -555,7 +557,7 @@ void ctkVTKScalarsToColorsWidget::setXRange(double min, double max) { Q_D(ctkVTKScalarsToColorsWidget); vtkAxis* xAxis = d->CurrentControlPointsItem ? - d->CurrentControlPointsItem->GetXAxis() : d->View->chart()->GetAxis(vtkAxis::BOTTOM); + d->CurrentControlPointsItem->GetXAxis() : d->View->abstractChart()->GetAxis(vtkAxis::BOTTOM); Q_ASSERT(xAxis); if (xAxis->GetMinimum() != min || xAxis->GetMaximum() != max) { @@ -570,7 +572,7 @@ void ctkVTKScalarsToColorsWidget::yRange(double* range)const { Q_D(const ctkVTKScalarsToColorsWidget); vtkAxis* yAxis = d->CurrentControlPointsItem ? - d->CurrentControlPointsItem->GetYAxis() : d->View->chart()->GetAxis(vtkAxis::LEFT); + d->CurrentControlPointsItem->GetYAxis() : d->View->abstractChart()->GetAxis(vtkAxis::LEFT); Q_ASSERT(yAxis); range[0] = yAxis->GetMinimum(); range[1] = yAxis->GetMaximum(); @@ -581,7 +583,7 @@ void ctkVTKScalarsToColorsWidget::setYRange(double min, double max) { Q_D(ctkVTKScalarsToColorsWidget); vtkAxis* yAxis = d->CurrentControlPointsItem ? - d->CurrentControlPointsItem->GetYAxis() : d->View->chart()->GetAxis(vtkAxis::LEFT); + d->CurrentControlPointsItem->GetYAxis() : d->View->abstractChart()->GetAxis(vtkAxis::LEFT); Q_ASSERT(yAxis); if (yAxis->GetMinimum() != min || yAxis->GetMaximum() != max) { @@ -596,14 +598,14 @@ void ctkVTKScalarsToColorsWidget::resetRange() { Q_D(ctkVTKScalarsToColorsWidget); vtkAxis* xAxis = d->CurrentControlPointsItem ? - d->CurrentControlPointsItem->GetXAxis() : d->View->chart()->GetAxis(vtkAxis::BOTTOM); + d->CurrentControlPointsItem->GetXAxis() : d->View->abstractChart()->GetAxis(vtkAxis::BOTTOM); if (xAxis) { this->setXRange(xAxis->GetMinimumLimit(), xAxis->GetMaximumLimit()); } vtkAxis* yAxis = d->CurrentControlPointsItem ? - d->CurrentControlPointsItem->GetYAxis() : d->View->chart()->GetAxis(vtkAxis::LEFT); + d->CurrentControlPointsItem->GetYAxis() : d->View->abstractChart()->GetAxis(vtkAxis::LEFT); if (yAxis) { this->setYRange(yAxis->GetMinimumLimit(), yAxis->GetMaximumLimit()); @@ -615,7 +617,7 @@ void ctkVTKScalarsToColorsWidget::onAxesModified() { Q_D(ctkVTKScalarsToColorsWidget); vtkAxis* xAxis = d->CurrentControlPointsItem ? - d->CurrentControlPointsItem->GetXAxis() : d->View->chart()->GetAxis(vtkAxis::BOTTOM); + d->CurrentControlPointsItem->GetXAxis() : d->View->abstractChart()->GetAxis(vtkAxis::BOTTOM); Q_ASSERT(xAxis); bool wasBlocking = d->XRangeSlider->blockSignals(true); @@ -627,7 +629,7 @@ void ctkVTKScalarsToColorsWidget::onAxesModified() d->XRangeSlider->blockSignals(wasBlocking); vtkAxis* yAxis = d->CurrentControlPointsItem ? - d->CurrentControlPointsItem->GetYAxis() : d->View->chart()->GetAxis(vtkAxis::LEFT); + d->CurrentControlPointsItem->GetYAxis() : d->View->abstractChart()->GetAxis(vtkAxis::LEFT); Q_ASSERT(yAxis); wasBlocking = d->YRangeSlider->blockSignals(true);