Pārlūkot izejas kodu

ctkExampleDicomAppLogic now derives from ctkDicomAbstractApp

Jean-Christophe Fillion-Robin 14 gadi atpakaļ
vecāks
revīzija
ea1d30e013

+ 19 - 5
Plugins/org.commontk.dah.app/ctkDicomAbstractApp.cpp

@@ -19,24 +19,38 @@
 
 =============================================================================*/
 
+// CTK includes
 #include "ctkDicomAbstractApp.h"
 
 class ctkDicomAbstractAppPrivate
 {
-
 public:
+  ctkDicomAbstractAppPrivate();
+  ~ctkDicomAbstractAppPrivate();
+};
 
-  ctkDicomAbstractAppPrivate()
-  {
+//----------------------------------------------------------------------------
+// ctkDicomAbstractAppPrivate methods
+
+//----------------------------------------------------------------------------
+ctkDicomAbstractAppPrivate::ctkDicomAbstractAppPrivate()
+{
+}
 
-  }
+//----------------------------------------------------------------------------
+ctkDicomAbstractAppPrivate::~ctkDicomAbstractAppPrivate()
+{
+}
 
-};
+//----------------------------------------------------------------------------
+// ctkDicomAbstractApp methods
 
+//----------------------------------------------------------------------------
 ctkDicomAbstractApp::ctkDicomAbstractApp() : d_ptr(new ctkDicomAbstractAppPrivate())
 {
 }
 
+//----------------------------------------------------------------------------
 ctkDicomAbstractApp::~ctkDicomAbstractApp()
 {
 }

+ 3 - 3
Plugins/org.commontk.dah.app/ctkDicomAbstractApp.h

@@ -24,18 +24,19 @@
 
 #include <ctkDicomAppInterface.h>
 #include <QScopedPointer>
+#include <org_commontk_dah_app_Export.h>
 
 class ctkDicomAbstractAppPrivate;
 
 /**
-  * Provide a basic implementation for an application app.
+  * Provides a basic implementation for an application app.
   *
   * TODO: provide helper/convenience methods to ease application development
   *
   * The methods of the ctkDicomAppInterface have to be implemented for the business logic,
   *
   */
-class ctkDicomAbstractApp : public ctkDicomAppInterface
+class org_commontk_dah_app_EXPORT ctkDicomAbstractApp : public ctkDicomAppInterface
 {
 
 public:
@@ -46,7 +47,6 @@ public:
 private:
   Q_DECLARE_PRIVATE(ctkDicomAbstractApp)
   const QScopedPointer<ctkDicomAbstractAppPrivate> d_ptr;
-
 };
 
 #endif // CTKDICOMABSTRACTAPP_H

+ 2 - 2
Plugins/org.commontk.dah.exampleapp/ctkExampleDicomAppLogic_p.h

@@ -23,7 +23,7 @@
 #ifndef CTKEXAMPLEDICOMAPPLOGIC_P_H
 #define CTKEXAMPLEDICOMAPPLOGIC_P_H
 
-#include <ctkDicomAppInterface.h>
+#include <ctkDicomAbstractApp.h>
 #include <ctkDicomHostInterface.h>
 
 #include <ctkServiceTracker.h>
@@ -32,7 +32,7 @@ struct ctkDicomHostInterface;
 
 class QPushButton;
 
-class ctkExampleDicomAppLogic : public QObject, public ctkDicomAppInterface
+class ctkExampleDicomAppLogic : public QObject, public ctkDicomAbstractApp
 {
   Q_OBJECT
   Q_INTERFACES(ctkDicomAppInterface)

+ 2 - 2
Plugins/org.commontk.dah.host/ctkDicomAbstractHost.h

@@ -31,7 +31,7 @@
 class ctkDicomAbstractHostPrivate;
 
 /**
-  * Provide a basic implementation for an application host.
+  * Provides a basic implementation for an application host.
   *
   * It starts a http server and serves one hosted application. Multiple instances
   * can be used for hosting multiple applications.
@@ -45,7 +45,7 @@ class org_commontk_dah_host_EXPORT ctkDicomAbstractHost : public ctkDicomHostInt
 public:
 
   /**
-    * Start the soap sever on the specified port or choose port automatically.
+    * Starts the soap sever on the specified port or choose port automatically.
     */
   ctkDicomAbstractHost(int hostPort = 0, int appPort = 0);
   int getHostPort() const;