Removed unused files. Clean code.

Plugins/org.commontk.dicom.wg23.app/ctkDicomAbstractApp.cpp

@@ -31,3 +31,7 @@ int ctkDicomAbstractApp::getPort() const
   Q_D(const ctkDicomAbstractApp);
   return d->port;
 }
+
+ctkDicomAbstractApp::~ctkDicomAbstractApp()
+{
+}

Plugins/org.commontk.dicom.wg23.app/ctkDicomAbstractApp.h

@@ -23,6 +23,7 @@ public:
       */
     ctkDicomAbstractApp(int port = 0);
     int getPort() const;
+    ~ctkDicomAbstractApp();
 
 private:
     Q_DECLARE_PRIVATE(ctkDicomAbstractApp)

Plugins/org.commontk.dicom.wg23.app/ctkDicomAppServer.h

@@ -19,6 +19,7 @@
 
 =============================================================================*/
 
+
 #ifndef CTKDICOMAPPPSERVER_H
 #define CTKDICOMAPPPSERVER_H
 
@@ -36,7 +37,6 @@ public:
   ~ctkDicomAppServer();
 
 private:
-
   Q_DECLARE_PRIVATE(ctkDicomAppServer)
 
   const QScopedPointer<ctkDicomAppServerPrivate> d_ptr;

Plugins/org.commontk.dicom.wg23.app/ctkDicomHostServicePrivate.cpp

@@ -1,129 +0,0 @@
-/*=============================================================================
-
-  Library: CTK
-
-  Copyright (c) 2010 German Cancer Research Center,
-    Division of Medical and Biological Informatics
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-
-#include "ctkDicomHostServicePrivate.h"
-
-#include <QApplication>
-#include <QCursor>
-#include <QNetworkReply>
-
-#include <stdexcept>
-
-ctkDicomHostService::ctkDicomHostService()
-{
-  connect(&http, SIGNAL(responseReady()), this, SLOT(responseReady()));
-
-  http.setHost("127.0.0.1", false, 8080);
-}
-
-void ctkDicomHostService::responseReady()
-{
-  blockingLoop.exit();
-}
-
-QString ctkDicomHostService::generateUID()
-{
-  return QString();
-}
-
-QRect ctkDicomHostService::getAvailableScreen(const QRect& preferredScreen)
-{
-  http.setAction("GetAvailableScreen");
-
-  QtSoapMessage request;
-  request.setMethod("GetAvailableScreen");
-
-  QtSoapStruct* preferredScreenType = new QtSoapStruct(QtSoapQName("preferredScreen"));
-  preferredScreenType->insert(new QtSoapSimpleType(QtSoapQName("Height"), preferredScreen.height()));
-  preferredScreenType->insert(new QtSoapSimpleType(QtSoapQName("Width"), preferredScreen.width()));
-  preferredScreenType->insert(new QtSoapSimpleType(QtSoapQName("RefPointX"), preferredScreen.x()));
-  preferredScreenType->insert(new QtSoapSimpleType(QtSoapQName("RefPointY"), preferredScreen.y()));
-
-  request.addMethodArgument(preferredScreenType);
-
-  http.submitRequest(request, "/IHostService");
-
-  qDebug() << "Submitted request GetAvailableScreen";
-
-  QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-
-  blockingLoop.exec(QEventLoop::ExcludeUserInputEvents | QEventLoop::WaitForMoreEvents);
-
-  QApplication::restoreOverrideCursor();
-
-  //qDebug() << "Reply error: " << reply->errorString();
-  //qDebug() << reply->readAll();
-  const QtSoapMessage& response = http.getResponse();
-
-  if (response.isFault())
-  {
-    throw std::runtime_error("server error");
-  }
-
-  qDebug() << "Response: " << response.toXmlString();
-
-  const QtSoapType &meth = response.method();
-
-  if (!meth.isValid() || meth.type() != QtSoapType::Struct)
-    qDebug() << "SOAP returning NIL: invalid or type != Struct";
-
-  const QtSoapStruct &m = dynamic_cast<const QtSoapStruct &>(meth);
-  if (m.count() == 0)
-    qDebug() << "SOAP returning NIL: count == 0";
-
-
-  const QtSoapType& screenResult = response.returnValue();
-  if (!screenResult.isValid())
-  {
-    //throw std::runtime_error("invalid return value");
-    qDebug() << response.errorString() << response.faultString().toString();
-    qDebug() << response.toXmlString();
-    return QRect();
-  }
-
-  qDebug() << screenResult.count() << screenResult["Height"].typeName();
-  QRect resultRect;
-  resultRect.setHeight(screenResult["Height"].toInt());
-  resultRect.setWidth(screenResult["Width"].toInt());
-  resultRect.setX(screenResult["RefPointX"].toInt());
-  resultRect.setY(screenResult["RefPointY"].toInt());
-
-  qDebug() << "x:" << resultRect.x() << " y:" << resultRect.y();
-
-  return resultRect;
-}
-
-QString ctkDicomHostService::getOutputLocation(const QStringList& preferredProtocols)
-{
-  Q_UNUSED(preferredProtocols)
-  return QString();
-}
-
-void ctkDicomHostService::notifyStateChanged(ctkDicomWG23::State state)
-{
-  Q_UNUSED(state)
-}
-
-void ctkDicomHostService::notifyStatus(const ctkDicomWG23::Status& status)
-{
-  Q_UNUSED(status)
-}

Plugins/org.commontk.dicom.wg23.app/ctkDicomHostServicePrivate.h

@@ -1,54 +0,0 @@
-/*=============================================================================
-
-  Library: CTK
-
-  Copyright (c) 2010 German Cancer Research Center,
-    Division of Medical and Biological Informatics
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=============================================================================*/
-
-
-#ifndef DICOMHOSTINTERFACEIMPL_P_H
-#define DICOMHOSTINTERFACEIMPL_P_H
-
-#include <ctkDicomHostInterface.h>
-
-#include <QEventLoop>
-#include <QtSoapHttpTransport>
-
-class ctkDicomHostService : public ctkDicomHostInterface
-{
-  Q_OBJECT
-
-public:
-    ctkDicomHostService();
-
-    virtual QString generateUID();
-    virtual QRect getAvailableScreen(const QRect& preferredScreen);
-    virtual QString getOutputLocation(const QStringList& preferredProtocols);
-    virtual void notifyStateChanged(ctkDicomWG23::State state);
-    virtual void notifyStatus(const ctkDicomWG23::Status& status);
-
-private slots:
-
-    void responseReady();
-
-private:
-
-    QEventLoop blockingLoop;
-    QtSoapHttpTransport http;
-};
-
-#endif // DICOMHOSTINTERFACEIMPL_P_H