浏览代码

Connect widget for hosted app outputs

Ivo Wolf 13 年之前
父节点
当前提交
8ad2f90e84

+ 1 - 1
Applications/ctkDICOMHost/ctkDICOMHostMainLogic.cpp

@@ -68,7 +68,7 @@ void ctkDICOMHostMainLogic::sendDataToHostedApp()
     SendData = true;
     if(this->Host->getApplicationState() == ctkDicomAppHosting::EXIT)
     {
-      this->Host->StartApplication(this->AppFileName);
+      this->HostControls->StartApplication(this->AppFileName);
     }
     if(this->Host->getApplicationState() == ctkDicomAppHosting::IDLE)
     {

+ 5 - 2
Plugins/org.commontk.dah.examplehost/ctkExampleHostControlWidget.cpp

@@ -59,11 +59,14 @@ ctkExampleHostControlWidget::~ctkExampleHostControlWidget()
 }
 
 //----------------------------------------------------------------------------
-void ctkExampleHostControlWidget::startButtonClicked()
+void ctkExampleHostControlWidget::StartApplication(QString appFileName)
 {
-  qDebug() << "start button clicked";
+  qDebug() << "ctkExampleHostControlWidget::StartApplication";
+  if(appFileName.isEmpty()==false)
+    this->setAppFileName(appFileName);
   if (this->Host)
     {
+    qDebug() << "Starting app";
     this->Host->StartApplication(this->AppFileName);
     //forward output to textedit
     connect(&this->Host->getAppProcess(),SIGNAL(readyReadStandardOutput()),this,SLOT(outputMessage()));

+ 5 - 3
Plugins/org.commontk.dah.examplehost/ctkExampleHostControlWidget.h

@@ -42,12 +42,14 @@ class org_commontk_dah_examplehost_EXPORT ctkExampleHostControlWidget : public Q
 public:
 
   explicit ctkExampleHostControlWidget(ctkExampleDicomHost * host, QWidget *parent = 0);
-  void setAppFileName(QString name);
-
   virtual ~ctkExampleHostControlWidget();
 
 public slots:
-  void startButtonClicked();
+  // the following to in capital letters for compatibility to ctkExampleDicomHost
+  void StartApplication(QString appFileName="");
+
+  void setAppFileName(QString name);
+
   void runButtonClicked();
   void stopButtonClicked();
   void suspendButtonClicked();

+ 2 - 2
Plugins/org.commontk.dah.examplehost/ctkExampleHostControlWidget.ui

@@ -228,7 +228,7 @@
    <sender>startButton</sender>
    <signal>clicked()</signal>
    <receiver>ctkExampleHostControlWidget</receiver>
-   <slot>startButtonClicked()</slot>
+   <slot>StartApplication()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>64</x>
@@ -322,7 +322,7 @@
   </connection>
  </connections>
  <slots>
-  <slot>startButtonClicked()</slot>
+  <slot>StartApplication()</slot>
   <slot>stopButtonClicked()</slot>
   <slot>loadButtonClicked()</slot>
   <slot>runButtonClicked()</slot>