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

modified curvepanel

Browse Source
This commit is contained in:
pimin 2025-10-27 16:10:42 +08:00
commit fafd290244
12 changed files with 611 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
src/translations/Dyt_zh_CN.ts
View File

@ -61,61 +61,76 @@
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="104"/>
<source>X Axis Title:</source>
<source>Chart Type:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="111"/>
<source>Enter X axis title...</source>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="112"/>
<source>Wave</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="118"/>
<source>Y Axis Title:</source>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="117"/>
<source>Report</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="125"/>
<source>Enter Y axis title...</source>
<source>X Axis Title:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="132"/>
<source>Enter X axis title...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="139"/>
<source>Y Axis Title:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="146"/>
<source>Enter Y axis title...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="153"/>
<source>Time Parameter:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="155"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="176"/>
<source>Axis Range Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="207"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="228"/>
<source>X Min:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="267"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="288"/>
<source>X Max:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="221"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="242"/>
<source>Y Min:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="214"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="235"/>
<source>Y Max:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="187"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="208"/>
<source>X Tick Count:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="362"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="383"/>
<source>Curve Name:</source>
<translation type="unfinished"></translation>
</message>
@ -125,243 +140,265 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="274"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="295"/>
<source>Y Tick Count:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="284"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="305"/>
<source>Curve Management</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="292"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="313"/>
<source>Curves:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="318"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="339"/>
<source>Add Curve</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="331"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="352"/>
<source>Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="356"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="377"/>
<source>Selected Curve Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="369"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="390"/>
<source>Enter curve name...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="376"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="397"/>
<source>Curve Color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="391"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="412"/>
<source>Select Color</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="404"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="425"/>
<source>background-color: rgb(255, 0, 0); border: 1px solid black;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="429"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="450"/>
<source>Data Start:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="449"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="470"/>
<source>Data Stop:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="490"/>
<source>X Value:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="516"/>
<source>Y Value:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="563"/>
<source>Add File</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="500"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.ui" line="573"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="291"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="403"/>
<source>Curve %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="323"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="330"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="336"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="342"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="348"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="363"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="369"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="377"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="384"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="390"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="397"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="403"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="411"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="416"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="422"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="427"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="438"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="443"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="451"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="458"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="435"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="442"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="448"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="454"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="460"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="475"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="481"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="489"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="497"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="503"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="510"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="516"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="523"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="529"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="538"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="543"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="549"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="554"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="565"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="570"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="578"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="585"/>
<source>Validation Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="323"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="435"/>
<source>Please select a data file.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="330"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="442"/>
<source>Selected file does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="336"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="448"/>
<source>Selected file is not readable. Please check file permissions.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="342"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="454"/>
<source>File is too large (over 100MB). Please select a smaller file.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="348"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="460"/>
<source>At least one curve must be defined.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="364"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="476"/>
<source>Curve %1 name cannot be empty.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="370"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="482"/>
<source>Curve name &apos;%1&apos; is duplicated. Please use different names.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="378"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="490"/>
<source>Curve name &apos;%1&apos; is too long. Please limit to 50 characters.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="385"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="498"/>
<source>Curve &apos;%1&apos; start and stop values must be greater than 0.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="391"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="504"/>
<source>Curve &apos;%1&apos; start value cannot be greater than stop value.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="398"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="511"/>
<source>Curve &apos;%1&apos; data range is too small. At least 2 data points are required.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="404"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="517"/>
<source>Curve &apos;%1&apos; stop value is too large. Please ensure it does not exceed 1000000.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="411"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="524"/>
<source>Curve &apos;%1&apos; X value is out of range. Please ensure it is between -1000000 and 1000000.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="530"/>
<source>Curve &apos;%1&apos; Y value is out of range. Please ensure it is between -1000000 and 1000000.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="538"/>
<source>Chart name cannot be empty.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="416"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="543"/>
<source>Chart name is too long. Please limit to 100 characters.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="422"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="549"/>
<source>X axis title is too long. Please limit to 50 characters.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="427"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="554"/>
<source>Y axis title is too long. Please limit to 50 characters.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="438"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="565"/>
<source>X axis minimum value must be less than maximum value.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="443"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="570"/>
<source>Y axis minimum value must be less than maximum value.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="451"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="578"/>
<source>Time parameter cannot be negative.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="458"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="585"/>
<source>X axis tick count must be at least 2.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="478"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="506"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="531"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="605"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="634"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="659"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="478"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="605"/>
<source>Failed to create file entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="506"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="634"/>
<source>Unable to get current workspace</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="516"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="644"/>
<source>Curve file count has reached the limit (9 files)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="519"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="647"/>
<source>File already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="522"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="650"/>
<source>File copy failed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="525"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="653"/>
<source>Invalid file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="528"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="656"/>
<source>Failed to add file</source>
<translation type="unfinished"></translation>
</message>

52
src/ui/Panel/CurvePanel.cpp
View File

