Merge branch 'bug-14492-MigrationAffineInteractor3DToNewConcept-Integration…
f7af2929b6ab
Actions

Description

Merge branch 'bug-14492-MigrationAffineInteractor3DToNewConcept-Integration-ModBuild-Sys' into bug-14492-MigrationAffineInteractor3DToNewConcept-FinalIntegration

Details

Provenance

• metzger

Authored on Dec 10 2013, 7:07 PM

Parents

rMITK3765ef796eee: Extensions to the new SurfaceDefomrationDataInteractor3D
rMITKf993906b3bb0: Merge branch 'bug-15849-VTK6Migration_IntegrationDec04'

Branches

Unknown

Tags

Unknown

Event Timeline

• metzger committed rMITKf7af2929b6ab: Merge branch 'bug-14492-MigrationAffineInteractor3DToNewConcept-Integration… (authored by • metzger).Dec 10 2013, 7:07 PM

Merged Changes

3765ef796eee Extensions to the new SurfaceDefomrationDataInteractor3D
Author
• metzger
Browse Repository
No Builds
No Audits
dd241934b17b created SurfaceDeformation stub
Author
• webechr
Browse Repository
No Builds
No Audits
de01ebe799c6 added statemachine and config of surface deformation
Author
• webechr
Browse Repository
No Builds
No Audits
e16a9640e56b mark as deprecated.
Author
• webechr
Browse Repository
No Builds
No Audits
a54661551d4e cleanup
Author
• webechr
Browse Repository
No Builds
No Audits
214a4dd5c77a Fix: init current position. Translate & Rotation working.
Author
• webechr
Browse Repository
No Builds
No Audits
716b6e68ee48 Merge branch 'bug-14492-MigrationAffineInteractor3DToNewConcept-Integration'…
Author
• webechr
Browse Repository
No Builds
No Audits
a027d798791d adapting us namespace changes
Author
• webechr
Browse Repository
No Builds
No Audits
00468fb05b6a Merge branch 'bug-14492-MigrationAffineInteractor3DToNewConcept' into bug-14492…
Author
• webechr
Browse Repository
No Builds
No Audits
9b3ee229bcd8 Fixes in XML files, Added conditioned transitions
Author
• webechr
Browse Repository
No Builds
No Audits
456b675e10f6 Merge branch 'bug-14492-MigrationAffineInteractor3DToNewConcept' into bug-14492…
Author
• webechr
Browse Repository
No Builds
No Audits
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 (16)

Path

Size

Modules/

ClippingTools/

mitkClippingPlaneRotationTool.cpp

mitkClippingPlaneRotationTool.h

mitkClippingPlaneTranslationTool.cpp

mitkClippingPlaneTranslationTool.h

MitkExt/

Interactions/

mitkAffineDataInteractor3D.cpp

mitkAffineDataInteractor3D.h

mitkAffineInteractor3D.h

mitkSurfaceDeformationDataInteractor3D.cpp

mitkSurfaceDeformationDataInteractor3D.h

Resources

Interactions

AffineDeformationConfig.xml

AffineInteraction3D.xml

AffineRotationConfig.xml

AffineTranslationConfig.xml

files.cmake

rMITKf7af2929b6ab

View Options

Modules/ClippingTools/mitkClippingPlaneRotationTool.cpp

View Options

Modules/ClippingTools/mitkClippingPlaneRotationTool.h

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/Interactions/mitkAffineInteractor3D.h

View Options

Modules/MitkExt/Interactions/mitkSurfaceDeformationDataInteractor3D.cpp

View Options

Modules/MitkExt/Interactions/mitkSurfaceDeformationDataInteractor3D.h

View Options

Modules/MitkExt/Resources/Interactions/AffineDeformationConfig.xml

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-Integration…f7af2929b6abActions

Description

Details

Event Timeline

Merged Changes

Changes (16)

rMITKf7af2929b6ab

Modules/ClippingTools/mitkClippingPlaneRotationTool.cpp

Modules/ClippingTools/mitkClippingPlaneRotationTool.h

Modules/ClippingTools/mitkClippingPlaneTranslationTool.cpp

Modules/ClippingTools/mitkClippingPlaneTranslationTool.h

Modules/MitkExt/Interactions/mitkAffineDataInteractor3D.cpp

Modules/MitkExt/Interactions/mitkAffineDataInteractor3D.h

Modules/MitkExt/Interactions/mitkAffineInteractor3D.h

Modules/MitkExt/Interactions/mitkSurfaceDeformationDataInteractor3D.cpp

Modules/MitkExt/Interactions/mitkSurfaceDeformationDataInteractor3D.h

Modules/MitkExt/Resources/Interactions/AffineDeformationConfig.xml

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-Integration…
f7af2929b6ab
Actions