Bladeren bron

Renamed files to start with ctkExample

To be consistent with org.commontk.dah.exampleapp, renamed files
from ctkDicomExample* to ctkExampleDicom*
Sascha Zelzer 14 jaren geleden
bovenliggende
commit
ce5bce77d7

+ 1 - 1
Applications/ctkExampleHost/ctkExampleHostMain.cpp

@@ -23,7 +23,7 @@
 #include <ctkPluginFramework.h>
 #include <ctkPluginException.h>
 
-#include <ctkDicomExampleHost.h>
+#include <ctkExampleDicomHost.h>
 #include <ctkHostAppExampleWidget.h>
 #include <ui_ctkExampleHostMainWindow.h>
 

+ 2 - 2
Applications/ctkExampleHost/ctkHostAppExampleWidget.cpp

@@ -1,6 +1,6 @@
 #include "ctkHostAppExampleWidget.h"
 #include "ui_ctkHostAppExampleWidget.h"
-#include "ctkDicomExampleHost.h"
+#include "ctkExampleDicomHost.h"
 #include "ctkDicomAppService.h"
 #include <ctkDicomWG23TypesHelper.h>
 
@@ -16,7 +16,7 @@ ctkHostAppExampleWidget::ctkHostAppExampleWidget(QWidget *parent) :
     ui->setupUi(this);
     ui->crashLabel->setVisible(false);
     ui->messageOutput->setVisible(false);
-    this->host = new ctkDicomExampleHost(ui->placeholderFrame);
+    this->host = new ctkExampleDicomHost(ui->placeholderFrame);
 
     connect(&this->host->getAppProcess(),SIGNAL(error(QProcess::ProcessError)),SLOT(appProcessError(QProcess::ProcessError)));
     connect(&this->host->getAppProcess(),SIGNAL(stateChanged(QProcess::ProcessState)),SLOT(appProcessStateChanged(QProcess::ProcessState)));

+ 2 - 2
Applications/ctkExampleHost/ctkHostAppExampleWidget.h

@@ -6,7 +6,7 @@
 
 #include <ctkDicomWG23Types.h>
 