@ -119,10 +119,18 @@ void CurvePanel::UpdateCurveDisplay()
QCheckBox* curveCheckBox = new QCheckBox(curve.name);
curveCheckBox->setChecked(true);
// Curve info
// Curve info - display different information based on chart type
QString colorStr = QString("rgb(%1,%2,%3)").arg(curve.color.red()).arg(curve.color.green()).arg(curve.color.blue());
QLabel* curveInfo = new QLabel(QString("Range: %1-%2, Color: %3")
.arg(curve.start).arg(curve.stop).arg(colorStr));
QLabel* curveInfo;
if (chartProperties.chartType == ChartType::Wave) {
curveInfo = new QLabel(QString("Range: %1-%2, Color: %3")
.arg(curve.data.wave.start).arg(curve.data.wave.stop).arg(colorStr));
} else {
curveInfo = new QLabel(QString("Position: (%1,%2), Color: %3")
.arg(curve.data.report.x).arg(curve.data.report.y).arg(colorStr));
}
curveInfo->setStyleSheet(QString("QLabel { color: %1; }").arg(colorStr));
curveLayout->addWidget(curveCheckBox);
@ -176,8 +184,8 @@ void CurvePanel::UpdateCurveDisplay()
// curveCheckBox->setChecked(true);
// QLabel* curveInfo = new QLabel(QString("Range: %1-%2, Color: %3, Pos: (%4,%5,%6)")
// .arg(curve.start).arg(curve.stop).arg(curve.color)
// .arg(curve.x).arg(curve.y).arg(curve.z));
// .arg(curve.data.wave.start).arg(curve.data.wave.stop).arg(curve.color)
// .arg(curve.data.report.x).arg(curve.data.report.y).arg(curve.z));
// curveInfo->setStyleSheet(QString("QLabel { color: rgb(%1); }").arg(curve.color));
// curveLayout->addWidget(curveCheckBox);
@ -340,19 +348,15 @@ void CurvePanel::OnDataPanelUpdated(FileEntryCurve* fileEntry) {
updateMinMaxX(propChart.xMin, propChart.xMax, propChart.xCount);
updateMinMaxY(propChart.yMin, propChart.yMax, propChart.yCount);
QString strFile = fileEntry->GetPath() + "/" + fileEntry->GetFileName();
FileEntryCurve::CurveProperties propCurves = fileEntry->GetCurveProperties();
if (propCurves.size() > 0)
if (propChart.chartType == ChartType::Wave)
{
QString strFile = fileEntry->GetPath();
if (propCurves.at(0).start == 0 && propCurves.at(0).stop == 0)
{
updateParseReportFile(strFile, propChart.timeParam, propCurves);
}
else
{
updateParseWaveFile(strFile, propChart.timeParam, propCurves);
}
updateParseWaveFile(strFile, propChart.timeParam, propCurves);
}
else if (propChart.chartType == ChartType::Report)
{
updateParseReportFile(strFile, propChart.timeParam, propCurves);
}
}
@ -490,7 +494,7 @@ void CurvePanel::updateParseWaveFile(const QString& strFile, int nT, FileEntryCu
if (bResetAxisX)
{
int nMax = propCurve.stop - propCurve.start;
int nMax = propCurve.data.wave.stop - propCurve.data.wave.start;
if (m_iXMax < nMax)
{
m_iXMax = nMax;
@ -498,7 +502,7 @@ void CurvePanel::updateParseWaveFile(const QString& strFile, int nT, FileEntryCu
}
QVariantList listData;
for (int nJ = propCurve.start; nJ < propCurve.stop; nJ++)
for (int nJ = propCurve.data.wave.start; nJ < propCurve.data.wave.stop; nJ++)
{
double value = listLine.at(nJ).toDouble();
listData.push_back(value);
@ -602,8 +606,8 @@ void CurvePanel::updateParseReportFile(const QString & strFile, int nT, FileEntr
{
FileEntryCurve::CurveProperty propCurve = listCurve.at(nI);
double x = listLine.at(propCurve.x).toDouble();
double y = listLine.at(propCurve.y).toDouble();
double x = listLine.at(propCurve.data.report.x).toDouble();
double y = listLine.at(propCurve.data.report.y).toDouble();
QPointF ptData = QPointF(x, y);
mapData.insert(nI, ptData);
@ -713,7 +717,11 @@ void CurvePanel::updateReportData(double t)
}
}
}
}
}
void CurvePanel::OnTimeChanged(double time)
{
updateWaveData(time);
updateReportData(time);
}

2
src/ui/Panel/CurvePanel.h
View File

@ -72,6 +72,8 @@ protected:
void OnDataPanelUpdated(FileEntryCurve* fileEntry);
virtual void OnTimeChanged(double time);
private:
/**
* @brief Update curve display based on chart data

7
src/ui/Panel/DataPanel.h
View File

@ -81,6 +81,13 @@ public:
* @brief Refresh panel content (virtual function, implemented by derived classes)
*/
virtual void RefreshPanel() {}
/**
* @brief Handle time change event (virtual function, implemented by derived classes)
* @param time Current time value from Timestep
*/
virtual void OnTimeChanged(double time) {}
/**
* @brief Initialize UI (virtual function, derived classes implement specific layout)
*/

43
src/ui/Panel/DataPanelManager.cpp
View File

@ -5,10 +5,12 @@
#include "ui/DockTitleBar.h"
#include "ui/MainWindow.h"
#include "workspace/FileEntry.h"
#include "workspace/Timestep.h"
#include "common/SpdLogger.h"
#include <QFileInfo>
#include <QDir>
#include <QSet>
const QString DataPanelManager::PANEL_OBJECT_NAME_PREFIX = "DataPanel_";
@ -42,6 +44,18 @@ void DataPanelManager::SetWorkspace(WorkSpace* workspace)
// Connect new workspace signals
if (currentWorkspace_) {
connect(currentWorkspace_, &WorkSpace::FilesChanged, this, &DataPanelManager::OnFilesChanged);
// Connect to Timestep signals if available
if (currentWorkspace_->GetTimestep()) {
connect(currentWorkspace_->GetTimestep(), &Timestep::TimeChanged, this, &DataPanelManager::OnTimeChanged);
}
// Connect to TimestepChanged signal to handle future Timestep changes
connect(currentWorkspace_, &WorkSpace::TimestepChanged, this, [this](Timestep* timestep) {
if (timestep) {
connect(timestep, &Timestep::TimeChanged, this, &DataPanelManager::OnTimeChanged);
}
});
}
// Update all panel types
@ -292,12 +306,31 @@ QString DataPanelManager::GeneratePanelObjectName(FileEntryType fileType, int in
int DataPanelManager::FindNextAvailableIndex(FileEntryType fileType) const
{
int index = 0;
QString baseKey = QString("%1_").arg(FileEntryTypeToString(fileType));
QSet<int> usedIndices;
QString typeStr = FileEntryTypeToString(fileType);
while (dataPanels_.contains(baseKey + QString::number(index))) {
index++;
for (auto it = dataPanels_.constBegin(); it != dataPanels_.constEnd(); ++it) {
if (it.value()->GetFileType() == fileType) {
usedIndices.insert(it.value()->GetIndex());
}
}
return index;
for (int i = 0; i < GetMaxPanelCount(); ++i) {
if (!usedIndices.contains(i)) {
return i;
}
}
return -1; // No available index
}
void DataPanelManager::OnTimeChanged(double time)
{
// Notify all active panels about time change
for (auto it = dataPanels_.constBegin(); it != dataPanels_.constEnd(); ++it) {
DataPanel* panel = it.value();
if (panel) {
panel->OnTimeChanged(time);
}
}
}

6
src/ui/Panel/DataPanelManager.h
View File

@ -68,6 +68,12 @@ public slots:
*/
void OnPanelClosed();
/**
* @brief Handle time change event from Timestep
* @param time Current time value
*/
void OnTimeChanged(double time);
private:
/**
* @brief Update panels for specific file type

344
src/ui/WorkSpace/AddCurveFileDlg.cpp
View File

@ -19,7 +19,17 @@ AddCurveFileDlg::AddCurveFileDlg(QWidget* parent)
SetupUI(ui);
SetTitle(getDialogTitle());
// Initialize chart type combo box
ui->chartTypeComboBox->addItem("Wave", static_cast<int>(ChartType::Wave));
ui->chartTypeComboBox->addItem("Report", static_cast<int>(ChartType::Report));
ui->chartTypeComboBox->setCurrentIndex(0); // Default to Wave
// Initialize chart properties with default values
chartProperties_.chartType = ChartType::Wave;
setupConnections();
updateCurvePropertiesUI(); // Initialize UI based on default chart type
}
AddCurveFileDlg::~AddCurveFileDlg() {
@ -30,6 +40,9 @@ void AddCurveFileDlg::setupConnections() {
// File selection connections
connect(ui->selectFileBtn, &QToolButton::clicked, this, &AddCurveFileDlg::OnSelectFile);
// Chart type connection
connect(ui->chartTypeComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &AddCurveFileDlg::onChartTypeChanged);
// Curve management connections
connect(ui->addCurveBtn, &QPushButton::clicked, this, &AddCurveFileDlg::onAddCurveClicked);
connect(ui->removeCurveBtn, &QPushButton::clicked, this, &AddCurveFileDlg::onRemoveCurveClicked);
@ -41,6 +54,8 @@ void AddCurveFileDlg::setupConnections() {
connect(ui->curveNameEdit, &QLineEdit::textChanged, this, &AddCurveFileDlg::onCurveNameChanged);
connect(ui->dataStartSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &AddCurveFileDlg::onCurveDataChanged);
connect(ui->dataStopSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &AddCurveFileDlg::onCurveDataChanged);
connect(ui->xValueSpinBox, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &AddCurveFileDlg::onCurveDataChanged);
connect(ui->yValueSpinBox, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &AddCurveFileDlg::onCurveDataChanged);
// Dialog buttons
connect(ui->addBtn, &QPushButton::clicked, this, &AddCurveFileDlg::onSure);
@ -78,24 +93,44 @@ void AddCurveFileDlg::onAddCurveClicked() {
saveCurveProperties();
}
// Create new curve with default properties
// Create new curve with default properties based on chart type
FileEntryCurve::CurveProperty newCurve;
newCurve.name = generateCurveName();
newCurve.color = generateCurveColor();
newCurve.start = 1;
newCurve.stop = 241;
// Set default values based on chart type
if (chartProperties_.chartType == ChartType::Wave) {
newCurve.data.wave.start = 1;
newCurve.data.wave.stop = 241;
} else {
newCurve.data.report.x = 0.0;
newCurve.data.report.y = 0.0;
}
// Add to curves list and UI
curves_.append(newCurve);
// Add to UI list widget
QListWidgetItem* item = new QListWidgetItem(QString("%1 [%2,%3] (%4,%5,%6)")
.arg(newCurve.name)
.arg(newCurve.start)
.arg(newCurve.stop)
.arg(newCurve.color.red())
.arg(newCurve.color.green())
.arg(newCurve.color.blue()));
// Add to UI list widget with appropriate display format
QString displayText;
if (chartProperties_.chartType == ChartType::Wave) {
displayText = QString("%1 [%2,%3] (%4,%5,%6)")
.arg(newCurve.name)
.arg(newCurve.data.wave.start)
.arg(newCurve.data.wave.stop)
.arg(newCurve.color.red())
.arg(newCurve.color.green())
.arg(newCurve.color.blue());
} else {
displayText = QString("%1 (%.2f,%.2f) (%4,%5,%6)")
.arg(newCurve.name)
.arg(newCurve.data.report.x)
.arg(newCurve.data.report.y)
.arg(newCurve.color.red())
.arg(newCurve.color.green())
.arg(newCurve.color.blue());
}
QListWidgetItem* item = new QListWidgetItem(displayText);
ui->curveListWidget->addItem(item);
++currentCurveIndex_;
@ -138,24 +173,25 @@ void AddCurveFileDlg::onCurveListWidgetItemClicked(QListWidgetItem* item) {
return;
}
// 获取点击项的索引
int clickedIndex = ui->curveListWidget->row(item);
// 如果点击的是当前选中项，可以进入编辑模式
if (clickedIndex == currentCurveIndex_) {
ui->curveNameEdit->setText(curves_[currentCurveIndex_].name);
ui->dataStartSpinBox->setValue(curves_[currentCurveIndex_].start);
ui->dataStopSpinBox->setValue(curves_[currentCurveIndex_].stop);
if (chartProperties_.chartType == ChartType::Wave) {
ui->dataStartSpinBox->setValue(curves_[currentCurveIndex_].data.wave.start);
ui->dataStopSpinBox->setValue(curves_[currentCurveIndex_].data.wave.stop);
} else {
ui->xValueSpinBox->setValue(curves_[currentCurveIndex_].data.report.x);
ui->yValueSpinBox->setValue(curves_[currentCurveIndex_].data.report.y);
}
updateColorPreview(curves_[currentCurveIndex_].color);
// 启用曲线属性编辑
enableCurveProperties(true);
// 将焦点设置到曲线名称编辑框，方便用户直接编辑
ui->curveNameEdit->setFocus();
ui->curveNameEdit->selectAll();
} else {
// 如果点击的是不同的项，更新选择
onCurveSelectionChanged();
}
}
@ -185,35 +221,65 @@ void AddCurveFileDlg::onCurveNameChanged() {
QString newName = ui->curveNameEdit->text();
curves_[currentCurveIndex_].name = newName;
// Update list item text
QListWidgetItem* item = ui->curveListWidget->item(currentCurveIndex_);
if (item) {
item->setText(QString("%1 [%2,%3] (%4,%5,%6)")
.arg(newName)
.arg(curves_[currentCurveIndex_].start)
.arg(curves_[currentCurveIndex_].stop)
.arg(curves_[currentCurveIndex_].color.red())
.arg(curves_[currentCurveIndex_].color.green())
.arg(curves_[currentCurveIndex_].color.blue()));
}
// Update list item text with appropriate format
QListWidgetItem* item = ui->curveListWidget->item(currentCurveIndex_);
if (item) {
QString displayText;
if (chartProperties_.chartType == ChartType::Wave) {
displayText = QString("%1 [%2,%3] (%4,%5,%6)")
.arg(newName)
.arg(curves_[currentCurveIndex_].data.wave.start)
.arg(curves_[currentCurveIndex_].data.wave.stop)
.arg(curves_[currentCurveIndex_].color.red())
.arg(curves_[currentCurveIndex_].color.green())
.arg(curves_[currentCurveIndex_].color.blue());
} else {
displayText = QString("%1 (%.2f,%.2f) (%4,%5,%6)")
.arg(newName)
.arg(curves_[currentCurveIndex_].data.report.x)
.arg(curves_[currentCurveIndex_].data.report.y)
.arg(curves_[currentCurveIndex_].color.red())
.arg(curves_[currentCurveIndex_].color.green())
.arg(curves_[currentCurveIndex_].color.blue());
}
item->setText(displayText);
}
}
}
void AddCurveFileDlg::onCurveDataChanged() {
if (currentCurveIndex_ >= 0 && currentCurveIndex_ < curves_.size()) {
curves_[currentCurveIndex_].start = ui->dataStartSpinBox->value();
curves_[currentCurveIndex_].stop = ui->dataStopSpinBox->value();
// Update curve data based on chart type
if (chartProperties_.chartType == ChartType::Wave) {
curves_[currentCurveIndex_].data.wave.start = ui->dataStartSpinBox->value();
curves_[currentCurveIndex_].data.wave.stop = ui->dataStopSpinBox->value();
} else {
curves_[currentCurveIndex_].data.report.x = ui->xValueSpinBox->value();
curves_[currentCurveIndex_].data.report.y = ui->yValueSpinBox->value();
}
// Update list item text
// Update display text in list widget
QListWidgetItem* item = ui->curveListWidget->item(currentCurveIndex_);
if (item) {
item->setText(QString("%1 [%2,%3] (%4,%5,%6)")
.arg(curves_[currentCurveIndex_].name)
.arg(curves_[currentCurveIndex_].start)
.arg(curves_[currentCurveIndex_].stop)
.arg(curves_[currentCurveIndex_].color.red())
.arg(curves_[currentCurveIndex_].color.green())
.arg(curves_[currentCurveIndex_].color.blue()));
QString itemText;
if (chartProperties_.chartType == ChartType::Wave) {
itemText = QString("%1 [%2,%3] (%4,%5,%6)")
.arg(curves_[currentCurveIndex_].name)
.arg(curves_[currentCurveIndex_].data.wave.start)
.arg(curves_[currentCurveIndex_].data.wave.stop)
.arg(curves_[currentCurveIndex_].color.red())
.arg(curves_[currentCurveIndex_].color.green())
.arg(curves_[currentCurveIndex_].color.blue());
} else {
itemText = QString("%1 (%2,%3) (%4,%5,%6)")
.arg(curves_[currentCurveIndex_].name)
.arg(curves_[currentCurveIndex_].data.report.x)
.arg(curves_[currentCurveIndex_].data.report.y)
.arg(curves_[currentCurveIndex_].color.red())
.arg(curves_[currentCurveIndex_].color.green())
.arg(curves_[currentCurveIndex_].color.blue());
}
item->setText(itemText);
}
}
}
@ -227,39 +293,69 @@ void AddCurveFileDlg::onColorButtonClicked() {
updateColorPreview(color);
// Update list item text
QListWidgetItem* item = ui->curveListWidget->item(currentCurveIndex_);
if (item) {
item->setText(QString("%1 [%2,%3] (%4,%5,%6)")
.arg(curves_[currentCurveIndex_].name)
.arg(curves_[currentCurveIndex_].start)
.arg(curves_[currentCurveIndex_].stop)
.arg(color.red())
.arg(color.green())
.arg(color.blue()));
}
QListWidgetItem* item = ui->curveListWidget->item(currentCurveIndex_);
if (item) {
QString itemText;
if (chartProperties_.chartType == ChartType::Wave) {
itemText = QString("%1 [%2,%3] (%4,%5,%6)")
.arg(curves_[currentCurveIndex_].name)
.arg(curves_[currentCurveIndex_].data.wave.start)
.arg(curves_[currentCurveIndex_].data.wave.stop)
.arg(color.red())
.arg(color.green())
.arg(color.blue());
} else {
itemText = QString("%1 (%2,%3) (%4,%5,%6)")
.arg(curves_[currentCurveIndex_].name)
.arg(curves_[currentCurveIndex_].data.report.x)
.arg(curves_[currentCurveIndex_].data.report.y)
.arg(color.red())
.arg(color.green())
.arg(color.blue());
}
item->setText(itemText);
}
}
}
}
void AddCurveFileDlg::addCurveToList(const FileEntryCurve::CurveProperty& curve) {
QString itemText = QString("%1 [%2,%3] (%4,%5,%6)")
.arg(curve.name)
.arg(curve.start)
.arg(curve.stop)
.arg(curve.color.red())
.arg(curve.color.green())
.arg(curve.color.blue());
ui->curveListWidget->addItem(itemText);
}
QString itemText;
if (chartProperties_.chartType == ChartType::Wave) {
itemText = QString("%1 [%2,%3] (%4,%5,%6)")
.arg(curve.name)
.arg(curve.data.wave.start)
.arg(curve.data.wave.stop)
.arg(curve.color.red())
.arg(curve.color.green())
.arg(curve.color.blue());
} else {
itemText = QString("%1 (%2,%3) (%4,%5,%6)")
.arg(curve.name)
.arg(curve.data.report.x)
.arg(curve.data.report.y)
.arg(curve.color.red())
.arg(curve.color.green())
.arg(curve.color.blue());
}
ui->curveListWidget->addItem(itemText);
}
void AddCurveFileDlg::updateCurveProperties() {
if (currentCurveIndex_ >= 0 && currentCurveIndex_ < curves_.size()) {
const FileEntryCurve::CurveProperty& curve = curves_[currentCurveIndex_];
ui->curveNameEdit->setText(curve.name);
ui->dataStartSpinBox->setValue(curve.start);
ui->dataStopSpinBox->setValue(curve.stop);
// Update properties based on chart type
if (chartProperties_.chartType == ChartType::Wave) {
ui->dataStartSpinBox->setValue(curve.data.wave.start);
ui->dataStopSpinBox->setValue(curve.data.wave.stop);
} else {
ui->xValueSpinBox->setValue(curve.data.report.x);
ui->yValueSpinBox->setValue(curve.data.report.y);
}
selectedColor_ = curve.color;
updateColorPreview(curve.color);
@ -269,16 +365,32 @@ void AddCurveFileDlg::updateCurveProperties() {
void AddCurveFileDlg::saveCurveProperties() {
if (currentCurveIndex_ >= 0 && currentCurveIndex_ < curves_.size()) {
curves_[currentCurveIndex_].name = ui->curveNameEdit->text();
curves_[currentCurveIndex_].start = ui->dataStartSpinBox->value();
curves_[currentCurveIndex_].stop = ui->dataStopSpinBox->value();
// Save properties based on chart type
if (chartProperties_.chartType == ChartType::Wave) {
curves_[currentCurveIndex_].data.wave.start = ui->dataStartSpinBox->value();
curves_[currentCurveIndex_].data.wave.stop = ui->dataStopSpinBox->value();
} else {
curves_[currentCurveIndex_].data.report.x = ui->xValueSpinBox->value();
curves_[currentCurveIndex_].data.report.y = ui->yValueSpinBox->value();
}
curves_[currentCurveIndex_].color = selectedColor_;
}
}
void AddCurveFileDlg::clearCurveProperties() {
ui->curveNameEdit->clear();
ui->dataStartSpinBox->setValue(1);
ui->dataStopSpinBox->setValue(241);
// Clear properties based on chart type
if (chartProperties_.chartType == ChartType::Wave) {
ui->dataStartSpinBox->setValue(1);
ui->dataStopSpinBox->setValue(241);
} else {
ui->xValueSpinBox->setValue(0.0);
ui->yValueSpinBox->setValue(0.0);
}
selectedColor_ = QColor(255, 0, 0);
updateColorPreview(selectedColor_);
}
@ -379,30 +491,45 @@ bool AddCurveFileDlg::validateSpecificParams() {
return false;
}
// Data range validation
if (curve.start < 1 || curve.stop < 1) {
QMessageBox::warning(this, tr("Validation Error"),
tr("Curve '%1' start and stop values must be greater than 0.").arg(curve.name));
return false;
}
if (curve.start > curve.stop) {
QMessageBox::warning(this, tr("Validation Error"),
tr("Curve '%1' start value cannot be greater than stop value.").arg(curve.name));
return false;
}
// Data range reasonableness validation
if (curve.stop - curve.start < 1) {
QMessageBox::warning(this, tr("Validation Error"),
tr("Curve '%1' data range is too small. At least 2 data points are required.").arg(curve.name));
return false;
}
if (curve.stop > 1000000) {
QMessageBox::warning(this, tr("Validation Error"),
tr("Curve '%1' stop value is too large. Please ensure it does not exceed 1000000.").arg(curve.name));
return false;
// Data range validation based on chart type
if (chartProperties_.chartType == ChartType::Wave) {
if (curve.data.wave.start < 1 || curve.data.wave.stop < 1) {
QMessageBox::warning(this, tr("Validation Error"),
tr("Curve '%1' start and stop values must be greater than 0.").arg(curve.name));
return false;
}
if (curve.data.wave.start > curve.data.wave.stop) {
QMessageBox::warning(this, tr("Validation Error"),
tr("Curve '%1' start value cannot be greater than stop value.").arg(curve.name));
return false;
}
// Data range reasonableness validation
if (curve.data.wave.stop - curve.data.wave.start < 1) {
QMessageBox::warning(this, tr("Validation Error"),
tr("Curve '%1' data range is too small. At least 2 data points are required.").arg(curve.name));
return false;
}
if (curve.data.wave.stop > 1000000) {
QMessageBox::warning(this, tr("Validation Error"),
tr("Curve '%1' stop value is too large. Please ensure it does not exceed 1000000.").arg(curve.name));
return false;
}
} else {
// Report type validation - ensure x and y values are reasonable
if (curve.data.report.x < -1000000 || curve.data.report.x > 1000000) {
QMessageBox::warning(this, tr("Validation Error"),
tr("Curve '%1' X value is out of range. Please ensure it is between -1000000 and 1000000.").arg(curve.name));
return false;
}
if (curve.data.report.y < -1000000 || curve.data.report.y > 1000000) {
QMessageBox::warning(this, tr("Validation Error"),
tr("Curve '%1' Y value is out of range. Please ensure it is between -1000000 and 1000000.").arg(curve.name));
return false;
}
}
}
@ -484,6 +611,7 @@ void AddCurveFileDlg::onSure() {
// Set chart properties
FileEntryCurve::ChartProperties chartProps;
chartProps.chartType = chartProperties_.chartType; // Set chart type
chartProps.xCount = ui->xCountSpinBox->value();
chartProps.yCount = ui->yCountSpinBox->value();
chartProps.xTitle = ui->xTitleEdit->text();
@ -535,3 +663,39 @@ void AddCurveFileDlg::onSure() {
accept();
}
}
void AddCurveFileDlg::onChartTypeChanged() {
// Save current curve properties if any curve is selected
if (currentCurveIndex_ >= 0) {
saveCurveProperties();
}
// Update chart type based on combo box selection
int selectedIndex = ui->chartTypeComboBox->currentIndex();
ChartType newChartType = static_cast<ChartType>(ui->chartTypeComboBox->itemData(selectedIndex).toInt());
chartProperties_.chartType = newChartType;
// Update UI to show appropriate curve property controls
updateCurvePropertiesUI();
// Update current curve properties display if a curve is selected
if (currentCurveIndex_ >= 0) {
updateCurveProperties();
}
}
void AddCurveFileDlg::updateCurvePropertiesUI() {
bool isWaveType = (chartProperties_.chartType == ChartType::Wave);
// Show/hide Wave type controls (Data Start/Stop)
ui->dataStartLabel->setVisible(isWaveType);
ui->dataStartSpinBox->setVisible(isWaveType);
ui->dataStopLabel->setVisible(isWaveType);
ui->dataStopSpinBox->setVisible(isWaveType);
// Show/hide Report type controls (X/Y Value)
ui->xValueLabel->setVisible(!isWaveType);
ui->xValueSpinBox->setVisible(!isWaveType);
ui->yValueLabel->setVisible(!isWaveType);
ui->yValueSpinBox->setVisible(!isWaveType);
}

19
src/ui/WorkSpace/AddCurveFileDlg.h
View File

@ -2,21 +2,16 @@
#include "BaseAddFileDlg.h"
#include "workspace/FileEntry.h"
#include <QColor>
#include <QList>
#include <memory>
QT_BEGIN_NAMESPACE
class QComboBox;
class QLineEdit;
class QCheckBox;
class QSpinBox;
class QDoubleSpinBox;
class QComboBox;
class QTextEdit;
class QToolButton;
class QLabel;
class QPushButton;
class QListWidget;
class QListWidgetItem;
class QPushButton;
class QLabel;
QT_END_NAMESPACE
namespace Ui {
class AddCurveFileDlg;
@ -39,10 +34,11 @@ private slots:
void onColorButtonClicked();
void onAddCurveClicked();
void onRemoveCurveClicked();
void onCurveListWidgetItemClicked(QListWidgetItem* item);
void onCurveListWidgetItemClicked(class QListWidgetItem* item);
void onCurveSelectionChanged();
void onCurveNameChanged();
void onCurveDataChanged();
void onChartTypeChanged();
void onSure();
private:
@ -50,6 +46,7 @@ private:
void updateColorPreview(const QColor& color);
void addCurveToList(const FileEntryCurve::CurveProperty& curve);
void updateCurveProperties();
void updateCurvePropertiesUI();
void saveCurveProperties();
void clearCurveProperties();
void enableCurveProperties(bool enabled);

86
src/ui/WorkSpace/AddCurveFileDlg.ui
View File

@ -99,52 +99,52 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="chartTypeLabel">
<property name="text">
<string>Chart Type:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="chartTypeComboBox"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="xTitleLabel">
<property name="text">
<string>X Axis Title:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<item row="2" column="1">
<widget class="QLineEdit" name="xTitleEdit">
<property name="placeholderText">
<string>Enter X axis title...</string>
</property>
</widget>
</item>
<item row="2" column="0">
<item row="3" column="0">
<widget class="QLabel" name="yTitleLabel">
<property name="text">
<string>Y Axis Title:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="3" column="1">
<widget class="QLineEdit" name="yTitleEdit">
<property name="placeholderText">
<string>Enter Y axis title...</string>
</property>
</widget>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QLabel" name="timeParamLabel">
<property name="text">
<string>Time Parameter:</string>
<string>Time:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="timeParamSpinBox">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>999999.000000000000000</double>
</property>
<property name="value">
<double>0.000000000000000</double>
</property>
</widget>
<item row="4" column="1">
<widget class="QSpinBox" name="timeParamSpinBox"/>
</item>
</layout>
</widget>
@ -463,6 +463,58 @@
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="xValueLabel">
<property name="visible">
<bool>false</bool>
</property>
<property name="text">
<string>X Value:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QDoubleSpinBox" name="xValueSpinBox">
<property name="visible">
<bool>false</bool>
</property>
<property name="minimum">
<double>-999999.000000000000000</double>
</property>
<property name="maximum">
<double>999999.000000000000000</double>
</property>
<property name="value">
<double>0.000000000000000</double>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="yValueLabel">
<property name="visible">
<bool>false</bool>
</property>
<property name="text">
<string>Y Value:</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QDoubleSpinBox" name="yValueSpinBox">
<property name="visible">
<bool>false</bool>
</property>
<property name="minimum">
<double>-999999.000000000000000</double>
</property>
<property name="maximum">
<double>999999.000000000000000</double>
</property>
<property name="value">
<double>0.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>

53
src/workspace/FileEntry.cpp
View File

@ -259,6 +259,7 @@ bool FileEntryCurve::SaveFiles(tinyxml2::XMLElement* scene, tinyxml2::XMLDocumen
// 设置chart属性
chartElement->SetAttribute("name", name_.toUtf8().constData());
chartElement->SetAttribute("path", fileName_.toUtf8().constData());
chartElement->SetAttribute("Type", ChartTypeToString(chartProperties_.chartType)); // 新增：保存Chart类型
chartElement->SetAttribute("xCount", chartProperties_.xCount);
chartElement->SetAttribute("yCount", chartProperties_.yCount);
chartElement->SetAttribute("xTitle", chartProperties_.xTitle.toUtf8().constData());
@ -276,8 +277,15 @@ bool FileEntryCurve::SaveFiles(tinyxml2::XMLElement* scene, tinyxml2::XMLDocumen
curveElement->SetAttribute("name", curve.name.toUtf8().constData());
curveElement->SetAttribute("color", QColorToString(curve.color).toUtf8().constData());
curveElement->SetAttribute("start", curve.start);
curveElement->SetAttribute("stop", curve.stop);
// 根据Chart类型保存不同的属性
if (chartProperties_.chartType == ChartType::Wave) {
curveElement->SetAttribute("start", curve.data.wave.start);
curveElement->SetAttribute("stop", curve.data.wave.stop);
} else if (chartProperties_.chartType == ChartType::Report) {
curveElement->SetAttribute("x", curve.data.report.x);
curveElement->SetAttribute("y", curve.data.report.y);
}
}
return true;
@ -308,6 +316,19 @@ bool FileEntryCurve::ParseFiles(const tinyxml2::XMLElement* chartElement) {
path_ = fileInfo.absolutePath();
}
// 解析Chart类型（新增）
const char* typeAttr = chartElement->Attribute("Type");
if (typeAttr) {
ChartType chartType;
if (ChartTypeFromString(typeAttr, chartType)) {
chartProperties_.chartType = chartType;
} else {
chartProperties_.chartType = ChartType::Wave; // 默认为Wave
}
} else {
chartProperties_.chartType = ChartType::Wave; // 向后兼容，默认为Wave
}
chartProperties_.xCount = chartElement->IntAttribute("xCount", 0);
chartProperties_.yCount = chartElement->IntAttribute("yCount", 0);
@ -335,26 +356,14 @@ bool FileEntryCurve::ParseFiles(const tinyxml2::XMLElement* chartElement) {
if (curveNameAttr) curve.name = QString::fromUtf8(curveNameAttr);
if (colorAttr) curve.color = StringToQColor(QString::fromUtf8(colorAttr));
const char* startAttr = curveElement->Attribute("start");
if (startAttr)
{
curve.start = curveElement->IntAttribute("start", 0);
}
const char* stopAttr = curveElement->Attribute("stop");
if (stopAttr)
{
curve.stop = curveElement->IntAttribute("stop", 0);
}
const char* xAttr = curveElement->Attribute("x");
if (xAttr)
{
curve.x = curveElement->IntAttribute("x", 0);
}
const char* yAttr = curveElement->Attribute("y");
if (yAttr)
{
curve.y = curveElement->IntAttribute("y", 0);
}
// 根据Chart类型解析不同的属性
if (chartProperties_.chartType == ChartType::Wave) {
curve.data.wave.start = curveElement->IntAttribute("start", 0);
curve.data.wave.stop = curveElement->IntAttribute("stop", 0);
} else if (chartProperties_.chartType == ChartType::Report) {
curve.data.report.x = curveElement->DoubleAttribute("x", 0.0);
curve.data.report.y = curveElement->DoubleAttribute("y", 0.0);
}
curveProperties_.append(curve);
}

51
src/workspace/FileEntry.h
View File

@ -11,6 +11,26 @@ enum class FileEntryType {
Light
};
enum class ChartType {
Wave,
Report
};
inline const char* ChartTypeToString(ChartType t) {
switch (t) {
case ChartType::Wave: return "Wave";
case ChartType::Report: return "Report";
}
return "Wave";
}
inline bool ChartTypeFromString(const char* s, ChartType& out) {
if (!s) return false;
if (0 == strcmp(s, "Wave")) { out = ChartType::Wave; return true; }
if (0 == strcmp(s, "Report")) { out = ChartType::Report; return true; }
return false;
}
inline const char* FileEntryTypeToString(FileEntryType t) {
switch (t) {
case FileEntryType::Curve: return "curve";
@ -84,6 +104,7 @@ std::shared_ptr<FileEntryLight> CreateEmptyFileEntryLight();
class FileEntryCurve : public FileEntry {
public:
struct ChartProperties {
ChartType chartType; // 新增：Chart类型
int xCount;
int yCount; // 对应XML的yCount
QString xTitle;
@ -98,28 +119,34 @@ public:
struct CurveProperty {
QString name;
QColor color;
int start;
int stop;
int x;
int y;
CurveProperty() {
name = "";
start = 0;
stop = 0;
x = 0;
y = 0;
}
// Wave类型使用start/stop，Report类型使用x/y
union {
struct {
int start;
int stop;
} wave;
struct {
double x;
double y;
} report;
} data;
};
using CurveProperties = QList<CurveProperty>;
public:
FileEntryCurve() { type_ = FileEntryType::Curve; }
FileEntryCurve() {
type_ = FileEntryType::Curve;
chartProperties_.chartType = ChartType::Wave; // 默认为Wave类型
}
void SetChartProperties(const ChartProperties& props) { chartProperties_ = props; }
const ChartProperties& GetChartProperties() const { return chartProperties_; }
void SetChartType(ChartType type) { chartProperties_.chartType = type; }
ChartType GetChartType() const { return chartProperties_.chartType; }
void AddCurveProperty(const CurveProperty& prop) { curveProperties_.append(prop); }
void RemoveCurveProperty(int index) { curveProperties_.removeAt(index); }
const CurveProperties& GetCurveProperties() const { return curveProperties_; }

13
src/workspace/WorkSpaceXMLParse.cpp
View File

@ -107,6 +107,19 @@ bool WorkSpaceXMLParse::ParseFiles(const tinyxml2::XMLElement* element) {
return false;
}
// 首先处理新的Chart元素结构
const tinyxml2::XMLElement* chartElement = element->FirstChildElement("Chart");
while (nullptr != chartElement) {
// 创建FileEntryCurve对象来解析Chart数据
auto curveEntry = CreateEmptyFileEntryCurve();
if (curveEntry && curveEntry->ParseFiles(chartElement)) {
// 添加解析后的FileEntry到workspace
workSpace_->SetFileEntry(curveEntry, false);
}
chartElement = chartElement->NextSiblingElement("Chart");
}
// 保持向后兼容：处理旧的type元素结构
const tinyxml2::XMLElement* typeElement = element->FirstChildElement("type");
while (nullptr != typeElement) {
const char* name = typeElement->Attribute("name");