ENH: better user interface for ctkDICOM

Applications/ctkDICOM/ctkDICOM.cxx

@@ -1,20 +1,15 @@
 //
 // QT includes
 #include <QApplication>
-#include <QFrame>
-#include <QHBoxLayout>
 
 // ctk includes
 #include "qCTKDCMTKQueryRetrieveWidget.h"
-#include "qCTKDCMTKQueryWidget.h"
 
 int main(int argc, char** argv)
 {
   QApplication app(argc, argv);
   
   qCTKDCMTKQueryRetrieveWidget queryRetrieve;
-  qCTKDCMTKQueryWidget query;
-  //query.setParent(queryRetrieve.findChild<QFrame *>("queryFrame"));
   queryRetrieve.show();
   return app.exec();
 }

Libs/DICOM/Widgets/CMakeLists.txt

@@ -22,6 +22,8 @@ SET(KIT_SRCS
   qCTKDCMTKServerNodeWidget.h
   qCTKDCMTKQueryWidget.cxx
   qCTKDCMTKQueryWidget.h
+  qCTKDCMTKCommandWidget.cxx
+  qCTKDCMTKCommandWidget.h
   )
 
 # Headers that should run through moc
@@ -35,6 +37,7 @@ SET(KIT_UI_FORMS
   Resources/UI/qCTKDCMTKQueryRetrieveWidget.ui
   Resources/UI/qCTKDCMTKServerNodeWidget.ui
   Resources/UI/qCTKDCMTKQueryWidget.ui
+  Resources/UI/qCTKDCMTKCommandWidget.ui
 )
 
 # Resources

Libs/DICOM/Widgets/Resources/UI/qCTKDCMTKCommandWidget.ui

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>qCTKDCMTKCommandWidget</class>
+ <widget class="QWidget" name="qCTKDCMTKCommandWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>609</width>
+    <height>303</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout_2">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Retrieve To</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="comboBox">
+       <item>
+        <property name="text">
+         <string>Set Directory...</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton">
+       <property name="text">
+        <string>Query</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_2">
+       <property name="text">
+        <string>Retrieve</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_3">
+       <property name="text">
+        <string>Refresh</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

Libs/DICOM/Widgets/Resources/UI/qCTKDCMTKQueryRetrieveWidget.ui

@@ -34,22 +34,13 @@
        </widget>
       </item>
       <item>
-       <widget class="qCTKDCMTKQueryWidget" name="queryWidget" native="true">
-        <zorder>locationWidget</zorder>
-       </widget>
+       <widget class="qCTKDCMTKQueryWidget" name="queryWidget" native="true"/>
       </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="QFrame" name="commandsFrame">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-    </widget>
+    <widget class="qCTKDCMTKCommandWidget" name="widget" native="true"/>
    </item>
    <item>
     <widget class="QTreeWidget" name="treeWidget">
@@ -75,6 +66,12 @@
    <header>qctkdcmtkservernodewidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>qCTKDCMTKCommandWidget</class>
+   <extends>QWidget</extends>
+   <header>qctkdcmtkcommandwidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

Libs/DICOM/Widgets/qCTKDCMTKCommandWidget.cxx

@@ -0,0 +1,34 @@
+
+// qCTKDCMTK includes
+#include "qCTKDCMTKCommandWidget.h"
+#include "ui_qCTKDCMTKCommandWidget.h"
+
+//----------------------------------------------------------------------------
+class qCTKDCMTKCommandWidgetPrivate: public qCTKPrivate<qCTKDCMTKCommandWidget>, 
+                                       public Ui_qCTKDCMTKCommandWidget
+{
+public:
+  qCTKDCMTKCommandWidgetPrivate(){}
+};
+
+//----------------------------------------------------------------------------
+// qCTKDCMTKCommandWidgetPrivate methods
+
+
+//----------------------------------------------------------------------------
+// qCTKDCMTKCommandWidget methods
+
+qCTKDCMTKCommandWidget::qCTKDCMTKCommandWidget(QWidget* _parent):Superclass(_parent)
+{
+  QCTK_INIT_PRIVATE(qCTKDCMTKCommandWidget);
+  QCTK_D(qCTKDCMTKCommandWidget);
+  
+  d->setupUi(this);
+}
+
+//----------------------------------------------------------------------------
+qCTKDCMTKCommandWidget::~qCTKDCMTKCommandWidget()
+{
+}
+
+

Libs/DICOM/Widgets/qCTKDCMTKCommandWidget.h

@@ -0,0 +1,25 @@
+#ifndef __qCTKDCMTKCommandWidget_h
+#define __qCTKDCMTKCommandWidget_h
+
+// QT includes 
+#include <QWidget>
+
+// qCTK includes
+#include <ctkPimpl.h>
+
+#include "CTKDICOMWidgetsExport.h"
+
+class qCTKDCMTKCommandWidgetPrivate; 
+
+class Q_CTK_DICOM_WIDGETS_EXPORT qCTKDCMTKCommandWidget : public QWidget
+{
+public:
+  typedef QWidget Superclass;
+  explicit qCTKDCMTKCommandWidget(QWidget* parent=0);
+  virtual ~qCTKDCMTKCommandWidget();
+
+private:
+  QCTK_DECLARE_PRIVATE(qCTKDCMTKCommandWidget);
+};
+
+#endif