-class ctkDicomExampleHost;
+class ctkExampleDicomHost;
 
 namespace Ui {
     class ctkHostAppExampleWidget;
@@ -33,7 +33,7 @@ public slots:
     void placeholderResized();
 
 protected:
-    ctkDicomExampleHost* host;
+    ctkExampleDicomHost* host;
     QString appFileName;
 
 private:

+ 4 - 4
Plugins/org.commontk.dah.examplehost/CMakeLists.txt

@@ -3,15 +3,15 @@ PROJECT(org_commontk_dah_examplehost)
 SET(PLUGIN_export_directive "org_commontk_dah_examplehost_EXPORT")
 
 SET(PLUGIN_SRCS
-  ctkDicomExampleHostPlugin.cpp
-  ctkDicomExampleHost.cpp
+  ctkExampleDicomHostPlugin.cpp
+  ctkExampleDicomHost.cpp
   ctkHostedAppPlaceholderWidget.cpp
 )
 
 # Files which should be processed by Qts moc
 SET(PLUGIN_MOC_SRCS
-  ctkDicomExampleHostPlugin_p.h
-  ctkDicomExampleHost.h
+  ctkExampleDicomHostPlugin_p.h
+  ctkExampleDicomHost.h
   ctkHostedAppPlaceholderWidget.h
 )
 

+ 11 - 11
Plugins/org.commontk.dah.examplehost/ctkDicomExampleHost.cpp

@@ -1,4 +1,4 @@
-#include "ctkDicomExampleHost.h"
+#include "ctkExampleDicomHost.h"
 #include "ctkDicomWG23TypesHelper.h"
 
 #include <QProcess>
@@ -7,7 +7,7 @@
 
 #include <iostream>
 
-ctkDicomExampleHost::ctkDicomExampleHost(ctkHostedAppPlaceholderWidget* placeholderWidget, int hostPort, int appPort) :
+ctkExampleDicomHost::ctkExampleDicomHost(ctkHostedAppPlaceholderWidget* placeholderWidget, int hostPort, int appPort) :
     ctkDicomAbstractHost(hostPort, appPort),
     placeholderWidget(placeholderWidget),
     applicationState(ctkDicomWG23::IDLE)
@@ -15,7 +15,7 @@ ctkDicomExampleHost::ctkDicomExampleHost(ctkHostedAppPlaceholderWidget* placehol
   connect(&this->appProcess,SIGNAL(readyReadStandardOutput()),SLOT(forwardConsoleOutput()));
 }
 
-void ctkDicomExampleHost::StartApplication(QString AppPath){
+void ctkExampleDicomHost::StartApplication(QString AppPath){
 
     QStringList l;
     l.append("--hostURL");
@@ -34,7 +34,7 @@ void ctkDicomExampleHost::StartApplication(QString AppPath){
     this->appProcess.start(AppPath,l);
 }
 
-QRect ctkDicomExampleHost::getAvailableScreen(const QRect& preferredScreen){
+QRect ctkExampleDicomHost::getAvailableScreen(const QRect& preferredScreen){
     qDebug()<< "Application asked for this area:"<< preferredScreen;
 
     QRect rect (this->placeholderWidget->getAbsolutePosition());
@@ -44,18 +44,18 @@ QRect ctkDicomExampleHost::getAvailableScreen(const QRect& preferredScreen){
 }
 
 
-void ctkDicomExampleHost::notifyStateChanged(ctkDicomWG23::State state){
+void ctkExampleDicomHost::notifyStateChanged(ctkDicomWG23::State state){
     qDebug()<< "new state received:"<< static_cast<int>(state);
     qDebug()<< "new state received:"<< ctkDicomSoapState::toStringValue(state);
     emit stateChangedReceived(state);
 }
 
-void ctkDicomExampleHost::notifyStatus(const ctkDicomWG23::Status& status){
+void ctkExampleDicomHost::notifyStatus(const ctkDicomWG23::Status& status){
     qDebug()<< "new status received:"<<status.codeMeaning;
     emit statusReceived(status);;
 }
 
-ctkDicomExampleHost::~ctkDicomExampleHost()
+ctkExampleDicomHost::~ctkExampleDicomHost()
 {
   qDebug() << "Exiting host: trying to terminate app";
   this->appProcess.terminate();
@@ -63,7 +63,7 @@ ctkDicomExampleHost::~ctkDicomExampleHost()
   this->appProcess.kill();
 }
 
-void ctkDicomExampleHost::forwardConsoleOutput()
+void ctkExampleDicomHost::forwardConsoleOutput()
 {
   while( this->appProcess.bytesAvailable() )
   {
@@ -73,18 +73,18 @@ void ctkDicomExampleHost::forwardConsoleOutput()
   }
 }
 
-bool ctkDicomExampleHost::notifyDataAvailable(ctkDicomWG23::AvailableData data, bool lastData)
+bool ctkExampleDicomHost::notifyDataAvailable(ctkDicomWG23::AvailableData data, bool lastData)
 {
   return false;
 }
 
-QList<ctkDicomWG23::ObjectLocator>* ctkDicomExampleHost::getData(
+QList<ctkDicomWG23::ObjectLocator>* ctkExampleDicomHost::getData(
   QList<QUuid> objectUUIDs, 
   QList<QString> acceptableTransferSyntaxUIDs, 
   bool includeBulkData)
 {
   return NULL;
 }
-void ctkDicomExampleHost::releaseData(QList<QUuid> objectUUIDs)
+void ctkExampleDicomHost::releaseData(QList<QUuid> objectUUIDs)
 {
 }

+ 6 - 6
Plugins/org.commontk.dah.examplehost/ctkDicomExampleHost.h

@@ -1,5 +1,5 @@
-#ifndef CTKDICOMEXAMPLEHOST_H
-#define CTKDICOMEXAMPLEHOST_H
+#ifndef CTKEXAMPLEDICOMHOST_H
+#define CTKEXAMPLEDICOMHOST_H
 
 #include <ctkDicomAbstractHost.h>
 #include <ctkHostedAppPlaceholderWidget.h>
@@ -9,10 +9,10 @@
 #include <QUrl>
 #include <QProcess>
 
-class org_commontk_dah_examplehost_EXPORT ctkDicomExampleHost : public ctkDicomAbstractHost{
+class org_commontk_dah_examplehost_EXPORT ctkExampleDicomHost : public ctkDicomAbstractHost{
     Q_OBJECT
 public:
-    ctkDicomExampleHost(ctkHostedAppPlaceholderWidget* placeholderWidget, int hostPort = 8080, int appPort = 8081);
+    ctkExampleDicomHost(ctkHostedAppPlaceholderWidget* placeholderWidget, int hostPort = 8080, int appPort = 8081);
 
     virtual void StartApplication(QString AppPath);
     virtual QString generateUID() { return ""; }
@@ -29,7 +29,7 @@ public:
     virtual void releaseData(QList<QUuid> objectUUIDs);
     
     const QProcess& getAppProcess() const { return appProcess; }
-    ~ctkDicomExampleHost();
+    ~ctkExampleDicomHost();
 
 signals:
     void stateChangedReceived(ctkDicomWG23::State state);
@@ -44,4 +44,4 @@ protected:
     void forwardConsoleOutput();
 };
 
-#endif // CTKDICOMEXAMPLEHOST_H
+#endif // CTKEXAMPLEDICOMHOST_H

+ 9 - 9
Plugins/org.commontk.dah.examplehost/ctkDicomExampleHostPlugin.cpp

@@ -20,42 +20,42 @@
 =============================================================================*/
 
 
-#include "ctkDicomExampleHostPlugin_p.h"
+#include "ctkExampleDicomHostPlugin_p.h"
 #include <QtPlugin>
 
-ctkDicomExampleHostPlugin* ctkDicomExampleHostPlugin::instance = 0;
+ctkExampleDicomHostPlugin* ctkExampleDicomHostPlugin::instance = 0;
 
-ctkDicomExampleHostPlugin::ctkDicomExampleHostPlugin()
+ctkExampleDicomHostPlugin::ctkExampleDicomHostPlugin()
   : context(0)
 {
 }
 
-ctkDicomExampleHostPlugin::~ctkDicomExampleHostPlugin()
+ctkExampleDicomHostPlugin::~ctkExampleDicomHostPlugin()
 {
   
 }
 
-void ctkDicomExampleHostPlugin::start(ctkPluginContext* context)
+void ctkExampleDicomHostPlugin::start(ctkPluginContext* context)
 {
   instance = this;
   this->context = context;
 }
 
-void ctkDicomExampleHostPlugin::stop(ctkPluginContext* context)
+void ctkExampleDicomHostPlugin::stop(ctkPluginContext* context)
 {
   Q_UNUSED(context)
 }
 
-ctkDicomExampleHostPlugin* ctkDicomExampleHostPlugin::getInstance()
+ctkExampleDicomHostPlugin* ctkExampleDicomHostPlugin::getInstance()
 {
   return instance;
 }
 
-ctkPluginContext* ctkDicomExampleHostPlugin::getPluginContext() const
+ctkPluginContext* ctkExampleDicomHostPlugin::getPluginContext() const
 {
   return context;
 }
 
-Q_EXPORT_PLUGIN2(org_commontk_dah_examplehost_Export_Export, ctkDicomExampleHostPlugin)
+Q_EXPORT_PLUGIN2(org_commontk_dah_examplehost_Export_Export, ctkExampleDicomHostPlugin)
 
 

+ 9 - 9
Plugins/org.commontk.dah.examplehost/ctkDicomExampleHostPlugin_p.h

@@ -20,12 +20,12 @@
 =============================================================================*/
 
 
-#ifndef CTKDICOMEXAMPLEHOSTPLUGIN_P_H
-#define CTKDICOMEXAMPLEHOSTPLUGIN_P_H
+#ifndef CTKEXAMPLEDICOMHOSTPLUGIN_P_H
+#define CTKEXAMPLEDICOMHOSTPLUGIN_P_H
 
 #include <ctkPluginActivator.h>
 
-class ctkDicomExampleHostPlugin :
+class ctkExampleDicomHostPlugin :
   public QObject, public ctkPluginActivator
 {
   Q_OBJECT
@@ -33,23 +33,23 @@ class ctkDicomExampleHostPlugin :
 
 public:
 
-  ctkDicomExampleHostPlugin();
-  ~ctkDicomExampleHostPlugin();
+  ctkExampleDicomHostPlugin();
+  ~ctkExampleDicomHostPlugin();
 
   void start(ctkPluginContext* context);
   void stop(ctkPluginContext* context);
 
-  static ctkDicomExampleHostPlugin* getInstance();
+  static ctkExampleDicomHostPlugin* getInstance();
 
   ctkPluginContext* getPluginContext() const;
 
 
 private:
 
-  static ctkDicomExampleHostPlugin* instance;
+  static ctkExampleDicomHostPlugin* instance;
   ctkPluginContext* context;
 
 
-}; // ctkDicomExampleHostPlugin
+}; // ctkExampleDicomHostPlugin
 
-#endif // CTKDICOMEXAMPLEHOSTPLUGIN_P_H
+#endif // CTKEXAMPLEDICOMHOSTPLUGIN_P_H