|
@@ -311,7 +311,22 @@ void ProgMon::onReadStandardOutput()
|
|
|
QProcess * proc = (QProcess *)sender();
|
|
|
QByteArray ba = proc->readAllStandardOutput();
|
|
|
|
|
|
+ int nsize = mvectorprog.size();
|
|
|
+ int i;
|
|
|
+ for(i=0;i<nsize;i++)
|
|
|
+ {
|
|
|
+ if(proc == mvectorprog.at(i).mProcess)
|
|
|
+ {
|
|
|
+ if(mvectorprog.at(i).mbSavestdout)
|
|
|
+ {
|
|
|
+ std::cout<<ba.data()<<std::endl;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
+ // std::cout<<" proc std out: "<<ba.data()<<std::endl;
|
|
|
+ return;
|
|
|
if(mbAllNoLog == false)
|
|
|
{
|
|
|
mMutex_stdout.lock();
|
|
@@ -326,7 +341,21 @@ void ProgMon::onReadStandardError()
|
|
|
QProcess * proc = (QProcess *)sender();
|
|
|
QByteArray ba = proc->readAllStandardError();
|
|
|
|
|
|
+ int nsize = mvectorprog.size();
|
|
|
+ int i;
|
|
|
+ for(i=0;i<nsize;i++)
|
|
|
+ {
|
|
|
+ if(proc == mvectorprog.at(i).mProcess)
|
|
|
+ {
|
|
|
+ if(mvectorprog.at(i).mbSavestdout)
|
|
|
+ {
|
|
|
+ std::cout<<ba.data()<<std::endl;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
+// std::cout<<" proc err out: "<<ba.data()<<std::endl;
|
|
|
+ return;
|
|
|
mMutex_errout.lock();
|
|
|
if(mvectorerrout.size()<1000) mvectorerrout.push_back(stdoutunit(proc,ba));
|
|
|
mMutex_errout.unlock();
|
|
@@ -534,6 +563,9 @@ void ProgMon::StartProc(ProgUnit *pu)
|
|
|
connect(pu->mProcess,SIGNAL(started()),this,SLOT(onProcessStarted()));
|
|
|
connect(pu->mProcess,SIGNAL(finished(int)),this,SLOT(onProcessEnd()));
|
|
|
|
|
|
+ connect(pu->mProcess,SIGNAL(readyReadStandardOutput()),this,SLOT(onReadStandardOutput()));
|
|
|
+ connect(pu->mProcess,SIGNAL(readyReadStandardError()),this,SLOT(onReadStandardError()));
|
|
|
+
|
|
|
pu->mProcess->start("cyber_launch",QStringList() << "start"<<pu->strcmd.data());
|
|
|
pu->state = 1;
|
|
|
|