Sfoglia il codice sorgente

init now calls setDicomDatabase, which then calls setUpTableView

Andreas Fetzer 10 anni fa
parent
commit
1fe9d921f4
1 ha cambiato i file con 7 aggiunte e 1 eliminazioni
  1. 7 1
      Libs/DICOM/Widgets/ctkDICOMTableView.cpp

+ 7 - 1
Libs/DICOM/Widgets/ctkDICOMTableView.cpp

@@ -91,7 +91,7 @@ void ctkDICOMTableViewPrivate::init()
 
 
   if (this->dicomDatabase != 0)
   if (this->dicomDatabase != 0)
     {
     {
-      this->setUpTableView();
+      q->setDicomDataBase(this->dicomDatabase);
     }
     }
 }
 }
 
 
@@ -217,7 +217,13 @@ ctkDICOMTableView::~ctkDICOMTableView()
 void ctkDICOMTableView::setDicomDataBase(ctkDICOMDatabase *dicomDatabase)
 void ctkDICOMTableView::setDicomDataBase(ctkDICOMDatabase *dicomDatabase)
 {
 {
   Q_D(ctkDICOMTableView);
   Q_D(ctkDICOMTableView);
+
+  //Do nothing if no database is set
+  if (!dicomDatabase)
+    return;
+
   d->dicomDatabase = dicomDatabase;
   d->dicomDatabase = dicomDatabase;
+  d->setUpTableView();
   //Create connections for new database
   //Create connections for new database
   QObject::connect(d->dicomDatabase, SIGNAL(instanceAdded(const QString&)),
   QObject::connect(d->dicomDatabase, SIGNAL(instanceAdded(const QString&)),
                    this, SLOT(onInstanceAdded()));
                    this, SLOT(onInstanceAdded()));