diff --git a/taskbusplatform/core/taskcell.cpp b/taskbusplatform/core/taskcell.cpp index 259a1ffb1022890c2eb66de6fddf140d7f66ca2a..0e346afb80149610627eb9d31157d80890346b88 100644 --- a/taskbusplatform/core/taskcell.cpp +++ b/taskbusplatform/core/taskcell.cpp @@ -19,6 +19,9 @@ #include #include #include + +int taskCell::default_batchtime = 10; + taskCell::taskCell() { @@ -372,11 +375,11 @@ unsigned int taskCell::set_function_instance(const QString & func, unsigned int taskCell::function_batchtime(const QString & func) const { if (m_mainBlock.contains(func) == false) - return 10; + return default_batchtime; if (m_mainBlock[func].contains("instance")==false) - return 10; + return default_batchtime; if (m_mainBlock[func]["instance"].contains("batchtime")==false) - return 10; + return default_batchtime; return m_mainBlock[func]["instance"]["batchtime"].toUInt(); } //设置模块批次间隔 Set the module batch time diff --git a/taskbusplatform/core/taskcell.h b/taskbusplatform/core/taskcell.h index 38c5df61bd8e6e52290b6e769b45c684e9e29027..dc5fa1376df7c4868e2856f66d6add36b588d55f 100644 --- a/taskbusplatform/core/taskcell.h +++ b/taskbusplatform/core/taskcell.h @@ -45,6 +45,8 @@ public: taskCell(); virtual ~taskCell(); const QSet & full_paths() const {return m_set_fullpaths;} + //默认的批量推送时间 + static int default_batchtime; protected: /*! * \brief m_mainBlock主结构:功能键、大类、属性键、属性值 diff --git a/taskbusplatform/core/tasknode.cpp b/taskbusplatform/core/tasknode.cpp index 80e622e140f0eb024766e89fe91185cd9a6f215b..bcab7ab280deee8a1d392d9d9dd333c7b4248ad3 100644 --- a/taskbusplatform/core/tasknode.cpp +++ b/taskbusplatform/core/tasknode.cpp @@ -17,6 +17,7 @@ taskNode::taskNode(QObject *parent) : QObject(parent) ,m_process(new QProcess(this)) + ,m_nBatchTime(taskCell::default_batchtime) { connect(m_process,&QProcess::started,this, &taskNode::sig_pro_started,Qt::QueuedConnection); @@ -39,6 +40,7 @@ taskNode::taskNode(QObject *parent) connect(this,&taskNode::private_sig_nextcab,this, &taskNode::slot_readyReadStandardOutput,Qt::QueuedConnection); m_nBp_TimerID = startTimer(200); + } taskNode::~taskNode() { diff --git a/taskbusplatform/core/taskproject.cpp b/taskbusplatform/core/taskproject.cpp index 280d33150eeb0388f598480e2485f45502c3aa20..8eea75152b0bd663d4ef0230e58b8d9304e29c1f 100644 --- a/taskbusplatform/core/taskproject.cpp +++ b/taskbusplatform/core/taskproject.cpp @@ -780,6 +780,10 @@ void taskProject::start_project() TASKBUS::set_proc_nice(pr); settings.setValue("settings/nice",pr); + int bt = settings.value("settings/batchtime",taskCell::default_batchtime).toInt(); + taskCell::default_batchtime = bt; + + settings.setValue("settings/batchtime",taskCell::default_batchtime); if (m_bRunning) return;