Merge branch 'MITK-bug-12506-trac-1588-MITK-plugin-for-CTK-CLI' into niftk
db37592aa3f5Unpublished
Actions

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge branch 'MITK-bug-12506-trac-1588-MITK-plugin-for-CTK-CLI' into niftk

Details

Provenance

clarkson	Authored on Sep 18 2012, 2:40 PM
kislinsk	Pushed on Aug 6 2018, 4:04 PM

Parents

rMITK5d26e4b0460b: Merge branch 'b1757-MITK-upgrade' into niftk
rMITK576f66720701: Update CLI module to not need QmitkDataStorageComboBox.xsl on account of CTK…

Branches

Unknown

Tags

Unknown

Event Timeline

clarkson committed rMITKdb37592aa3f5: Merge branch 'MITK-bug-12506-trac-1588-MITK-plugin-for-CTK-CLI' into niftk (authored by clarkson).Sep 18 2012, 2:40 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

576f66720701 Update CLI module to not need QmitkDataStorageComboBox.xsl on account of CTK…
Author
clarkson
Browse Repository
No Builds
No Audits
a8d30cf83291 Added call to setParameterContainerEnabled in reworked CTK…
Author
clarkson
Browse Repository
No Builds
No Audits
fa0334c9d06d Removed invalid setParametersEnabled as reworking CTK side
Author
clarkson
Browse Repository
No Builds
No Audits
e5b628c3ac10 Removed redundant QmitkCmdLineModuleGui::lockGui()
Author
clarkson
Browse Repository
No Builds
No Audits
990e38b901dd Set GUI parameters in progress widget to disabled in CLI module
Author
clarkson
Browse Repository
No Builds
No Audits
f91344c3378a Remove addtional unnecessary browse button for image targets
Author
clarkson
Browse Repository
No Builds
No Audits
8edf610069dd Update doxygen for CLI module
Author
clarkson
Browse Repository
No Builds
No Audits
2129a59021cf Added XML validation errors as tab widget tool tips
Author
clarkson
Browse Repository
No Builds
No Audits
17ea90d71297 Fixed typo in comment
Author
clarkson
Browse Repository
No Builds
No Audits
1b380927f6d7 Added user preference for max concurrent processes to CLI module
Author
clarkson
Browse Repository
No Builds
No Audits
b26ee5665af0 Refactor CommandLineModulesView to enable multiple tabs, for multiple modules…
Author
clarkson
Browse Repository
No Builds
No Audits
1329cf37defc In QmitkDataStorageComboBoxWithSelectNone add SetSelectedNode and fix…
Author
clarkson
Browse Repository
No Builds
No Audits
ac20fe359733 Added ShowProgressBar and ShowConsole for CLI module
Author
clarkson
Browse Repository
No Builds
No Audits
4f4516d914c6 Reduced margins/spacing in QmitkCmdLineModuleProgressWidget
Author
clarkson
Browse Repository
No Builds
No Audits
e5ca2b1545a3 Convert generated Help and About tabs to ctkCollapsibleGroupBox for consistency…
Author
clarkson
Browse Repository
No Builds
No Audits
62bf78150a2b Fix multiple layouts overlaying each other problem when switching CLI module
Author
clarkson
Browse Repository
No Builds
No Audits
b7cf1d28a2c3 Improve minimum width: Remove choose label, and use tool tip instead
Author
clarkson
Browse Repository
No Builds
No Audits
61a0d6f73e21 Try grabbing all stderr and stdout output in CLI module
Author
clarkson
Browse Repository
No Builds
No Audits
bd605c7d9b60 Added UCL credits to CLI module User Manual
Author
clarkson
Browse Repository
No Builds
No Audits
0cae1fa57145 Fixed stdout and stderr reporting
Author
clarkson
Browse Repository
No Builds
No Audits
04de0c970039 Updated UserManual for CLI module to descript XML validation combo, and fix icon
Author
clarkson
Browse Repository
No Builds
No Audits
b18c3833b262 Small layout changes in CLI module
Author
clarkson
Browse Repository
No Builds
No Audits
99137fe6ee2f Fixed handling of URL in generated Help text for CLI module
Author
clarkson
Browse Repository
No Builds
No Audits
41ea9a05aeb1 Added user preference for XML validation mode in CLI module
Author
clarkson
Browse Repository
No Builds
No Audits
ddf6382e9533 Tweaked status messages for cancelled CLI modules
Author
clarkson
Browse Repository
No Builds
No Audits
806662d9e8d4 Updated User Manual for CLI plugin
Author
clarkson
Browse Repository
No Builds
No Audits
d378102b1dd9 Small cosmetic layout change, adding space in a QVBoxLayout
Author
clarkson
Browse Repository
No Builds
No Audits
73ea0a4ef7b3 Declared ctkCmdLineModuleReference as Qt MetaType to stop ctkMenuComboBox…
Author
clarkson
Browse Repository
No Builds
No Audits
e52681acb5db Minor doxygen tweaks in CLI plugin
Author
clarkson
Browse Repository
No Builds
No Audits
780be9f0b6c4 Set object name on QAction in QmitkCmdLineModuleMenuComboBox
Author
clarkson
Browse Repository
No Builds
No Audits
2f8d37dc82cd Refactored CLI plugin to move logic out of CommandLineModulesView and into…
Author
clarkson
Browse Repository
No Builds
No Audits
f37446fc83d8 Changed layout of QmitkCmdLineModuleProgressWidget
Author
clarkson
Browse Repository
No Builds
No Audits
be1474d97a6a Moved processing logic out of CommandLineModulesView and into…
Author
clarkson
Browse Repository
No Builds
No Audits
4c8f0e15a128 Removed Stop button from the main view in CLI plugin
Author
clarkson
Browse Repository
No Builds
No Audits
e31479ad5850 Added QmitkCmdLineModuleProgressWidget based on…
Author
clarkson
Browse Repository
No Builds
No Audits
9e332822c741 Remove console from CLI plugin view
Author
clarkson
Browse Repository
No Builds
No Audits
cdc98c6227b3 Updated CLI view and preference page to handle individual modules
Author
clarkson
Browse Repository
No Builds
No Audits
505f1683b02d Added connections to ctkCmdLineModuleFutureWatcher outputDataReady and…
Author
clarkson
Browse Repository
No Builds
No Audits
37c8c5b37af7 Simplified preferences page, as file watching not ready yet
Author
clarkson
Browse Repository
No Builds
No Audits
399cbb662035 Removed spurious debug output from QmitkCmdLineModuleMenuComboBox
Author
clarkson
Browse Repository
No Builds
No Audits
06d6be8fc3d8 Removed ctkCmdLineModuleMenuFactoryQtGui and implemented…
Author
clarkson
Browse Repository
No Builds
No Audits
12be4db6aa01 Updated CLI plugin to use ctkCmdLineModuleMenuFactoryQtGui from local folder…
Author
clarkson
Browse Repository
No Builds
No Audits
0afb610d213e Moved ctkCmdLineModuleMenuFactoryQtGui from CTK to MITK
Author
clarkson
Browse Repository
No Builds
No Audits
662e0550ed80 Added new widget ctkCmdLineModuleMenuComboBox
Author
clarkson
Browse Repository
No Builds
No Audits
94d5d9a94c12 Added QmitkFileListWidget and QmitkDirectoryListWidget as helpers to set up…
Author
clarkson
Browse Repository
No Builds
No Audits
f8352c427007 QmitkUiLoader now derives from ctkCmdLineModuleQtUiLoader
Author
clarkson
Browse Repository
No Builds
No Audits
f27e47683a52 Update CLI module to new CTK API including ctkPathListWidget
Author
clarkson
Browse Repository
No Builds
No Audits
5ab8e2c70a68 Added missing icon pause.png
Author
clarkson
Browse Repository
No Builds
No Audits
c6cad8116c5f Added call to ctkCmdLineModuleFrontend::reset() to set parameters to defaults
Author
clarkson
Browse Repository
No Builds
No Audits
b84835f6172d Tidy up debug/console output
Author
clarkson
Browse Repository
No Builds
No Audits

