//-------------------------------------------------------------------
wxVtkMPR2DView::~wxVtkMPR2DView()
{
- if (_ptsA!=NULL) { _ptsA -> Delete(); }
- if (_lineAActor!=NULL) { _lineAActor -> Delete(); }
- if (_lineAMapper!=NULL) { _lineAMapper -> Delete(); }
- if (_pdA!=NULL) { _pdA -> Delete(); }
- if (_ptsB!=NULL) { _ptsB -> Delete(); }
- if (_lineBActor!=NULL) { _lineBActor -> Delete(); }
- if (_lineBMapper!=NULL) { _lineBMapper -> Delete(); }
- if (_pdB!=NULL) { _pdB -> Delete(); }
+ if (_ptsA!=NULL) { _ptsA->Delete(); }
+ if (_lineAActor!=NULL) { _lineAActor->Delete(); }
+ if (_lineAMapper!=NULL) { _lineAMapper->Delete(); }
+ if (_pdA!=NULL) { _pdA->Delete(); }
+ if (_ptsB!=NULL) { _ptsB->Delete(); }
+ if (_lineBActor!=NULL) { _lineBActor->Delete(); }
+ if (_lineBMapper!=NULL) { _lineBMapper->Delete(); }
+ if (_pdB!=NULL) { _pdB->Delete(); }
}
//-------------------------------------------------------------------
vtkMPRBaseData *wxVtkMPR2DView::GetVtkmprbasedata()
((vtkInteractorStyleBaseView*)GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _interactorstylemprview );
}
- if(img!=NULL){
+ if(img!=NULL)
+ {
double* origin = img->GetOrigin();
img->GetExtent(x1,x2,y1,y2,z1,z2);
img->GetSpacing(spc);
_ptsA->SetPoint(1, 1000 , 1000 , 1000 );
_pdA = vtkPolyData::New();
_lineAMapper = vtkPolyDataMapper::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
_lineAMapper->SetInput(_pdA);
+#else
+ _lineAMapper->SetInputData(_pdA);
+#endif
+
_lineAMapper->ImmediateModeRenderingOn();
_lineAActor->SetMapper(_lineAMapper);
}
_pdB->SetPoints( _ptsB );
_pdB->SetLines( linesB );
linesB->Delete(); //do not delete lines ??
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
_lineBMapper->SetInput(_pdB);
+#else
+ _lineBMapper->SetInputData(_pdB);
+#endif
+
_lineBMapper->ImmediateModeRenderingOn();
if(_imageViewer2XYZ)
{
void wxVtkMPR2DView::SetVisibleAxis(bool ok)
{
- if (ok!=_visibleAxis)
+ if (ok != _visibleAxis)
{
- _visibleAxis=ok;
+ _visibleAxis = ok;
if (_visibleAxis==true)
{
_imageViewer2XYZ->GetVtkImageViewer2()->GetRenderer()->AddActor( _lineAActor );
} // ok
}
+
+//-------------------------------------------------------------------
+void wxVtkMPR2DView::ResetBackXYZ()
+{
+ _backX = -9999;
+ _backY = -9999;
+ _backZ = -9999;
+}
+
+
//-------------------------------------------------------------------
void wxVtkMPR2DView::Refresh()
{
y2 += origin[1];
z1 += origin[2];
z2 += origin[2];
- xx1 = x1*spc[0];
- yy1 = y1*spc[1];
- zz1 = z1*spc[2];
- xx2 = x2*spc[0];
- yy2 = y2*spc[1];
- zz2 = z2*spc[2];
+ xx1 = x1*spc[0];
+ yy1 = y1*spc[1];
+ zz1 = z1*spc[2];
+ xx2 = x2*spc[0];
+ yy2 = y2*spc[1];
+ zz2 = z2*spc[2];
x1 = (int)(x1*spc[0]);
y1 = (int)(y1*spc[1]);
z1 = (int)(z1*spc[2]);
xx = (int)(GetVtkmprbasedata()->GetX());
yy = (int)(GetVtkmprbasedata()->GetY());
zz = (int)(GetVtkmprbasedata()->GetZ());
-//EED 02/08/2013
-// x = round(xx*spc[0]);
-// y = round(yy*spc[1]);
-// z = round(zz*spc[2]);
x = xx*spc[0];
y = yy*spc[1];
z = zz*spc[2];
//_ptsA->SetPoint(1, x2, y2 , z );
//_ptsB->SetPoint(0, x2, y , z1);
//_ptsB->SetPoint(1, x2, y , z2);
- _ptsA->SetPoint(0, xx2, yy1 , z );
- _ptsA->SetPoint(1, xx2, yy2 , z );
- _ptsB->SetPoint(0, xx2, y , zz1);
- _ptsB->SetPoint(1, xx2, y , zz2);
+ _ptsA->SetPoint(0, xx2+1, yy1 , z );
+ _ptsA->SetPoint(1, xx2+1, yy2 , z );
+ _ptsB->SetPoint(0, xx2+1, y , zz1);
+ _ptsB->SetPoint(1, xx2+1, y , zz2);
position[1] = y;
position[2] = z;
focalpoint[1] = y;
//_ptsA->SetPoint(1, x2 , y2 , z );
//_ptsB->SetPoint(0, x , y2 , z1);
//_ptsB->SetPoint(1, x , y2 , z2);
- _ptsA->SetPoint(0, xx1 , y1 , z );
- _ptsA->SetPoint(1, xx2 , y1 , z );
- _ptsB->SetPoint(0, x , y1 , zz1);
- _ptsB->SetPoint(1, x , y1 , zz2);
+ _ptsA->SetPoint(0, xx1 , y1-1 , z );
+ _ptsA->SetPoint(1, xx2 , y1-1 , z );
+ _ptsB->SetPoint(0, x , y1-1 , zz1);
+ _ptsB->SetPoint(1, x , y1-1 , zz2);
position[0] = x;
position[2] = z;
focalpoint[0] = x;
//_ptsA->SetPoint(1, x2 , y , z2 );
//_ptsB->SetPoint(0, x , y1, z2 );
//_ptsB->SetPoint(1, x , y2, z2 );
- _ptsA->SetPoint(0, xx1 , y , z1 );
- _ptsA->SetPoint(1, xx2 , y , z1 );
- _ptsB->SetPoint(0, x , yy1, z1 );
- _ptsB->SetPoint(1, x , yy2, z1 );
+
+ _ptsA->SetPoint(0, xx1 , y , z1-1 );
+ _ptsA->SetPoint(1, xx2 , y , z1-1 );
+ _ptsB->SetPoint(0, x , yy1, z1-1 );
+ _ptsB->SetPoint(1, x , yy2, z1-1 );
+
position[0] = x;
position[1] = y;
focalpoint[0] = x;
focalpoint[1] = y;
} // if back
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+ // ..
+#else
+ _ptsA->Modified();
+ _ptsB->Modified();
+#endif
+
if (fixAxis2D == true)
{
GetRenderer()->GetActiveCamera()->SetPosition(position);
} // if GetFixAxis2D
_lineAActor->GetProperty()->SetOpacity( opacityAxis );
_lineBActor->GetProperty()->SetOpacity( opacityAxis );
+ SetOpacityText( opacityAxis );
_backX = xx;
_backY = yy;
_backZ = zz;
imageactor->SetInterpolate( GetVtkBaseData()->GetInterpolate() );
//EED 01nov2012
UpdateColorWindowLevel();
+//EED 05juin2019
+ UpdateCameraParallelScale();
wxVtkBaseView::Refresh();
}
}