Merge branch 'master' of github.com:pieper/CTK

CMakeLists.txt

@@ -20,7 +20,6 @@ IF(NOT EXECUTABLE_OUTPUT_PATH)
 ENDIF(NOT EXECUTABLE_OUTPUT_PATH)
 SET(CTK_LIBRARY_PATH ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
 SET(CTK_EXECUTABLE_PATH ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
-SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
 
 #-----------------------------------------------------------------------------
 # Install directories, used for install rules.
@@ -56,7 +55,7 @@ OPTION(BUILD_TESTING "Test the project" ON)
 IF(BUILD_TESTING)
   ENABLE_TESTING()
   INCLUDE(CTest)
-  SET(CXX_TEST_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+  SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
   MARK_AS_ADVANCED(TCL_TCLSH DART_ROOT)
     
   # Setup file for setting custom ctest vars

Libs/Core/Testing/CMakeLists.txt

@@ -19,7 +19,7 @@ IF(WIN32)
 ENDIF(WIN32)
 
 MACRO( SIMPLE_TEST  TESTNAME )
-  ADD_TEST( ${TESTNAME} ${LAUNCH_EXE} ${KIT_TESTS} ${TESTNAME} )
+  ADD_TEST( ${TESTNAME} ${KIT_TESTS} ${TESTNAME} )
 ENDMACRO( SIMPLE_TEST  )
 
 #

Libs/DICOM/Core/CMakeLists.txt

@@ -30,6 +30,7 @@ SET(KIT_UI_FORMS
 
 # Resources
 SET(KIT_resources
+  Resources/dicom.qrc
 )
 
 # Additional Target libraries

Libs/DICOM/Core/Testing/qCTKDCMTKTest1.cxx

@@ -0,0 +1,24 @@
+#include <QTextStream>
+
+#include "qCTKDCMTK.h"
+
+#include <iostream>
+#include <cstdlib>
+
+int qCTKDCMTKTest1(int argc, char** argv) {
+ 
+  QTextStream out(stdout);
+  qCTKDCMTK myCTK;
+  if ( myCTK.openDatabase( argv[1]) )
+    {
+    out << "open db success\n";
+    myCTK.initializeDatabase();
+    }
+  else
+    { 
+    out << "ERROR: " ;
+    out << myCTK.GetLastError();
+    }
+  return EXIT_SUCCESS;
+}
+

Libs/DICOM/Resources/dicom-schema.sql

@@ -1,50 +0,0 @@
-
-BEGIN TRANSACTION;
-DROP TABLE IF EXISTS 'Images' ;
-DROP TABLE IF EXISTS 'Patients' ;
-DROP TABLE IF EXISTS 'Series' ;
-DROP TABLE IF EXISTS 'Studies' ;
-
-CREATE TABLE 'Images' (
-  'Filename' VARCHAR(1024) NOT NULL ,
-  'SeriesInstanceUID' VARCHAR(255) NOT NULL ,
-  PRIMARY KEY ('Filename') );
-CREATE TABLE 'Patients' (
-  'UID' INTEGER PRIMARY KEY AUTOINCREMENT,
-  'PatientsName' VARCHAR(255) NULL ,
-  'PatientID' VARCHAR(255) NULL ,
-  'PatientsBirthDate' DATE NULL ,
-  'PatientsBirthTime' TIME NULL ,
-  'PatientsSex' varchar(1) NULL ,
-  'PatientsComments' VARCHAR(255) NULL );
-CREATE TABLE 'Series' (
-  'SeriesInstanceUID' VARCHAR(255) NOT NULL ,
-  'StudyInstanceUID' VARCHAR(45) NOT NULL ,
-  'SeriesNumber' INT NULL ,
-  'SeriesDate' DATE NULL ,
-  'SeriesTime' VARCHAR(20) NULL ,
-  'SeriesDescription' VARCHAR(255) NULL ,
-  'BodyPartExamined' VARCHAR(255) NULL ,
-  'FrameOfReferenceUID' VARCHAR(255) NULL ,
-  'AcquisitionNumber' INT NULL ,
-  'ContrastAgent' VARCHAR(255) NULL ,
-  'ScanningSequence' VARCHAR(45) NULL ,
-  'EchoNumber' INT NULL ,
-  'TemporalPosition' INT NULL ,
-  PRIMARY KEY ('SeriesInstanceUID') );
-CREATE TABLE 'Studies' (
-  'StudyInstanceUID' VARCHAR(255) NOT NULL ,
-  'PatientsUID' INT NOT NULL ,
-  'StudyID' VARCHAR(255) NULL ,
-  'StudyDate' DATE NULL ,
-  'StudyTime' VARCHAR(20) NULL ,
-  'AccessionNumber' VARCHAR(255) NULL ,
-  'ModalitiesInStudy' VARCHAR(255) NULL ,
-  'ReferringPhysician' VARCHAR(255) NULL ,
-  'StudyDescription' VARCHAR(255) NULL ,
-  PRIMARY KEY ('StudyInstanceUID') );
-COMMIT;
-