_contourVtkActor = NULL;
_bboxMapper = NULL;
_range = 1;
- _sizePointsContour = 100;
+ _sizePointsContour = 500;
_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()
}
// ---------------------------------------------------------------------------
-void manualViewBaseContour :: RemoveCompleteContourActor()
+void manualViewBaseContour::RemoveCompleteContourActor()
{
/*vtkRenderer * theRenderer =*/ _wxvtkbaseview->GetRenderer(); // JPRx ??
//Removing the spline
//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 );
+
+//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();
_bboxMapper = vtkPolyDataMapper::New();
_bboxMapper->ScalarVisibilityOff( );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
_bboxMapper->SetInput(_pd);
_bboxMapper->ImmediateModeRenderingOn();
+#else
+ _bboxMapper->SetInputData(_pd);
+#endif
+
+
_contourVtkActor->SetMapper(_bboxMapper);
_contourVtkActor->GetProperty()->BackfaceCullingOff();
InitTextActor();
}
+// ----------------------------------------------------------------------------
void manualViewBaseContour::SetCellArray(bool type)
{
if (type==true)
// _textActor->GetPositionCoordinate()->SetValue( 0.8 , 0.8 );
vtkTextProperty *tprop = _textActor->GetTextProperty();
- tprop->SetFontSize(14);
+ tprop->SetFontSize(12);
tprop->SetFontFamilyToArial();
- tprop->SetColor(0, 0, 1);
+ tprop->SetColor(1, 1, 0);
// Text 2
// _textActor2->GetPositionCoordinate()->SetValue( 0.8 , 0.8 );
vtkTextProperty *tprop2 = _textActor2->GetTextProperty();
- tprop2->SetFontSize(14);
+ tprop2->SetFontSize(12);
tprop2->SetFontFamilyToArial();
- tprop2->SetColor(0, 0, 1);
+ tprop2->SetColor(1, 1, 0);
}
double pp[3];
int i,size = _sizePointsContour;
double *vx = (double*)malloc(sizeof(double)*size);
- for (i=0;i<size;i++){
+ for (i=0;i<size;i++)
+ {
_pts->GetPoint(i,pp);
vx[i]=pp[0];
- }
+ } // for i
return vx;
}
// ----------------------------------------------------------------------------
double pp[3];
int i,size = _sizePointsContour;
double *vy = (double*)malloc(sizeof(double)*size);
- for (i=0;i<size;i++){
+ for (i=0;i<size;i++)
+ {
_pts->GetPoint(i,pp);
vy[i]=pp[1];
- }
+ } // for i
return vy;
}
// ----------------------------------------------------------------------------
double pp[3];
int i,size = _sizePointsContour;
double *vz = (double*)malloc(sizeof(double)*size);
- for (i=0;i<size;i++){
+ for (i=0;i<size;i++)
+ {
_pts->GetPoint(i,pp);
vz[i]=pp[2];
- }
+ } // for i
return vz;
}
// ----------------------------------------------------------------------------
RefreshContour();
}
int i,size=_lstViewPoints.size();
- for (i=0;i<size;i++){
+ for (i=0;i<size;i++)
+ {
UpdateViewPoint(i);
_lstViewPoints[i]->UpdateColorActor();
- }
+ } // for i
UpdateColorActor();
if (_show_text==true)
_show_text = ok;
if (_show_text==false && _textActor!=NULL)
{
- _textActor->SetInput("00");
- _textActor2->SetInput("00");
+ _textActor->SetInput("");
+ _textActor2->SetInput("");
}
}
// ----------------------------------------------------------------------------