Merge branch 'bug-18500-ImplementationOfRdfTripleStoreBaseApi' into bug-18500…
8a8a8501b0f0
Actions

Description

Merge branch 'bug-18500-ImplementationOfRdfTripleStoreBaseApi' into bug-18500-ImplementationOfRdfTripleStoreBaseApiIntegration

Conflicts:
CMake/mitkFunctionGetLibrarySearchPaths.cmake
Modules/CMakeLists.txt
Modules/RDF/mitkRdfNode.cpp
Modules/RDF/mitkRdfNode.h

Details

Provenance

• knorr

Authored on May 21 2015, 3:04 PM

Parents

rMITK4235bd6f3859: Removed double include.
rMITKc31d9c4bb715: Merge branch 'bug-18998-COMP-Branch'

Branches

Unknown

Tags

Unknown

Event Timeline

• knorr committed rMITK8a8a8501b0f0: Merge branch 'bug-18500-ImplementationOfRdfTripleStoreBaseApi' into bug-18500… (authored by • knorr).May 21 2015, 3:04 PM

Merged Changes

4235bd6f3859 Removed double include.
Author
• knorr
Browse Repository
No Builds
No Audits
aa5b08544d7c Implemented Pimpl-idom for RdfStore.
Author
• knorr
Browse Repository
No Builds
No Audits
477069b8d218 Declared some methods as const.
Author
• knorr
Browse Repository
No Builds
No Audits
1b7000e11e2b Added content of the Tests for the RDF Module.
Author
• knorr
Browse Repository
No Builds
No Audits
596d2b78e264 Changed comments. Deleted dummy test method. Added TestSuits for each RDF class.
Author
• knorr
Browse Repository
No Builds
No Audits
21978813d3dd Added documentation. And changed evaluation plugin to give better results for…
Author
• knorr
Browse Repository
No Builds
No Audits
1f9dbaa248f9 some fixes to ResultMAP
Author
• knorr
Browse Repository
No Builds
No Audits
d45791cbd082 added more nodes
Author
• knorr
Browse Repository
No Builds
No Audits
2478c01cbedc triple creation
Author
• knorr
Browse Repository
No Builds
No Audits
c25d79d0cc11 Changed format and get all dataNodes of datastorage
Author
• knorr
Browse Repository
No Builds
No Audits
bf3aae384205 Changed some little bugs and some renamings. Added QWidget for adding a new…
Author
• knorr
Browse Repository
No Builds
No Audits
6cfed786ba54 Added PATH variable for Redland for Win32
Author
• knorr
Browse Repository
No Builds
No Audits
3024f1418a75 Changed little things ranamed etc. icon.. deleted documentation..
Author
• knorr
Browse Repository
No Builds
No Audits
8c19ce64cd64 Fill MitkRDF with needed classes for a triplestore. Created a new plugin for…
Author
• knorr
Browse Repository
No Builds
No Audits
63f726b81ebe Merge branch 'bug-18491-redland-integration' into bug-18500…
Author
• knorr
Browse Repository
No Builds
No Audits

Changes (31)

Path

Size

Packages

CMake/

mitkFunctionGetLibrarySearchPaths.cmake

O1: MITK Reviewer Group I

Modules/

RDF/

Testing/

mitkRdfTripleTest.cpp

	mitkRdfUri.cpp/
	Testing/


	mitkRdfNodeTest.cpp

mitkRdfUri.h

Plugins/

PluginList.cmake

org.mitk.gui.qt.rdftriplestore

CMakeLists.txt

files.cmake

manifest_headers.cmake

QmitkRdfTriplestoreView.cpp

QmitkRdfTriplestoreView.h

QmitkRdfTriplestoreViewControls.ui

org_mitk_gui_qt_rdftriplestore_Activator.cpp

org_mitk_gui_qt_rdftriplestore_Activator.h

rMITK8a8a8501b0f0

View Options

CMake/mitkFunctionGetLibrarySearchPaths.cmake

View Options

Modules/RDF/CMakeLists.txt

View Options

Modules/RDF/Testing/files.cmake

View Options

Modules/RDF/Testing/mitkRdfNodeTest.cpp

View Options

Modules/RDF/Testing/mitkRdfStoreTest.cpp

View Options

Modules/RDF/Testing/mitkRdfTripleTest.cpp

View Options

Modules/RDF/Testing/mitkRdfUriTest.cpp

View Options

Modules/RDF/files.cmake

View Options

Modules/RDF/mitkRdfNode.cpp

View Options

Modules/RDF/mitkRdfNode.h

View Options

Modules/RDF/mitkRdfStore.cpp

View Options

Modules/RDF/mitkRdfStore.h

View Options

Modules/RDF/mitkRdfTriple.cpp

View Options

Modules/RDF/mitkRdfTriple.h

View Options

Modules/RDF/mitkRdfUri.cpp

View Options

Modules/RDF/mitkRdfUri.h

View Options

Plugins/PluginList.cmake

View Options

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

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.rdftriplestore/resources/rdf_flyer.xpm

View Options

Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/QmitkRdfTriplestoreView.cpp

View Options

Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/QmitkRdfTriplestoreView.h

View Options

Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/QmitkRdfTriplestoreViewControls.ui

View Options

Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/org_mitk_gui_qt_rdftriplestore_Activator.cpp

View Options

Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/org_mitk_gui_qt_rdftriplestore_Activator.h

Merge branch 'bug-18500-ImplementationOfRdfTripleStoreBaseApi' into bug-18500…8a8a8501b0f0Actions

Description

Details

Event Timeline

Merged Changes

Changes (31)

rMITK8a8a8501b0f0

CMake/mitkFunctionGetLibrarySearchPaths.cmake

Modules/RDF/CMakeLists.txt

Modules/RDF/Testing/files.cmake

Modules/RDF/Testing/mitkRdfNodeTest.cpp

Modules/RDF/Testing/mitkRdfStoreTest.cpp

Modules/RDF/Testing/mitkRdfTripleTest.cpp

Modules/RDF/Testing/mitkRdfUriTest.cpp

Modules/RDF/files.cmake

Modules/RDF/mitkRdfNode.cpp

Modules/RDF/mitkRdfNode.h

Modules/RDF/mitkRdfStore.cpp

Modules/RDF/mitkRdfStore.h

Modules/RDF/mitkRdfTriple.cpp

Modules/RDF/mitkRdfTriple.h

Modules/RDF/mitkRdfUri.cpp

Modules/RDF/mitkRdfUri.h

Plugins/PluginList.cmake

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

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

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

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

Plugins/org.mitk.gui.qt.rdftriplestore/resources/rdf_flyer.xpm

Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/QmitkRdfTriplestoreView.cpp

Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/QmitkRdfTriplestoreView.h

Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/QmitkRdfTriplestoreViewControls.ui

Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/org_mitk_gui_qt_rdftriplestore_Activator.cpp

Plugins/org.mitk.gui.qt.rdftriplestore/src/internal/org_mitk_gui_qt_rdftriplestore_Activator.h

Merge branch 'bug-18500-ImplementationOfRdfTripleStoreBaseApi' into bug-18500…
8a8a8501b0f0
Actions