_spc[0] = 1;
_spc[1] = 1;
_spc[2] = 1;
-
_coulorEdit_r = 1;
_coulorEdit_g = 1;
_coulorEdit_b = 0;
-
_coulorNormal_r = 1;
_coulorNormal_g = 0;
_coulorNormal_b = 1;
-
_coulorSelection_r = 0;
_coulorSelection_g = 1;
_coulorSelection_b = 0;
-
_widthline = 1;
-
}
// ----------------------------------------------------------------------------
manualViewBaseContour::~manualViewBaseContour()
//Adding each control point
if( ifControlPoints )
+ {
AddControlPoints();
+ }
RefreshContour();
Refresh();
}
// ---------------------------------------------------------------------------
-void manualViewBaseContour :: RemoveCompleteContourActor()
+void manualViewBaseContour::RemoveCompleteContourActor()
{
/*vtkRenderer * theRenderer =*/ _wxvtkbaseview->GetRenderer(); // JPRx ??
//Removing the spline
if(_show_text)
{
_wxvtkbaseview->GetRenderer()->AddActor2D( _textActor );
+ _wxvtkbaseview->GetRenderer()->AddActor2D( _textActor2 );
}
}
// ----------------------------------------------------------------------------
if(_show_text)
{
_wxvtkbaseview->GetRenderer()->RemoveActor2D( _textActor );
+ _wxvtkbaseview->GetRenderer()->RemoveActor2D( _textActor2 );
}
}
// ----------------------------------------------------------------------------
DeleteVtkObjects();
_pts = vtkPoints::New();
_pts->SetNumberOfPoints(nps);
- for (i=0 ; i<nps ; i++){
+ for (i=0 ; i<nps ; i++)
+ {
_pts->SetPoint(i, 0 , 0 , 0 );
}
// This is for the boundaring inicialisation
//EED 29Mars2009
//_pts->SetPoint(0, 0 , 0 , -1000 );
//_pts->SetPoint(1, 0 , 0 , 1000 );
- _pts->SetPoint(0, -1000 , -1000 , -1000 );
- _pts->SetPoint(1, 1000 , 1000 , 1000 );
- vtkCellArray *lines = vtkCellArray::New();
- lines->InsertNextCell( nps /* +1 */ );
- for ( i=0 ; i<nps+1 ; i++ ){
- lines->InsertCellPoint(i % nps );
+//EED 2017-03-02
+// _pts->SetPoint(0, -1000 , -1000 , -1000 );
+// _pts->SetPoint(1, 1000 , 1000 , 1000 );
+
+ // This is the structure for the spline
+ _splineCell = vtkCellArray::New();
+ _splineCell->InsertNextCell( nps /* +1 */ );
+ for ( i=0 ; i<nps+1 ; i++ )
+ {
+ _splineCell->InsertCellPoint(i % nps );
}
+
+ // This is the structure for the spline justo to points (line)
+ // This will be use in the refresh part, in case the spline have only 2 points
+ _lineCell = vtkCellArray::New();
+ _lineCell->InsertNextCell(2);
+ _lineCell->InsertCellPoint(0);
+ _lineCell->InsertCellPoint(1);
+
_pd = vtkPolyData::New();
_pd->SetPoints( _pts );
- _pd->SetLines( lines );
- lines->Delete(); //do not delete lines ??
+ _pd->SetLines( _splineCell );
+ // lines->Delete(); //do not delete lines ??
_contourVtkActor = vtkActor::New();
_bboxMapper = vtkPolyDataMapper::New();
_bboxMapper->ScalarVisibilityOff( );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
_bboxMapper->SetInput(_pd);
+#else
+ _bboxMapper->SetInputData(_pd);
+#endif
+
+
_bboxMapper->ImmediateModeRenderingOn();
_contourVtkActor->SetMapper(_bboxMapper);
_contourVtkActor->GetProperty()->BackfaceCullingOff();
InitTextActor();
}
+// ----------------------------------------------------------------------------
+void manualViewBaseContour::SetCellArray(bool type)
+{
+ if (type==true)
+ {
+ _pd->SetLines( _splineCell );
+ } else {
+ _pd->SetLines( _lineCell );
+ }// if type
+}
+
+// ----------------------------------------------------------------------------
void manualViewBaseContour::InitTextActor()
{
// Text
vtkTextProperty *tprop = _textActor->GetTextProperty();
tprop->SetFontSize(14);
tprop->SetFontFamilyToArial();
- tprop->SetColor(0, 0, 1);
+ tprop->SetColor(1, 1, 0);
+
+
+ // Text 2
+ _textActor2 = vtkTextActor::New();
+// _textActor->SetDisplayPosition(200, 200);
+ _textActor2->SetInput("00");
+ // Set coordinates to match the old vtkScaledTextActor default value
+// _textActor2->GetPosition2Coordinate()->SetCoordinateSystemToNormalizedViewport();
+// _textActor2->GetPosition2Coordinate()->SetValue( 0.2 , 0.2 );
+ _textActor2->GetPositionCoordinate()->SetCoordinateSystemToWorld ();
+// _textActor2->GetPositionCoordinate()->SetValue( 0.8 , 0.8 );
+
+ vtkTextProperty *tprop2 = _textActor2->GetTextProperty();
+ tprop2->SetFontSize(14);
+ tprop2->SetFontFamilyToArial();
+ tprop2->SetColor(1, 1, 0);
+
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
void manualViewBaseContour::Refresh() // virtual
{
- if (_contourVtkActor!=NULL){
+ if (_contourVtkActor!=NULL)
+ {
RefreshContour();
}
int i,size=_lstViewPoints.size();
void manualViewBaseContour::RefreshText() // virtual
{
if( _textActor!=NULL)
+ {
_textActor -> SetInput("00");
+ _textActor2 -> SetInput("00");
+ }
}
// ----------------------------------------------------------------------------
void manualViewBaseContour::SetColorNormalContour(double r, double g, double b)
_contourVtkActor->GetProperty()->SetOpacity( opacity );
_textActor->GetProperty()->SetOpacity( opacity );
_textActor->SetInput("00");
+ _textActor2->GetProperty()->SetOpacity( opacity );
+ _textActor2->SetInput("00");
}
// ----------------------------------------------------------------------------
if (_show_text==false && _textActor!=NULL)
{
_textActor->SetInput("00");
+ _textActor2->SetInput("00");
}
}
// ----------------------------------------------------------------------------