Fixes and enhs for the visual dicom browser

Applications/ctkDICOMVisualBrowser/ctkDICOMVisualBrowserMain.cpp

@@ -110,15 +110,13 @@ int main(int argc, char** argv)
   DICOMVisualBrowser.setMinimumSize(QSize(1000, 1000));
   DICOMVisualBrowser.setDatabaseDirectory(databaseDirectory);
 
-  DICOMVisualBrowser.serverSettingsGroupBox()->setChecked(true);
   QObject::connect(&directoryButton, SIGNAL(directoryChanged(const QString&)),
                    &DICOMVisualBrowser, SLOT(setDatabaseDirectory(const QString&)));
 
   mainLayout.addWidget(&DICOMVisualBrowser);
-
   mainWidget.setLayout(&mainLayout);
-
   mainWidget.show();
+  DICOMVisualBrowser.onShowPatients();
 
   return app.exec();
 }

Libs/Core/ctkAbstractJob.h

@@ -190,9 +190,9 @@ struct CTK_CORE_EXPORT ctkJobDetail {
   {
     this->JobClass = job.className();
     this->JobUID = job.jobUID();
-    this->CreationDateTime = job.creationDateTime().toString("HH:mm:ss.zzz ddd MMM yyyy");
-    this->StartDateTime = job.startDateTime().toString("HH:mm:ss.zzz ddd MMM yyyy");
-    this->CompletionDateTime = job.completionDateTime().toString("HH:mm:ss.zzz ddd MMM yyyy");
+    this->CreationDateTime = job.creationDateTime().toString("HH:mm:ss.zzz ddd dd MMM yyyy");
+    this->StartDateTime = job.startDateTime().toString("HH:mm:ss.zzz ddd dd MMM yyyy");
+    this->CompletionDateTime = job.completionDateTime().toString("HH:mm:ss.zzz ddd dd MMM yyyy");
   }
   virtual ~ctkJobDetail() = default;
 

Libs/Core/ctkJobScheduler.cpp

@@ -27,6 +27,7 @@
 #include <QSharedPointer>
 #include <QThreadPool>
 #include <QUuid>
+#include <QDebug>
 
 // CTK includes
 #include "ctkAbstractJob.h"
@@ -219,6 +220,25 @@ void ctkJobSchedulerPrivate::removeJobs(const QStringList &jobUIDs)
   }
 }
 
+//------------------------------------------------------------------------------
+void ctkJobSchedulerPrivate::removeAllJobs()
+{
+  Q_Q(ctkJobScheduler);
+
+  this->QueueMutex.lock();
+  foreach (QSharedPointer<ctkAbstractJob> job, this->JobsQueue)
+  {
+    QObject::disconnect(job.data(), SIGNAL(started()), q, SLOT(onJobStarted()));
+    QObject::disconnect(job.data(), SIGNAL(canceled()), q, SLOT(onJobCanceled()));
+    QObject::disconnect(job.data(), SIGNAL(failed()), q, SLOT(onJobFailed()));
+    QObject::disconnect(job.data(), SIGNAL(finished()), q, SLOT(onJobFinished()));
+    QObject::disconnect(job.data(), SIGNAL(progressJobDetail(QVariant)), q, SIGNAL(progressJobDetail(QVariant)));
+
+    this->JobsQueue.remove(job->jobUID());
+  }
+  this->QueueMutex.unlock();
+}
+
 //------------------------------------------------------------------------------
 int ctkJobSchedulerPrivate::getSameTypeJobsInThreadPoolQueueOrRunning(QSharedPointer<ctkAbstractJob> job)
 {
@@ -271,14 +291,15 @@ ctkJobScheduler::ctkJobScheduler(ctkJobSchedulerPrivate* pimpl, QObject* parent)
 // --------------------------------------------------------------------------
 ctkJobScheduler::~ctkJobScheduler()
 {
+  Q_D(ctkJobScheduler);
   this->setFreezeJobsScheduling(true);
   this->stopAllJobs(true);
   // stopAllJobs is not main thread blocking. Therefore we need actually
   // to wait the jobs to end (either finished or stopped) before closing the application.
   // Issue: waiting time for the jobs to stop vs waiting the application to close.
   // We should avoid the application crash at exiting.
-  // Is 10 sec enough or too long?
-  this->waitForDone(10000);
+  // The job scheduler currently waits all the jobs to be properly stopped.
+  this->waitForFinish(true);
 }
 
 //----------------------------------------------------------------------------
@@ -309,6 +330,25 @@ int ctkJobScheduler::numberOfPersistentJobs()
   return numberOfPersistentJobs;
 }
 
