vtkTensorsVisu::vtkTensorsVisu() : vtkVectorsTensorsVisuBase()
{
ss = vtkSphereSource::New();
- superquadratic = vtkSuperquadricSource::New();
+ superquadratic = vtkSuperquadricSource::New();
cs = vtkCubeSource::New();
- tg = vtkTensorGlyph::New();
- pdn = vtkPolyDataNormals::New();
+
+ tg = NULL;
+
+ pdn = vtkPolyDataNormals::New();
pd = vtkPolyData::New();
- pod = vtkPointData::New();
+ pod = vtkPointData::New();
}
//------------------------------------------------------------------------
{
if(GetTypeForm()==2) // source superquadratic
{
+ if (tg==NULL) { tg = vtkTensorGlyph::New(); }
+
superquadratic->SetThetaResolution(20);
superquadratic->SetPhiResolution(20);
#if VTK_MAJOR_VERSION <= 5
tg->SetSource(superquadratic->GetOutput());
#else
+ superquadratic->Update();
tg->SetSourceData(superquadratic->GetOutput());
#endif
} else if(GetTypeForm()==1) { // source sphere
#if VTK_MAJOR_VERSION <= 5
tg->SetSource(ss->GetOutput());
#else
+ ss->Update();
tg->SetSourceData(ss->GetOutput());
#endif
} else { // source cube
#if VTK_MAJOR_VERSION <= 5
tg->SetSource(cs->GetOutput());
#else
+ cs->Update();
tg->SetSourceData(cs->GetOutput());
#endif
}
_pdm->SetInput( pdn->GetOutput() );
#else
pdn->SetInputData(tg->GetOutput());
+ pdn->Update();
_pdm->SetInputData( pdn->GetOutput() );
+ _pdm->Update();
#endif
_actor->SetMapper( _pdm );
_actor->GetProperty()->SetOpacity( GetOpacity() );
vtkIdType numSourcePts;
// vtkIdType numSourceCells;
- vtkPoints *sourcePts = tg->GetSource()->GetPoints();
- numSourcePts = sourcePts->GetNumberOfPoints();
+ vtkPoints *sourcePts = tg->GetSource()->GetPoints();
+
+
+ numSourcePts = sourcePts->GetNumberOfPoints();
// numSourceCells = tg->GetSource()->GetNumberOfCells();
vtkDataArray *tensorsArray = pointdata_do->GetArray("tensors");
vtkDoubleArray *newScalarArray = vtkDoubleArray::New();
newScalarArray->SetName( "NormalsEED" );
newScalarArray->SetNumberOfComponents(3);
- int iNumPts,iNumSourcePts;
+ int iNumPts,iNumSourcePts;
int iNormalsEED=0;
double *normalValue;
double sumEigenvalue,sumEigenvalue1,sumEigenvalue2,sumEigenvalue3;
for (iNumPts=0;iNumPts<numPnts;iNumPts++)
{
normalValue = tensorsArray->GetTuple9(iNumPts);
- sumEigenvalue1 = sqrt (normalValue[0]*normalValue[0] + normalValue[1]*normalValue[1] + normalValue[2]*normalValue[2]);
- sumEigenvalue2 = sqrt (normalValue[3]*normalValue[3] + normalValue[4]*normalValue[4] + normalValue[5]*normalValue[5]);
- sumEigenvalue3 = sqrt (normalValue[6]*normalValue[6] + normalValue[7]*normalValue[7] + normalValue[8]*normalValue[8]);
+ sumEigenvalue1 = sqrt (normalValue[0]*normalValue[0] + normalValue[1]*normalValue[1] + normalValue[2]*normalValue[2]);
+ sumEigenvalue2 = sqrt (normalValue[3]*normalValue[3] + normalValue[4]*normalValue[4] + normalValue[5]*normalValue[5]);
+ sumEigenvalue3 = sqrt (normalValue[6]*normalValue[6] + normalValue[7]*normalValue[7] + normalValue[8]*normalValue[8]);
if ((sumEigenvalue1>=sumEigenvalue2) && (sumEigenvalue1>=sumEigenvalue3))
{
} // for iNumSourcePts
} // for iNumPts
+
+
pointdata_tg->RemoveArray( "NormalsEED" );
pointdata_tg->AddArray( newScalarArray );
// pointdata_pdn->Update();
tg->Update();
} // if tensorsArray
-
-
_pdm->ScalarVisibilityOn();
_pdm->SetColorModeToMapScalars();
//_pdm->SetColorModeToDefault();
_pdm->SetLookupTable( _LutEED );
_pdm->SelectColorArray( "NormalsEED" );
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+ //...
+#else
+ _pdm->Update();
+#endif
/*
int i,sizeDa = pointdata_tg->GetNumberOfArrays();
}
*/
-
-
} // _active
-
- VisibilityActor();
-
+ VisibilityActor();
}