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

modify file entity

Browse Source
This commit is contained in:
brige 2025-10-26 15:55:41 +08:00
parent 6fb3bd9c59
commit 05d2968d41
20 changed files with 608 additions and 484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
src/translations/Dyt_zh_CN.ts
View File

@ -245,152 +245,194 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="288"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="291"/>
<source>Curve %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="319"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="326"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="332"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="338"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="344"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="359"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="365"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="373"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="380"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="386"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="393"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="399"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="407"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="412"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="418"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="423"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="434"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="439"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="448"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="453"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="460"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="467"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="473"/>
<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="452"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="457"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="464"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="471"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="477"/>
<source>Validation Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="319"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="323"/>
<source>Please select a data file.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="326"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="330"/>
<source>Selected file does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="332"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="336"/>
<source>Selected file is not readable. Please check file permissions.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="338"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="342"/>
<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="344"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="348"/>
<source>At least one curve must be defined.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="360"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="364"/>
<source>Curve %1 name cannot be empty.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="366"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="370"/>
<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="374"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="378"/>
<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="381"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="385"/>
<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="387"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="391"/>
<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="394"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="398"/>
<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="400"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="404"/>
<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="407"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="411"/>
<source>Chart name cannot be empty.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="412"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="416"/>
<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="418"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="422"/>
<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="423"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="427"/>
<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="434"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="438"/>
<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="439"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="443"/>
<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="448"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="452"/>
<source>X column and Y column cannot be the same.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="453"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="457"/>
<source>Data column indices must be greater than 0.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="460"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="464"/>
<source>Time parameter cannot be negative.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="467"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="471"/>
<source>X axis tick count must be at least 2.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="473"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="477"/>
<source>Description is too long. Please limit to 500 characters.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="497"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="524"/>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="549"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="497"/>
<source>Failed to create file entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="524"/>
<source>Unable to get current workspace</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="534"/>
<source>Curve file count has reached the limit (9 files)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="537"/>
<source>File already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="540"/>
<source>File copy failed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="543"/>
<source>Invalid file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/WorkSpace/AddCurveFileDlg.cpp" line="546"/>
<source>Failed to add file</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>AddLightFileDlg</name>
@ -1740,30 +1782,34 @@
<message>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="66"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="90"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="114"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="118"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="122"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="132"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="156"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="160"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="164"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="174"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="198"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="202"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="206"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="216"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="240"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="244"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="113"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="117"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="121"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="125"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="135"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="158"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="162"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="166"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="170"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="180"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="203"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="207"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="211"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="215"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="225"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="248"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="252"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="256"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="260"/>
<source>prompt</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="66"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="90"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="132"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="174"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="216"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="135"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="180"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="225"/>
<source>please create workspace first</source>
<translation type="unfinished"></translation>
</message>
@ -1773,42 +1819,50 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="108"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="150"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="102"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="147"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="192"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="234"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="237"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="109"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="151"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="103"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="148"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="193"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="235"/>
<source>Failed to set file path</source>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="238"/>
<source>Failed to create file entry</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="115"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="157"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="199"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="241"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="126"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="171"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="216"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="261"/>
<source>invalid file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="114"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="159"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="204"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="249"/>
<source>up to 9 files allowed for this type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="119"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="161"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="203"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="245"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="118"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="163"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="208"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="253"/>
<source>file already added for this type</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="123"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="165"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="207"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="249"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="122"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="167"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="212"/>
<location filename="../ui/Menu/FileManagerMenu.cpp" line="257"/>
<source>copy file failed</source>
<translation type="unfinished"></translation>
</message>

100
src/ui/Menu/FileManagerMenu.cpp
View File

