Merge branch 'bug-14492-MigrationAffineInteractor3DToNewConcept' into bug…
456b675e10f6
Actions

Description

Merge branch 'bug-14492-MigrationAffineInteractor3DToNewConcept' into bug-14492-MigrationAffineInteractor3DToNewConcept-Integration

Details

Provenance

• webechr

Authored on Aug 28 2013, 1:37 PM

Parents

rMITKdac89aab70ee: Merge branch 'bug-14492-MigrationAffineInteractor3DToNewConcept' of mitk.org…
rMITK8483355ef48a: Merge branch 'bug-15931-AngularError'

Branches

Unknown

Tags

Unknown

Event Timeline

• webechr committed rMITK456b675e10f6: Merge branch 'bug-14492-MigrationAffineInteractor3DToNewConcept' into bug… (authored by • webechr).Aug 28 2013, 1:37 PM

Merged Changes

dac89aab70ee Merge branch 'bug-14492-MigrationAffineInteractor3DToNewConcept' of mitk.org…
Author
• webechr
Browse Repository
No Builds
No Audits
b62f72f7bebc New changes to rotate the plane and add new action to the config files
Author
• metzger
Browse Repository
No Builds
No Audits
d6bbf0023bff Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept
Author
• metzger
Browse Repository
No Builds
No Audits
c323b67c9773 Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept
Author
• webechr
Browse Repository
No Builds
No Audits
68cd91ad2da0 Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept
Author
• metzger
Browse Repository
No Builds
No Audits
1985fd924b03 Some changes to let the new state machine and config file run. So now you can…
Author
• metzger
Browse Repository
No Builds
No Audits
2c6898247063 Add method for translate a polydata.
Author
• metzger
Browse Repository
No Builds
No Audits
d9a013c9b220 TranslationTool for translating the clipping plane migrated to new interaction…
Author
• metzger
Browse Repository
No Builds
No Audits
4f433360bf6d Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept
Author
• metzger
Browse Repository
No Builds
No Audits
bd529556247e Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept
Author
• metzger
Browse Repository
No Builds
No Audits
d2765fb26b9e Some more events implemented, based on the old stuff but with new interaction…
Author
• metzger
Browse Repository
No Builds
No Audits
fadff8493e4e Add a new version of the AffineInteractor3D. It is based on the new interaction…
Author
• metzger
Browse Repository
No Builds
No Audits
5c9c1f96c9cd Merge branch 'bug-13664-RedesignInteraction-Integration-4' into bug-14492…
Author
• metzger
Browse Repository
No Builds
No Audits
4958ac201db3 Merge branch 'bug-13664-RedesignInteraction-Integration-4' into bug-14492…
Author
• metzger
Browse Repository
No Builds
No Audits
de051b876da8 Merge remote-tracking branch 'origin/bug-14492…
Author
• metzger
Browse Repository
No Builds
No Audits
b1b8cfe3f9df Updated Config files to changed xml description
Author
• webechr
Browse Repository
No Builds
No Audits
f485c71dde0b Merge branch 'master' into bug-14492-MigrationAffineInteractor3DToNewConcept
Author
• metzger
Browse Repository
No Builds
No Audits
c540c043062f Merge branch 'bug-13037-MigrationAffineInteractor3DToNewConcept' into bug-14492…
Author
• metzger
Browse Repository
No Builds
No Audits
d7bd5745153e Add new state machine pattern for the affine interaction and suitable config…
Author
• metzger
Browse Repository
No Builds
No Audits

Changes (10)

Path

Size

Modules/

ClippingTools/

mitkClippingPlaneTranslationTool.cpp

mitkClippingPlaneTranslationTool.h

MitkExt/

Interactions/

mitkAffineDataInteractor3D.cpp

mitkAffineDataInteractor3D.h

Resources

Interactions

AffineInteraction3D.xml

AffineRotationConfig.xml

AffineTranslationConfig.xml

files.cmake

rMITK456b675e10f6

View Options

Modules/ClippingTools/mitkClippingPlaneTranslationTool.cpp

View Options

Modules/ClippingTools/mitkClippingPlaneTranslationTool.h

View Options

Modules/MitkExt/Interactions/mitkAffineDataInteractor3D.cpp

View Options

Modules/MitkExt/Interactions/mitkAffineDataInteractor3D.h

View Options

Modules/MitkExt/Resources/Interactions/AffineInteraction3D.xml

View Options

Modules/MitkExt/Resources/Interactions/AffineRotationConfig.xml

View Options

Modules/MitkExt/Resources/Interactions/AffineTranslationConfig.xml

View Options

Modules/MitkExt/files.cmake

Merge branch 'bug-14492-MigrationAffineInteractor3DToNewConcept' into bug…456b675e10f6Actions

Description

Details

Event Timeline

Merged Changes

Changes (10)

rMITK456b675e10f6

Modules/ClippingTools/mitkClippingPlaneTranslationTool.cpp

Modules/ClippingTools/mitkClippingPlaneTranslationTool.h

Modules/MitkExt/Interactions/mitkAffineDataInteractor3D.cpp

Modules/MitkExt/Interactions/mitkAffineDataInteractor3D.h

Modules/MitkExt/Resources/Interactions/AffineInteraction3D.xml

Modules/MitkExt/Resources/Interactions/AffineRotationConfig.xml

Modules/MitkExt/Resources/Interactions/AffineTranslationConfig.xml

Modules/MitkExt/files.cmake

Merge branch 'bug-14492-MigrationAffineInteractor3DToNewConcept' into bug…
456b675e10f6
Actions