mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-04 09:54:13 +02:00
79a8637251
Where two wires cross without being connected, a project can now draw a small arc (a hop) on one of them, instead of the user inserting a jump symbol and splitting the wire. It is a project setting, off by default: Project properties > Général > "Croisements de conducteurs", with no hops, hops on horizontal wires, or hops on vertical wires. Choosing the orientation rather than following drawing order keeps a project consistent. Only the drawing changes: no element is added and no wire is split. A wire that ends or bends on another one is a junction and never hops, and a crossing too close to the end of a segment for the arc to fit is drawn plainly. PDF, SVG and image export and printing show the hops, since they paint through Conductor::paint(); DXF export, which writes the segments itself, does not. The setting is saved as <wire_crossings hop="..."/> under the project root, next to <usage>, and only when hops are on, so a project that never used them saves exactly as before. The geometry is in wirehops.cpp, free of any graphics item, and tested on its own. Conductor::paintedPath() feeds it the conductors of the folio from a snapshot of their scene points, rebuilt only when a conductor changes shape, moves, or enters or leaves a folio; each hop path is cached the same way. Asking the scene for the conductors in a rect instead strokes every candidate's shape, which made a 366-wire folio render 0.6 s slower; with the snapshot the difference is within measurement noise. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
185 lines
4.9 KiB
C++
185 lines
4.9 KiB
C++
/*
|
|
Copyright 2006-2026 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 PROJECTCONFIGPAGES_H
|
|
#define PROJECTCONFIGPAGES_H
|
|
#include "configpage.h"
|
|
|
|
class QLabel;
|
|
class QComboBox;
|
|
class QLineEdit;
|
|
class QCheckBox;
|
|
class QPushButton;
|
|
class QETProject;
|
|
class BorderPropertiesWidget;
|
|
class ConductorPropertiesWidget;
|
|
class DiagramContextWidget;
|
|
class ReportPropertieWidget;
|
|
class XRefPropertiesWidget;
|
|
class SelectAutonumW;
|
|
class FolioAutonumberingW;
|
|
class FormulaAutonumberingW;
|
|
class AutoNumberingManagementW;
|
|
|
|
/**
|
|
@brief The ProjectConfigPage class
|
|
This class, derived from ConfigPage,
|
|
aims at providing the basic skeleton for a project configuration page.
|
|
*/
|
|
class ProjectConfigPage : public ConfigPage {
|
|
Q_OBJECT
|
|
// Constructor, destructor
|
|
public:
|
|
ProjectConfigPage(QETProject *, QWidget * = nullptr);
|
|
~ProjectConfigPage() override;
|
|
private:
|
|
ProjectConfigPage(const ProjectConfigPage &);
|
|
|
|
// methods
|
|
public:
|
|
virtual QETProject *project() const;
|
|
virtual QETProject *setProject(QETProject *project, bool = true);
|
|
void applyConf() override;
|
|
/**
|
|
Apply configuration to the project after user input. This method is
|
|
automatically called when the ConfigDialog is validated, and only if the
|
|
project is both non-zero and not read-only.
|
|
*/
|
|
virtual void applyProjectConf() = 0;
|
|
|
|
protected:
|
|
virtual void init();
|
|
/**
|
|
Use this pure virtual method to initialize your page widgets.
|
|
*/
|
|
virtual void initWidgets() = 0;
|
|
/**
|
|
Use this pure virtual method to initialize your page layout. This method is
|
|
always called after initWidgets().
|
|
*/
|
|
virtual void initLayout() = 0;
|
|
/**
|
|
Use this pure virtual method to fill widgets with project values.
|
|
*/
|
|
virtual void readValuesFromProject() = 0;
|
|
/**
|
|
Use this pure virtual method to adjust the "read only" state of your page
|
|
widgets according to the currently edited project.
|
|
*/
|
|
virtual void adjustReadOnly() = 0;
|
|
|
|
// attributes
|
|
protected:
|
|
QETProject *m_project; ///< Currently edited project
|
|
};
|
|
|
|
/**
|
|
This page enables users to configure the main properties of a project.
|
|
*/
|
|
class ProjectMainConfigPage : public ProjectConfigPage {
|
|
Q_OBJECT
|
|
// Constructor, destructor
|
|
public:
|
|
ProjectMainConfigPage(QETProject *, QWidget * = nullptr);
|
|
~ProjectMainConfigPage() override;
|
|
private:
|
|
ProjectMainConfigPage(const ProjectMainConfigPage &);
|
|
|
|
// methods
|
|
public:
|
|
QString title() const override;
|
|
QIcon icon() const override;
|
|
void applyProjectConf() override;
|
|
QString projectTitle() const;
|
|
|
|
protected:
|
|
void initWidgets() override;
|
|
void initLayout() override;
|
|
void readValuesFromProject() override;
|
|
void adjustReadOnly() override;
|
|
|
|
private slots:
|
|
void resetUsageTracker();
|
|
|
|
// attributes
|
|
protected:
|
|
QLabel *title_label_;
|
|
QLineEdit *title_value_;
|
|
QLabel *title_information_;
|
|
QLabel *project_variables_label_;
|
|
DiagramContextWidget *project_variables_;
|
|
QLabel *usage_label_;
|
|
QLabel *usage_value_;
|
|
QCheckBox *usage_enabled_cb_;
|
|
QPushButton *usage_reset_pb_;
|
|
QLabel *wire_hops_label_;
|
|
QComboBox *wire_hops_cb_;
|
|
};
|
|
|
|
class ProjectAutoNumConfigPage : public ProjectConfigPage {
|
|
Q_OBJECT
|
|
|
|
//Methods
|
|
public:
|
|
ProjectAutoNumConfigPage (QETProject *project,
|
|
QWidget *parent = nullptr);
|
|
|
|
QString title() const override;
|
|
QIcon icon() const override;
|
|
void applyProjectConf() override;
|
|
virtual void changeToTab(int);
|
|
protected:
|
|
void initWidgets() override;
|
|
void initLayout() override {}
|
|
void readValuesFromProject() override;
|
|
void adjustReadOnly() override;
|
|
private:
|
|
void buildConnections();
|
|
private slots:
|
|
void updateContextConductor(const QString&);//conductor
|
|
void saveContextConductor();
|
|
void removeContextConductor();
|
|
void updateContextFolio(const QString&);//folio
|
|
void saveContextFolio();
|
|
void removeContextFolio();
|
|
void updateContextElement(const QString&);//element
|
|
void saveContextElement();
|
|
void removeContextElement();
|
|
void importFromProject();
|
|
|
|
void applyAutoNum();
|
|
void applyManagement();
|
|
|
|
signals:
|
|
void setAutoNum(QString);
|
|
void setAutoNum(int,int);
|
|
void saveCurrentTbp();
|
|
void loadSavedTbp();
|
|
|
|
//Attributes
|
|
private:
|
|
SelectAutonumW *m_saw_conductor;
|
|
SelectAutonumW *m_saw_folio;
|
|
SelectAutonumW *m_saw_element;
|
|
FolioAutonumberingW *m_faw;
|
|
AutoNumberingManagementW *m_amw;
|
|
QPushButton *m_import_pb = nullptr;
|
|
|
|
};
|
|
|
|
#endif
|