Add EdzImporter + collection-panel import action (M2)

Wires EPLAN .edz import into the elements panel. EdzImporter orchestrates
EdzArchive -> EdzPart -> EdzElementBuilder and writes the generated .elmt into a
destination collection folder (named by order number). A right-click
"Importer une piece EPLAN (.edz)..." action on a writable collection directory
opens a file picker, runs the importer into that folder's fileSystemPath() and
reloads the panel; errors surface via QetMessageBox. Modeled on newElement().

EdzImporter verified headless against the Python oracle for KG6000/MFH200/
R1D200; the panel wiring is built/tested via the WSL Qt5+KF5 build.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Shane Ringrose
2026-06-20 07:34:52 +12:00
parent 7cc5790f7c
commit f4ff6c81f9
5 changed files with 177 additions and 0 deletions
@@ -19,6 +19,7 @@
#include "../editor/ui/qetelementeditor.h"
#include "../elementscategoryeditor.h"
#include "../import/edz/edzimporter.h"
#include "../newelementwizard.h"
#include "../qetapp.h"
#include "../qetdiagrameditor.h"
@@ -33,6 +34,7 @@
#include "xmlprojectelementcollectionitem.h"
#include <QDesktopServices>
#include <QFileDialog>
#include <QMenu>
#include <QTimer>
#include <QUrl>
@@ -158,6 +160,8 @@ void ElementsCollectionWidget::setUpAction()
tr("Nouveau dossier"), this);
m_new_element = new QAction(QET::Icons::ElementNew,
tr("Nouvel élément"), this);
m_import_edz = new QAction(QET::Icons::ElementNew,
tr("Importer une pièce EPLAN (.edz)…"), this);
m_show_this_dir = new QAction(QET::Icons::FolderOnlyThis,
tr("Afficher uniquement ce dossier"),
this);
@@ -247,6 +251,8 @@ void ElementsCollectionWidget::setUpConnection()
this, &ElementsCollectionWidget::newDirectory);
connect(m_new_element, &QAction::triggered,
this, &ElementsCollectionWidget::newElement);
connect(m_import_edz, &QAction::triggered,
this, &ElementsCollectionWidget::importEdz);
connect(m_show_this_dir, &QAction::triggered,
this, &ElementsCollectionWidget::showThisDir);
connect(m_show_all_dir, &QAction::triggered,
@@ -329,6 +335,7 @@ void ElementsCollectionWidget::customContextMenu(const QPoint &point)
{
if (!feci->isMacrosCollection()) {
m_context_menu->addAction(m_new_element);
m_context_menu->addAction(m_import_edz);
}
m_context_menu->addAction(m_new_directory);
if (!feci->isCollectionRoot())
@@ -599,6 +606,44 @@ void ElementsCollectionWidget::newElement()
&ElementsCollectionWidget::locationWasSaved);
}
/**
@brief ElementsCollectionWidget::importEdz
Import an EPLAN Data Portal part (.edz) as a QET element into the directory
pointed at by the context menu.
*/
void ElementsCollectionWidget::importEdz()
{
ElementCollectionItem *eci = elementCollectionItemForIndex(
m_index_at_context_menu);
if (!eci || eci->type() != FileElementCollectionItem::Type) {
return;
}
FileElementCollectionItem *feci =
static_cast<FileElementCollectionItem*>(eci);
if (feci->isCommonCollection() || !feci->isDir()) {
return;
}
const QString edz_path = QFileDialog::getOpenFileName(
this, tr("Importer une pièce EPLAN"), QString(),
tr("Pièces EPLAN (*.edz)"));
if (edz_path.isEmpty()) {
return;
}
EdzImporter importer;
if (!importer.importToDirectory(edz_path, feci->fileSystemPath())) {
QET::QetMessageBox::critical(
this, tr("Import EPLAN"),
tr("Impossible d'importer cette pièce :\n%1")
.arg(importer.errorString()));
return;
}
reload();
}
/**
@brief ElementsCollectionWidget::showThisDir
Hide all directories except the pointed dir;
@@ -72,6 +72,7 @@ class ElementsCollectionWidget : public QWidget
void editDirectory();
void newDirectory();
void newElement();
void importEdz();
void showThisDir();
void resetShowThisDir();
void dirProperties();
@@ -112,6 +113,7 @@ class ElementsCollectionWidget : public QWidget
*m_edit_dir,
*m_new_directory,
*m_new_element,
*m_import_edz,
*m_show_this_dir,
*m_show_all_dir,
*m_dir_propertie;
+83
View File
@@ -0,0 +1,83 @@
/*
Copyright 2006 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
QElectroTech is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#include "edzimporter.h"
#include "edzarchive.h"
#include "edzpart.h"
#include "edzelementbuilder.h"
#include <QDir>
#include <QDomDocument>
#include <QFile>
#include <QRegularExpression>
/**
Import the .edz at @a edz_path, writing the generated .elmt into the
filesystem folder @a dest_dir. @return true on success; writtenPath() then
holds the created file. On failure errorString() explains why.
*/
bool EdzImporter::importToDirectory(const QString &edz_path,
const QString &dest_dir)
{
m_written.clear();
m_error.clear();
EdzArchive archive;
if (!archive.extract(edz_path)) {
m_error = archive.errorString();
return false;
}
EdzPart part;
if (!part.parse(archive.partXmlPath())) {
m_error = part.errorString();
return false;
}
const QDomDocument doc = EdzElementBuilder::build(part);
// Name the file from the order number (fall back to part number / source).
QString base = part.orderNumber();
if (base.isEmpty()) {
base = part.partNumber();
}
if (base.isEmpty()) {
base = QFileInfo(edz_path).completeBaseName();
}
base.replace(QRegularExpression(QStringLiteral("[^A-Za-z0-9._-]")),
QStringLiteral("_"));
const QDir dir(dest_dir);
if (!dir.exists() && !dir.mkpath(QStringLiteral("."))) {
m_error = QStringLiteral("Destination folder does not exist: %1")
.arg(dest_dir);
return false;
}
const QString out_path = dir.filePath(base + QStringLiteral(".elmt"));
QFile file(out_path);
if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
m_error = QStringLiteral("Cannot write %1").arg(out_path);
return false;
}
file.write(EdzElementBuilder::toElmtString(doc).toUtf8());
file.close();
m_written = out_path;
return true;
}
+45
View File
@@ -0,0 +1,45 @@
/*
Copyright 2006 The QElectroTech Team
This file is part of QElectroTech.
QElectroTech is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
QElectroTech is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EDZIMPORTER_H
#define EDZIMPORTER_H
#include <QString>
/**
@brief Orchestrates importing an EPLAN .edz package as a QET element.
Ties together EdzArchive (extract) -> EdzPart (parse) -> EdzElementBuilder
(build) and writes the resulting .elmt into a destination collection folder.
UI-decoupled so it stays unit-testable headless; the collection widget calls
importToDirectory() and then refreshes the panel.
*/
class EdzImporter
{
public:
bool importToDirectory(const QString &edz_path,
const QString &dest_dir);
QString writtenPath() const { return m_written; }
QString errorString() const { return m_error; }
private:
QString m_written;
QString m_error;
};
#endif // EDZIMPORTER_H