ManualPaintModel::ManualPaintModel()
{
- _active = true;
- _tool = 0; // 0 pencil , 1 fill
- _brushfilter = new BrushFilter();
- _fillfilter = new FillFilter();
- _imageUndoRedo = new ImageUndoRedo();
+ _active = true;
+ _tool = 0; // 0 pencil , 1 fill
+ _brushfilter = new BrushFilter();
+ _fillfilter = new FillFilter();
+ _imageUndoRedo = new ImageUndoRedo();
+ _imageUndoRedo_visited = new ImageUndoRedo();
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
void ManualPaintModel::Set2D3D(int dim2D3D)
{
- _brushfilter->Set2D3D(dim2D3D);
- _fillfilter->Set2D3D(dim2D3D);
+ _brushfilter -> Set2D3D(dim2D3D);
+ _fillfilter -> Set2D3D(dim2D3D);
}
//---------------------------------------------------------------------------
{
_brushfilter -> SetImages(image,image2);
_fillfilter -> SetImages(image,image2);
- _imageUndoRedo->SetImage(image);
+ if (image2!=NULL)
+ {
+ _imageUndoRedo->SetImage(image2);
+ } else {
+ _imageUndoRedo->SetImage(image);
+ }
+ _imageUndoRedo_visited->SetImage( _fillfilter->GetAuxImageFill() );
} else {
printf("EED Warning image=NULL in ManualPaintModel::SetImage(image)\n ");
}
{
imMManager = this->_fillfilter->GetImageMManager();
} // if 1
- this->_imageUndoRedo->SetURImages(imMManager);
- this->_brushfilter->CleanImageMManager();
- this->_fillfilter->CleanImageMManager();
+ this->_imageUndoRedo -> SetURImages(imMManager);
+ this->_imageUndoRedo_visited -> SetURImages(imMManager);
+ this->_brushfilter -> CleanImageMManager();
+ this->_fillfilter -> CleanImageMManager();
}
//---------------------------------------------------------------------------
void ManualPaintModel::Undo()
{
this->_imageUndoRedo->Undo();
+ this->_imageUndoRedo_visited->Undo();
}
void ManualPaintModel::Redo()
{
this->_imageUndoRedo->Redo();
+ this->_imageUndoRedo_visited->Redo();
}
+
+
+int ManualPaintModel::GetRestorBaseInitialPointX()
+{
+ return this->_imageUndoRedo->GetRestorBaseInitialPointX();
+}
+
+int ManualPaintModel::GetRestorBaseInitialPointY()
+{
+ return this->_imageUndoRedo->GetRestorBaseInitialPointY();
+}
+
+int ManualPaintModel::GetRestorBaseInitialPointZ()
+{
+ return this->_imageUndoRedo->GetRestorBaseInitialPointZ();
+}
+