Changeset 14554 for trunk

Timestamp:

11/03/12 19:18:21 (12 years ago)

Author:

tbretz

Message:

Some improvements for the output during a script is running; added a callback for each state change.

File:

• trunk/FACT++/src/RemoteControl.h (modified) (6 diffs)

trunk/FACT++/src/RemoteControl.h

@@ -23 +23 @@
 {
 protected:
+    std::ostream &lin;           /// Output stream for local synchrounous output
     std::ostream &lout;          /// Output stream for local synchrounous output
 
@@ -29 +30 @@
 protected:
     // Redirect asynchronous output to the output window
-    RemoteControlImp(std::ostream &, std::ostream &in) : lout(in)
+    RemoteControlImp(std::ostream &out, std::ostream &in) : lin(out), lout(in)
     {
     }
@@ -165 +166 @@
     virtual void  JsEnd(const std::string &)          { UnsubscribeAll(); SetSection(-3); }
     virtual bool  JsSend(const std::string &str)      { return ProcessCommand(str); }
-    virtual void  JsOut(const std::string &msg)       { lout << msg << endl; }
+    virtual void  JsOut(const std::string &msg)       { lin << msg << endl; }
     virtual void  JsPrint(const std::string &msg)     { if (fImp) fImp->Comment(msg.empty()?" ":msg); }
     virtual void  JsAlarm(const std::string &msg)     { if (fImp) fImp->Alarm(msg.empty()?" ":msg); }
@@ -413 +414 @@
 
             T::fScript = opt;
+
+            T::Lock();
             JsRun(opt, data);
+            T::Unlock();
+
             return true;
         }
@@ -431 +436 @@
             }
 
+            T::Lock();
             const int rc = JsWait(server, state, ms);
+            T::Unlock();
 
             if (rc<0 || rc==1)
@@ -476 +483 @@
     }
 
-    void SetReceiver(StateMachineDimControl &imp) { fImp = &imp; }
+    void SetReceiver(StateMachineDimControl &imp)
+    {
+        fImp = &imp;
+        fImp->SetStateCallback(bind(&InterpreterV8::JsHandleState, this, placeholders::_1, placeholders::_2));
+    }
 };