Changes (61)

Path

Size

Applications/

mitkWorkbench/

mitkWorkbench.cpp

Modules/

Qmitk/

QmitkDataStorageComboBox.h

Plugins/

CLINiftyRegRunning2.png

CLIPreferences.png

CLIPreferencesAdditionalDirectories.png

CLIPreferencesAdditionalModules.png

manifest_headers.cmake

plugin.xml

resources

CommandLineModulesResources.qrc

QmitkCmdLineModuleMenuComboBox.cpp

QmitkCmdLineModuleMenuComboBox.h

internal

CommandLineModulesPreferencesPage.cpp

CommandLineModulesPreferencesPage.h

CommandLineModulesView.cpp

CommandLineModulesView.h

CommandLineModulesViewConstants.cpp

CommandLineModulesViewConstants.h

CommandLineModulesViewControls.cpp

CommandLineModulesViewControls.h

CommandLineModulesViewControls.ui

QmitkCmdLineModuleFactoryGui.cpp

QmitkCmdLineModuleFactoryGui.h

QmitkCmdLineModuleGui.cpp

QmitkCmdLineModuleGui.h

QmitkCmdLineModuleProgressWidget.cpp

QmitkCmdLineModuleProgressWidget.h

QmitkCmdLineModuleProgressWidget.ui

