Преглед изворни кода

ENH: return correct screen area for hosted applications

Marco Nolden пре 14 година
родитељ
комит
4b08659244
1 измењених фајлова са 0 додато и 72 уклоњено
  1. 0 72
      Plugins/org.commontk.dicom.examplehost/ctkDicomExampleHost.cpp.orig

+ 0 - 72
Plugins/org.commontk.dicom.examplehost/ctkDicomExampleHost.cpp.orig

@@ -1,72 +0,0 @@
-#include "ctkDicomExampleHost.h"
-#include "ctkDicomWG23TypesHelper.h"
-
-#include <QProcess>
-#include <QtDebug>
-#include <QRect>
-
-#include <iostream>
-
-<<<<<<< HEAD
-ctkDicomExampleHost::ctkDicomExampleHost(ctkHostedAppPlaceholderWidget* placeholderWidget, int hostPort, int appPort) :
-=======
-ctkDicomExampleHost::ctkDicomExampleHost(QWidget* placeholderWidget, int hostPort, int appPort) :
->>>>>>> ENH: display application state change messages in the gui
-    ctkDicomAbstractHost(hostPort, appPort),
-    placeholderWidget(placeholderWidget),
-    applicationState(ctkDicomWG23::IDLE)
-{
-  connect(&this->appProcess,SIGNAL(readyReadStandardOutput()),SLOT(forwardConsoleOutput()));
-}
-
-void ctkDicomExampleHost::StartApplication(QString AppPath){
-
-    QStringList l;
-    l.append("--hostURL");
-    l.append(QString("http://localhost:") + QString::number(this->getHostPort()) );
-    l.append("--applicationURL");
-    l.append(QString("http://localhost:") + QString::number(this->getAppPort()));
-    l.append("dicomapp"); // the app plugin to use - has to be changed later
-
-    qDebug() << "starting application: " << AppPath << " " << l;
-    this->appProcess.setProcessChannelMode(QProcess::MergedChannels);
-    this->appProcess.start(AppPath,l);
-
-}
-
-QRect ctkDicomExampleHost::getAvailableScreen(const QRect& preferredScreen){
-    qDebug()<< "Application asked for this area:"<< preferredScreen;
-
-    QRect rect (this->placeholderWidget->getAbsolutePosition());
-    emit giveAvailableScreen(rect);
-    return rect;
-}
-
-
-void ctkDicomExampleHost::notifyStateChanged(ctkDicomWG23::State state){
-    qDebug()<< "new state received:"<< ctkDicomSoapState::toStringValue(state);
-    emit stateChangedReceived(state);
-}
-
-void ctkDicomExampleHost::notifyStatus(const ctkDicomWG23::Status& status){
-    qDebug()<< "new status received:"<<status.codeMeaning;
-    emit statusReceived(status);;
-}
-
-ctkDicomExampleHost::~ctkDicomExampleHost()
-{
-  qDebug() << "Exiting host: trying to terminate app";
-  this->appProcess.terminate();
-  qDebug() << "Exiting host: trying to kill app";
-  this->appProcess.kill();
-}
-
-void ctkDicomExampleHost::forwardConsoleOutput()
-{
-  while( this->appProcess.bytesAvailable() )
-  {
-    QString line( this->appProcess.readLine() );
-    line.prepend(">>>> ");
-    std::cout << line.toStdString();
-  }
-}