Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SofaKernel] BREAKING: Replacing DataEngine with SimpleDataEngine #814

Merged
merged 8 commits into from
Nov 21, 2018
Merged

[SofaKernel] BREAKING: Replacing DataEngine with SimpleDataEngine #814

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e52780a
[SofaKernel] BREAKING: Replacing DataEngine with SimpleDataEngine
marques-bruno Nov 8, 2018
262b897
[DataUpdate][DataEngine] All engines in Sofa's default build are modi…
marques-bruno Nov 8, 2018
879865d
[DataUpdate][SofaGeneralEngine] FIX: Removing call to update on input…
marques-bruno Nov 8, 2018
a8a30f7
Changing file encoding to UTF-8
marques-bruno Nov 9, 2018
6e16240
Applying doUpdate change on DataEngines from image, SofaPython, Regis…
marques-bruno Nov 9, 2018
4666499
FIX: bad typo in CollisionToCarvingEngine.h
marques-bruno Nov 9, 2018
ebe0f5e
[DataEngine] REFACTOR forgotten plugin MeshSTEPLoader
marques-bruno Nov 16, 2018
ac2f4ea
[DataEngine] REFACTOR: even simpler dataengine, setDirtyValue obsolet…
marques-bruno Nov 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Changing file encoding to UTF-8
  • Loading branch information
@marques-bruno
marques-bruno committed Nov 9, 2018
commit a8a30f75feb9b91d572cd03e4099d2bd100ac706
10 changes: 4 additions & 6 deletions applications/plugins/image/CollisionToCarvingEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,18 +137,16 @@ class CollisionToCarvingEngine : public core::DataEngine

protected:

virtual void update() override
virtual void doUpdate() override
{

bool updateImage = this->inputImage.isDirty(); // change of input image -> update output image
bool updateTransform = this->inputTransform.isDirty(); // change of input transform -> update output transform
bool updateImage = m_datatracker.isDirty(this->inputImage); // change of input image -> update output image
bool updateTransform = m_datatracker.isDirty(this->inputTransform); // change of input transform -> update output transform

if(in==NULL){in = new raImagei(this->inputImage);}
if(inT==NULL){inT = new raTransform(this->inputTransform);}
if(out==NULL){out = new waImageo(this->outputImage);}
if(outT==NULL){outT = new waTransform(this->outputTransform);}

cleanDirty();

if((*in)->isEmpty()) return;

Expand Down Expand Up @@ -179,7 +177,7 @@ class CollisionToCarvingEngine : public core::DataEngine
}
}
else{
//cout<< "La collision dans une image rotationn� n'est pas encore prise en compte" <<endl;
//cout<< "La collision dans une image rotationné n'est pas encore prise en compte" <<endl;
}
if (updateTransform) (*outT)->update(); // update internal data
}
Expand Down