Merge branch 'bug-18116-SimulationIntegration'
5280a090155a
Actions

Description

Merge branch 'bug-18116-SimulationIntegration'

Details

Provenance

Authored on Sep 18 2014, 11:06 AM

Parents

rMITKa7d6ee3519fb: Merge remote-tracking branch 'origin/personal/kislinsk/Simulation2' into bug…
rMITK04fd3accbb8d: Merge branch 'bug-17836-pythoninstaller-sitk-integration'

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK5280a090155a: Merge branch 'bug-18116-SimulationIntegration' (authored by kislinsk).Sep 18 2014, 11:06 AM

Merged Changes

a7d6ee3519fb Merge remote-tracking branch 'origin/personal/kislinsk/Simulation2' into bug…
Author
kislinsk
Browse Repository
No Builds
No Audits
573fe2309713 Continued implementing simulation interaction (still beta).
Author
kislinsk
Browse Repository
No Builds
No Audits
016f69ec8374 Implemented simulation interactor (beta) and simulation scene "data manager".
Author
kislinsk
Browse Repository
No Builds
No Audits
a40c44ef5f1d Added live simulation scene tree view.
Author
kislinsk
Browse Repository
No Builds
No Audits
d6873cab8680 Moved time measurement into Simulation class and Scheduler to SimulationService.
Author
kislinsk
Browse Repository
No Builds
No Audits
e95b244cef8d Added missing breaks in switch statement.
Author
kislinsk
Browse Repository
No Builds
No Audits
cfaf8a765ed4 Implemented fair pseudo-parallel simulation runs with weighted round robin…
Author
kislinsk
Browse Repository
No Builds
No Audits
c0085bf597eb Implemented scheduler for pseudo-parallel simulation runs.
Author
kislinsk
Browse Repository
No Builds
No Audits
39d48426d480 Clarified interfaces of Simulation and SimulationService and moved…
Author
kislinsk
Browse Repository
No Builds
No Audits
bffdf5e842e2 Preserve original paths of simulation scenes to keep relative paths in…
Author
kislinsk
Browse Repository
No Builds
No Audits
9a46d2277658 Implemented writer and serializer for simulations.
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (64)

Path

Size

Packages

CMakeLists.txt

O1: MITK Reviewer Group I

Modules/

Simulation/

mitkISimulationService.h

mitkRoundRobinSchedulingAlgorithm.cpp

	mitkRoundRobinSchedulingAlgorithm.h
	mitkSimulationService.h

mitkSchedulableProcess.cpp

mitkSchedulableProcess.h

mitkScheduler.cpp

mitkScheduler.h

	mitkSchedulingAlgorithmBase.h
	mitkSimulationService.h

mitkSimulation.cpp

mitkSimulation.h

mitkSimulationInteractor.cpp

mitkSimulationInteractor.h

mitkSimulationObjectFactory.cpp

mitkSimulationObjectFactory.h

mitkSimulationReader.cpp

mitkSimulationSerializer.cpp

	mitkSimulationSerializer.h
	mitkSimulationService.h

mitkSimulationService.cpp

mitkSimulationService.h

mitkSimulationVtkMapper3D.cpp

mitkSimulationWriter.cpp

mitkSimulationWriter.h

mitkSimulationWriterFactory.cpp

	mitkSimulationWriterFactory.h
	mitkSimulationService.h

mitkVtkSimulationPolyDataMapper.cpp

mitkVtkSimulationPolyDataMapper.h

mitkWeightedRoundRobinSchedulingAlgorithm.cpp

	mitkWeightedRoundRobinSchedulingAlgorithm.h
	mitkSimulationService.h

	Modules/	Simulation/
	Plugins/	org.mitk.simulation/


	src/

mitkExportMitkVisitor.cpp

mitkExportMitkVisitor.h

	mitkSchedulingAlgorithmBase.cpp/
	src/	internal/


	mitkGetDataStorage.h

Plugins/

org.mitk.gui.qt.simulation/

resources/

src/

internal/

QmitkBaseItemDelegate.cpp

QmitkBaseItemDelegate.h

QmitkBaseTreeWidget.cpp

QmitkBaseTreeWidget.h

QmitkSceneTreeWidget.cpp

QmitkSceneTreeWidget.h

QmitkSimulationView.cpp

QmitkSimulationView.h

QmitkSimulationViewControls.ui

	org.mitk.gui.qt.simulation/	src/	internal/
	org.mitk.simulation/	src/	internal/

	QmitkNoEditItemDelegate.cpp
	mitkGetSimulationDataNode.h

	QmitkNoEditItemDelegate.h
	mitkGetSimulationDataNode.h

org.mitk.simulation/

files.cmake

src/

internal/

mitkGetData.h

mitkGetDataStorage.cpp

mitkGetDataStorage.h

mitkGetSimulationDataNode.cpp

mitkGetSimulationDataNode.h

mitkExportMitkVisitor.cpp

mitkExportMitkVisitor.h

mitkMeshMitkLoader.cpp

rMITK5280a090155a

View Options

CMakeLists.txt

View Options

Modules/Simulation/CMakeLists.txt

View Options

Modules/Simulation/Resources/Interactions/Simulation.xml

View Options

Modules/Simulation/Resources/Interactions/SimulationConfig.xml

View Options

Modules/Simulation/files.cmake

View Options

Modules/Simulation/mitkExportMitkVisitor.cpp

View Options

Modules/Simulation/mitkExportMitkVisitor.h

View Options

