//---------------------------------------------------------------------------
void FillFilter::SetImages(vtkImageData *image,vtkImageData *image2) // virtual
{
- baseFilterManualPaint::SetImages(image,image2);
+
+
+ baseFilterManualPaint::SetImages(image,image2);
if ((_maxX!=_maxXback) || (_maxY!=_maxYback) || (_maxZ!=_maxZback))
{
_auxImageFill->SetDimensions(_maxX + 1, _maxY + 1, _maxZ + 1);
_auxImageFill->SetOrigin(0, 0, 0);
_auxImageFill->SetExtent(0, _maxX, 0, _maxY, 0, _maxZ);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
_auxImageFill->SetWholeExtent(0, _maxX, 0, _maxY, 0, _maxZ);
_auxImageFill->SetScalarTypeToUnsignedChar();
_auxImageFill->AllocateScalars();
+#else
+ _auxImageFill->AllocateScalars(VTK_UNSIGNED_CHAR,1);
+#endif
_ptrAuxImageFill = (unsigned char *)_auxImageFill->GetScalarPointer();
memset(_ptrAuxImageFill, 0, (_maxX+1) * (_maxY+1) * (_maxZ+1) );
}
-
- _auxImageFill = vtkImageData::New();
- _auxImageFill->SetDimensions(_maxX + 1, _maxY + 1, _maxZ + 1);
- _auxImageFill->SetOrigin(0, 0, 0);
- _auxImageFill->SetExtent(0, _maxX, 0, _maxY, 0, _maxZ);
-
-
-//EED 2017-01-01 Migration VTK7
-#if VTK_MAJOR_VERSION <= 5
- _auxImageFill->SetWholeExtent(0, _maxX, 0, _maxY, 0, _maxZ);
- _auxImageFill->SetScalarTypeToUnsignedChar();
- _auxImageFill->AllocateScalars();
-#else
- _auxImageFill->AllocateScalars(VTK_UNSIGNED_CHAR,1);
-#endif
-
_maxXback=_maxX;
_maxYback=_maxY;
- _maxYback=_maxZ;
+ _maxZback=_maxZ;
}
_countRecursiveFillProblem = 0;
_countProgressingFill = 0;
_usingAuxImageFill = false;
+
ivi = _px + _py*(_maxX+1) + _pz*(_maxX+1)*(_maxY+1); // index vector image
+
+
+DEF_POINTER_IMAGE_VTK_CREA_set(v_image,ss_image,p_image,st_image,_image)
+DEF_POINTER_IMAGE_VTK_CREA_set(v_image2,ss_image2,p_image2,st_image2,_image2)
+
+
+
//EED01
// FillToolRecursive(_px, _py, _pz);
FillToolRecursive(_px, _py, _pz, ivi);
//---------------------------------------------------------------------------
void FillFilter::FillToolRecursive(int px, int py, int pz,long int ivi)
{
-DEF_POINTER_IMAGE_VTK_CREA(v_image,ss_image,p_image,st_image,_image)
-DEF_POINTER_IMAGE_VTK_CREA(v_image2,ss_image2,p_image2,st_image2,_image2)
+//ups ??EED DEF_POINTER_IMAGE_VTK_CREA(v_image,ss_image,p_image,st_image,_image)
+//ups ??EED DEF_POINTER_IMAGE_VTK_CREA(v_image2,ss_image2,p_image2,st_image2,_image2)
_countRecursiveFill++;
_countProgressingFill++;
{
if (_usingAuxImageFill == true)
{
- this->_IMManager->AddModifiedPixel(px, py, pz); //DFCH
+//UPS ??EED this->_IMManager->AddModifiedPixel(px, py, pz); //DFCH
//EED01
// _auxImageFill->SetScalarComponentFromFloat(px, py, pz, 0, 0);
_ptrAuxImageFill[ ivi ]=0;
}
- _tmpDistfill = (px-_pxfill)*(px-_pxfill)
- + (py-_pyfill)*(py-_pyfill)
- + (pz-_pzfill)*(pz-_pzfill);
+ difX=px-_pxfill;
+ difY=py-_pyfill;
+ difZ=pz-_pzfill;
+ _tmpDistfill = difX*difX + difY*difY + difZ*difZ;
+// _tmpDistfill = (px-_pxfill)*(px-_pxfill)
+// + (py-_pyfill)*(py-_pyfill)
+// + (pz-_pzfill)*(pz-_pzfill);
//if (_countRecursiveFill >1 )
//{
if (_auxGrayLevelValidationFill == true)
{
- this->_IMManager->AddModifiedPixel(px, py, pz); //DFCH
+//UPS ??EED this->_IMManager->AddModifiedPixel(px, py, pz); //DFCH
if (_image2!=NULL)
{
//EED01