Diffusion MITK f5e05310c2a5

Merge branch 'bug-14628-SOFASimulationTemplates'
f5e05310c2a5
Actions

Description

Merge branch 'bug-14628-SOFASimulationTemplates'

Details

Provenance

kislinsk

Authored on Apr 3 2013, 7:32 PM

Parents

rMITK0850a95732d0: Continued documentation.
rMITK61ff4c2eb79e: Merge branch 'bug-13139-Fix4'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITKf5e05310c2a5: Merge branch 'bug-14628-SOFASimulationTemplates' (authored by kislinsk).Apr 3 2013, 7:32 PM

Merged Changes

0850a95732d0 Continued documentation.
Author
kislinsk
Browse Repository
No Builds
No Audits
7b34a3661af5 Began extending documentation.
Author
kislinsk
Browse Repository
No Builds
No Audits
1d779b3f7088 Fixed surface recording for empty simulation scenes.
Author
kislinsk
Browse Repository
No Builds
No Audits
ecd718037617 Renamed name to id for simulation templates.
Author
kislinsk
Browse Repository
No Builds
No Audits
198e8bcd7ae8 Implemented simulation template references.
Author
kislinsk
Browse Repository
No Builds
No Audits
82bfb077d365 First minimal implementation is complete.
Author
kislinsk
Browse Repository
No Builds
No Audits
afdc2a8289e4 Continued to implement simulation scene templates.
Author
kislinsk
Browse Repository
No Builds
No Audits
6c55a7d88a15 Began to implement simulation scene template parsing.
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (41)

Path

Size

Packages

Modules/

Simulation/

Documentation/

doxygen/

Manual.dox

SOFA_MITK.png

SimulationPreferences.png

files.cmake

mitkSimulation.cpp

mitkSimulation.h

mitkSimulationObjectFactory.cpp

mitkSimulationObjectFactory.h

mitkSimulationReader.h

mitkSimulationTemplate.cpp

mitkSimulationTemplate.h

mitkSimulationTemplateIOFactory.cpp

mitkSimulationTemplateIOFactory.h

mitkSimulationTemplateReader.cpp

	mitkSimulationTemplateReader.h
	mitkSimulationReader.h

Plugins/

PluginList.cmake

org.mitk.gui.qt.datamanager/

src/

QmitkDataManagerView.cpp

O1: MITK Reviewer Group I

org.mitk.gui.qt.simulation/

CMakeLists.txt

files.cmake

manifest_headers.cmake

plugin.xml

src/

internal/

QmitkCreateSimulationAction.cpp

QmitkCreateSimulationAction.h

QmitkSimulationPreferencePage.cpp

QmitkSimulationPreferencePage.h

QmitkSimulationView.cpp

org_mitk_gui_qt_simulation_Activator.cpp

simulationTemplate.png

src

internal

org_mitk_simulation_Activator.cpp

org_mitk_simulation_Activator.h

mitkGetSimulationPreferences.cpp

mitkGetSimulationPreferences.h

	org.mitk.simulation/
	org.mitk.gui.qt.simulation/

manifest_headers.cmake

resources/

	simulation.png
	icon.png

rMITKf5e05310c2a5

View Options

Modules/Simulation/Documentation/doxygen/Manual.dox

View Options

Modules/Simulation/Documentation/doxygen/SOFA_MITK.png

View Options

Modules/Simulation/Documentation/doxygen/SimulationPreferences.png

View Options

Modules/Simulation/files.cmake

View Options

Modules/Simulation/mitkSimulation.cpp

View Options

Modules/Simulation/mitkSimulation.h

View Options

Modules/Simulation/mitkSimulationObjectFactory.cpp

View Options

Modules/Simulation/mitkSimulationObjectFactory.h

View Options

Modules/Simulation/mitkSimulationReader.h

View Options

Modules/Simulation/mitkSimulationTemplate.cpp

View Options

Modules/Simulation/mitkSimulationTemplate.h

View Options

Modules/Simulation/mitkSimulationTemplateIOFactory.cpp

View Options

Modules/Simulation/mitkSimulationTemplateIOFactory.h

View Options

Modules/Simulation/mitkSimulationTemplateReader.cpp

View Options

