resizable image

mjoppich · Feb 20, 2017 · 92087bc · 92087bc
1 parent ebf89d7
commit 92087bc
Show file tree

Hide file tree

Showing 11 changed files with 230 additions and 28 deletions.
diff --git a/src/app/AdvancedStreamBox.cpp b/src/app/AdvancedStreamBox.cpp
@@ -20,7 +20,7 @@
 #include "AdvancedStreamBox.h"
 
 
-AdvancedCornerWidget::AdvancedCornerWidget(AdvancedStreamBox* pParentBox)
+AdvancedCornerWidget::AdvancedCornerWidget(QWidget* pParentBox)
 {
     m_oMouseStart = QPoint(-1,-1);
     m_oMouseEnd = QPoint(-1,-1);

diff --git a/src/app/AdvancedStreamBox.h b/src/app/AdvancedStreamBox.h
@@ -118,7 +118,7 @@ class AdvancedCornerWidget : public QWidget {
 
 public:
 
-    AdvancedCornerWidget(AdvancedStreamBox* pParentBox);
+    AdvancedCornerWidget(QWidget* pParentBox);
 
     void updateWidgetGeometry();
 
@@ -139,7 +139,7 @@ class AdvancedCornerWidget : public QWidget {
     QPoint m_oMouseEnd;
     QSize m_oCurrentSize;
 
-    AdvancedStreamBox* m_pParentBox;
+    QWidget* m_pParentBox;
 
 };
 

diff --git a/src/app/ProcessLauncher.h b/src/app/ProcessLauncher.h
@@ -198,6 +198,7 @@ class ProcessLauncher : public QObject
 
         }
         */
+
         QIODevice::OpenMode eMode = QIODevice::ReadWrite;
 
         std::cout << "Running QProcess for: " << m_sProgram.toStdString() << " " << m_sParam.toStdString() << std::endl;
@@ -227,6 +228,9 @@ class ProcessLauncher : public QObject
         LOGLVL( oArgs.join(',').toStdString(), Logging::ERR);
 
         QProcess* pProcess = m_pProcess;
+        QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+        pProcess->setProcessEnvironment(env);
+
 
         this->connect(m_pProcess, static_cast<void(QProcess::*)(QProcess::ProcessError)>(&QProcess::errorOccurred),
                            [pProcess, this](QProcess::ProcessError errorCode){

diff --git a/src/parsing/nodes/ExecutionDeferredNode.cpp b/src/parsing/nodes/ExecutionDeferredNode.cpp
@@ -0,0 +1,5 @@
+//
+// Created by joppich on 2/20/17.
+//
+
+#include "ExecutionDeferredNode.h"
diff --git a/src/parsing/nodes/ExecutionDeferredNode.h b/src/parsing/nodes/ExecutionDeferredNode.h
@@ -0,0 +1,38 @@
+//
+// Created by joppich on 2/20/17.
+//
+
+#ifndef BIOGUI_EXECUTIONDEFERREDNODE_H
+#define BIOGUI_EXECUTIONDEFERREDNODE_H
+
+
+#include <QProcess>
+#include "ExecutionNode.h"
+#include <src/app/ExecuteThread.h>
+
+
+class ExecutionDeferredNode : public ExecutionNode {
+
+public:
+
+    ExecutionDeferredNode(QDomElement* pElement)
+    : ExecutionNode(pElement)
+    {
+        m_bDeferred = (this->getDomElementAttribute(pElement, "DEFERRED", "true").toUpper().compare("TRUE", Qt::CaseInsensitive) == 0);
+
+    }
+
+    virtual std::string evaluateDeferred( std::map< std::string, ExecutionNode*>* pID2Node,
+                                  std::map<std::string, std::string>* pInputID2Value,
+                                  std::map<std::string, WidgetFunctionNode*>* pInputID2FunctionWidget,
+                                  QProcess* pProcess, ExecuteThread* pThread, bool bDeferred) = 0;
+
+protected:
+
+    bool m_bDeferred;
+
+
+};
+
+
+#endif //BIOGUI_EXECUTIONDEFERREDNODE_H
diff --git a/src/parsing/nodes/ExecutionExecuteNode.h b/src/parsing/nodes/ExecutionExecuteNode.h
@@ -76,10 +76,13 @@ class ExecutionExecuteNode : public ExecutionExecutableNode {
             if (bDeferred)
             {
                 // only output nodes
-                if (ExecutionOutputNode* pOutPutnode = dynamic_cast<ExecutionOutputNode*>( m_vChildren.at(i) ))
+                if (ExecutionDeferredNode* pOutPutnode = dynamic_cast<ExecutionDeferredNode*>( m_vChildren.at(i) ))
                 {
                     sReturn = sReturn + pOutPutnode->evaluateDeferred(pID2Node, pInputID2Value, pInputID2FunctionWidget, pProcess, pThread, bDeferred);
                 }
+
+
+
             } else {
 
                 if (pProcess != NULL)

diff --git a/src/parsing/nodes/ExecutionMessageBoxNode.h b/src/parsing/nodes/ExecutionMessageBoxNode.h
@@ -6,18 +6,19 @@
 #define BIOGUI_EXECUTIONMESSAGEBOXNODE_H
 
 #include "ExecutionNode.h"
+#include "ExecutionDeferredNode.h"
 
 #include <QDialogButtonBox>
 #include <QMessageBox>
 
-class ExecutionMessageBoxNode : public ExecutionNode {
+class ExecutionMessageBoxNode : public ExecutionDeferredNode {
 
 public:
 
     enum MB_TYPE {INFO, ALERT, QUESTION} ;
 
     ExecutionMessageBoxNode(QDomElement* pElement)
-            : ExecutionNode(pElement)
+            : ExecutionDeferredNode(pElement)
     {
         m_sTag = "messagebox";
 
@@ -50,11 +51,19 @@ class ExecutionMessageBoxNode : public ExecutionNode {
 
     }
 
-    std::string evaluate( std::map< std::string, ExecutionNode*>* pID2Node,
-                          std::map<std::string, std::string>* pInputID2Value,
-                          std::map<std::string, WidgetFunctionNode*>* pInputID2FunctionWidget)
+    virtual std::string evaluateDeferred( std::map< std::string, ExecutionNode*>* pID2Node,
+                                          std::map<std::string, std::string>* pInputID2Value,
+                                          std::map<std::string, WidgetFunctionNode*>* pInputID2FunctionWidget,
+                                          QProcess* pProcess, ExecuteThread* pThread, bool bDeferred)
     {
 
+        if (m_bDeferred && !bDeferred)
+            return "";
+
+        if (!m_bDeferred && bDeferred)
+            return "";
+
+
         if (m_sValue.size() > 0)
         {
 
@@ -99,6 +108,14 @@ class ExecutionMessageBoxNode : public ExecutionNode {
 
     }
 
+    std::string evaluate( std::map< std::string, ExecutionNode*>* pID2Node,
+                          std::map<std::string, std::string>* pInputID2Value,
+                          std::map<std::string, WidgetFunctionNode*>* pInputID2FunctionWidget)
+    {
+
+        return this->evaluateDeferred(pID2Node, pInputID2Value, pInputID2FunctionWidget, NULL, NULL, false);
+    }
+
 protected:
 
     void addNodeAttributes(std::vector<std::string>& vAttributes)

diff --git a/src/parsing/nodes/ExecutionOutputNode.h b/src/parsing/nodes/ExecutionOutputNode.h
@@ -32,12 +32,13 @@
 #include <fstream>
 
 #include "ExecutionNode.h"
+#include "ExecutionDeferredNode.h"
 
-class ExecutionOutputNode : public ExecutionNode {
+class ExecutionOutputNode : public ExecutionDeferredNode {
 
 public:
     ExecutionOutputNode(QDomElement* pElement)
-    : ExecutionNode(pElement)
+    : ExecutionDeferredNode(pElement)
     {
 
         m_sType = this->getDomElementAttribute(pElement, "TYPE", "STD").toUpper().toStdString();
@@ -49,7 +50,6 @@ class ExecutionOutputNode : public ExecutionNode {
         m_sHost = this->getDomElementAttribute(pElement, "host", "").toStdString();
         m_iPort = std::stoi(this->getDomElementAttribute(pElement, "port", "25").toStdString());
 
-        m_bDefferred = (this->getDomElementAttribute(pElement, "DEFERRED", "true").toUpper().compare("TRUE", Qt::CaseInsensitive) == 0);
 
 
         if (m_sTo.size() == 0)
@@ -308,7 +308,6 @@ class ExecutionOutputNode : public ExecutionNode {
     std::string m_sHost;
     int m_iPort;
 
-    bool m_bDefferred;
 
 
 

diff --git a/src/parsing/nodes/ExecutionUpdateNode.h b/src/parsing/nodes/ExecutionUpdateNode.h
@@ -22,42 +22,63 @@
 
 
 #include "ExecutionNode.h"
+#include "ExecutionDeferredNode.h"
 
-class ExecutionUpdateNode : public ExecutionNode {
+class ExecutionUpdateNode : public ExecutionDeferredNode {
 
 public:
 
     ExecutionUpdateNode(QDomElement* pElement)
-            : ExecutionNode(pElement)
+            : ExecutionDeferredNode(pElement)
     {
         m_sValue = this->getDomElementAttribute(pElement, "VALUE", "").toStdString();
 
         m_sTarget = this->getDomElementAttribute(pElement, "TARGET", "");
         m_sAttribute = this->getDomElementAttribute(pElement, "ATTRIB", "");
 
+
+
     }
 
     virtual ~ExecutionUpdateNode()
     {
 
     }
 
-    std::string evaluate( std::map< std::string, ExecutionNode*>* pID2Node,
-                          std::map<std::string, std::string>* pInputID2Value,
-                          std::map<std::string, WidgetFunctionNode*>* pInputID2FunctionWidget)
+    virtual std::string evaluateDeferred( std::map< std::string, ExecutionNode*>* pID2Node,
+                                          std::map<std::string, std::string>* pInputID2Value,
+                                          std::map<std::string, WidgetFunctionNode*>* pInputID2FunctionWidget,
+                                          QProcess* pProcess, ExecuteThread* pThread, bool bDeferred)
     {
 
+        if (m_bDeferred && !bDeferred)
+            return "";
+
+        if (!m_bDeferred && bDeferred)
+            return "";
+
         std::map<std::string, WidgetFunctionNode*>::iterator oIt = pInputID2FunctionWidget->find(m_sTarget.toStdString());
 
         if (oIt != pInputID2FunctionWidget->end())
         {
+            std::string resolvedValue = this->parseDynamicValues(m_sValue, pID2Node, pInputID2Value, pInputID2FunctionWidget);
+
             // do something
-            oIt->second->setAttribute( m_sAttribute.toStdString(), m_sValue );
+            oIt->second->setAttribute( m_sAttribute.toStdString(), resolvedValue );
 
             return m_sValue;
         }
 
         return "";
+
+    }
+
+    std::string evaluate( std::map< std::string, ExecutionNode*>* pID2Node,
+                          std::map<std::string, std::string>* pInputID2Value,
+                          std::map<std::string, WidgetFunctionNode*>* pInputID2FunctionWidget)
+    {
+
+        return this->evaluateDeferred(pID2Node, pInputID2Value, pInputID2FunctionWidget, NULL, NULL, false);
     }
 
 protected:
@@ -67,12 +88,12 @@ class ExecutionUpdateNode : public ExecutionNode {
         vAttributes.push_back("TARGET");
         vAttributes.push_back("ATTRIB");
         vAttributes.push_back("VALUE");
+        vAttributes.push_back("DEFERRED");
     }
 
     QString m_sAttribute;
     QString m_sTarget;
 
-
 };