Modules/Simulation/mitkISimulationService.h

View Options

Modules/Simulation/mitkRoundRobinSchedulingAlgorithm.cpp

View Options

Modules/Simulation/mitkRoundRobinSchedulingAlgorithm.h

View Options

Modules/Simulation/mitkSchedulableProcess.cpp

View Options

Modules/Simulation/mitkSchedulableProcess.h

View Options

Modules/Simulation/mitkScheduler.cpp

View Options

Modules/Simulation/mitkScheduler.h

View Options

Modules/Simulation/mitkSchedulingAlgorithmBase.cpp

View Options

Modules/Simulation/mitkSchedulingAlgorithmBase.h

View Options

Modules/Simulation/mitkSimulation.cpp

View Options

Modules/Simulation/mitkSimulation.h

View Options

Modules/Simulation/mitkSimulationInteractor.cpp

View Options

Modules/Simulation/mitkSimulationInteractor.h

View Options

Modules/Simulation/mitkSimulationObjectFactory.cpp

View Options

Modules/Simulation/mitkSimulationObjectFactory.h

View Options

Modules/Simulation/mitkSimulationReader.cpp

View Options

Modules/Simulation/mitkSimulationSerializer.cpp

View Options

Modules/Simulation/mitkSimulationSerializer.h

View Options

Modules/Simulation/mitkSimulationService.cpp

View Options

Modules/Simulation/mitkSimulationService.h

View Options

Modules/Simulation/mitkSimulationVtkMapper3D.cpp

View Options

Modules/Simulation/mitkSimulationWriter.cpp

View Options

Modules/Simulation/mitkSimulationWriter.h

View Options

Modules/Simulation/mitkSimulationWriterFactory.cpp

View Options

Modules/Simulation/mitkSimulationWriterFactory.h

View Options

Modules/Simulation/mitkVtkSimulationPolyDataMapper.cpp

View Options

Modules/Simulation/mitkVtkSimulationPolyDataMapper.h

View Options

Modules/Simulation/mitkWeightedRoundRobinSchedulingAlgorithm.cpp

View Options

Modules/Simulation/mitkWeightedRoundRobinSchedulingAlgorithm.h

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/resources/Node_16x16.png

View Options

Plugins/org.mitk.gui.qt.simulation/resources/Object_16x16.png

View Options

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

View Options

Plugins/org.mitk.gui.qt.simulation/resources/Slave_16x16.png

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationViewControls.ui

View Options

Plugins/org.mitk.simulation/files.cmake

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

Merge branch 'bug-18116-SimulationIntegration'5280a090155aActions

Description

Details

Event Timeline

Merged Changes

Changes (64)

rMITK5280a090155a

CMakeLists.txt

Modules/Simulation/CMakeLists.txt

Modules/Simulation/Resources/Interactions/Simulation.xml

Modules/Simulation/Resources/Interactions/SimulationConfig.xml

Modules/Simulation/files.cmake

Modules/Simulation/mitkExportMitkVisitor.cpp

Modules/Simulation/mitkExportMitkVisitor.h

Modules/Simulation/mitkISimulationService.h

Modules/Simulation/mitkRoundRobinSchedulingAlgorithm.cpp

Modules/Simulation/mitkRoundRobinSchedulingAlgorithm.h

Modules/Simulation/mitkSchedulableProcess.cpp

Modules/Simulation/mitkSchedulableProcess.h

Modules/Simulation/mitkScheduler.cpp

Modules/Simulation/mitkScheduler.h

Modules/Simulation/mitkSchedulingAlgorithmBase.cpp

Modules/Simulation/mitkSchedulingAlgorithmBase.h

Modules/Simulation/mitkSimulation.cpp

Modules/Simulation/mitkSimulation.h

Modules/Simulation/mitkSimulationInteractor.cpp

Modules/Simulation/mitkSimulationInteractor.h

Modules/Simulation/mitkSimulationObjectFactory.cpp

Modules/Simulation/mitkSimulationObjectFactory.h

Modules/Simulation/mitkSimulationReader.cpp

Modules/Simulation/mitkSimulationSerializer.cpp

Modules/Simulation/mitkSimulationSerializer.h

Modules/Simulation/mitkSimulationService.cpp

Modules/Simulation/mitkSimulationService.h

Modules/Simulation/mitkSimulationVtkMapper3D.cpp

Modules/Simulation/mitkSimulationWriter.cpp

Modules/Simulation/mitkSimulationWriter.h

Modules/Simulation/mitkSimulationWriterFactory.cpp

Modules/Simulation/mitkSimulationWriterFactory.h

Modules/Simulation/mitkVtkSimulationPolyDataMapper.cpp

Modules/Simulation/mitkVtkSimulationPolyDataMapper.h

Modules/Simulation/mitkWeightedRoundRobinSchedulingAlgorithm.cpp

Modules/Simulation/mitkWeightedRoundRobinSchedulingAlgorithm.h

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

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

Plugins/org.mitk.gui.qt.simulation/resources/Node_16x16.png

Plugins/org.mitk.gui.qt.simulation/resources/Object_16x16.png

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

Plugins/org.mitk.gui.qt.simulation/resources/Slave_16x16.png

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

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

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

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

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

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

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

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

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

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

Plugins/org.mitk.gui.qt.simulation/src/internal/QmitkSimulationViewControls.ui

Plugins/org.mitk.simulation/files.cmake

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

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

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

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

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

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

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

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

Merge branch 'bug-18116-SimulationIntegration'
5280a090155a
Actions