Skip to content

Commit 1cb4ffa

Browse files
spyridon97spyridon97
committed
ENH: ctkVTKScalarsToColorsView/Widget don't use chart()
1 parent 9a06496 commit 1cb4ffa

File tree

4 files changed

+32
-24
lines changed

4 files changed

+32
-24
lines changed

‎Libs/Visualization/VTK/Widgets/Testing/Cpp/ctkVTKScalarsToColorsViewTest2.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ int ctkVTKScalarsToColorsViewTest2(int argc, char * argv [] )
107107
ctkVTKScalarsToColorsView view(0);
108108
// add transfer function item
109109
vtkPlot* ctfPlot = view.addColorTransferFunction(ctf);
110-
view.chart()->SetPlotCorner(ctfPlot, 1);
110+
view.xyChart()->SetPlotCorner(ctfPlot, 1);
111111
ctfPlot->SetOpacity(0.7);
112112
// add histogram item
113113
view.addPlot(histogramPlot);
114-
view.chart()->SetBarWidthFraction(1.);
114+
view.xyChart()->SetBarWidthFraction(1.);
115115
view.setAxesToChartBounds();
116116
view.show();
117117

‎Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.cpp‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
// VTK includes
2929
#include <vtkAxis.h>
30+
#include <vtkChart.h>
3031
#include <vtkChartXY.h>
3132
#include <vtkColorTransferControlPointsItem.h>
3233
#include <vtkColorTransferFunction.h>
@@ -75,9 +76,12 @@ ctkVTKScalarsToColorsViewPrivate::ctkVTKScalarsToColorsViewPrivate(ctkVTKScalars
7576
void ctkVTKScalarsToColorsViewPrivate::init()
7677
{
7778
Q_Q(ctkVTKScalarsToColorsView);
78-
vtkChartXY* chart = q->chart();
79-
chart->SetAutoAxes(false);
80-
chart->SetHiddenAxisBorder(0);
79+
vtkChartXY* chart = q->xyChart();
80+
if (chart)
81+
{
82+
chart->SetAutoAxes(false);
83+
chart->SetHiddenAxisBorder(0);
84+
}
8185
this->showBorders(true);
8286
QObject::connect(q, SIGNAL(boundsChanged()), q, SLOT(onBoundsChanged()));
8387
q->onChartUpdated();
@@ -87,7 +91,7 @@ void ctkVTKScalarsToColorsViewPrivate::init()
8791
void ctkVTKScalarsToColorsViewPrivate::showBorders(bool visible)
8892
{
8993
Q_Q(ctkVTKScalarsToColorsView);
90-
vtkChartXY* chart = q->chart();
94+
vtkChart* chart = q->abstractChart();
9195
for (int i = 0; i < 4; ++i)
9296
{
9397
chart->GetAxis(i)->SetVisible(true);
@@ -283,10 +287,11 @@ ::addPiecewiseFunctionControlPoints(vtkPiecewiseFunction* piecewiseTF)
283287
QList<vtkPlot*> ctkVTKScalarsToColorsView::plots()const
284288
{
285289
QList<vtkPlot*> res;
286-
const vtkIdType count = this->chart()->GetNumberOfPlots();
290+
vtkChart* chart = this->abstractChart();
291+
const vtkIdType count = chart->GetNumberOfPlots();
287292
for(vtkIdType i = 0; i < count; ++i)
288293
{
289-
res << this->chart()->GetPlot(i);
294+
res << chart->GetPlot(i);
290295
}
291296
return res;
292297
}
@@ -506,7 +511,7 @@ ::setPiecewiseFunctionToPlots(vtkPiecewiseFunction* piecewiseTF)
506511
bool ctkVTKScalarsToColorsView
507512
::areBordersVisible()const
508513
{
509-
return this->chart()->GetAxis(0)->GetVisible();
514+
return this->abstractChart()->GetAxis(0)->GetVisible();
510515
}
511516

512517
// ----------------------------------------------------------------------------

‎Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,11 @@ template<class T>
130130
QList<T*> ctkVTKScalarsToColorsView::plots()const
131131
{
132132
QList<T*> res;
133-
const vtkIdType count = this->chart()->GetNumberOfPlots();
133+
vtkChart* chart = this->abstractChart();
134+
const vtkIdType count = chart->GetNumberOfPlots();
134135
for(vtkIdType i = 0; i < count; ++i)
135136
{
136-
vtkPlot* plot = this->chart()->GetPlot(i);
137+
vtkPlot* plot = chart->GetPlot(i);
137138
if (T::SafeDownCast(plot) != 0)
138139
{
139140
res << T::SafeDownCast(plot);

‎Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsWidget.cpp‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
// VTK includes
3333
#include <vtkAxis.h>
34+
#include <vtkChart.h>
3435
#include <vtkChartXY.h>
3536
#include <vtkColorTransferControlPointsItem.h>
3637
#include <vtkColorTransferFunction.h>
@@ -333,14 +334,15 @@ void ctkVTKScalarsToColorsWidget::setCurrentControlPointsItem(vtkControlPointsIt
333334
}
334335
this->qvtkReconnect(d->CurrentControlPointsItem, item, vtkCommand::ModifiedEvent,
335336
this, SLOT(updateCurrentPoint()));
337+
vtkChart* chart = d->View->abstractChart();
336338
this->qvtkReconnect(d->CurrentControlPointsItem ?
337-
d->CurrentControlPointsItem->GetXAxis() : d->View->chart()->GetAxis(0),
338-
item ? item->GetXAxis() : d->View->chart()->GetAxis(0),
339+
d->CurrentControlPointsItem->GetXAxis() : chart->GetAxis(0),
340+
item ? item->GetXAxis() : chart->GetAxis(0),
339341
vtkCommand::ModifiedEvent,
340342
this, SLOT(onAxesModified()));
341343
this->qvtkReconnect(d->CurrentControlPointsItem ?
342-
d->CurrentControlPointsItem->GetYAxis() : d->View->chart()->GetAxis(1),
343-
item ? item->GetYAxis() : d->View->chart()->GetAxis(1),
344+
d->CurrentControlPointsItem->GetYAxis() : chart->GetAxis(1),
345+
item ? item->GetYAxis() : chart->GetAxis(1),
344346
vtkCommand::ModifiedEvent,
345347
this, SLOT(onAxesModified()));
346348
d->CurrentControlPointsItem = item;
@@ -420,7 +422,7 @@ void ctkVTKScalarsToColorsWidget::updateCurrentPoint()
420422
d->CurrentControlPointsItem->GetControlPoint(pointId, point);
421423

422424
vtkAxis* xAxis = d->CurrentControlPointsItem ?
423-
d->CurrentControlPointsItem->GetXAxis() : d->View->chart()->GetAxis(vtkAxis::BOTTOM);
425+
d->CurrentControlPointsItem->GetXAxis() : d->View->abstractChart()->GetAxis(vtkAxis::BOTTOM);
424426
Q_ASSERT(xAxis);
425427
if (xAxis && (xAxis->GetMinimumLimit() > point[0] || xAxis->GetMaximumLimit() < point[0]))
426428
{
@@ -544,7 +546,7 @@ void ctkVTKScalarsToColorsWidget::xRange(double* range)const
544546
{
545547
Q_D(const ctkVTKScalarsToColorsWidget);
546548
vtkAxis* xAxis = d->CurrentControlPointsItem ?
547-
d->CurrentControlPointsItem->GetXAxis() : d->View->chart()->GetAxis(vtkAxis::BOTTOM);
549+
d->CurrentControlPointsItem->GetXAxis() : d->View->abstractChart()->GetAxis(vtkAxis::BOTTOM);
548550
Q_ASSERT(xAxis);
549551
range[0] = xAxis->GetMinimum();
550552
range[1] = xAxis->GetMaximum();
@@ -555,7 +557,7 @@ void ctkVTKScalarsToColorsWidget::setXRange(double min, double max)
555557
{
556558
Q_D(ctkVTKScalarsToColorsWidget);
557559
vtkAxis* xAxis = d->CurrentControlPointsItem ?
558-
d->CurrentControlPointsItem->GetXAxis() : d->View->chart()->GetAxis(vtkAxis::BOTTOM);
560+
d->CurrentControlPointsItem->GetXAxis() : d->View->abstractChart()->GetAxis(vtkAxis::BOTTOM);
559561
Q_ASSERT(xAxis);
560562
if (xAxis->GetMinimum() != min || xAxis->GetMaximum() != max)
561563
{
@@ -570,7 +572,7 @@ void ctkVTKScalarsToColorsWidget::yRange(double* range)const
570572
{
571573
Q_D(const ctkVTKScalarsToColorsWidget);
572574
vtkAxis* yAxis = d->CurrentControlPointsItem ?
573-
d->CurrentControlPointsItem->GetYAxis() : d->View->chart()->GetAxis(vtkAxis::LEFT);
575+
d->CurrentControlPointsItem->GetYAxis() : d->View->abstractChart()->GetAxis(vtkAxis::LEFT);
574576
Q_ASSERT(yAxis);
575577
range[0] = yAxis->GetMinimum();
576578
range[1] = yAxis->GetMaximum();
@@ -581,7 +583,7 @@ void ctkVTKScalarsToColorsWidget::setYRange(double min, double max)
581583
{
582584
Q_D(ctkVTKScalarsToColorsWidget);
583585
vtkAxis* yAxis = d->CurrentControlPointsItem ?
584-
d->CurrentControlPointsItem->GetYAxis() : d->View->chart()->GetAxis(vtkAxis::LEFT);
586+
d->CurrentControlPointsItem->GetYAxis() : d->View->abstractChart()->GetAxis(vtkAxis::LEFT);
585587
Q_ASSERT(yAxis);
586588
if (yAxis->GetMinimum() != min || yAxis->GetMaximum() != max)
587589
{
@@ -596,14 +598,14 @@ void ctkVTKScalarsToColorsWidget::resetRange()
596598
{
597599
Q_D(ctkVTKScalarsToColorsWidget);
598600
vtkAxis* xAxis = d->CurrentControlPointsItem ?
599-
d->CurrentControlPointsItem->GetXAxis() : d->View->chart()->GetAxis(vtkAxis::BOTTOM);
601+
d->CurrentControlPointsItem->GetXAxis() : d->View->abstractChart()->GetAxis(vtkAxis::BOTTOM);
600602
if (xAxis)
601603
{
602604
this->setXRange(xAxis->GetMinimumLimit(), xAxis->GetMaximumLimit());
603605
}
604606

605607
vtkAxis* yAxis = d->CurrentControlPointsItem ?
606-
d->CurrentControlPointsItem->GetYAxis() : d->View->chart()->GetAxis(vtkAxis::LEFT);
608+
d->CurrentControlPointsItem->GetYAxis() : d->View->abstractChart()->GetAxis(vtkAxis::LEFT);
607609
if (yAxis)
608610
{
609611
this->setYRange(yAxis->GetMinimumLimit(), yAxis->GetMaximumLimit());
@@ -615,7 +617,7 @@ void ctkVTKScalarsToColorsWidget::onAxesModified()
615617
{
616618
Q_D(ctkVTKScalarsToColorsWidget);
617619
vtkAxis* xAxis = d->CurrentControlPointsItem ?
618-
d->CurrentControlPointsItem->GetXAxis() : d->View->chart()->GetAxis(vtkAxis::BOTTOM);
620+
d->CurrentControlPointsItem->GetXAxis() : d->View->abstractChart()->GetAxis(vtkAxis::BOTTOM);
619621
Q_ASSERT(xAxis);
620622

621623
bool wasBlocking = d->XRangeSlider->blockSignals(true);
@@ -627,7 +629,7 @@ void ctkVTKScalarsToColorsWidget::onAxesModified()
627629
d->XRangeSlider->blockSignals(wasBlocking);
628630

629631
vtkAxis* yAxis = d->CurrentControlPointsItem ?
630-
d->CurrentControlPointsItem->GetYAxis() : d->View->chart()->GetAxis(vtkAxis::LEFT);
632+
d->CurrentControlPointsItem->GetYAxis() : d->View->abstractChart()->GetAxis(vtkAxis::LEFT);
631633
Q_ASSERT(yAxis);
632634

633635
wasBlocking = d->YRangeSlider->blockSignals(true);

0 commit comments

Comments
 (0)