Modules/Simulation/mitkSimulationTemplateReader.h

View Options

Plugins/PluginList.cmake

View Options

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

View Options

Plugins/org.mitk.gui.qt.simulation/CMakeLists.txt

View Options

Plugins/org.mitk.gui.qt.simulation/files.cmake

View Options

Plugins/org.mitk.gui.qt.simulation/manifest_headers.cmake

View Options

Plugins/org.mitk.gui.qt.simulation/plugin.xml

View Options

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkCreateSimulationAction.cpp

View Options

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkCreateSimulationAction.h

View Options

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationPreferencePage.cpp

View Options

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationPreferencePage.h

View Options

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationView.cpp

View Options

Plugins/org.mitk.gui.qt.simulation/src/internal/org_mitk_gui_qt_simulation_Activator.cpp

View Options

Plugins/org.mitk.simulation/CMakeLists.txt

View Options

Plugins/org.mitk.simulation/files.cmake

View Options

Plugins/org.mitk.simulation/manifest_headers.cmake

View Options

Plugins/org.mitk.simulation/resources/Simulation.qrc

View Options

Plugins/org.mitk.simulation/resources/simulation.png

View Options

Plugins/org.mitk.simulation/resources/simulationTemplate.png

View Options

Plugins/org.mitk.simulation/src/internal/org_mitk_simulation_Activator.cpp

View Options

Plugins/org.mitk.simulation/src/internal/org_mitk_simulation_Activator.h

View Options

Plugins/org.mitk.simulation/src/mitkGetSimulationPreferences.cpp

View Options

Plugins/org.mitk.simulation/src/mitkGetSimulationPreferences.h

Merge branch 'bug-14628-SOFASimulationTemplates'f5e05310c2a5Actions

Description

Details

Event Timeline

Merged Changes

Changes (41)

rMITKf5e05310c2a5

Modules/Simulation/Documentation/doxygen/Manual.dox

Modules/Simulation/Documentation/doxygen/SOFA_MITK.png

Modules/Simulation/Documentation/doxygen/SimulationPreferences.png

Modules/Simulation/files.cmake

Modules/Simulation/mitkSimulation.cpp

Modules/Simulation/mitkSimulation.h

Modules/Simulation/mitkSimulationObjectFactory.cpp

Modules/Simulation/mitkSimulationObjectFactory.h

Modules/Simulation/mitkSimulationReader.h

Modules/Simulation/mitkSimulationTemplate.cpp

Modules/Simulation/mitkSimulationTemplate.h

Modules/Simulation/mitkSimulationTemplateIOFactory.cpp

Modules/Simulation/mitkSimulationTemplateIOFactory.h

Modules/Simulation/mitkSimulationTemplateReader.cpp

Modules/Simulation/mitkSimulationTemplateReader.h

Plugins/PluginList.cmake

Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp

Plugins/org.mitk.gui.qt.simulation/CMakeLists.txt

Plugins/org.mitk.gui.qt.simulation/files.cmake

Plugins/org.mitk.gui.qt.simulation/manifest_headers.cmake

Plugins/org.mitk.gui.qt.simulation/plugin.xml

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkCreateSimulationAction.cpp

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkCreateSimulationAction.h

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationPreferencePage.cpp

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationPreferencePage.h

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationView.cpp

Plugins/org.mitk.gui.qt.simulation/src/internal/org_mitk_gui_qt_simulation_Activator.cpp

Plugins/org.mitk.simulation/CMakeLists.txt

Plugins/org.mitk.simulation/files.cmake

Plugins/org.mitk.simulation/manifest_headers.cmake

Plugins/org.mitk.simulation/resources/Simulation.qrc

Plugins/org.mitk.simulation/resources/simulation.png

Plugins/org.mitk.simulation/resources/simulationTemplate.png

Plugins/org.mitk.simulation/src/internal/org_mitk_simulation_Activator.cpp

Plugins/org.mitk.simulation/src/internal/org_mitk_simulation_Activator.h

Plugins/org.mitk.simulation/src/mitkGetSimulationPreferences.cpp

Plugins/org.mitk.simulation/src/mitkGetSimulationPreferences.h

Merge branch 'bug-14628-SOFASimulationTemplates'
f5e05310c2a5
Actions