+//----------------------------------------------------------------------------
+int ctkJobScheduler::numberOfRunningJobs()
+{
+  Q_D(ctkJobScheduler);
+
+  d->QueueMutex.lock();
+  int numberOfRunningJobs = 0;
+  foreach (QSharedPointer<ctkAbstractJob> job, d->JobsQueue)
+  {
+    if (job->status() == ctkAbstractJob::JobStatus::Running)
+    {
+      numberOfRunningJobs++;
+    }
+  }
+  d->QueueMutex.unlock();
+
+  return numberOfRunningJobs;
+}
+
 //----------------------------------------------------------------------------
 void ctkJobScheduler::addJob(ctkAbstractJob* job)
 {
@@ -378,9 +418,9 @@ void ctkJobScheduler::waitForFinish(bool waitForPersistentJobs)
   {
     numberOfPersistentJobs = 0;
   }
-  while (this->numberOfJobs() > numberOfPersistentJobs)
+  while (this->numberOfRunningJobs() > numberOfPersistentJobs)
   {
-    d->ThreadPool->waitForDone(300);
+    this->waitForDone(500);
   }
 }
 

Libs/Core/ctkJobScheduler.h

@@ -54,6 +54,7 @@ class CTK_CORE_EXPORT ctkJobScheduler : public QObject
   /// Jobs managment
   Q_INVOKABLE int numberOfJobs();
   Q_INVOKABLE int numberOfPersistentJobs();
+  Q_INVOKABLE int numberOfRunningJobs();
 
   Q_INVOKABLE void addJob(ctkAbstractJob* job);
 

Libs/Core/ctkJobScheduler_p.h

@@ -59,6 +59,7 @@ public Q_SLOTS:
   virtual bool insertJob(QSharedPointer<ctkAbstractJob> job);
   virtual bool removeJob(const QString& jobUID);
   virtual void removeJobs(const QStringList& jobUIDs);
+  virtual void removeAllJobs();
   int getSameTypeJobsInThreadPoolQueueOrRunning(QSharedPointer<ctkAbstractJob> job);
   QString generateUniqueJobUID();
 

Libs/DICOM/Core/CMakeLists.txt

