Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
colorEagleStdio
taskbus
提交
4861ce02
taskbus
项目概览
colorEagleStdio
/
taskbus
通知
159
Star
11
Fork
3
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
taskbus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
4861ce02
编写于
10月 22, 2023
作者:
丁劲犇
😸
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
指定Path的时候,不能破坏了相对路径的依赖性。
上级
761538f5
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
16 addition
and
10 deletion
+16
-10
modules/wrappers/wrapper_scripts/dlgwrpscript.cpp
modules/wrappers/wrapper_scripts/dlgwrpscript.cpp
+1
-2
modules/wrappers/wrapper_stdio/dlgwrpstdio.cpp
modules/wrappers/wrapper_stdio/dlgwrpstdio.cpp
+5
-4
taskbusplatform/core/tasknode.cpp
taskbusplatform/core/tasknode.cpp
+2
-2
taskbusplatform/gui/taskbusplatformfrm_modules.cpp
taskbusplatform/gui/taskbusplatformfrm_modules.cpp
+3
-1
taskbusplatform/tui/subtask_wrapper.cpp
taskbusplatform/tui/subtask_wrapper.cpp
+5
-1
未找到文件。
modules/wrappers/wrapper_scripts/dlgwrpscript.cpp
浏览文件 @
4861ce02
...
@@ -65,13 +65,12 @@ bool DlgWrpScript::cmd_start()
...
@@ -65,13 +65,12 @@ bool DlgWrpScript::cmd_start()
lstCmds
<<
ui
->
lineEdit_parasec
->
text
();
lstCmds
<<
ui
->
lineEdit_parasec
->
text
();
lstCmds
<<
m_lstArgs
;
lstCmds
<<
m_lstArgs
;
QFileInfo
cmdinfo
(
cmdline
);
QFileInfo
cmdinfo
(
cmdline
);
m_process
->
setProgram
(
cmdinfo
.
absoluteFilePath
());
//设置当前路径
//设置当前路径
if
(
ui
->
lineEdit_workingDir
->
text
().
length
())
if
(
ui
->
lineEdit_workingDir
->
text
().
length
())
m_process
->
setWorkingDirectory
(
ui
->
lineEdit_workingDir
->
text
());
m_process
->
setWorkingDirectory
(
ui
->
lineEdit_workingDir
->
text
());
else
else
m_process
->
setWorkingDirectory
(
cmdinfo
.
absolutePath
());
m_process
->
setWorkingDirectory
(
cmdinfo
.
absolutePath
());
m_process
->
setProgram
(
cmdline
);
//准备环境变量
//准备环境变量
QProcessEnvironment
env
=
QProcessEnvironment
::
systemEnvironment
();
QProcessEnvironment
env
=
QProcessEnvironment
::
systemEnvironment
();
const
QString
newEnv
=
ui
->
plainTextEdit_extraEnv
->
toPlainText
();
const
QString
newEnv
=
ui
->
plainTextEdit_extraEnv
->
toPlainText
();
...
...
modules/wrappers/wrapper_stdio/dlgwrpstdio.cpp
浏览文件 @
4861ce02
...
@@ -125,8 +125,12 @@ bool DlgWrpStdio::cmd_start()
...
@@ -125,8 +125,12 @@ bool DlgWrpStdio::cmd_start()
return
false
;
return
false
;
const
QString
exe
=
ui
->
lineEdit_prgPath
->
text
();
const
QString
exe
=
ui
->
lineEdit_prgPath
->
text
();
const
QString
cmd
=
ui
->
lineEdit_parasec
->
text
();
const
QString
cmd
=
ui
->
lineEdit_parasec
->
text
();
QFileInfo
cmdinfo
(
exe
);
QFileInfo
cmdinfo
(
exe
);
QString
command
=
"
\"
"
+
cmdinfo
.
absoluteFilePath
()
+
"
\"
"
;
if
(
cmd
.
size
())
command
+=
" "
+
cmd
;
//设置当前路径
//设置当前路径
if
(
ui
->
lineEdit_workingDir
->
text
().
length
())
if
(
ui
->
lineEdit_workingDir
->
text
().
length
())
m_process
->
setWorkingDirectory
(
ui
->
lineEdit_workingDir
->
text
());
m_process
->
setWorkingDirectory
(
ui
->
lineEdit_workingDir
->
text
());
...
@@ -155,9 +159,6 @@ bool DlgWrpStdio::cmd_start()
...
@@ -155,9 +159,6 @@ bool DlgWrpStdio::cmd_start()
env
.
insert
(
skey
,
sval
);
env
.
insert
(
skey
,
sval
);
}
}
m_process
->
setProcessEnvironment
(
env
);
m_process
->
setProcessEnvironment
(
env
);
QString
command
=
exe
;
if
(
cmd
.
size
())
command
+=
" "
+
cmd
;
m_process
->
startCommand
(
command
);
m_process
->
startCommand
(
command
);
return
true
;
return
true
;
}
}
...
...
taskbusplatform/core/tasknode.cpp
浏览文件 @
4861ce02
...
@@ -69,9 +69,9 @@ bool taskNode::cmd_start(QObject * node,QString cm, QStringList paras)
...
@@ -69,9 +69,9 @@ bool taskNode::cmd_start(QObject * node,QString cm, QStringList paras)
const
QString
cmdline
=
cm
;
const
QString
cmdline
=
cm
;
QFileInfo
cmdinfo
(
cm
);
QFileInfo
cmdinfo
(
cm
);
QStringList
lstCmds
=
paras
;
QStringList
lstCmds
=
paras
;
m_process
->
setProgram
(
cmdline
);
m_process
->
setProgram
(
cmdinfo
.
absoluteFilePath
());
m_process
->
setArguments
(
lstCmds
);
m_process
->
setWorkingDirectory
(
cmdinfo
.
absolutePath
());
m_process
->
setWorkingDirectory
(
cmdinfo
.
absolutePath
());
m_process
->
setArguments
(
lstCmds
);
m_process
->
start
();
m_process
->
start
();
QString
cmdlinestr
=
cmdline
;
QString
cmdlinestr
=
cmdline
;
...
...
taskbusplatform/gui/taskbusplatformfrm_modules.cpp
浏览文件 @
4861ce02
...
@@ -48,8 +48,10 @@ void taskBusPlatformFrm::load_modules(QStringList newfms)
...
@@ -48,8 +48,10 @@ void taskBusPlatformFrm::load_modules(QStringList newfms)
{
{
QProcess
proc
;
QProcess
proc
;
QFileInfo
infocmd
(
newfm
);
QFileInfo
infocmd
(
newfm
);
proc
.
setProgram
(
infocmd
.
absoluteFilePath
());
proc
.
setWorkingDirectory
(
infocmd
.
absolutePath
());
proc
.
setWorkingDirectory
(
infocmd
.
absolutePath
());
proc
.
start
(
newfm
,
QStringList
()
<<
"--information"
);
proc
.
setArguments
(
QStringList
()
<<
"--information"
);
proc
.
start
();
array
.
append
(
proc
.
readAll
());
array
.
append
(
proc
.
readAll
());
proc
.
waitForFinished
(
10000
);
proc
.
waitForFinished
(
10000
);
array
.
append
(
proc
.
readAll
());
array
.
append
(
proc
.
readAll
());
...
...
taskbusplatform/tui/subtask_wrapper.cpp
浏览文件 @
4861ce02
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
#include <QTextStream>
#include <QTextStream>
#include <QProcess>
#include <QProcess>
#include <QAtomicInt>
#include <QAtomicInt>
#include <QDir>
#include <stdio.h>
#include <stdio.h>
#include "core/taskcell.h"
#include "core/taskcell.h"
#include "core/taskproject.h"
#include "core/taskproject.h"
...
@@ -41,6 +42,7 @@ using namespace TASKBUS;
...
@@ -41,6 +42,7 @@ using namespace TASKBUS;
int
main
(
int
argc
,
char
*
argv
[])
int
main
(
int
argc
,
char
*
argv
[])
{
{
QCoreApplication
a
(
argc
,
argv
);
QCoreApplication
a
(
argc
,
argv
);
QDir
::
setCurrent
(
a
.
applicationDirPath
());
init_client
();
init_client
();
//init ProfileLog
//init ProfileLog
profile_log
::
init
();
profile_log
::
init
();
...
@@ -193,8 +195,10 @@ void load_modules(QStringList newfms, taskCell * cell)
...
@@ -193,8 +195,10 @@ void load_modules(QStringList newfms, taskCell * cell)
{
{
QProcess
proc
;
QProcess
proc
;
QFileInfo
infocmd
(
newfm
);
QFileInfo
infocmd
(
newfm
);
proc
.
setProgram
(
infocmd
.
absoluteFilePath
());
proc
.
setArguments
(
QStringList
()
<<
"--information"
);
proc
.
setWorkingDirectory
(
infocmd
.
absolutePath
());
proc
.
setWorkingDirectory
(
infocmd
.
absolutePath
());
proc
.
start
(
newfm
,
QStringList
()
<<
"--information"
);
proc
.
start
();
proc
.
waitForFinished
(
10000
);
proc
.
waitForFinished
(
10000
);
array
.
append
(
proc
.
readAll
());
array
.
append
(
proc
.
readAll
());
proc
.
kill
();
proc
.
kill
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录