diff --git a/Plugins/org.mitk.gui.qt.rdftriplestore/CMakeLists.txt b/Plugins/org.mitk.gui.qt.rdftriplestore/CMakeLists.txt index 06a60fb191..f83b67f1e6 100644 --- a/Plugins/org.mitk.gui.qt.rdftriplestore/CMakeLists.txt +++ b/Plugins/org.mitk.gui.qt.rdftriplestore/CMakeLists.txt @@ -1,7 +1,8 @@ project(org_mitk_gui_qt_rdftriplestore) MACRO_CREATE_MITK_CTK_PLUGIN( - MODULE_DEPENDS MitkRDF EXPORT_DIRECTIVE RDFTRIPLESTORE_EXPORT EXPORTED_INCLUDE_SUFFIXES src + MODULE_DEPENDS MitkRDF + PACKAGE_DEPENDS Qt4|QtCore ) diff --git a/Plugins/org.mitk.gui.qt.rdftriplestore/documentation/UserManual/Manual.dox b/Plugins/org.mitk.gui.qt.rdftriplestore/documentation/UserManual/Manual.dox deleted file mode 100644 index 02011bc12c..0000000000 --- a/Plugins/org.mitk.gui.qt.rdftriplestore/documentation/UserManual/Manual.dox +++ /dev/null @@ -1,18 +0,0 @@ -/** -\bundlemainpage{org.mitk.gui.qt.rdftriplestore} Rdftriplestore - -imageMacro{"icon.xpm","Icon of Rdftriplestore",2.00} - -Available sections: - - \ref org.mitk.gui.qt.rdftriplestoreOverview - -\section org.mitk.gui.qt.rdftriplestoreOverview -Describe the features of your awesome plugin here - - -*/ diff --git a/Plugins/org.mitk.gui.qt.rdftriplestore/documentation/UserManual/icon.xpm b/Plugins/org.mitk.gui.qt.rdftriplestore/documentation/UserManual/icon.xpm deleted file mode 100644 index 83e48be4d8..0000000000 --- a/Plugins/org.mitk.gui.qt.rdftriplestore/documentation/UserManual/icon.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static const char * icon_xpm[] = { -"16 16 2 1", -" c #FF0000", -". c #000000", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/Plugins/org.mitk.gui.qt.rdftriplestore/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.rdftriplestore/documentation/doxygen/modules.dox deleted file mode 100644 index 0f888348cf..0000000000 --- a/Plugins/org.mitk.gui.qt.rdftriplestore/documentation/doxygen/modules.dox +++ /dev/null @@ -1,16 +0,0 @@ -/** - \defgroup org_mitk_gui_qt_rdftriplestore org.mitk.gui.qt.rdftriplestore - \ingroup MITKPlugins - - \brief Describe your plugin here. - -*/ - -/** - \defgroup org_mitk_gui_qt_rdftriplestore_internal Internal - \ingroup org_mitk_gui_qt_rdftriplestore - - \brief This subcategory includes the internal classes of the org.mitk.gui.qt.rdftriplestore plugin. Other - plugins must not rely on these classes. They contain implementation details and their interface - may change at any time. We mean it. -*/ diff --git a/Plugins/org.mitk.gui.qt.rdftriplestore/files.cmake b/Plugins/org.mitk.gui.qt.rdftriplestore/files.cmake index 594ce5220c..7819a50c96 100644 --- a/Plugins/org.mitk.gui.qt.rdftriplestore/files.cmake +++ b/Plugins/org.mitk.gui.qt.rdftriplestore/files.cmake @@ -1,42 +1,44 @@ set(SRC_CPP_FILES ) set(INTERNAL_CPP_FILES org_mitk_gui_qt_rdftriplestore_Activator.cpp QmitkRdfTriplestoreView.cpp ) set(UI_FILES src/internal/QmitkRdfTriplestoreViewControls.ui ) set(MOC_H_FILES src/internal/org_mitk_gui_qt_rdftriplestore_Activator.h src/internal/QmitkRdfTriplestoreView.h ) # list of resource files which can be used by the plug-in # system without loading the plug-ins shared library, # for example the icon used in the menu and tabs for the # plug-in views in the workbench set(CACHED_RESOURCE_FILES - resources/icon.xpm + resources/rdf_flyer.xpm plugin.xml ) # list of Qt .qrc files which contain additional resources # specific to this plugin set(QRC_FILES ) -set(CPP_FILES ) +set(CPP_FILES + +) foreach(file ${SRC_CPP_FILES}) set(CPP_FILES ${CPP_FILES} src/${file}) endforeach(file ${SRC_CPP_FILES}) foreach(file ${INTERNAL_CPP_FILES}) set(CPP_FILES ${CPP_FILES} src/internal/${file}) endforeach(file ${INTERNAL_CPP_FILES}) diff --git a/Plugins/org.mitk.gui.qt.rdftriplestore/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.rdftriplestore/manifest_headers.cmake index 5c617a9ef9..079ae3c059 100644 --- a/Plugins/org.mitk.gui.qt.rdftriplestore/manifest_headers.cmake +++ b/Plugins/org.mitk.gui.qt.rdftriplestore/manifest_headers.cmake @@ -1,5 +1,5 @@ -set(Plugin-Name "Rdftriplestore") +set(Plugin-Name "RDF Triplestore Plugin") set(Plugin-Version "0.1") set(Plugin-Vendor "DKFZ, Medical and Biological Informatics") set(Plugin-ContactAddress "") set(Require-Plugin org.mitk.gui.qt.common) diff --git a/Plugins/org.mitk.gui.qt.rdftriplestore/plugin.xml b/Plugins/org.mitk.gui.qt.rdftriplestore/plugin.xml index a831c60e82..dd807d70ed 100644 --- a/Plugins/org.mitk.gui.qt.rdftriplestore/plugin.xml +++ b/Plugins/org.mitk.gui.qt.rdftriplestore/plugin.xml @@ -1,11 +1,11 @@ - + diff --git a/Plugins/org.mitk.gui.qt.rdftriplestore/resources/icon.xpm b/Plugins/org.mitk.gui.qt.rdftriplestore/resources/icon.xpm deleted file mode 100644 index 83e48be4d8..0000000000 --- a/Plugins/org.mitk.gui.qt.rdftriplestore/resources/icon.xpm +++ /dev/null @@ -1,21 +0,0 @@ -/* XPM */ -static const char * icon_xpm[] = { -"16 16 2 1", -" c #FF0000", -". c #000000", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/Plugins/org.mitk.gui.qt.rdftriplestore/resources/rdf_flyer.xpm b/Plugins/org.mitk.gui.qt.rdftriplestore/resources/rdf_flyer.xpm new file mode 100644 index 0000000000..0291161c9b Binary files /dev/null and b/Plugins/org.mitk.gui.qt.rdftriplestore/resources/rdf_flyer.xpm differ diff --git a/Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/QmitkRdfTriplestoreView.cpp b/Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/QmitkRdfTriplestoreView.cpp index 251c3064ac..6fa9cc672b 100644 --- a/Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/QmitkRdfTriplestoreView.cpp +++ b/Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/QmitkRdfTriplestoreView.cpp @@ -1,84 +1,84 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ // Blueberry #include #include // Qmitk #include "QmitkRdfTriplestoreView.h" // Qt #include // MitkRdf #include #include #include #include -const std::string QmitkRdfTriplestoreView::VIEW_ID = "org.mitk.views.qmitkrdftriplestoreview"; +const std::string QmitkRdfTriplestoreView::VIEW_ID = "org.mitk.views.rdftriplestore"; void QmitkRdfTriplestoreView::SetFocus() { m_Controls.buttonPerformImageProcessing->setFocus(); } void QmitkRdfTriplestoreView::CreateQtPartControl( QWidget *parent ) { // create GUI widgets from the Qt Designer's .ui file m_Controls.setupUi( parent ); connect( m_Controls.buttonPerformImageProcessing, SIGNAL(clicked()), this, SLOT(DoImageProcessing()) ); } void QmitkRdfTriplestoreView::OnSelectionChanged( berry::IWorkbenchPart::Pointer /*source*/, const QList& nodes ) { } void QmitkRdfTriplestoreView::DoImageProcessing() { typedef mitk::RdfStore Store; typedef mitk::RdfTriple Triple; typedef mitk::RdfNode Node; typedef mitk::RdfUri Uri; // Create a new Store Store store; // Create a new base URI for the store and set it into the store std::string base = "http://www.mitk.org/Base"; Uri baseUri(base); // Create some nodes mitk::RdfNode project1(mitk::RdfUri("http://www.mitk.org/rdfOntology/resource.rdf#Project1")); mitk::RdfNode subject1(mitk::RdfUri("http://www.mitk.org/rdfOntology/resource.rdf#Subject1")); // Create some predicate(/property) nodes mitk::RdfNode hasA(mitk::RdfUri("http://www.mitk.org/rdfOntology/property.rdf#hasA")); mitk::RdfNode name(mitk::RdfUri("http://www.mitk.org/rdfOntology/property.rdf#name")); // Create some triples mitk::RdfTriple t1(project1, hasA, subject1); mitk::RdfTriple t2(project1, name, (std::string) "MyProject"); // Add triples to store store.Add(t1); store.Add(t1); // Save the store in a local path store.Save("C:/Users/knorr/Desktop/storeFromMitk.rdf"); } diff --git a/Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/org_mitk_gui_qt_rdftriplestore_Activator.cpp b/Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/org_mitk_gui_qt_rdftriplestore_Activator.cpp index f344d2a0c0..15cae057d3 100644 --- a/Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/org_mitk_gui_qt_rdftriplestore_Activator.cpp +++ b/Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/org_mitk_gui_qt_rdftriplestore_Activator.cpp @@ -1,35 +1,41 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #include "org_mitk_gui_qt_rdftriplestore_Activator.h" #include #include "QmitkRdfTriplestoreView.h" +#include + +//US_INITIALIZE_MODULE + namespace mitk { void org_mitk_gui_qt_rdftriplestore_Activator::start(ctkPluginContext* context) { BERRY_REGISTER_EXTENSION_CLASS(QmitkRdfTriplestoreView, context) } void org_mitk_gui_qt_rdftriplestore_Activator::stop(ctkPluginContext* context) { Q_UNUSED(context) } } -Q_EXPORT_PLUGIN2(org_mitk_gui_qt_rdftriplestore, mitk::org_mitk_gui_qt_rdftriplestore_Activator) +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + Q_EXPORT_PLUGIN2(org_mitk_gui_qt_rdftriplestore, mitk::org_mitk_gui_qt_rdftriplestore_Activator) +#endif diff --git a/Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/org_mitk_gui_qt_rdftriplestore_Activator.h b/Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/org_mitk_gui_qt_rdftriplestore_Activator.h index c25ff7eba4..7f5a6aecaf 100644 --- a/Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/org_mitk_gui_qt_rdftriplestore_Activator.h +++ b/Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/org_mitk_gui_qt_rdftriplestore_Activator.h @@ -1,36 +1,43 @@ /*=================================================================== The Medical Imaging Interaction Toolkit (MITK) Copyright (c) German Cancer Research Center, Division of Medical and Biological Informatics. All rights reserved. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See LICENSE.txt or http://www.mitk.org for details. ===================================================================*/ #ifndef org_mitk_gui_qt_rdftriplestore_Activator_h #define org_mitk_gui_qt_rdftriplestore_Activator_h #include +#include namespace mitk { - class org_mitk_gui_qt_rdftriplestore_Activator : + + class MITK_LOCAL org_mitk_gui_qt_rdftriplestore_Activator : public QObject, public ctkPluginActivator { Q_OBJECT - Q_INTERFACES(ctkPluginActivator) +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + Q_PLUGIN_METADATA(IID "org_mitk_gui_qt_rdftriplestore") +#endif + Q_INTERFACES(ctkPluginActivator) public: void start(ctkPluginContext* context); void stop(ctkPluginContext* context); + }; // org_mitk_gui_qt_rdftriplestore_Activator -} + +} // end of namespace mitk #endif // org_mitk_gui_qt_rdftriplestore_Activator_h