@ -96,20 +96,19 @@ void FileManagerMenu::AddWaveFile() {
if (dialog && dialog->exec() == QDialog::Accepted) {
QString selectedPath = dialog->getSelectedFilePath();
// Create file entry
switch (current->CreateFileEntry(FileEntryType::Curve)) {
case WorkSpace::FileEntryResult::Ok: {
// Get the index of the newly created file entry
auto entries = current->GetFileEntries(FileEntryType::Curve);
int newIndex = static_cast<int>(entries.size()) - 1;
// Set file path
if (!current->SetFileEntryPath(FileEntryType::Curve, newIndex, selectedPath)) {
// Create file entry using factory function
auto fileEntry = CreateFileEntryCurve(selectedPath);
if (!fileEntry) {
QMessageBox::warning(&MainFrame::Get(), QObject::tr("Error"),
QObject::tr("Failed to set file path"));
QObject::tr("Failed to create file entry"));
return;
}
// Add to workspace
switch (current->SetFileEntry(fileEntry)) {
case WorkSpace::FileEntryResult::Ok:
// Success - no action needed
break;
}
case WorkSpace::FileEntryResult::LimitExceeded:
QMessageBox::information(&MainFrame::Get(), QObject::tr("prompt"),
QObject::tr("up to 9 files allowed for this type"));
@ -122,6 +121,10 @@ void FileManagerMenu::AddWaveFile() {
QMessageBox::information(&MainFrame::Get(), QObject::tr("prompt"),
QObject::tr("copy file failed"));
break;
case WorkSpace::FileEntryResult::InvalidFile:
QMessageBox::information(&MainFrame::Get(), QObject::tr("prompt"),
QObject::tr("invalid file"));
break;
}
}
}
@ -138,20 +141,19 @@ void FileManagerMenu::AddSurfaceFile() {
if (dialog && dialog->exec() == QDialog::Accepted) {
QString selectedPath = dialog->getSelectedFilePath();
// Create file entry
switch (current->CreateFileEntry(FileEntryType::Surface)) {
case WorkSpace::FileEntryResult::Ok: {
// Get the index of the newly created file entry
auto entries = current->GetFileEntries(FileEntryType::Surface);
int newIndex = static_cast<int>(entries.size()) - 1;
// Set file path
if (!current->SetFileEntryPath(FileEntryType::Surface, newIndex, selectedPath)) {
// Create file entry using factory function
auto fileEntry = CreateFileEntrySurface(selectedPath);
if (!fileEntry) {
QMessageBox::warning(&MainFrame::Get(), QObject::tr("Error"),
QObject::tr("Failed to set file path"));
QObject::tr("Failed to create file entry"));
return;
}
// Add to workspace
switch (current->SetFileEntry(fileEntry)) {
case WorkSpace::FileEntryResult::Ok:
// Success - no action needed
break;
}
case WorkSpace::FileEntryResult::LimitExceeded:
QMessageBox::information(&MainFrame::Get(), QObject::tr("prompt"),
QObject::tr("up to 9 files allowed for this type"));
@ -164,6 +166,10 @@ void FileManagerMenu::AddSurfaceFile() {
QMessageBox::information(&MainFrame::Get(), QObject::tr("prompt"),
QObject::tr("copy file failed"));
break;
case WorkSpace::FileEntryResult::InvalidFile:
QMessageBox::information(&MainFrame::Get(), QObject::tr("prompt"),
QObject::tr("invalid file"));
break;
}
}
}
@ -180,20 +186,19 @@ void FileManagerMenu::AddTableFile() {
if (dialog && dialog->exec() == QDialog::Accepted) {
QString selectedPath = dialog->getSelectedFilePath();
// Create file entry
switch (current->CreateFileEntry(FileEntryType::Table)) {
case WorkSpace::FileEntryResult::Ok: {
// Get the index of the newly created file entry
auto entries = current->GetFileEntries(FileEntryType::Table);
int newIndex = static_cast<int>(entries.size()) - 1;
// Set file path
if (!current->SetFileEntryPath(FileEntryType::Table, newIndex, selectedPath)) {
// Create file entry using factory function
auto fileEntry = CreateFileEntryTable(selectedPath);
if (!fileEntry) {
QMessageBox::warning(&MainFrame::Get(), QObject::tr("Error"),
QObject::tr("Failed to set file path"));
QObject::tr("Failed to create file entry"));
return;
}
// Add to workspace
switch (current->SetFileEntry(fileEntry)) {
case WorkSpace::FileEntryResult::Ok:
// Success - no action needed
break;
}
case WorkSpace::FileEntryResult::LimitExceeded:
QMessageBox::information(&MainFrame::Get(), QObject::tr("prompt"),
QObject::tr("up to 9 files allowed for this type"));
@ -206,6 +211,10 @@ void FileManagerMenu::AddTableFile() {
QMessageBox::information(&MainFrame::Get(), QObject::tr("prompt"),
QObject::tr("copy file failed"));
break;
case WorkSpace::FileEntryResult::InvalidFile:
QMessageBox::information(&MainFrame::Get(), QObject::tr("prompt"),
QObject::tr("invalid file"));
break;
}
}
}
@ -222,20 +231,19 @@ void FileManagerMenu::AddLightFile() {
if (dialog && dialog->exec() == QDialog::Accepted) {
QString selectedPath = dialog->getSelectedFilePath();
// Create file entry
switch (current->CreateFileEntry(FileEntryType::Light)) {
case WorkSpace::FileEntryResult::Ok: {
// Get the index of the newly created file entry
auto entries = current->GetFileEntries(FileEntryType::Light);
int newIndex = static_cast<int>(entries.size()) - 1;
// Set file path
if (!current->SetFileEntryPath(FileEntryType::Light, newIndex, selectedPath)) {
// Create file entry using factory function
auto fileEntry = CreateFileEntryLight(selectedPath);
if (!fileEntry) {
QMessageBox::warning(&MainFrame::Get(), QObject::tr("Error"),
QObject::tr("Failed to set file path"));
QObject::tr("Failed to create file entry"));
return;
}
// Add to workspace
switch (current->SetFileEntry(fileEntry)) {
case WorkSpace::FileEntryResult::Ok:
// Success - no action needed
break;
}
case WorkSpace::FileEntryResult::LimitExceeded:
QMessageBox::information(&MainFrame::Get(), QObject::tr("prompt"),
QObject::tr("up to 9 files allowed for this type"));
@ -248,6 +256,10 @@ void FileManagerMenu::AddLightFile() {
QMessageBox::information(&MainFrame::Get(), QObject::tr("prompt"),
QObject::tr("copy file failed"));
break;
case WorkSpace::FileEntryResult::InvalidFile:
QMessageBox::information(&MainFrame::Get(), QObject::tr("prompt"),
QObject::tr("invalid file"));
break;
}
}
}

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

@ -114,7 +114,7 @@ void DataPanelManager::UpdatePanelsForType(FileEntryType fileType)
}
// Get files of specified type from current workspace
std::vector<FileEntry> files = currentWorkspace_->GetFileEntries(fileType);
std::vector<std::shared_ptr<FileEntry>> files = currentWorkspace_->GetFileEntries(fileType);
// Limit to maximum panels per type
const int maxPanels = qMin(static_cast<int>(files.size()), GetMaxPanelCount());
@ -135,8 +135,8 @@ void DataPanelManager::UpdatePanelsForType(FileEntryType fileType)
// Create or update panels
for (int i = 0; i < maxPanels; ++i) {
const FileEntry& fileEntry = files[i];
QString filePath = currentWorkspace_->GetFileEntryAbsPath(fileEntry.type, i);
std::shared_ptr<FileEntry> fileEntry = files[i];
QString filePath = currentWorkspace_->GetFileEntryAbsPath(fileEntry->GetType(), i);
QString panelKey = QString("%1_%2").arg(FileEntryTypeToString(fileType)).arg(i);
if (dataPanels_.contains(panelKey)) {

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

@ -192,7 +192,7 @@ const QString QWorkspaceAttribute::GetCommondFilePath() const
return workspace_->GetCommondFilePath();
}
std::vector<FileEntry> QWorkspaceAttribute::GetFileEntries(FileEntryType type) const {
std::vector<std::shared_ptr<FileEntry>> QWorkspaceAttribute::GetFileEntries(FileEntryType type) const {
if (nullptr == workspace_) {
return {};
}
@ -210,7 +210,18 @@ void QWorkspaceAttribute::SetFileEntryPath(FileEntryType type, int index, const
if (nullptr == workspace_) {
return;
}
workspace_->SetFileEntryPath(type, index, path);
// Get the file entries for this type
auto entries = workspace_->GetFileEntries(type);
if (index < 0 || index >= static_cast<int>(entries.size())) {
return;
}
// Update the path of the specific entry
entries[index]->SetPath(path);
// Trigger files changed signal
workspace_->SetFileEntryCount(type, static_cast<int>(entries.size()));
}
QString QWorkspaceAttribute::GetFileEntryAbsPath(FileEntryType type, int index) const {

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

@ -85,7 +85,7 @@ public:
const QString GetCommondFilePath() const;
// Grouped files API
std::vector<FileEntry> GetFileEntries(FileEntryType type) const;
std::vector<std::shared_ptr<FileEntry>> GetFileEntries(FileEntryType type) const;
void SetFileEntryCount(FileEntryType type, int count);
void SetFileEntryPath(FileEntryType type, int index, const QString& path);
QString GetFileEntryAbsPath(FileEntryType type, int index) const;

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

@ -6,6 +6,9 @@
#include <QColorDialog>
#include <QListWidget>
#include "workspace/WorkSpace.h"
#include "workspace/WorkSpaceManager.h"
#include "ui_AddCurveFileDlg.h"
AddCurveFileDlg::AddCurveFileDlg(QWidget* parent)
@ -16,7 +19,6 @@ AddCurveFileDlg::AddCurveFileDlg(QWidget* parent)
SetupUI(ui);
SetTitle(getDialogTitle());
setupSpecificUI();
setupConnections();
}
@ -24,44 +26,15 @@ AddCurveFileDlg::~AddCurveFileDlg() {
delete ui;
}
void AddCurveFileDlg::setupSpecificUI() {
// Initialize curve properties group as disabled
enableCurveProperties(false);
// Initialize color preview
updateColorPreview(selectedColor_);
// Add a default curve
CurveProperties defaultCurve;
defaultCurve.name = generateCurveName();
defaultCurve.color = generateCurveColor();
defaultCurve.start = 1;
defaultCurve.stop = 241;
curves_.append(defaultCurve);
addCurveToList(defaultCurve);
// Select the first curve
if (ui->curveListWidget->count() > 0) {
ui->curveListWidget->setCurrentRow(0);
onCurveSelectionChanged();
}
}
void AddCurveFileDlg::setupConnections() {
// File selection connections
connect(ui->selectFileBtn, &QToolButton::clicked, this, &AddCurveFileDlg::onSelectFileClicked);
connect(ui->filePathEdit, &QLineEdit::textChanged, this, &AddCurveFileDlg::onFilePathChanged);
// Data format connections
connect(ui->separatorComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
this, &AddCurveFileDlg::onDelimiterChanged);
connect(ui->hasHeaderCheckBox, &QCheckBox::toggled, this, &AddCurveFileDlg::onHeaderToggled);
connect(ui->selectFileBtn, &QToolButton::clicked, this, &AddCurveFileDlg::OnSelectFile);
// Curve management connections
connect(ui->addCurveBtn, &QPushButton::clicked, this, &AddCurveFileDlg::onAddCurveClicked);
connect(ui->removeCurveBtn, &QPushButton::clicked, this, &AddCurveFileDlg::onRemoveCurveClicked);
connect(ui->curveListWidget, &QListWidget::currentRowChanged, this, &AddCurveFileDlg::onCurveSelectionChanged);
connect(ui->curveListWidget, &QListWidget::itemClicked, this, &AddCurveFileDlg::onCurveListWidgetItemClicked);
// Curve properties connections
connect(ui->colorButton, &QPushButton::clicked, this, &AddCurveFileDlg::onColorButtonClicked);
@ -74,36 +47,29 @@ void AddCurveFileDlg::setupConnections() {
connect(ui->cancelBtn, &QPushButton::clicked, this, &QDialog::reject);
}
void AddCurveFileDlg::onSelectFileClicked() {
QString fileName = QFileDialog::getOpenFileName(
this,
getDialogTitle(),
QString(),
getFileFilter()
);
if (!fileName.isEmpty()) {
ui->filePathEdit->setText(fileName);
updateFileInfo(fileName);
}
}
void AddCurveFileDlg::updateFileInfo(const QString& filePath) {
QFileInfo fileInfo(filePath);
if (fileInfo.exists()) {
ui->fileNameValue->setText(fileInfo.fileName());
ui->fileSizeValue->setText(QString::number(fileInfo.size()) + " bytes");
qint64 size = fileInfo.size();
QString sizeText;
if (size < 1024) {
sizeText = QString("%1 B").arg(size);
}
else if (size < 1024 * 1024) {
sizeText = QString("%1 KB").arg(size / 1024.0, 0, 'f', 1);
}
else {
sizeText = QString("%1 MB").arg(size / (1024.0 * 1024.0), 0, 'f', 1);
}
ui->fileSizeValue->setText(sizeText);
} else {
ui->fileNameValue->setText("-");
ui->fileSizeValue->setText("-");
}
}
void AddCurveFileDlg::onFilePathChanged() {
QString filePath = ui->filePathEdit->text();
if (!filePath.isEmpty()) {
updateFileInfo(filePath);
}
ui->filePathEdit->setText(filePath);
}
void AddCurveFileDlg::onAddCurveClicked() {
@ -113,7 +79,7 @@ void AddCurveFileDlg::onAddCurveClicked() {
}
// Create new curve with default properties
CurveProperties newCurve;
FileEntryCurve::CurveProperty newCurve;
newCurve.name = generateCurveName();
newCurve.color = generateCurveColor();
newCurve.start = 1;
@ -121,7 +87,17 @@ void AddCurveFileDlg::onAddCurveClicked() {
// Add to curves list and UI
curves_.append(newCurve);
addCurveToList(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()));
ui->curveListWidget->addItem(item);
++currentCurveIndex_;
// Select the new curve
ui->curveListWidget->setCurrentRow(curves_.size() - 1);
@ -134,7 +110,7 @@ void AddCurveFileDlg::onRemoveCurveClicked() {
}
// Don't allow removing the last curve
if (curves_.size() <= 1) {
if (curves_.size() <= 0) {
QMessageBox::information(this, "Information", "At least one curve must remain.");
return;
}
@ -157,6 +133,33 @@ void AddCurveFileDlg::onRemoveCurveClicked() {
}
}
void AddCurveFileDlg::onCurveListWidgetItemClicked(QListWidgetItem* item) {
if (!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);
updateColorPreview(curves_[currentCurveIndex_].color);
// 启用曲线属性编辑
enableCurveProperties(true);
// 将焦点设置到曲线名称编辑框，方便用户直接编辑
ui->curveNameEdit->setFocus();
ui->curveNameEdit->selectAll();
} else {
// 如果点击的是不同的项，更新选择
onCurveSelectionChanged();
}
}
void AddCurveFileDlg::onCurveSelectionChanged() {
int currentRow = ui->curveListWidget->currentRow();
@ -238,7 +241,7 @@ void AddCurveFileDlg::onColorButtonClicked() {
}
}
void AddCurveFileDlg::addCurveToList(const CurveProperties& curve) {
void AddCurveFileDlg::addCurveToList(const FileEntryCurve::CurveProperty& curve) {
QString itemText = QString("%1 [%2,%3] (%4,%5,%6)")
.arg(curve.name)
.arg(curve.start)
@ -252,7 +255,7 @@ void AddCurveFileDlg::addCurveToList(const CurveProperties& curve) {
void AddCurveFileDlg::updateCurveProperties() {
if (currentCurveIndex_ >= 0 && currentCurveIndex_ < curves_.size()) {
const CurveProperties& curve = curves_[currentCurveIndex_];
const FileEntryCurve::CurveProperty& curve = curves_[currentCurveIndex_];
ui->curveNameEdit->setText(curve.name);
ui->dataStartSpinBox->setValue(curve.start);
@ -315,13 +318,14 @@ void AddCurveFileDlg::updateColorPreview(const QColor& color) {
bool AddCurveFileDlg::validateSpecificParams() {
// File path validation
if (ui->filePathEdit->text().isEmpty()) {
const QString& selectFilePath = getSelectedFilePath();
if (selectFilePath.isEmpty()) {
QMessageBox::warning(this, tr("Validation Error"), tr("Please select a data file."));
return false;
}
// File existence validation
QFileInfo fileInfo(ui->filePathEdit->text());
QFileInfo fileInfo(selectFilePath);
if (!fileInfo.exists()) {
QMessageBox::warning(this, tr("Validation Error"), tr("Selected file does not exist."));
return false;
@ -353,7 +357,7 @@ bool AddCurveFileDlg::validateSpecificParams() {
// Curve name uniqueness validation
QStringList curveNames;
for (int i = 0; i < curves_.size(); ++i) {
const CurveProperties& curve = curves_[i];
const FileEntryCurve::CurveProperty& curve = curves_[i];
if (curve.name.isEmpty()) {
QMessageBox::warning(this, tr("Validation Error"),
@ -485,68 +489,67 @@ QString AddCurveFileDlg::getDialogTitle() const {
return "Add Curve Data File";
}
AddCurveFileDlg::CurveParams AddCurveFileDlg::getCurveParams() const {
CurveParams params;
params.chart = getChartProperties();
params.curves = getCurveProperties();
params.format = getDataFormatParams();
return params;
}
AddCurveFileDlg::ChartProperties AddCurveFileDlg::getChartProperties() const {
ChartProperties chart;
chart.name = ui->chartNameEdit->text();
chart.path = ui->filePathEdit->text();
chart.xTitle = ui->xTitleEdit->text();
chart.yTitle = ui->yTitleEdit->text();
chart.xMin = ui->xMinSpinBox->value();
chart.xMax = ui->xMaxSpinBox->value();
chart.xCount = ui->xCountSpinBox->value();
chart.yMin = ui->yMinSpinBox->value();
chart.yMax = ui->yMaxSpinBox->value();
chart.timeParam = ui->timeParamSpinBox->value();
return chart;
}
QList<AddCurveFileDlg::CurveProperties> AddCurveFileDlg::getCurveProperties() const {
return curves_;
}
AddCurveFileDlg::DataFormatParams AddCurveFileDlg::getDataFormatParams() const {
DataFormatParams format;
// Get delimiter based on combo box selection
QString delimiterText = ui->separatorComboBox->currentText();
if (delimiterText.contains("Comma")) {
format.delimiter = ",";
} else if (delimiterText.contains("Tab")) {
format.delimiter = "\t";
} else if (delimiterText.contains("Space")) {
format.delimiter = " ";
} else if (delimiterText.contains("Semicolon")) {
format.delimiter = ";";
} else {
format.delimiter = ","; // Default
}
format.hasHeader = ui->hasHeaderCheckBox->isChecked();
format.xColumn = ui->xColumnSpinBox->value();
format.yColumn = ui->yColumnSpinBox->value();
format.description = ui->descriptionEdit->toPlainText();
return format;
}
void AddCurveFileDlg::onDelimiterChanged() {
// This slot can be used for future delimiter-related logic
}
void AddCurveFileDlg::onHeaderToggled(bool hasHeader) {
// This slot can be used for future header-related logic
}
void AddCurveFileDlg::onSure() {
if (validateSpecificParams()) {
// Create FileEntryCurve object using factory function
auto fileEntryCurve = CreateFileEntryCurve(getSelectedFilePath());
if (!fileEntryCurve) {
QMessageBox::warning(this, tr("Error"), tr("Failed to create file entry"));
return;
}
// Set curve properties
fileEntryCurve->SetName(ui->chartNameEdit->text());
// Set chart properties
FileEntryCurve::ChartProperties chartProps;
chartProps.xCount = ui->xCountSpinBox->value();
chartProps.xTitle = ui->xTitleEdit->text();
chartProps.yTitle = ui->yTitleEdit->text();
chartProps.xMin = ui->xMinSpinBox->value();
chartProps.xMax = ui->xMaxSpinBox->value();
chartProps.yMin = ui->yMinSpinBox->value();
chartProps.yMax = ui->yMaxSpinBox->value();
chartProps.timeParam = ui->timeParamSpinBox->value();
fileEntryCurve->SetChartProperties(chartProps);
// Add curve properties
for (const auto& curve : curves_) {
fileEntryCurve->AddCurveProperty(curve);
}
// Get current workspace
WorkSpace* workspace = WorkSpaceManager::Get().GetCurrent();
if (!workspace) {
QMessageBox::warning(this, tr("Error"), tr("Unable to get current workspace"));
return;
}
// Add FileEntryCurve to workspace using new SetFileEntry method
auto result = workspace->SetFileEntry(fileEntryCurve);
if (result != WorkSpace::FileEntryResult::Ok) {
QString errorMsg;
switch (result) {
case WorkSpace::FileEntryResult::LimitExceeded:
errorMsg = tr("Curve file count has reached the limit (9 files)");
break;
case WorkSpace::FileEntryResult::Duplicate:
errorMsg = tr("File already exists");
break;
case WorkSpace::FileEntryResult::CopyFailed:
errorMsg = tr("File copy failed");
break;
case WorkSpace::FileEntryResult::InvalidFile:
errorMsg = tr("Invalid file");
break;
default:
errorMsg = tr("Failed to add file");
break;
}
QMessageBox::warning(this, tr("Error"), errorMsg);
return;
}
accept();
}
}

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

@ -1,8 +1,10 @@
#pragma once
#include "BaseAddFileDlg.h"
#include "workspace/FileEntry.h"
#include <QColor>
#include <QList>
#include <memory>
class QLineEdit;
class QCheckBox;
@ -24,66 +26,20 @@ class AddCurveFileDlg : public BaseAddFileDlg {
Q_OBJECT
public:
// Chart properties structure
struct ChartProperties {
QString name;
QString path;
QString xTitle;
QString yTitle;
double xMin;
double xMax;
int xCount;
double yMin;
double yMax;
double timeParam;
};
// Curve properties structure
struct CurveProperties {
QString name;
QColor color;
int start;
int stop;
};
// Data format parameters structure
struct DataFormatParams {
QString delimiter;
bool hasHeader;
int xColumn;
int yColumn;
QString description;
};
// Combined parameters structure
struct CurveParams {
ChartProperties chart;
QList<CurveProperties> curves; // Changed to support multiple curves
DataFormatParams format;
};
explicit AddCurveFileDlg(QWidget* parent = nullptr);
~AddCurveFileDlg() override;
CurveParams getCurveParams() const;
ChartProperties getChartProperties() const;
QList<CurveProperties> getCurveProperties() const; // Changed to return list
DataFormatParams getDataFormatParams() const;
protected:
QString getFileFilter() const override;
QString getDialogTitle() const override;
void setupSpecificUI() override;
bool validateSpecificParams() override;
void updateFileInfo(const QString& filePath) override;
private slots:
void onDelimiterChanged();
void onHeaderToggled(bool hasHeader);
void onSelectFileClicked();
void onFilePathChanged();
void onColorButtonClicked();
void onAddCurveClicked();
void onRemoveCurveClicked();
void onCurveListWidgetItemClicked(QListWidgetItem* item);
void onCurveSelectionChanged();
void onCurveNameChanged();
void onCurveDataChanged();
@ -91,9 +47,8 @@ private slots:
private:
void setupConnections();
void updateFileInfo(const QString& filePath);
void updateColorPreview(const QColor& color);
void addCurveToList(const CurveProperties& curve);
void addCurveToList(const FileEntryCurve::CurveProperty& curve);
void updateCurveProperties();
void saveCurveProperties();
void clearCurveProperties();
@ -102,7 +57,9 @@ private:
QColor generateCurveColor() const;
Ui::AddCurveFileDlg* ui;
QList<CurveProperties> curves_;
int currentCurveIndex_;
QColor selectedColor_;
FileEntryCurve::ChartProperties chartProperties_;
FileEntryCurve::CurveProperties curves_;
};

4
src/ui/WorkSpace/AddLightFileDlg.cpp
View File

@ -11,16 +11,12 @@ AddLightFileDlg::AddLightFileDlg(QWidget* parent)
ui->setupUi(this);
SetTitle(getDialogTitle());
setupSpecificUI();
}
AddLightFileDlg::~AddLightFileDlg() {
delete ui;
}
void AddLightFileDlg::setupSpecificUI() {
}
bool AddLightFileDlg::validateSpecificParams() {
LightParams params = getLightParams();

2
src/ui/WorkSpace/AddLightFileDlg.h
View File

@ -27,8 +27,8 @@ public:
protected:
QString getFileFilter() const override;
QString getDialogTitle() const override;
void setupSpecificUI() override;
bool validateSpecificParams() override;
void updateFileInfo(const QString& filePath) override {}
private slots:
void onDelimiterChanged();

5
src/ui/WorkSpace/AddSurfaceFileDlg.cpp
View File

@ -14,7 +14,6 @@ AddSurfaceFileDlg::AddSurfaceFileDlg(QWidget* parent)
ui_->setupUi(this);
SetTitle(getDialogTitle());
setupSpecificUI();
setupConnections();
}
@ -22,10 +21,6 @@ AddSurfaceFileDlg::~AddSurfaceFileDlg() {
delete ui_;
}
void AddSurfaceFileDlg::setupSpecificUI() {
// UI is already set up in constructor
}
void AddSurfaceFileDlg::setupConnections() {
connect(ui_->selectFileBtn, &QToolButton::clicked, this, &AddSurfaceFileDlg::onSelectFileClicked);
connect(ui_->filePathEdit, &QLineEdit::textChanged, this, &AddSurfaceFileDlg::onFilePathChanged);

1
src/ui/WorkSpace/AddSurfaceFileDlg.h
View File

@ -41,7 +41,6 @@ public:
protected:
QString getFileFilter() const override;
QString getDialogTitle() const override;
void setupSpecificUI() override;
bool validateSpecificParams() override;
private slots:

5
src/ui/WorkSpace/AddTableFileDlg.cpp
View File

@ -16,7 +16,6 @@ AddTableFileDlg::AddTableFileDlg(QWidget* parent)
ui->setupUi(this);
SetTitle(getDialogTitle());
setupSpecificUI();
setupConnections();
}
@ -24,10 +23,6 @@ AddTableFileDlg::~AddTableFileDlg() {
delete ui;
}
void AddTableFileDlg::setupSpecificUI() {
// UI is already set up in constructor
}
void AddTableFileDlg::setupConnections() {
// Connect file selection
connect(ui->selectFileBtn, &QToolButton::clicked, this, &AddTableFileDlg::onSelectFileClicked);

1
src/ui/WorkSpace/AddTableFileDlg.h
View File

@ -28,7 +28,6 @@ public:
protected:
QString getFileFilter() const override;
QString getDialogTitle() const override;
void setupSpecificUI() override;
bool validateSpecificParams() override;
private slots:

85
src/ui/WorkSpace/BaseAddFileDlg.cpp
View File

@ -18,15 +18,8 @@
BaseAddFileDlg::BaseAddFileDlg(FileEntryType fileType, QWidget* parent)
: Dialog(parent)
, fileType_(fileType)
, leFilePath_(nullptr)
, tbSelectFile_(nullptr)
, lblFileName_(nullptr)
, lblFileSize_(nullptr)
, teDescription_(nullptr) {
, fileType_(fileType) {
//setupBaseUI();
initBaseConnect();
}
BaseAddFileDlg::~BaseAddFileDlg() {
@ -40,67 +33,12 @@ QString BaseAddFileDlg::getSelectedFilePath() const {
return selectedFilePath_;
}
QString BaseAddFileDlg::getDescription() const {
return teDescription_->toPlainText().trimmed();
}
void BaseAddFileDlg::setupBaseUI() {
setFixedSize(500, 400);
QVBoxLayout* mainLayout = new QVBoxLayout(this);
mainLayout->setContentsMargins(20, 20, 20, 20);
mainLayout->setSpacing(15);
QGroupBox* fileGroup = new QGroupBox(QStringLiteral("File Selection"), this);
QGridLayout* fileLayout = new QGridLayout(fileGroup);
QLabel* pathLabel = new QLabel(QStringLiteral("File Path:"), this);
leFilePath_ = new QLineEdit(this);
leFilePath_->setReadOnly(true);
tbSelectFile_ = new QToolButton(this);
tbSelectFile_->setText(QStringLiteral("..."));
tbSelectFile_->setFixedSize(30, 25);
fileLayout->addWidget(pathLabel, 0, 0);
fileLayout->addWidget(leFilePath_, 0, 1);
fileLayout->addWidget(tbSelectFile_, 0, 2);
mainLayout->addWidget(fileGroup);
QGroupBox* infoGroup = new QGroupBox(QStringLiteral("File Information"), this);
QGridLayout* infoLayout = new QGridLayout(infoGroup);
QLabel* nameLabel = new QLabel(QStringLiteral("File Name:"), this);
lblFileName_ = new QLabel(QStringLiteral("No file selected"), this);
QLabel* sizeLabel = new QLabel(QStringLiteral("File Size:"), this);
lblFileSize_ = new QLabel(QStringLiteral("0 bytes"), this);
infoLayout->addWidget(nameLabel, 0, 0);
infoLayout->addWidget(lblFileName_, 0, 1);
infoLayout->addWidget(sizeLabel, 1, 0);
infoLayout->addWidget(lblFileSize_, 1, 1);
mainLayout->addWidget(infoGroup);
QGroupBox* descGroup = new QGroupBox(QStringLiteral("Description"), this);
QVBoxLayout* descLayout = new QVBoxLayout(descGroup);
teDescription_ = new QTextEdit(this);
teDescription_->setMaximumHeight(80);
descLayout->addWidget(teDescription_);
mainLayout->addWidget(descGroup);
}
void BaseAddFileDlg::initBaseConnect() {
connect(tbSelectFile_, &QToolButton::clicked, this, &BaseAddFileDlg::OnSelectFile);
}
void BaseAddFileDlg::OnSelectFile() {
const QString workspacePath = Application::GetWorkSpacePath();
QString filePath = QFileDialog::getOpenFileName(
this,
QStringLiteral("Select File"),
workspacePath,
getDialogTitle(),
QString(),
getFileFilter()
);
@ -109,7 +47,6 @@ void BaseAddFileDlg::OnSelectFile() {
}
selectedFilePath_ = filePath;
leFilePath_->setText(filePath);
updateFileInfo(filePath);
LOG_INFO("Selected file: {}", filePath.toStdString());
@ -123,22 +60,6 @@ void BaseAddFileDlg::OnSure() {
accept();
}
void BaseAddFileDlg::updateFileInfo(const QString& filePath) {
QFileInfo fileInfo(filePath);
lblFileName_->setText(fileInfo.fileName());
qint64 size = fileInfo.size();
QString sizeText;
if (size < 1024) {
sizeText = QString("%1 B").arg(size);
} else if (size < 1024 * 1024) {
sizeText = QString("%1 KB").arg(size / 1024.0, 0, 'f', 1);
} else {
sizeText = QString("%1 MB").arg(size / (1024.0 * 1024.0), 0, 'f', 1);
}
lblFileSize_->setText(sizeText);
}
bool BaseAddFileDlg::validateBaseInput() {
if (selectedFilePath_.isEmpty()) {
QMessageBox::warning(this, QStringLiteral("Warning"),

23
src/ui/WorkSpace/BaseAddFileDlg.h
View File

@ -7,11 +7,6 @@
#include <QWidget>
class QLineEdit;
class QLabel;
class QTextEdit;
class QToolButton;
class BaseAddFileDlg : public Dialog {
Q_OBJECT
@ -21,7 +16,7 @@ public:
FileEntryType getSelectedFileType() const;
QString getSelectedFilePath() const;
QString getDescription() const;
QString getDescription() const { return description_; }
virtual bool validateSpecificParams() = 0;
virtual QString getFileFilter() const = 0;
@ -32,21 +27,15 @@ protected slots:
void OnSure();
protected:
QLineEdit* leFilePath_;
QToolButton* tbSelectFile_;
QLabel* lblFileName_;
QLabel* lblFileSize_;
QTextEdit* teDescription_;
void setupBaseUI();
void initBaseConnect();
void updateFileInfo(const QString& filePath);
bool validateBaseInput();
void SetTitle(const QString& title);
virtual void setupSpecificUI() = 0;
virtual void updateFileInfo(const QString& filePath) = 0;
protected:
QString selectedFilePath_;
QString description_;
private:
FileEntryType fileType_;
QString selectedFilePath_;
};

79
src/workspace/FileEntry.cpp Normal file
View File

@ -0,0 +1,79 @@
#include "workspace/FileEntry.h"
#include <QFileInfo>
#include "common/SpdLogger.h"
void FileEntry::SetPath(const QString& path) {
QFileInfo fileInfo(path);
if (!fileInfo.exists()) {
LOG_WARN("file not exist: {}", path.toLocal8Bit().constData());
return;
}
path_ = fileInfo.path();
fileName_ = fileInfo.fileName();
}
// Factory function implementations
std::shared_ptr<FileEntry> CreateFileEntry(FileEntryType type, const QString& filePath) {
switch (type) {
case FileEntryType::Curve:
return CreateFileEntryCurve(filePath);
case FileEntryType::Surface:
return CreateFileEntrySurface(filePath);
case FileEntryType::Table:
return CreateFileEntryTable(filePath);
case FileEntryType::Light:
return CreateFileEntryLight(filePath);
default:
LOG_ERROR("Unknown FileEntryType: {}", static_cast<int>(type));
return nullptr;
}
}
std::shared_ptr<FileEntryCurve> CreateFileEntryCurve(const QString& filePath) {
QFileInfo fileInfo(filePath);
if (!fileInfo.exists()) {
LOG_ERROR("File does not exist: {}", filePath.toUtf8().constData());
return nullptr;
}
auto fileEntry = std::make_shared<FileEntryCurve>();
fileEntry->SetPath(filePath);
fileEntry->SetName(fileInfo.baseName()); // Use base name as default display name
return fileEntry;
}
std::shared_ptr<FileEntry> CreateFileEntrySurface(const QString& filePath) {
auto fileEntry = std::make_shared<FileEntry>();
fileEntry->SetType(FileEntryType::Surface);
if (!filePath.isEmpty()) {
fileEntry->SetPath(filePath);
}
return fileEntry;
}
std::shared_ptr<FileEntry> CreateFileEntryTable(const QString& filePath) {
auto fileEntry = std::make_shared<FileEntry>();
fileEntry->SetType(FileEntryType::Table);
if (!filePath.isEmpty()) {
fileEntry->SetPath(filePath);
}
return fileEntry;
}
std::shared_ptr<FileEntry> CreateFileEntryLight(const QString& filePath) {
auto fileEntry = std::make_shared<FileEntry>();
fileEntry->SetType(FileEntryType::Light);
if (!filePath.isEmpty()) {
fileEntry->SetPath(filePath);
}
return fileEntry;
}

80
src/workspace/FileEntry.h
View File

@ -1,6 +1,7 @@
#pragma once
#include <QString>
#include <QColor>
enum class FileEntryType {
Curve,
@ -9,11 +10,6 @@ enum class FileEntryType {
Light
};
struct FileEntry {
FileEntryType type;
QString fileName; // relative file name under workspace dir; may be empty
};
inline const char* FileEntryTypeToString(FileEntryType t) {
switch (t) {
case FileEntryType::Curve: return "curve";
@ -32,3 +28,77 @@ inline bool FileEntryTypeFromString(const char* s, FileEntryType& out) {
if (0 == strcmp(s, "light")) { out = FileEntryType::Light; return true; }
return false;
}
class FileEntryCurve;
class FileEntry {
public:
virtual ~FileEntry() = default;
FileEntryType GetType() const { return type_; }
void SetType(FileEntryType type) { type_ = type; }
void SetPath(const QString& path);
QString GetPath() const { return path_; }
void SetFileNanme(const QString& fileNmae) { fileName_ = fileNmae; }
const QString& GetFileName() const { return fileName_; }
void SetName(const QString& name) { name_ = name; }
QString GetName() const { return name_; }
virtual FileEntryCurve* AsCurve() { return nullptr; }
protected:
FileEntryType type_;
QString path_;
QString fileName_;
QString name_;
};
// Factory functions for creating FileEntry objects
std::shared_ptr<FileEntry> CreateFileEntry(FileEntryType type, const QString& filePath);
std::shared_ptr<FileEntryCurve> CreateFileEntryCurve(const QString& filePath);
std::shared_ptr<FileEntry> CreateFileEntrySurface(const QString& filePath);
std::shared_ptr<FileEntry> CreateFileEntryTable(const QString& filePath);
std::shared_ptr<FileEntry> CreateFileEntryLight(const QString& filePath);
class FileEntryCurve : public FileEntry {
public:
struct ChartProperties {
int xCount;
QString xTitle;
QString yTitle;
double xMin;
double xMax;
double yMin;
double yMax;
double timeParam;
};
struct CurveProperty {
QString name;
QColor color;
int start;
int stop;
};
using CurveProperties = QList<CurveProperty>;
public:
FileEntryCurve() { type_ = FileEntryType::Curve; }
void SetChartProperties(const ChartProperties& props) { chartProperties_ = props; }
const ChartProperties& GetChartProperties() const { return chartProperties_; }
void AddCurveProperty(const CurveProperty& prop) { curveProperties_.append(prop); }
void RemoveCurveProperty(int index) { curveProperties_.removeAt(index); }
const CurveProperties& GetCurveProperties() const { return curveProperties_; }
FileEntryCurve* AsCurve() override { return this; }
private:
ChartProperties chartProperties_;
CurveProperties curveProperties_;
};

125
src/workspace/WorkSpace.cpp
View File

@ -7,6 +7,7 @@
#include "workspace/WorkSpaceXMLParse.h"
#include "workspace/WorkSpaceXMLWrite.h"
#include "workspace/CommandManager.h"
#include "workspace/FileEntry.h"
#include "workspace/WorkSpaceItem.h"
#include "workspace/Timestep.h"
@ -118,7 +119,64 @@ void WorkSpace::SetRDPath(const QString& path)
rdFile_ = fileInfo.fileName();
}
std::vector<FileEntry> WorkSpace::GetFileEntries(FileEntryType type) const {
WorkSpace::FileEntryResult WorkSpace::SetFileEntry(std::shared_ptr<FileEntry> fileEntry) {
if (!fileEntry) {
LOG_ERROR("FileEntry is null");
return FileEntryResult::InvalidFile;
}
FileEntryType type = fileEntry->GetType();
auto& vec = files_[type];
// Check limit (max 9 per type)
if (vec.size() >= 9) {
LOG_WARN("File entry limit exceeded for type: {}", FileEntryTypeToString(type));
return FileEntryResult::LimitExceeded;
}
// Check for duplicates by file path
QString filePath = QString("%1/%2").arg(fileEntry->GetPath(), fileEntry->GetFileName());
for (const auto& existingEntry : vec) {
if (existingEntry->GetPath() == filePath) {
LOG_WARN("Duplicate file entry: {}", filePath.toUtf8().constData());
return FileEntryResult::Duplicate;
}
}
// Copy file to workspace directory
QFileInfo fileInfo(filePath);
if (!fileInfo.exists()) {
LOG_ERROR("File does not exist: {}", filePath.toUtf8().constData());
return FileEntryResult::InvalidFile;
}
QString targetPath = QString("%1/%2").arg(GetDir(), fileInfo.fileName());
bool copySuccess = FileUtils::CopyFileToPath(filePath, targetPath, true);
LOG_INFO("Copy file {} to {}: {}",
filePath.toLocal8Bit().data(),
targetPath.toLocal8Bit().data(),
copySuccess);
if (!copySuccess) {
LOG_ERROR("Failed to copy file to workspace");
return FileEntryResult::CopyFailed;
}
// Update file entry with workspace-relative path
fileEntry->SetFileNanme(fileInfo.fileName());
// Add to files collection
vec.push_back(fileEntry);
++filesSeq_;
emit FilesChanged(type);
LOG_INFO("Successfully added file entry: {} (type: {})",
fileInfo.fileName().toUtf8().constData(),
FileEntryTypeToString(type));
return FileEntryResult::Ok;
}
std::vector<std::shared_ptr<FileEntry>> WorkSpace::GetFileEntries(FileEntryType type) const {
auto it = files_.find(type);
if (it == files_.end()) {
return {};
@ -126,19 +184,6 @@ std::vector<FileEntry> WorkSpace::GetFileEntries(FileEntryType type) const {
return it->second;
}
WorkSpace::FileEntryResult WorkSpace::CreateFileEntry(FileEntryType type) {
auto& vec = files_[type];
if (vec.size() >= 9) {
return FileEntryResult::LimitExceeded;
}
// push a placeholder; actual filename may be set elsewhere via SetWavePath/SetRDPath/etc
vec.push_back(FileEntry{ type, QString() });
++filesSeq_;
// Notify listeners (e.g., PropertyBrowser) to refresh workspace properties
emit FilesChanged(type);
return FileEntryResult::Ok;
}
bool WorkSpace::SetFileEntryCount(FileEntryType type, int count) {
if (count < 0) count = 0;
if (count > 9) count = 9;
@ -149,7 +194,31 @@ bool WorkSpace::SetFileEntryCount(FileEntryType type, int count) {
if (static_cast<int>(vec.size()) < count) {
int toAdd = count - static_cast<int>(vec.size());
for (int i = 0; i < toAdd; ++i) {
vec.push_back(FileEntry{ type, QString() });
// Create the appropriate FileEntry subclass based on type
std::shared_ptr<FileEntry> fileEntry;
switch (type) {
case FileEntryType::Curve:
fileEntry = std::make_shared<FileEntryCurve>();
break;
case FileEntryType::Surface:
// TODO: Create FileEntrySurface when implemented
fileEntry = std::make_shared<FileEntry>();
fileEntry->SetType(FileEntryType::Surface);
break;
case FileEntryType::Table:
// TODO: Create FileEntryTable when implemented
fileEntry = std::make_shared<FileEntry>();
fileEntry->SetType(FileEntryType::Table);
break;
case FileEntryType::Light:
// TODO: Create FileEntryLight when implemented
fileEntry = std::make_shared<FileEntry>();
fileEntry->SetType(FileEntryType::Light);
break;
default:
return false; // Invalid type
}
vec.push_back(fileEntry);
}
} else {
vec.resize(count);
@ -159,30 +228,6 @@ bool WorkSpace::SetFileEntryCount(FileEntryType type, int count) {
return true;
}
bool WorkSpace::SetFileEntryPath(FileEntryType type, int index, const QString& path) {
auto& vec = files_[type];
if (index < 0 || index >= static_cast<int>(vec.size())) {
return false;
}
QFileInfo fileInfo(path);
if (!fileInfo.exists()) {
return false;
}
QString dirPath = QString("%1/%2").arg(GetDir(), fileInfo.fileName());
bool sucess = FileUtils::CopyFileToPath(path, dirPath, true);
LOG_INFO("copy grouped file {}: {} to {}",
path.toLocal8Bit().data(),
dirPath.toLocal8Bit().data(),
sucess);
if (!sucess) {
return false;
}
vec[index].fileName = fileInfo.fileName();
++filesSeq_;
emit FilesChanged(type);
return true;
}
QString WorkSpace::GetFileEntryAbsPath(FileEntryType type, int index) const {
auto it = files_.find(type);
if (it == files_.end()) {
@ -192,7 +237,7 @@ QString WorkSpace::GetFileEntryAbsPath(FileEntryType type, int index) const {
if (index < 0 || index >= static_cast<int>(vec.size())) {
return QString();
}
const QString& name = vec[index].fileName;
const QString& name = vec[index]->GetFileName();
if (name.isEmpty()) {
return QString();
}

13
src/workspace/WorkSpace.h
View File

@ -81,13 +81,15 @@ public:
const QString GetRDPath() const;
// Files list API (per-type, max 9 per type)
enum class FileEntryResult { Ok, LimitExceeded, Duplicate, CopyFailed };
FileEntryResult CreateFileEntry(FileEntryType type);
std::vector<FileEntry> GetFileEntries(FileEntryType type) const;
enum class FileEntryResult { Ok, LimitExceeded, Duplicate, CopyFailed, TypeMismatch, InvalidFile };
// New unified file entry management
FileEntryResult SetFileEntry(std::shared_ptr<FileEntry> fileEntry);
std::vector<std::shared_ptr<FileEntry>> GetFileEntries(FileEntryType type) const;
// Manage grouped file entries
bool SetFileEntryCount(FileEntryType type, int count);
bool SetFileEntryPath(FileEntryType type, int index, const QString& path);
QString GetFileEntryAbsPath(FileEntryType type, int index) const;
// Chart data management
@ -154,7 +156,6 @@ Q_SIGNALS:
void EntityRemoved(class Entity* entity);
void TimestepChanged(class Timestep* timestep);
void LampStatusChanged(class LampStatus* lampStatus);
// Emitted when grouped file entries change (count or path or creation)
void FilesChanged(FileEntryType type);
protected:
@ -184,7 +185,7 @@ private:
class LampStatus* lampStatus_{ nullptr };
class Entity* trackedEntity_{ nullptr };
// Stored as file entries under workspace dir, keyed by type
std::map<FileEntryType, std::vector<FileEntry>> files_;
std::map<FileEntryType, std::vector<std::shared_ptr<FileEntry>>> files_;
// Chart data storage
QList<FileTypeData> fileTypeData_;
// Monotonic sequence for file entries changes, used to trigger UI refresh

4
src/workspace/WorkSpaceXMLParse.cpp
View File

@ -379,9 +379,7 @@ bool WorkSpaceXMLParse::ParseFiles(const tinyxml2::XMLElement* element) {
// Also create file entries for backward compatibility
FileEntryType enumType;
if (FileEntryTypeFromString(name, enumType)) {
for (int i = 0; i < count; ++i) {
workSpace_->CreateFileEntry(enumType);
}
workSpace_->SetFileEntryCount(enumType, count);
}
}
typeElement = typeElement->NextSiblingElement("type");