@@ -18,6 +18,12 @@ set(KIT_SRCS
   ctkDICOMDisplayedFieldGenerator.h
   ctkDICOMEcho.cpp
   ctkDICOMEcho.h
+  ctkDICOMEchoJob.cpp
+  ctkDICOMEchoJob.h
+  ctkDICOMEchoJob_p.h
+  ctkDICOMEchoWorker.cpp
+  ctkDICOMEchoWorker.h
+  ctkDICOMEchoWorker_p.h
   ctkDICOMFilterProxyModel.cpp
   ctkDICOMFilterProxyModel.h
   ctkDICOMIndexer.cpp
@@ -105,6 +111,10 @@ set(KIT_MOC_SRCS
   ctkDICOMDisplayedFieldGenerator_p.h
   ctkDICOMDisplayedFieldGeneratorRuleFactory.h
   ctkDICOMEcho.h
+  ctkDICOMEchoJob.h
+  ctkDICOMEchoJob_p.h
+  ctkDICOMEchoWorker.h
+  ctkDICOMEchoWorker_p.h
   ctkDICOMIndexer.h
   ctkDICOMIndexer_p.h
   ctkDICOMInserter.h

Libs/DICOM/Core/Resources/dicom-schema.sql

@@ -23,7 +23,7 @@ DROP INDEX IF EXISTS 'SeriesStudyIndex' ;
 DROP INDEX IF EXISTS 'StudiesPatientIndex' ;
 
 CREATE TABLE 'SchemaInfo' ( 'Version' VARCHAR(1024) NOT NULL );
-INSERT INTO 'SchemaInfo' VALUES('0.8.0');
+INSERT INTO 'SchemaInfo' VALUES('0.8.1');
 
 CREATE TABLE 'Images' (
   'SOPInstanceUID' VARCHAR(64) NOT NULL,
@@ -32,7 +32,9 @@ CREATE TABLE 'Images' (
   'SeriesInstanceUID' VARCHAR(64) NOT NULL ,
   'InsertTimestamp' VARCHAR(20) NOT NULL ,
   'DisplayedFieldsUpdatedTimestamp' DATETIME NULL ,
-  PRIMARY KEY ('SOPInstanceUID') );
+  PRIMARY KEY ('SOPInstanceUID')
+);
+
 CREATE TABLE 'Patients' (
   'UID' INTEGER PRIMARY KEY AUTOINCREMENT,
   'PatientsName' VARCHAR(255) NULL ,
@@ -46,7 +48,16 @@ CREATE TABLE 'Patients' (
   'DisplayedPatientsName' VARCHAR(255) NULL ,
   'DisplayedNumberOfStudies' INT NULL ,
   'DisplayedLastStudyDate' DATE NULL ,
-  'DisplayedFieldsUpdatedTimestamp' DATETIME NULL );
+  'DisplayedFieldsUpdatedTimestamp' DATETIME NULL
+);
+
+CREATE TABLE 'ConnectionNames' (
+  'ConnectionID' INTEGER PRIMARY KEY AUTOINCREMENT,
+  'ConnectionName' VARCHAR(255) NOT NULL,
+  'PatientUID' INTEGER,
+  FOREIGN KEY('PatientUID') REFERENCES Patients('UID')
+);
+
 CREATE TABLE 'Studies' (
   'StudyInstanceUID' VARCHAR(64) NOT NULL ,
   'PatientsUID' INT NOT NULL ,
@@ -62,7 +73,9 @@ CREATE TABLE 'Studies' (
   'InsertTimestamp' VARCHAR(20) NOT NULL ,
   'DisplayedNumberOfSeries' INT NULL ,
   'DisplayedFieldsUpdatedTimestamp' DATETIME NULL ,
-  PRIMARY KEY ('StudyInstanceUID') );
+  PRIMARY KEY ('StudyInstanceUID')
+);
+
 CREATE TABLE 'Series' (
   'SeriesInstanceUID' VARCHAR(64) NOT NULL ,
   'StudyInstanceUID' VARCHAR(64) NOT NULL ,
@@ -83,7 +96,8 @@ CREATE TABLE 'Series' (
   'DisplayedSize' VARCHAR(20) NULL ,
   'DisplayedNumberOfFrames' INT NULL ,
   'DisplayedFieldsUpdatedTimestamp' DATETIME NULL ,
-  PRIMARY KEY ('SeriesInstanceUID') );
+  PRIMARY KEY ('SeriesInstanceUID')
+);
 
 CREATE INDEX IF NOT EXISTS 'ImagesFilenameIndex' ON 'Images' ('Filename');
 CREATE INDEX IF NOT EXISTS 'ImagesFilenameIndex' ON 'Images' ('URL');
@@ -93,7 +107,8 @@ CREATE INDEX IF NOT EXISTS 'StudiesPatientIndex' ON 'Studies' ('PatientsUID');
 
 CREATE TABLE 'Directories' (
   'Dirname' VARCHAR(1024) ,
-  PRIMARY KEY ('Dirname') );
+  PRIMARY KEY ('Dirname')
+);
 
 CREATE TABLE 'ColumnDisplayProperties' (
   'TableName' VARCHAR(64) NOT NULL,
@@ -102,7 +117,8 @@ CREATE TABLE 'ColumnDisplayProperties' (
   'Visibility' INT NULL DEFAULT 1 ,
   'Weight' INT NULL ,
   'Format' VARCHAR(255) NULL ,
-  PRIMARY KEY ('TableName', 'FieldName') );
+  PRIMARY KEY ('TableName', 'FieldName')
+);
 
 INSERT INTO 'ColumnDisplayProperties' VALUES('Patients', 'UID',                             '',                     0, 0, '');
 INSERT INTO 'ColumnDisplayProperties' VALUES('Patients', 'PatientsName',                    'Patient name',         0, 0, '');
@@ -157,4 +173,5 @@ CREATE TABLE 'DisplayedFieldGeneratorRules' (
   'Name' VARCHAR(64) NOT NULL,
   'Enabled' INT NULL DEFAULT 1 ,
   'Options' VARCHAR(255) NULL ,
-  PRIMARY KEY ('Name') );
+  PRIMARY KEY ('Name')
+);

Libs/DICOM/Core/Testing/Cpp/ctkDICOMJobTest1.cpp

@@ -50,7 +50,7 @@ int ctkDICOMJobTest1(int argc, char* argv[])
   CHECK_INT(queryJob.maximumNumberOfRetry(), 3);
   CHECK_INT(queryJob.maximumConcurrentJobsPerType(), 20);
   CHECK_INT(queryJob.priority(), QThread::Priority::LowPriority);
-  CHECK_INT(queryJob.dicomLevel(), ctkDICOMJob::DICOMLevels::Patients);
+  CHECK_INT(queryJob.dicomLevel(), ctkDICOMJob::DICOMLevels::None);
   CHECK_QSTRING(queryJob.patientID(), "");
   CHECK_QSTRING(queryJob.studyInstanceUID(), "");
   CHECK_QSTRING(queryJob.seriesInstanceUID(), "");