QmitkDataStorageComboBoxWithSelectNone.cpp

QmitkDataStorageComboBoxWithSelectNone.h

QmitkDirectoryListWidget.cpp

QmitkDirectoryListWidget.h

QmitkFileListWidget.cpp

QmitkFileListWidget.h

QmitkPathListWidget.ui

QmitkUiLoader.cpp

QmitkUiLoader.h

org_mitk_gui_qt_cli_Activator.cpp

org_mitk_gui_qt_cli_Activator.h

rMITKdb37592aa3f5

View Options

Applications/mitkWorkbench/mitkWorkbench.cpp

View Options

Modules/Qmitk/QmitkDataStorageComboBox.h

View Options

Plugins/PluginList.cmake

View Options

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

View Options

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLIF3D.png

View Options

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLIIcon.png

View Options

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLIInitial.png

View Options

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLINiftyReg.png

View Options

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLINiftyRegRunning2.png

View Options

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLIPreferences.png

View Options

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLIPreferencesAdditionalDirectories.png

View Options

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLIPreferencesAdditionalModules.png

View Options

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLIWithPrograms.png

View Options

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/Manual.dox

View Options

Plugins/org.mitk.gui.qt.cli/documentation/doxygen/modules.dox

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.cli/resources/CommandLineModulesResources.qrc

View Options

Plugins/org.mitk.gui.qt.cli/resources/icon.png

View Options

Plugins/org.mitk.gui.qt.cli/resources/icon.xpm

View Options

Plugins/org.mitk.gui.qt.cli/resources/pause.png

View Options

Plugins/org.mitk.gui.qt.cli/resources/run.png

View Options

Plugins/org.mitk.gui.qt.cli/resources/stop.png

View Options

Plugins/org.mitk.gui.qt.cli/resources/undo.png

View Options

Plugins/org.mitk.gui.qt.cli/src/QmitkCmdLineModuleMenuComboBox.cpp

View Options

