Przeglądaj źródła

Make the Cancel button dismiss the queryretrieve dialog

Add a canceled signal and hook it up to hide the dialog
Steve Pieper 14 lat temu
rodzic
commit
8fe0cf10f7

+ 2 - 0
Libs/DICOM/Widgets/ctkDICOMAppWidget.cpp

@@ -102,6 +102,7 @@ ctkDICOMAppWidget::ctkDICOMAppWidget(QWidget* _parent):Superclass(_parent),
   connect(d->ImportDialog, SIGNAL(fileSelected(QString)),this,SLOT(onImportDirectory(QString)));
 
   connect(d->DICOMDatabase.data(), SIGNAL( databaseChanged() ), &(d->DICOMModel), SLOT( reset() ) );
+  connect(d->QueryRetrieveWidget, SIGNAL( canceled() ), d->QueryRetrieveWidget, SLOT( hide() ) );
 
 }
 
@@ -173,6 +174,7 @@ void ctkDICOMAppWidget::openQueryDialog()
 
   d->QueryRetrieveWidget->show();
   d->QueryRetrieveWidget->raise();
+
 }
 
 //----------------------------------------------------------------------------

+ 1 - 0
Libs/DICOM/Widgets/ctkDICOMQueryRetrieveWidget.cpp

@@ -293,6 +293,7 @@ void ctkDICOMQueryRetrieveWidget::retrieve()
 void ctkDICOMQueryRetrieveWidget::cancel()
 {
   emit studiesRetrieved(QStringList());
+  emit canceled();
 }
 
 //----------------------------------------------------------------------------

+ 2 - 0
Libs/DICOM/Widgets/ctkDICOMQueryRetrieveWidget.h

@@ -53,6 +53,8 @@ signals:
   /// "Retrieve" button) or when the widget is cancelled (user clicked on the
   /// "Cancel" button).
   void studiesRetrieved(QStringList);
+  /// Signal to emit when cancel button pressed (after studiesRetrieved is emitted)
+  void canceled();
 
 protected slots:
   void onQueryProgressChanged(int value);