|
@@ -8,6 +8,7 @@
|
|
|
#include <QSettings>
|
|
|
#include <QAction>
|
|
|
#include <QModelIndex>
|
|
|
+#include <QCheckBox>
|
|
|
|
|
|
// ctkDICOMWidgets includes
|
|
|
#include "ctkDICOMDatabase.h"
|
|
@@ -16,6 +17,8 @@
|
|
|
#include "ctkDICOMQueryResultsTabWidget.h"
|
|
|
#include "ui_ctkDICOMAppWidget.h"
|
|
|
#include "ctkDirectoryButton.h"
|
|
|
+#include "ctkFileDialog.h"
|
|
|
+
|
|
|
#include "ctkDICOMQueryRetrieveWidget.h"
|
|
|
#include "ctkDICOMImportWidget.h"
|
|
|
|
|
@@ -29,7 +32,7 @@ class ctkDICOMAppWidgetPrivate: public Ui_ctkDICOMAppWidget
|
|
|
public:
|
|
|
ctkDICOMAppWidgetPrivate();
|
|
|
|
|
|
- ctkDICOMImportWidget* ImportWidget;
|
|
|
+ ctkFileDialog* ImportDialog;
|
|
|
ctkDICOMQueryRetrieveWidget* QueryRetrieveWidget;
|
|
|
|
|
|
ctkDICOMDatabase DICOMDatabase;
|
|
@@ -62,7 +65,12 @@ ctkDICOMAppWidget::ctkDICOMAppWidget(QWidget* _parent):Superclass(_parent),
|
|
|
connect(d->directoryButton, SIGNAL(directoryChanged(const QString&)), this, SLOT(setDatabaseDirectory(const QString&)));
|
|
|
|
|
|
//Initialize import widget
|
|
|
- d->ImportWidget = new ctkDICOMImportWidget();
|
|
|
+ d->ImportDialog = new ctkFileDialog();
|
|
|
+ QCheckBox* importCheckbox = new QCheckBox("Copy on import", d->ImportDialog);
|
|
|
+ d->ImportDialog->setBottomWidget(importCheckbox);
|
|
|
+ d->ImportDialog->setFileMode(QFileDialog::Directory);
|
|
|
+ d->ImportDialog->setLabelText(QFileDialog::Accept,"Import");
|
|
|
+ d->ImportDialog->setWindowTitle("Import DICOM files from directory ...");
|
|
|
|
|
|
//Set thumbnails width in thumbnail widget
|
|
|
//d->thumbnailsWidget->setThumbnailWidth(128);
|
|
@@ -80,7 +88,7 @@ ctkDICOMAppWidget::~ctkDICOMAppWidget()
|
|
|
Q_D(ctkDICOMAppWidget);
|
|
|
|
|
|
d->QueryRetrieveWidget->deleteLater();
|
|
|
- d->ImportWidget->deleteLater();
|
|
|
+ d->ImportDialog->deleteLater();
|
|
|
}
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
@@ -109,7 +117,7 @@ void ctkDICOMAppWidget::setDatabaseDirectory(const QString& directory)
|
|
|
d->treeView->setModel(&d->DICOMModel);
|
|
|
|
|
|
//pass DICOM database instance to Import widget
|
|
|
- d->ImportWidget->setDICOMDatabase(&d->DICOMDatabase);
|
|
|
+ // d->ImportDialog->setDICOMDatabase(&d->DICOMDatabase);
|
|
|
}
|
|
|
|
|
|
void ctkDICOMAppWidget::onAddToDatabase()
|
|
@@ -123,8 +131,8 @@ void ctkDICOMAppWidget::onAddToDatabase()
|
|
|
void ctkDICOMAppWidget::onImport(){
|
|
|
Q_D(ctkDICOMAppWidget);
|
|
|
|
|
|
- d->ImportWidget->show();
|
|
|
- d->ImportWidget->raise();
|
|
|
+ d->ImportDialog->show();
|
|
|
+ d->ImportDialog->raise();
|
|
|
}
|
|
|
|
|
|
void ctkDICOMAppWidget::onExport(){
|