Forráskód Böngészése

Redesign query/retrieve widget for use as dialog

Now we assume that the local database will exist as independent
ctkDICOMViewer application that will use this class as a dialog
rather than as the toplevel.
Steve Pieper 14 éve
szülő
commit
989583e303

+ 1 - 49
Libs/DICOM/Widgets/Resources/UI/ctkDICOMQueryRetrieveWidget.ui

@@ -30,48 +30,6 @@
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
-          <widget class="QFrame" name="frame_2">
-           <property name="frameShape">
-            <enum>QFrame::StyledPanel</enum>
-           </property>
-           <property name="frameShadow">
-            <enum>QFrame::Raised</enum>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <item>
-             <widget class="QLabel" name="label">
-              <property name="text">
-               <string>Local Database</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="ctkDirectoryButton" name="sqlDirectory" native="true">
-              <property name="minimumSize">
-               <size>
-                <width>30</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="toolTip">
-               <string>Local directory where cached files and database index file are stored.</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="addToDatabase">
-              <property name="toolTip">
-               <string>Add more files to the local database by browsing the filesystem</string>
-              </property>
-              <property name="text">
-               <string>Add...</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
           <widget class="QFrame" name="frame_3">
            <property name="frameShape">
             <enum>QFrame::StyledPanel</enum>
@@ -196,7 +154,7 @@
        </sizepolicy>
       </property>
       <attribute name="title">
-       <string>Local</string>
+       <string>Results</string>
       </attribute>
       <layout class="QHBoxLayout" name="horizontalLayout_2">
        <item>
@@ -227,12 +185,6 @@
    <header>ctkDICOMQueryResultsTabWidget.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ctkDirectoryButton</class>
-   <extends>QWidget</extends>
-   <header>ctkDirectoryButton.h</header>
-   <container>1</container>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

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

@@ -36,15 +36,6 @@ ctkDICOMQueryRetrieveWidget::ctkDICOMQueryRetrieveWidget(QWidget* _parent):Super
   d->results->disableCloseOnTab(0);
   connect(d->queryButton, SIGNAL(clicked()), this, SLOT(processQuery()));
   connect(d->results, SIGNAL(tabCloseRequested(int)), this, SLOT(onTabCloseRequested(int)));
-  connect(d->sqlDirectory, SIGNAL(directoryChanged(const QString&)), this, SLOT(onDatabaseDirectoryChanged(const QString&)));
-  connect(d->addToDatabase, SIGNAL(clicked()), this, SLOT(onAddToDatabase()));
-
-  QSettings settings;
-  if ( settings.value("DatabaseDirectory", "") != "" )
-  {
-    d->sqlDirectory->setDirectory(settings.value("DatabaseDirectory").toString());
-  }
-
 }
 
 //----------------------------------------------------------------------------
@@ -73,13 +64,6 @@ void ctkDICOMQueryRetrieveWidget::onTabCloseRequested(int index)
   d->results->removeTab(index);
 }
 
-void ctkDICOMQueryRetrieveWidget::onAddToDatabase()
-{
-  Q_D(ctkDICOMQueryRetrieveWidget);
-
-  //d->
-}
-
 //----------------------------------------------------------------------------
 void ctkDICOMQueryRetrieveWidget::processQuery()
 {

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

@@ -40,7 +40,6 @@ public slots:
     void onDatabaseDirectoryChanged(const QString& directory);
     void processQuery();
     void onTabCloseRequested(int index);
-    void onAddToDatabase();
 
 protected:
   QScopedPointer<ctkDICOMQueryRetrieveWidgetPrivate> d_ptr;