PM/DYTSrouce
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: PM:d3dc02a9c04f8c7ce3b9da5be2b947b95b7ac51d
Branches Tags
PM:main
PM:new_osg
PM:new_osg_render
PM:master
...
compare: PM:f68bbfe8b4bcc5b8f7dc9acd03c13794f7412c0e
Branches Tags
PM:new_osg
PM:main
PM:new_osg_render
PM:master

2 Commits
d3dc02a9c0 ... f68bbfe8b4

Author SHA1 Message Date
15712809671
f68bbfe8b4 Merge branch 'main' of https://code.brigecode.icu:16623/PM/DYTSrouce 2025-01-07 23:45:36 +08:00
15712809671
b80863eddc 绑定属性 2025-01-07 23:45:23 +08:00
15 changed files with 444 additions and 295 deletions
Show Stats Expand all files Collapse all files

186
src/translations/Dyt_zh_CN.ts
View File

@ -4,22 +4,22 @@
<context> <context>
<name>AddParamSetting</name> <name>AddParamSetting</name>
<message> <message>
<location filename="../ui/Layout/AddParamSetting.cpp" line="64"/> <location filename="../ui/Layout/AddParamSetting.cpp" line="67"/>
<source>ParamSetting</source> <source>ParamSetting</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Layout/AddParamSetting.cpp" line="104"/> <location filename="../ui/Layout/AddParamSetting.cpp" line="110"/>
<source>input param name</source> <source>param</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Layout/AddParamSetting.cpp" line="111"/> <location filename="../ui/Layout/AddParamSetting.cpp" line="117"/>
<source>input param descript</source> <source>input param descript</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/Layout/AddParamSetting.cpp" line="167"/> <location filename="../ui/Layout/AddParamSetting.cpp" line="170"/>
<source>input value</source> <source>input value</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -109,17 +109,7 @@
</message> </message>
<message> <message>
<location filename="../ui/Layout/CodeEdtUI.cpp" line="37"/> <location filename="../ui/Layout/CodeEdtUI.cpp" line="37"/>
<source>&amp;Import the Main template</source> <source>&amp;Import the template</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/Layout/CodeEdtUI.cpp" line="38"/>
<source>&amp;Import the LD template</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/Layout/CodeEdtUI.cpp" line="39"/>
<source>&amp;Import the SeekerSim template</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -422,12 +412,12 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/chartPlot/FitCurveDialog.cpp" line="767"/> <location filename="../ui/chartPlot/FitCurveDialog.cpp" line="773"/>
<source>2D Curve</source> <source>2D Curve</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/chartPlot/FitCurveDialog.cpp" line="771"/> <location filename="../ui/chartPlot/FitCurveDialog.cpp" line="777"/>
<source>2D(y(lg)) Curve</source> <source>2D(y(lg)) Curve</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -509,136 +499,141 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="110"/> <location filename="../ui/MainWindow.cpp" line="114"/>
<source>Wave Curve</source> <source>Wave Curve</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="118"/> <location filename="../ui/MainWindow.cpp" line="122"/>
<source>Speed Curve</source> <source>Speed Curve</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="127"/> <location filename="../ui/MainWindow.cpp" line="131"/>
<source>3D Curve</source> <source>3D Curve</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="139"/> <location filename="../ui/MainWindow.cpp" line="143"/>
<location filename="../ui/MainWindow.cpp" line="164"/> <location filename="../ui/MainWindow.cpp" line="168"/>
<source>Target number</source> <source>Target number</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="139"/> <location filename="../ui/MainWindow.cpp" line="143"/>
<location filename="../ui/MainWindow.cpp" line="164"/> <location filename="../ui/MainWindow.cpp" line="168"/>
<source>Signal-to-noise ratio</source> <source>Signal-to-noise ratio</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="140"/> <location filename="../ui/MainWindow.cpp" line="144"/>
<location filename="../ui/MainWindow.cpp" line="165"/> <location filename="../ui/MainWindow.cpp" line="169"/>
<source>Azimuth line of sight</source> <source>Azimuth line of sight</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="140"/> <location filename="../ui/MainWindow.cpp" line="144"/>
<location filename="../ui/MainWindow.cpp" line="165"/> <location filename="../ui/MainWindow.cpp" line="169"/>
<source>Pitch gaze angle</source> <source>Pitch gaze angle</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="141"/> <location filename="../ui/MainWindow.cpp" line="145"/>
<location filename="../ui/MainWindow.cpp" line="166"/> <location filename="../ui/MainWindow.cpp" line="170"/>
<source>azimuth</source> <source>azimuth</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="141"/> <location filename="../ui/MainWindow.cpp" line="145"/>
<location filename="../ui/MainWindow.cpp" line="166"/> <location filename="../ui/MainWindow.cpp" line="170"/>
<source>Pitch angle</source> <source>Pitch angle</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="142"/> <location filename="../ui/MainWindow.cpp" line="146"/>
<location filename="../ui/MainWindow.cpp" line="167"/> <location filename="../ui/MainWindow.cpp" line="171"/>
<source>attribute</source> <source>attribute</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="142"/> <location filename="../ui/MainWindow.cpp" line="146"/>
<location filename="../ui/MainWindow.cpp" line="167"/> <location filename="../ui/MainWindow.cpp" line="171"/>
<source>Doppler</source> <source>Doppler</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="143"/> <location filename="../ui/MainWindow.cpp" line="147"/>
<location filename="../ui/MainWindow.cpp" line="168"/> <location filename="../ui/MainWindow.cpp" line="172"/>
<source>course</source> <source>course</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="143"/> <location filename="../ui/MainWindow.cpp" line="147"/>
<location filename="../ui/MainWindow.cpp" line="168"/> <location filename="../ui/MainWindow.cpp" line="172"/>
<source>Speed</source> <source>Speed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="144"/> <location filename="../ui/MainWindow.cpp" line="148"/>
<location filename="../ui/MainWindow.cpp" line="169"/> <location filename="../ui/MainWindow.cpp" line="173"/>
<source>longitude</source> <source>longitude</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="144"/> <location filename="../ui/MainWindow.cpp" line="148"/>
<location filename="../ui/MainWindow.cpp" line="169"/> <location filename="../ui/MainWindow.cpp" line="173"/>
<source>latitude</source> <source>latitude</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="145"/> <location filename="../ui/MainWindow.cpp" line="149"/>
<location filename="../ui/MainWindow.cpp" line="170"/> <location filename="../ui/MainWindow.cpp" line="174"/>
<source>distance</source> <source>distance</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="145"/> <location filename="../ui/MainWindow.cpp" line="149"/>
<location filename="../ui/MainWindow.cpp" line="170"/> <location filename="../ui/MainWindow.cpp" line="174"/>
<source>velocity</source> <source>velocity</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="146"/> <location filename="../ui/MainWindow.cpp" line="150"/>
<location filename="../ui/MainWindow.cpp" line="171"/> <location filename="../ui/MainWindow.cpp" line="175"/>
<source>Radial dimensions</source> <source>Radial dimensions</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="146"/> <location filename="../ui/MainWindow.cpp" line="150"/>
<location filename="../ui/MainWindow.cpp" line="171"/> <location filename="../ui/MainWindow.cpp" line="175"/>
<source>Target RCS</source> <source>Target RCS</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="152"/> <location filename="../ui/MainWindow.cpp" line="156"/>
<source>Report Table</source> <source>Report Table</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="177"/> <location filename="../ui/MainWindow.cpp" line="181"/>
<source>Report</source> <source>Report</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="186"/> <location filename="../ui/MainWindow.cpp" line="190"/>
<source>Signal Indicator Lamp</source> <source>Signal Indicator Lamp</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/MainWindow.cpp" line="194"/> <location filename="../ui/MainWindow.cpp" line="197"/>
<source>ParamSetting</source> <source>ParamSetting</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../ui/MainWindow.cpp" line="202"/>
<source>Matlab File</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>ModelBrowser</name> <name>ModelBrowser</name>
@ -974,43 +969,43 @@
<context> <context>
<name>QtConeWaveComponentManager</name> <name>QtConeWaveComponentManager</name>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8732"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8828"/>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8741"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8837"/>
<source>ConeWaveComponent</source> <source>ConeWaveComponent</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8828"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8924"/>
<source>Height</source> <source>Height</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8835"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8931"/>
<source>Radius</source> <source>Radius</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8842"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8938"/>
<source>levelCount</source> <source>levelCount</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8849"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8945"/>
<source>levelHeight</source> <source>levelHeight</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8856"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8952"/>
<source>Color1</source> <source>Color1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8863"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8959"/>
<source>Color2</source> <source>Color2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8870"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8966"/>
<source>Color3</source> <source>Color3</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1116,28 +1111,28 @@
<context> <context>
<name>QtDashedLineComponentManager</name> <name>QtDashedLineComponentManager</name>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="9055"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="9151"/>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="9064"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="9160"/>
<source>DashedLineComponent</source> <source>DashedLineComponent</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="9133"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="9229"/>
<source>Start</source> <source>Start</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="9140"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="9236"/>
<source>End</source> <source>End</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="9147"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="9243"/>
<source>Radius</source> <source>Radius</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="9154"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="9250"/>
<source>Color</source> <source>Color</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1153,12 +1148,12 @@
<context> <context>
<name>QtEntityPropertyManager</name> <name>QtEntityPropertyManager</name>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8212"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8308"/>
<source>Name</source> <source>Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8219"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8315"/>
<source>Transform</source> <source>Transform</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1240,13 +1235,13 @@
<context> <context>
<name>QtMeshComponetManager</name> <name>QtMeshComponetManager</name>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8326"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8422"/>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8335"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8431"/>
<source>MeshComponent</source> <source>MeshComponent</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8408"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8504"/>
<source>Mesh</source> <source>Mesh</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1290,13 +1285,13 @@
<context> <context>
<name>QtPathComponentManager</name> <name>QtPathComponentManager</name>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8485"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8581"/>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8494"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8590"/>
<source>PathComponent</source> <source>PathComponent</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8567"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8663"/>
<source>Path</source> <source>Path</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1546,20 +1541,45 @@
<context> <context>
<name>QtWorkspacePropertyManager</name> <name>QtWorkspacePropertyManager</name>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8012"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8039"/>
<source>Name</source> <source>Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8019"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8046"/>
<source>Description</source> <source>Description</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8026"/> <location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8053"/>
<source>Timestep</source> <source>Timestep</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8060"/>
<source>SimMatlab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8067"/>
<source>MatlabParam</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8074"/>
<source>Wave</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8081"/>
<source>RD</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/PropertyBrowser/qtpropertymanager.cpp" line="8088"/>
<source>Report</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>SignalIndicatorLampUI</name> <name>SignalIndicatorLampUI</name>