Plugins/org.mitk.gui.qt.cli/src/QmitkCmdLineModuleMenuComboBox.h

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesPreferencesPage.cpp

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesPreferencesPage.h

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesView.cpp

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesView.h

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesViewConstants.cpp

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesViewConstants.h

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesViewControls.cpp

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesViewControls.h

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesViewControls.ui

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkCmdLineModuleFactoryGui.cpp

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkCmdLineModuleFactoryGui.h

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkCmdLineModuleGui.cpp

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkCmdLineModuleGui.h

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkCmdLineModuleProgressWidget.cpp

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkCmdLineModuleProgressWidget.h

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkCmdLineModuleProgressWidget.ui

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkDataStorageComboBoxWithSelectNone.cpp

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkDataStorageComboBoxWithSelectNone.h

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkDirectoryListWidget.cpp

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkDirectoryListWidget.h

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkFileListWidget.cpp

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkFileListWidget.h

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkPathListWidget.ui

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkUiLoader.cpp

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkUiLoader.h

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/org_mitk_gui_qt_cli_Activator.cpp

View Options

Plugins/org.mitk.gui.qt.cli/src/internal/org_mitk_gui_qt_cli_Activator.h

Merge branch 'MITK-bug-12506-trac-1588-MITK-plugin-for-CTK-CLI' into niftkdb37592aa3f5UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (61)

rMITKdb37592aa3f5

Applications/mitkWorkbench/mitkWorkbench.cpp

Modules/Qmitk/QmitkDataStorageComboBox.h

Plugins/PluginList.cmake

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

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLIF3D.png

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLIIcon.png

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLIInitial.png

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLINiftyReg.png

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLINiftyRegRunning2.png

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLIPreferences.png

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLIPreferencesAdditionalDirectories.png

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLIPreferencesAdditionalModules.png

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/CLIWithPrograms.png

Plugins/org.mitk.gui.qt.cli/documentation/UserManual/Manual.dox

Plugins/org.mitk.gui.qt.cli/documentation/doxygen/modules.dox

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

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

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

Plugins/org.mitk.gui.qt.cli/resources/CommandLineModulesResources.qrc

Plugins/org.mitk.gui.qt.cli/resources/icon.png

Plugins/org.mitk.gui.qt.cli/resources/icon.xpm

Plugins/org.mitk.gui.qt.cli/resources/pause.png

Plugins/org.mitk.gui.qt.cli/resources/run.png

Plugins/org.mitk.gui.qt.cli/resources/stop.png

Plugins/org.mitk.gui.qt.cli/resources/undo.png

Plugins/org.mitk.gui.qt.cli/src/QmitkCmdLineModuleMenuComboBox.cpp

Plugins/org.mitk.gui.qt.cli/src/QmitkCmdLineModuleMenuComboBox.h

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesPreferencesPage.cpp

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesPreferencesPage.h

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesView.cpp

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesView.h

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesViewConstants.cpp

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesViewConstants.h

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesViewControls.cpp

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesViewControls.h

Plugins/org.mitk.gui.qt.cli/src/internal/CommandLineModulesViewControls.ui

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkCmdLineModuleFactoryGui.cpp

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkCmdLineModuleFactoryGui.h

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkCmdLineModuleGui.cpp

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkCmdLineModuleGui.h

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkCmdLineModuleProgressWidget.cpp

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkCmdLineModuleProgressWidget.h

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkCmdLineModuleProgressWidget.ui

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkDataStorageComboBoxWithSelectNone.cpp

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkDataStorageComboBoxWithSelectNone.h

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkDirectoryListWidget.cpp

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkDirectoryListWidget.h

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkFileListWidget.cpp

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkFileListWidget.h

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkPathListWidget.ui

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkUiLoader.cpp

Plugins/org.mitk.gui.qt.cli/src/internal/QmitkUiLoader.h

Plugins/org.mitk.gui.qt.cli/src/internal/org_mitk_gui_qt_cli_Activator.cpp

Plugins/org.mitk.gui.qt.cli/src/internal/org_mitk_gui_qt_cli_Activator.h

Merge branch 'MITK-bug-12506-trac-1588-MITK-plugin-for-CTK-CLI' into niftk
db37592aa3f5Unpublished
Actions