16
src/ui/Layout/AddParamSetting.cpp
View File

@ -11,6 +11,7 @@
#include <qdebug.h> #include <qdebug.h>
#include "../../workspace/WorkSpaceManager.h" #include "../../workspace/WorkSpaceManager.h"
#include "../../workspace/WorkSpace.h"
#include "../../common/RecourceHelper.h" #include "../../common/RecourceHelper.h"
#include <QFile> #include <QFile>
@ -70,6 +71,9 @@ void AddParamSetting::AttachDock(DockWidget* dockWidget)
void AddParamSetting::InitTable() void AddParamSetting::InitTable()
{ {
if (m_strDir.isEmpty())
return;
QSettings sett(m_strDir, QSettings::IniFormat); QSettings sett(m_strDir, QSettings::IniFormat);
QStringList listGroup = sett.childGroups(); QStringList listGroup = sett.childGroups();
@ -410,11 +414,19 @@ void AddParamSetting::slotButtonRemove()
void AddParamSetting::slotButtonCommit() void AddParamSetting::slotButtonCommit()
{ {
QString strMatlabFile = WorkSpaceManager::Get().GetDYTMatlabPFile(); QString strMatlabFile ="";
if (WorkSpaceManager::Get().GetCurrent())
{
if (!WorkSpaceManager::Get().GetCurrent()->GetMatlabParam().isEmpty())
{
strMatlabFile = RecourceHelper::Get().GetBasePath() + "/" + WorkSpaceManager::Get().GetCurrent()->GetMatlabParam();
}
}
if (strMatlabFile.isEmpty()) if (strMatlabFile.isEmpty())
{ {
strMatlabFile = RecourceHelper::Get().GetBasePath() + "/workspace/MatlabParam.m"; strMatlabFile = RecourceHelper::Get().GetBasePath() + "/workspace/MatlabParam.m";
WorkSpaceManager::Get().SetDYTMatlabPFile(strMatlabFile); WorkSpaceManager::Get().GetCurrent()->SetMatlabParam("MatlabParam.m");
} }
QFile file(strMatlabFile); QFile file(strMatlabFile);

29
src/ui/Layout/CodeEdtUI.cpp
View File

@ -34,18 +34,18 @@ CodeEdtUI::CodeEdtUI(QWidget *parent)
// ´´½¨²Ëµ¥ // ´´½¨²Ëµ¥
QMenu* fileMenu = menuBar()->addMenu(tr("&file")); QMenu* fileMenu = menuBar()->addMenu(tr("&file"));
QAction* openMainAction = new QAction(tr("&Import the Main template"), this); QAction* openMainAction = new QAction(tr("&Import the template"), this);
QAction* openLDAction = new QAction(tr("&Import the LD template"), this); /* QAction* openLDAction = new QAction(tr("&Import the LD template"), this);
QAction* openSeekerSimAction = new QAction(tr("&Import the SeekerSim template"), this); QAction* openSeekerSimAction = new QAction(tr("&Import the SeekerSim template"), this);*/
QAction* saveAction = new QAction(tr("&save"), this); QAction* saveAction = new QAction(tr("&save"), this);
fileMenu->addAction(openMainAction); fileMenu->addAction(openMainAction);
fileMenu->addAction(openLDAction); //fileMenu->addAction(openLDAction);
fileMenu->addAction(openSeekerSimAction); //fileMenu->addAction(openSeekerSimAction);
fileMenu->addAction(saveAction); fileMenu->addAction(saveAction);
connect(openMainAction, &QAction::triggered, this, &CodeEdtUI::openMainFile); connect(openMainAction, &QAction::triggered, this, &CodeEdtUI::openMainFile);
connect(openLDAction, &QAction::triggered, this, &CodeEdtUI::openLDFile); /* connect(openLDAction, &QAction::triggered, this, &CodeEdtUI::openLDFile);
connect(openSeekerSimAction, &QAction::triggered, this, &CodeEdtUI::openSeekerSimFile); connect(openSeekerSimAction, &QAction::triggered, this, &CodeEdtUI::openSeekerSimFile);*/
connect(saveAction, &QAction::triggered, this, &CodeEdtUI::saveFile); connect(saveAction, &QAction::triggered, this, &CodeEdtUI::saveFile);
@ -71,11 +71,10 @@ void CodeEdtUI::AttachDock(DockWidget* dockWidget)
} }
void CodeEdtUI::openMainFile() { void CodeEdtUI::openMainFile() {
QString fileName = WorkSpaceManager::Get().GetDYTMMainFile(); //QFileDialog::getOpenFileName(this, "Open File", "", "Matlab Files (*.m)"); QString fileName = ""; //QFileDialog::getOpenFileName(this, "Open File", "", "Matlab Files (*.m)");
if (fileName.isEmpty()) if (fileName.isEmpty())
{ {
fileName = QFileDialog::getOpenFileName(this, "Open File", "", "Matlab Files (*.m)"); fileName = QFileDialog::getOpenFileName(this, "Open File", "", "Matlab Files (*.m)");
WorkSpaceManager::Get().SetDYTMMainFile(fileName);
} }
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
@ -92,11 +91,10 @@ void CodeEdtUI::openMainFile() {
void CodeEdtUI::openLDFile() void CodeEdtUI::openLDFile()
{ {
QString fileName = WorkSpaceManager::Get().GetDYTMLDFile(); //QFileDialog::getOpenFileName(this, "Open File", "", "Matlab Files (*.m)"); QString fileName = ""; //QFileDialog::getOpenFileName(this, "Open File", "", "Matlab Files (*.m)");
if (fileName.isEmpty()) if (fileName.isEmpty())
{ {
fileName = QFileDialog::getOpenFileName(this, "Open File", "", "Matlab Files (*.m)"); fileName = QFileDialog::getOpenFileName(this, "Open File", "", "Matlab Files (*.m)");
WorkSpaceManager::Get().SetDYTMLDFile(fileName);
} }
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
@ -115,11 +113,10 @@ void CodeEdtUI::openLDFile()
void CodeEdtUI::openSeekerSimFile() void CodeEdtUI::openSeekerSimFile()
{ {
QString fileName = WorkSpaceManager::Get().GetDYTMSeekerSimFile(); //QFileDialog::getOpenFileName(this, "Open File", "", "Matlab Files (*.m)"); QString fileName = ""; //QFileDialog::getOpenFileName(this, "Open File", "", "Matlab Files (*.m)");
if (fileName.isEmpty()) if (fileName.isEmpty())
{ {
fileName = QFileDialog::getOpenFileName(this, "Open File", "", "Matlab Files (*.m)"); fileName = QFileDialog::getOpenFileName(this, "Open File", "", "Matlab Files (*.m)");
WorkSpaceManager::Get().SetDYTMSeekerSimFile(fileName);
} }
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
@ -137,9 +134,9 @@ void CodeEdtUI::openSeekerSimFile()
} }
void CodeEdtUI::saveFile() { void CodeEdtUI::saveFile() {
//QString fileName = QFileDialog::getSaveFileName(this, "Save File", "", "Matlab Files (*.m)"); QString fileName = QFileDialog::getSaveFileName(this, "Save File", "", "Matlab Files (*.m)");
if (!m_strCurOpenFile.isEmpty()) { if (!fileName.isEmpty()) {
QFile file(m_strCurOpenFile); QFile file(fileName);
if (file.open(QIODevice::WriteOnly | QIODevice::Text)) { if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
QTextStream out(&file); QTextStream out(&file);
out << editor->toPlainText(); out << editor->toPlainText();

65
src/ui/MainWindow.cpp
View File

@ -87,28 +87,32 @@ void MainWindow::InitUI() {
qtOsgViewWidget_->Initialize(); qtOsgViewWidget_->Initialize();
m_mapDockWidget.insert("PropertyBrowser", attribte); m_mapDockWidget.insert("PropertyBrowser", attribte);
QString wavePath = WorkSpaceManager::Get().GetDYTWaveFile(); QString wavePath ="", speedPath = "", rdPath = "", matlabParam="";
if (wavePath.isEmpty()) { if (WorkSpaceManager::Get().GetCurrent())
wavePath = RecourceHelper::Get().GetBasePath() + "/workspace/Wave.txt"; {
WorkSpaceManager::Get().SetDYTWaveFile(wavePath); if (!WorkSpaceManager::Get().GetCurrent()->GetWavePath().isEmpty())
{
wavePath = RecourceHelper::Get().GetBasePath() + "/" + WorkSpaceManager::Get().GetCurrent()->GetWavePath();
} }
// const QString wavePath = RecourceHelper::Get().GetBasePath() + "/workspace/Wave.txt";
QString speedPath = WorkSpaceManager::Get().GetDYTReportFile(); if (!WorkSpaceManager::Get().GetCurrent()->GetReportPath().isEmpty())
if (speedPath.isEmpty()) { {
speedPath = RecourceHelper::Get().GetBasePath() + "/workspace/Report.txt"; speedPath = RecourceHelper::Get().GetBasePath() + "/" + WorkSpaceManager::Get().GetCurrent()->GetReportPath();
WorkSpaceManager::Get().SetDYTReportFile(speedPath); }
if (!WorkSpaceManager::Get().GetCurrent()->GetRDPath().isEmpty())
{
rdPath = RecourceHelper::Get().GetBasePath() + "/" + WorkSpaceManager::Get().GetCurrent()->GetRDPath();
}
if (!WorkSpaceManager::Get().GetCurrent()->GetMatlabParam().isEmpty())
{
matlabParam = RecourceHelper::Get().GetBasePath() + "/" + WorkSpaceManager::Get().GetCurrent()->GetMatlabParam();
} }
//const QString speedPath = RecourceHelper::Get().GetBasePath() + "/workspace/Report.txt";
QString rdPath = WorkSpaceManager::Get().GetDYTRDFile();
if (rdPath.isEmpty()) {
rdPath = RecourceHelper::Get().GetBasePath() + "/workspace/RD.txt";
WorkSpaceManager::Get().SetDYTRDFile(rdPath);
} }
// const QString rdPath = RecourceHelper::Get().GetBasePath() + "/workspace/RD.txt";
DockWidget* fitCurveDock = new DockWidget(tr("Wave Curve"), 0); DockWidget* fitCurveDock = new DockWidget(tr("Wave Curve"), 0);
// addDockWidget(pSettingUI->GetArea("2DCurveDialog"), fitCurveDock);
fitCurveDlg_ = new FitCurveDialog(1); fitCurveDlg_ = new FitCurveDialog(1);
fitCurveDlg_->AttachDock(fitCurveDock); fitCurveDlg_->AttachDock(fitCurveDock);
m_mapDockWidget.insert("WaveCurveDialog", fitCurveDock); m_mapDockWidget.insert("WaveCurveDialog", fitCurveDock);
@ -116,7 +120,7 @@ void MainWindow::InitUI() {
fitCurveDlg_->InitWaveFile(wavePath); fitCurveDlg_->InitWaveFile(wavePath);
DockWidget* fitLgCurveDock = new DockWidget(tr("Speed Curve"), 0); DockWidget* fitLgCurveDock = new DockWidget(tr("Speed Curve"), 0);
//addDockWidget(pSettingUI->GetArea("2D(lg)CurveDialog"), fitLgCurveDock);
fitYLgCurveDlg_ = new FitCurveDialog(1); fitYLgCurveDlg_ = new FitCurveDialog(1);
fitYLgCurveDlg_->AttachDock(fitLgCurveDock); fitYLgCurveDlg_->AttachDock(fitLgCurveDock);
m_mapDockWidget.insert("SpeedCurveDialog", fitLgCurveDock); m_mapDockWidget.insert("SpeedCurveDialog", fitLgCurveDock);
@ -125,7 +129,7 @@ void MainWindow::InitUI() {
fitYLgCurveDlg_->InitReportFile(speedPath); fitYLgCurveDlg_->InitReportFile(speedPath);
DockWidget* surfaceCurveDock = new DockWidget(tr("3D Curve"), 0); DockWidget* surfaceCurveDock = new DockWidget(tr("3D Curve"), 0);
// addDockWidget(pSettingUI->GetArea("3DCurveDialog"), surfaceCurveDock);
surfaceDlg_ = new SurfaceDialog(); surfaceDlg_ = new SurfaceDialog();
surfaceDlg_->AttachDock(surfaceCurveDock); surfaceDlg_->AttachDock(surfaceCurveDock);
m_mapDockWidget.insert("3DCurveDialog", surfaceCurveDock); m_mapDockWidget.insert("3DCurveDialog", surfaceCurveDock);
@ -190,9 +194,8 @@ void MainWindow::InitUI() {
m_mapDockWidget.insert("SignalIndicatorLampUI", signalIndicatorLampDock); m_mapDockWidget.insert("SignalIndicatorLampUI", signalIndicatorLampDock);
const QString iniPath = RecourceHelper::Get().GetBasePath() + "/workspace/ParamSetting.ini";
DockWidget* addParamSettingDock = new DockWidget(tr("ParamSetting"), 0); DockWidget* addParamSettingDock = new DockWidget(tr("ParamSetting"), 0);
addParamDlg_ = new AddParamSetting(iniPath); addParamDlg_ = new AddParamSetting(matlabParam);
addParamDlg_->AttachDock(addParamSettingDock); addParamDlg_->AttachDock(addParamSettingDock);
m_mapDockWidget.insert("ParamSetting", addParamSettingDock); m_mapDockWidget.insert("ParamSetting", addParamSettingDock);
@ -359,25 +362,23 @@ void MainWindow::slotShowUISetting() {
void MainWindow::slotResetWorkSpace() void MainWindow::slotResetWorkSpace()
{ {
QString wavePath = WorkSpaceManager::Get().GetDYTWaveFile(); QString wavePath = "", speedPath = "", rdPath = "";
if (wavePath.isEmpty()) if (WorkSpaceManager::Get().GetCurrent())
{ {
wavePath = RecourceHelper::Get().GetBasePath() + "/workspace/Wave.txt"; if (!WorkSpaceManager::Get().GetCurrent()->GetWavePath().isEmpty())
WorkSpaceManager::Get().SetDYTWaveFile(wavePath); {
wavePath = RecourceHelper::Get().GetBasePath() + "/" + WorkSpaceManager::Get().GetCurrent()->GetWavePath();
} }
QString speedPath = WorkSpaceManager::Get().GetDYTReportFile(); if (!WorkSpaceManager::Get().GetCurrent()->GetReportPath().isEmpty())
if (speedPath.isEmpty())
{ {
speedPath = RecourceHelper::Get().GetBasePath() + "/workspace/Report.txt"; speedPath = RecourceHelper::Get().GetBasePath() + "/" + WorkSpaceManager::Get().GetCurrent()->GetReportPath();
WorkSpaceManager::Get().SetDYTReportFile(speedPath);
} }
QString rdPath = WorkSpaceManager::Get().GetDYTRDFile(); if (!WorkSpaceManager::Get().GetCurrent()->GetRDPath().isEmpty())
if (rdPath.isEmpty())
{ {
rdPath = RecourceHelper::Get().GetBasePath() + "/workspace/RD.txt"; rdPath = RecourceHelper::Get().GetBasePath() + "/" + WorkSpaceManager::Get().GetCurrent()->GetRDPath();
WorkSpaceManager::Get().SetDYTRDFile(rdPath); }
} }
fitCurveDlg_->InitWaveFile(wavePath); fitCurveDlg_->InitWaveFile(wavePath);

9
src/ui/Menu/ChartPlotMenu.cpp
View File

@ -1,7 +1,7 @@
#include "ChartPlotMenu.h" #include "ChartPlotMenu.h"
#include "../Matlab/MatlabObject.h" #include "../Matlab/MatlabObject.h"
#include "../../common/RecourceHelper.h"
#include "workspace/WorkSpace.h" #include "workspace/WorkSpace.h"
#include "workspace/WorkSpaceManager.h" #include "workspace/WorkSpaceManager.h"
#include <qmessagebox.h> #include <qmessagebox.h>
@ -22,15 +22,20 @@ ChartPlotMenu::~ChartPlotMenu()
void ChartPlotMenu::InitMenu() void ChartPlotMenu::InitMenu()
{ {
connect(ui.toolButton, &QToolButton::clicked, this, [=] { connect(ui.toolButton, &QToolButton::clicked, this, [=] {
if (WorkSpaceManager::Get().GetCurrent())
{
MatlabObject mtlb; MatlabObject mtlb;
QString strFile = WorkSpaceManager::Get().GetDYTMMainFile(); QString strFile = WorkSpaceManager::Get().GetCurrent()->GetSimMatlab();
if (!strFile.isEmpty()) if (!strFile.isEmpty())
{ {
strFile = RecourceHelper::Get().GetBasePath() + "/" + WorkSpaceManager::Get().GetCurrent()->GetSimMatlab();
mtlb.RunMatlabFile(strFile); mtlb.RunMatlabFile(strFile);
} }
else else
{ {
QMessageBox::information(nullptr, QString::fromLocal8Bit("提示"), QString::fromLocal8Bit("请检查仿真文件路径是否存在！")); QMessageBox::information(nullptr, QString::fromLocal8Bit("提示"), QString::fromLocal8Bit("请检查仿真文件路径是否存在！"));
} }
}
}); });
} }

96
src/ui/PropertyBrowser/qtpropertymanager.cpp
View File

@ -7875,10 +7875,22 @@ public:
QMap<const QtProperty*, QtProperty*> m_properyToName; QMap<const QtProperty*, QtProperty*> m_properyToName;
QMap<const QtProperty*, QtProperty*> m_properyToDescription; QMap<const QtProperty*, QtProperty*> m_properyToDescription;
QMap<const QtProperty*, QtProperty*> m_properyToTimestep; QMap<const QtProperty*, QtProperty*> m_properyToTimestep;
QMap<const QtProperty*, QtProperty*> m_properyToSimMatlab;
QMap<const QtProperty*, QtProperty*> m_properyToMatlabParam;
QMap<const QtProperty*, QtProperty*> m_properyToWave;
QMap<const QtProperty*, QtProperty*> m_properyToReport;
QMap<const QtProperty*, QtProperty*> m_properyToRD;
QMap<const QtProperty*, QtProperty*> m_nameToPropery; QMap<const QtProperty*, QtProperty*> m_nameToPropery;
QMap<const QtProperty*, QtProperty*> m_descriptionToPropery; QMap<const QtProperty*, QtProperty*> m_descriptionToPropery;
QMap<const QtProperty*, QtProperty*> m_timestepToPropery; QMap<const QtProperty*, QtProperty*> m_timestepToPropery;
QMap<const QtProperty*, QtProperty*> m_simMatlabToPropery;
QMap<const QtProperty*, QtProperty*> m_matlabParamToPropery;
QMap<const QtProperty*, QtProperty*> m_waveToPropery;
QMap<const QtProperty*, QtProperty*> m_reportToPropery;
QMap<const QtProperty*, QtProperty*> m_rdToPropery;
}; };
void QtWorkspacePropertyManagerPrivate::slotStringChanged(QtProperty* property, QString value) { void QtWorkspacePropertyManagerPrivate::slotStringChanged(QtProperty* property, QString value) {
@ -7894,6 +7906,10 @@ void QtWorkspacePropertyManagerPrivate::slotStringChanged(QtProperty* property,
QWorkspaceAttribute c = m_values[prop]; QWorkspaceAttribute c = m_values[prop];
c.SetTimeStep(value); c.SetTimeStep(value);
q_ptr->setValue(prop, c); q_ptr->setValue(prop, c);
} else if (QtProperty* prop = m_simMatlabToPropery.value(property, 0)) {
QWorkspaceAttribute c = m_values[prop];
c.SetSimMatlab(value);
q_ptr->setValue(prop, c);
} }
} }
@ -7912,6 +7928,11 @@ void QtWorkspacePropertyManagerPrivate::slotPropertyDestroyed(QtProperty* proper
m_timestepToPropery[subProp] = 0; m_timestepToPropery[subProp] = 0;
m_timestepToPropery.remove(property); m_timestepToPropery.remove(property);
} }
if (QtProperty* subProp = m_simMatlabToPropery.value(property, nullptr)) {
m_simMatlabToPropery[subProp] = 0;
m_simMatlabToPropery.remove(property);
}
} }
QtWorkspacePropertyManager::QtWorkspacePropertyManager(QObject* parent) QtWorkspacePropertyManager::QtWorkspacePropertyManager(QObject* parent)
@ -7996,6 +8017,12 @@ void QtWorkspacePropertyManager::setValue(QtProperty* property, const QWorkspace
d_ptr->m_stringProperyManager->setValue(d_ptr->m_properyToName[property], value.GetName()); d_ptr->m_stringProperyManager->setValue(d_ptr->m_properyToName[property], value.GetName());
d_ptr->m_stringProperyManager->setValue(d_ptr->m_properyToDescription[property], value.GetDescription()); d_ptr->m_stringProperyManager->setValue(d_ptr->m_properyToDescription[property], value.GetDescription());
d_ptr->m_filesProperyManager->setValue(d_ptr->m_properyToTimestep[property], value.GetTimeStep()); d_ptr->m_filesProperyManager->setValue(d_ptr->m_properyToTimestep[property], value.GetTimeStep());
d_ptr->m_filesProperyManager->setValue(d_ptr->m_properyToSimMatlab[property], value.GetSimMatlab());
d_ptr->m_filesProperyManager->setValue(d_ptr->m_properyToMatlabParam[property], value.GetMatlabParam());
d_ptr->m_filesProperyManager->setValue(d_ptr->m_properyToWave[property], value.GetWavePath());
d_ptr->m_filesProperyManager->setValue(d_ptr->m_properyToReport[property], value.GetReportPath());
d_ptr->m_filesProperyManager->setValue(d_ptr->m_properyToRD[property], value.GetRDPath());
emit propertyChanged(property); emit propertyChanged(property);
emit valueChanged(property, value); emit valueChanged(property, value);
@ -8028,6 +8055,41 @@ void QtWorkspacePropertyManager::initializeProperty(QtProperty* property) {
d_ptr->m_properyToTimestep[property] = prop; d_ptr->m_properyToTimestep[property] = prop;
d_ptr->m_timestepToPropery[prop] = property; d_ptr->m_timestepToPropery[prop] = property;
property->addSubProperty(prop); property->addSubProperty(prop);
prop = d_ptr->m_filesProperyManager->addProperty();
prop->setPropertyName(tr("SimMatlab"));
d_ptr->m_filesProperyManager->setValueOnly(prop, val.GetSimMatlab());
d_ptr->m_properyToSimMatlab[property] = prop;
d_ptr->m_simMatlabToPropery[prop] = property;
property->addSubProperty(prop);
prop = d_ptr->m_filesProperyManager->addProperty();
prop->setPropertyName(tr("MatlabParam"));
d_ptr->m_filesProperyManager->setValueOnly(prop, val.GetMatlabParam());
d_ptr->m_properyToMatlabParam[property] = prop;
d_ptr->m_simMatlabToPropery[prop] = property;
property->addSubProperty(prop);
prop = d_ptr->m_filesProperyManager->addProperty();
prop->setPropertyName(tr("Wave"));
d_ptr->m_filesProperyManager->setValueOnly(prop, val.GetWavePath());
d_ptr->m_properyToWave[property] = prop;
d_ptr->m_waveToPropery[prop] = property;
property->addSubProperty(prop);
prop = d_ptr->m_filesProperyManager->addProperty();
prop->setPropertyName(tr("RD"));
d_ptr->m_filesProperyManager->setValueOnly(prop, val.GetRDPath());
d_ptr->m_properyToRD[property] = prop;
d_ptr->m_rdToPropery[prop] = property;
property->addSubProperty(prop);
prop = d_ptr->m_filesProperyManager->addProperty();
prop->setPropertyName(tr("Report"));
d_ptr->m_filesProperyManager->setValueOnly(prop, val.GetReportPath());
d_ptr->m_properyToReport[property] = prop;
d_ptr->m_reportToPropery[prop] = property;
property->addSubProperty(prop);
} }
/*! /*!
@ -8055,6 +8117,40 @@ void QtWorkspacePropertyManager::uninitializeProperty(QtProperty* property) {
} }
d_ptr->m_properyToTimestep.remove(property); d_ptr->m_properyToTimestep.remove(property);
prop = d_ptr->m_simMatlabToPropery[property];
if (prop) {
d_ptr->m_simMatlabToPropery.remove(prop);
delete prop;
}
d_ptr->m_properyToSimMatlab.remove(property);
prop = d_ptr->m_matlabParamToPropery[property];
if (prop) {
d_ptr->m_matlabParamToPropery.remove(prop);
delete prop;
}
d_ptr->m_properyToMatlabParam.remove(property);
prop = d_ptr->m_waveToPropery[property];
if (prop) {
d_ptr->m_waveToPropery.remove(prop);
delete prop;
}
d_ptr->m_properyToWave.remove(property);
prop = d_ptr->m_reportToPropery[property];
if (prop) {
d_ptr->m_reportToPropery.remove(prop);
delete prop;
}
d_ptr->m_properyToReport.remove(property);
prop = d_ptr->m_rdToPropery[property];
if (prop) {
d_ptr->m_rdToPropery.remove(prop);
delete prop;
}
d_ptr->m_properyToRD.remove(property);
} }
#pragma endregion #pragma endregion

83
src/ui/PropertyBrowser/qtworkspaceattribute.cpp
View File

@ -88,6 +88,89 @@ const QString QWorkspaceAttribute::GetTimeStep() const {
return timestep->GetPath(); return timestep->GetPath();
} }
void QWorkspaceAttribute::SetSimMatlab(const QString& path) {
if (nullptr == workspace_) {
return;
}
workspace_->SetSimMatlab(path);
}
const QString QWorkspaceAttribute::GetSimMatlab() const {
if (nullptr == workspace_) {
return "";
}
return workspace_->GetSimMatlab();
}
void QWorkspaceAttribute::SetMatlabParam(const QString& path)
{
if (nullptr == workspace_) {
return;
}
workspace_->SetMatlabParam(path);
}
const QString QWorkspaceAttribute::GetMatlabParam() const
{
if (nullptr == workspace_) {
return "";
}
return workspace_->GetMatlabParam();
}
void QWorkspaceAttribute::SetWavePath(const QString& path)
{
if (nullptr == workspace_) {
return;
}
workspace_->SetWavePath(path);
}
const QString QWorkspaceAttribute::GetWavePath() const
{
if (nullptr == workspace_) {
return "";
}
return workspace_->GetWavePath();
}
void QWorkspaceAttribute::SetReportPath(const QString& path)
{
if (nullptr == workspace_) {
return;
}
workspace_->SetReportPath(path);
}
const QString QWorkspaceAttribute::GetReportPath() const
{
if (nullptr == workspace_) {
return "";
}
return workspace_->GetReportPath();
}
void QWorkspaceAttribute::SetRDPath(const QString& path)
{
if (nullptr == workspace_) {
return;
}
workspace_->SetRDPath(path);
}
const QString QWorkspaceAttribute::GetRDPath() const
{
if (nullptr == workspace_) {
return "";
}
return workspace_->GetRDPath();
}
QTransformAttribute::QTransformAttribute(class Transform* obj) QTransformAttribute::QTransformAttribute(class Transform* obj)
: object_(obj) { : object_(obj) {

14
src/ui/PropertyBrowser/qtworkspaceattribute.h
View File

@ -62,6 +62,20 @@ public:
void SetTimeStep(const QString& timestep); void SetTimeStep(const QString& timestep);
const QString GetTimeStep() const; const QString GetTimeStep() const;
void SetSimMatlab(const QString& path);
const QString GetSimMatlab() const;
void SetMatlabParam(const QString& path);
const QString GetMatlabParam() const;
void SetWavePath(const QString& path);
const QString GetWavePath() const;
void SetReportPath(const QString& path);
const QString GetReportPath() const;
void SetRDPath(const QString& path);
const QString GetRDPath() const;
private: private:
class WorkSpace* workspace_{ nullptr }; class WorkSpace* workspace_{ nullptr };
}; };

5
src/ui/Table/targetlistwgt.cpp
View File

@ -104,6 +104,11 @@ void TargetListWgt::AddRowData(QVariant& var)
void TargetListWgt::InitFile(const QString& strFile, int iBatchCount) void TargetListWgt::InitFile(const QString& strFile, int iBatchCount)
{ {
if (strFile.isEmpty())
{
return;
}
m_iBatchCount = iBatchCount; m_iBatchCount = iBatchCount;
m_strFile = strFile; m_strFile = strFile;
m_vecReportPoint.clear(); m_vecReportPoint.clear();

6
src/ui/chartPlot/FitCurveDialog.cpp
View File

@ -629,12 +629,18 @@ QVector<int> FitCurveDialog::getAxisRanges() {
void FitCurveDialog::InitWaveFile(const QString& strFile, int iBatchCount) void FitCurveDialog::InitWaveFile(const QString& strFile, int iBatchCount)
{ {
if (strFile.isEmpty())
return;
m_vecWavePoint.clear(); m_vecWavePoint.clear();
ParseWave(strFile, m_vecWavePoint, iBatchCount); ParseWave(strFile, m_vecWavePoint, iBatchCount);
} }
void FitCurveDialog::InitReportFile(const QString& strFile, int iBatchCount) void FitCurveDialog::InitReportFile(const QString& strFile, int iBatchCount)
{ {
if (strFile.isEmpty())
return;
m_vecReportPoint.clear(); m_vecReportPoint.clear();
ParseReport(strFile, m_vecReportPoint, iBatchCount); ParseReport(strFile, m_vecReportPoint, iBatchCount);
} }

3
src/ui/chartPlot/SurfaceDialog.cpp
View File

@ -48,6 +48,9 @@ void SurfaceDialog::AttachDock(DockWidget* dockWidget)
void SurfaceDialog::InitRD(const QString& strFile, int iBatch, int iRowCount) void SurfaceDialog::InitRD(const QString& strFile, int iBatch, int iRowCount)
{ {
if (strFile.isEmpty())
return;
m_vecRDPoint.clear(); m_vecRDPoint.clear();
ParseRD(strFile, m_vecRDPoint,iBatch, iRowCount); ParseRD(strFile, m_vecRDPoint,iBatch, iRowCount);
} }

42
src/workspace/WorkSpace.h
View File

@ -46,6 +46,41 @@ public:
inline const QString& GetDescribe() const { inline const QString& GetDescribe() const {
return describe_; return describe_;
} }
inline void SetSimMatlab(const QString& path) {
simMatlabPath_ = path;
}
inline const QString GetSimMatlab() const {
return simMatlabPath_;
}
inline void SetMatlabParam(const QString& path) {
matlabParamPath_ = path;
}
inline const QString GetMatlabParam() const {
return matlabParamPath_;
}
inline void SetWavePath(const QString& path) {
waveFile_ = path;
}
inline const QString GetWavePath() const {
return waveFile_;
}
inline void SetReportPath(const QString& path) {
reportFile_ = path;
}
inline const QString GetReportPath() const {
return reportFile_;
}
inline void SetRDPath(const QString& path) {
rdFile_ = path;
}
inline const QString GetRDPath() const {
return rdFile_;
}
inline void SetHomeViewpoint(const osgEarth::Viewpoint& viewpoint) { inline void SetHomeViewpoint(const osgEarth::Viewpoint& viewpoint) {
homeViewpoint_ = viewpoint; homeViewpoint_ = viewpoint;
} }
@ -107,6 +142,13 @@ private:
QString uuid_; QString uuid_;
QString describe_; QString describe_;
QString path_; QString path_;
QString simMatlabPath_;
QString waveFile_;
QString reportFile_;
QString rdFile_;
QString matlabParamPath_;
osgEarth::Viewpoint homeViewpoint_; osgEarth::Viewpoint homeViewpoint_;
bool leaded_{ false }; bool leaded_{ false };

88
src/workspace/WorkSpaceManager.h
View File

@ -29,83 +29,6 @@ public:
void SetCurrent(WorkSpace* workspace); void SetCurrent(WorkSpace* workspace);
WorkSpace* GetCurrent() const { return current_; } WorkSpace* GetCurrent() const { return current_; }
bool SetDYTWaveFile(const QString& file)
{
m_waveFile = file;
return true;
}
bool SetDYTReportFile(const QString& file)
{
m_reportFile = file;
return true;
}
bool SetDYTRDFile(const QString& file)
{
m_rdFile = file;
return true;
}
bool SetDYTMMainFile(const QString& file)
{
m_mMainFile = file;
return true;
}
bool SetDYTMLDFile(const QString& file)
{
m_mLDFile = file;
return true;
}
bool SetDYTMSeekerSimFile(const QString& file)
{
m_mSeekerSimFile = file;
return true;
}
bool SetDYTMatlabPFile(const QString& file)
{
m_strMatlabPile = file;
return true;
}
QString GetDYTWaveFile()
{
return m_waveFile;
}
QString GetDYTReportFile()
{
return m_reportFile;
}
QString GetDYTRDFile()
{
return m_rdFile;
}
QString GetDYTMMainFile()
{
return m_mMainFile;
}
QString GetDYTMLDFile()
{
return m_mLDFile;
}
QString GetDYTMSeekerSimFile()
{
return m_mSeekerSimFile;
}
QString GetDYTMatlabPFile()
{
return m_strMatlabPile;
}
void OnFrame(); void OnFrame();
signals: signals:
@ -119,15 +42,4 @@ private:
class OEScene* scene_{ nullptr }; class OEScene* scene_{ nullptr };
WorkSpace* current_{ nullptr }; WorkSpace* current_{ nullptr };
int64_t lastTime_{ 0 }; int64_t lastTime_{ 0 };
QString m_waveFile;
QString m_reportFile;
QString m_rdFile;
QString m_mMainFile;
QString m_mLDFile;
QString m_mSeekerSimFile;
QString m_strMatlabPile;
}; };

40
src/workspace/WorkSpaceXMLParse.cpp
View File

@ -114,7 +114,7 @@ bool WorkSpaceXMLParse::ParseChart(const tinyxml2::XMLElement* element)
const tinyxml2::XMLAttribute* attribute = xmlElement->FirstAttribute(); const tinyxml2::XMLAttribute* attribute = xmlElement->FirstAttribute();
while (nullptr != attribute) { while (nullptr != attribute) {
WorkSpaceManager::Get().SetDYTWaveFile(QString::fromLocal8Bit(attribute->Value())); workSpace_->SetWavePath(QString::fromLocal8Bit(attribute->Value()));
attribute = attribute->Next(); attribute = attribute->Next();
} }
} }
@ -124,7 +124,7 @@ bool WorkSpaceXMLParse::ParseChart(const tinyxml2::XMLElement* element)
const tinyxml2::XMLAttribute* attribute = xmlElement->FirstAttribute(); const tinyxml2::XMLAttribute* attribute = xmlElement->FirstAttribute();
while (nullptr != attribute) { while (nullptr != attribute) {
WorkSpaceManager::Get().SetDYTReportFile(QString::fromLocal8Bit(attribute->Value())); workSpace_->SetReportPath(QString::fromLocal8Bit(attribute->Value()));
attribute = attribute->Next(); attribute = attribute->Next();
} }
} }
@ -134,47 +134,17 @@ bool WorkSpaceXMLParse::ParseChart(const tinyxml2::XMLElement* element)
const tinyxml2::XMLAttribute* attribute = xmlElement->FirstAttribute(); const tinyxml2::XMLAttribute* attribute = xmlElement->FirstAttribute();
while (nullptr != attribute) { while (nullptr != attribute) {
WorkSpaceManager::Get().SetDYTRDFile(QString::fromLocal8Bit(attribute->Value())); workSpace_->SetRDPath(QString::fromLocal8Bit(attribute->Value()));
attribute = attribute->Next(); attribute = attribute->Next();
} }
} }
else if (0 == strcmp(name, "MMain")) else if (0 == strcmp(name, "SimMatlab"))
{ {
QVariantMap varChart; QVariantMap varChart;
const tinyxml2::XMLAttribute* attribute = xmlElement->FirstAttribute(); const tinyxml2::XMLAttribute* attribute = xmlElement->FirstAttribute();
while (nullptr != attribute) { while (nullptr != attribute) {
WorkSpaceManager::Get().SetDYTMMainFile(QString::fromLocal8Bit(attribute->Value())); workSpace_->SetSimMatlab(QString::fromLocal8Bit(attribute->Value()));
attribute = attribute->Next();
}
}
else if (0 == strcmp(name, "MLD"))
{
QVariantMap varChart;
const tinyxml2::XMLAttribute* attribute = xmlElement->FirstAttribute();
while (nullptr != attribute) {
WorkSpaceManager::Get().SetDYTMLDFile(QString::fromLocal8Bit(attribute->Value()));
attribute = attribute->Next();
}
}
else if (0 == strcmp(name, "MSeekerSim"))
{
QVariantMap varChart;
const tinyxml2::XMLAttribute* attribute = xmlElement->FirstAttribute();
while (nullptr != attribute) {
WorkSpaceManager::Get().SetDYTMSeekerSimFile(QString::fromLocal8Bit(attribute->Value()));
attribute = attribute->Next();
}
}
else if (0 == strcmp(name, "MatlabP"))
{
QVariantMap varChart;
const tinyxml2::XMLAttribute* attribute = xmlElement->FirstAttribute();
while (nullptr != attribute) {
WorkSpaceManager::Get().SetDYTMatlabPFile(QString::fromLocal8Bit(attribute->Value()));
attribute = attribute->Next(); attribute = attribute->Next();
} }
} }

27
src/workspace/WorkSpaceXMLWrite.cpp
View File

@ -93,46 +93,29 @@ bool WorkSpaceXMLWrite::SaveChart(tinyxml2::XMLElement* scene, tinyxml2::XMLDocu
tinyxml2::XMLElement* chart = doc->NewElement("Wave"); tinyxml2::XMLElement* chart = doc->NewElement("Wave");
charts->LinkEndChild(chart); charts->LinkEndChild(chart);
chart->SetAttribute("file", WorkSpaceManager::Get().GetDYTWaveFile().toLocal8Bit().constData()); chart->SetAttribute("file", workSpace_->GetWavePath().toLocal8Bit().constData());
} }
{ {
tinyxml2::XMLElement* chart = doc->NewElement("Report"); tinyxml2::XMLElement* chart = doc->NewElement("Report");
charts->LinkEndChild(chart); charts->LinkEndChild(chart);
chart->SetAttribute("Report", WorkSpaceManager::Get().GetDYTReportFile().toLocal8Bit().constData()); chart->SetAttribute("Report", workSpace_->GetReportPath().toLocal8Bit().constData());
} }
{ {
tinyxml2::XMLElement* chart = doc->NewElement("RD"); tinyxml2::XMLElement* chart = doc->NewElement("RD");
charts->LinkEndChild(chart); charts->LinkEndChild(chart);
chart->SetAttribute("RD", WorkSpaceManager::Get().GetDYTRDFile().toLocal8Bit().constData()); chart->SetAttribute("RD", workSpace_->GetRDPath().toLocal8Bit().constData());
} }
{ {
tinyxml2::XMLElement* chart = doc->NewElement("MMain"); tinyxml2::XMLElement* chart = doc->NewElement("SimMatlab");
charts->LinkEndChild(chart); charts->LinkEndChild(chart);
chart->SetAttribute("MMain", WorkSpaceManager::Get().GetDYTMMainFile().toLocal8Bit().constData()); chart->SetAttribute("SimMatlab", workSpace_->GetSimMatlab().toLocal8Bit().constData());
} }
{
tinyxml2::XMLElement* chart = doc->NewElement("MLD");
charts->LinkEndChild(chart);
chart->SetAttribute("MLD", WorkSpaceManager::Get().GetDYTMLDFile().toLocal8Bit().constData());
}
{
tinyxml2::XMLElement* chart = doc->NewElement("MSeekerSim");
charts->LinkEndChild(chart);
chart->SetAttribute("MSeekerSim", WorkSpaceManager::Get().GetDYTMSeekerSimFile().toLocal8Bit().constData());
}
{
tinyxml2::XMLElement* chart = doc->NewElement("MatlabP");
charts->LinkEndChild(chart);
chart->SetAttribute("MatlabP", WorkSpaceManager::Get().GetDYTMatlabPFile().toLocal8Bit().constData());
}
return true; return true;
} }