kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-03-15 22:39:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Wrap code for better readability

Browse Source
This commit is contained in:
Simon De Backer
2020-08-20 21:58:23 +02:00
parent 0c00d83b27
commit 331918d143
41 changed files with 716 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sources/ui/conductorpropertiesdialog.cpp
View File

@@ -29,7 +29,8 @@
@param conductor : conductor to edit propertie
@param parent : parent widget
*/
ConductorPropertiesDialog::ConductorPropertiesDialog(Conductor *conductor, QWidget *parent) :
ConductorPropertiesDialog::ConductorPropertiesDialog(Conductor *conductor,
QWidget *parent) :
QDialog(parent),
ui(new Ui::ConductorPropertiesDialog)
{
@@ -58,11 +59,13 @@ ConductorPropertiesDialog::~ConductorPropertiesDialog()
@param conductor : conductor to edit propertie
@param parent : parent widget
*/
void ConductorPropertiesDialog::PropertiesDialog(Conductor *conductor, QWidget *parent)
void ConductorPropertiesDialog::PropertiesDialog(Conductor *conductor,
QWidget *parent)
{
ConductorPropertiesDialog cpd (conductor, parent);
if (cpd.exec() == QDialog::Rejected || cpd.properties() == conductor->properties()) return;
if (cpd.exec() == QDialog::Rejected
|| cpd.properties() == conductor->properties()) return;
QVariant old_value, new_value;
old_value.setValue(conductor->properties());

6
sources/ui/conductorpropertiesdialog.h
View File

@@ -34,8 +34,10 @@ class ConductorPropertiesDialog : public QDialog
Q_OBJECT
public:
explicit ConductorPropertiesDialog (Conductor *conductor, QWidget *parent = nullptr);
static void PropertiesDialog (Conductor *conductor, QWidget *parent = nullptr);
explicit ConductorPropertiesDialog (Conductor *conductor,
QWidget *parent = nullptr);
static void PropertiesDialog (Conductor *conductor,
QWidget *parent = nullptr);
~ConductorPropertiesDialog() override;
ConductorProperties properties() const;

7
sources/ui/conductorpropertieswidget.cpp
View File

@@ -43,7 +43,9 @@ ConductorPropertiesWidget::ConductorPropertiesWidget(QWidget *parent) :
@param properties : properties to edit
@param parent : parent widget
*/
ConductorPropertiesWidget::ConductorPropertiesWidget(const ConductorProperties &properties, QWidget *parent) :
ConductorPropertiesWidget::ConductorPropertiesWidget(
const ConductorProperties &properties,
QWidget *parent) :
QWidget(parent),
ui(new Ui::ConductorPropertiesWidget)
{
@@ -66,7 +68,8 @@ ConductorPropertiesWidget::~ConductorPropertiesWidget()
Set the properties
@param properties
*/
void ConductorPropertiesWidget::setProperties(const ConductorProperties &properties)
void ConductorPropertiesWidget::setProperties(
const ConductorProperties &properties)
{
if (m_properties == properties)
return;

4
sources/ui/conductorpropertieswidget.h
View File

@@ -34,7 +34,9 @@ class ConductorPropertiesWidget : public QWidget
public:
explicit ConductorPropertiesWidget(QWidget *parent = nullptr);
explicit ConductorPropertiesWidget(const ConductorProperties &properties, QWidget *parent = nullptr);
explicit ConductorPropertiesWidget(
const ConductorProperties &properties,
QWidget *parent = nullptr);
~ConductorPropertiesWidget() override;
//METHODS

6
sources/ui/diagrampropertieseditordockwidget.h
View File

@@ -32,8 +32,10 @@ class DiagramPropertiesEditorDockWidget : public PropertiesEditorDockWidget
void setDiagram(Diagram *diagram);
private: //Make this method private because only this class manage the editor widget.
bool addEditor(PropertiesEditorWidget *editor, int index = 0) { return PropertiesEditorDockWidget::addEditor(editor, index); }
bool removeEditor(PropertiesEditorWidget *editor) { return PropertiesEditorDockWidget::removeEditor(editor); }
bool addEditor(PropertiesEditorWidget *editor,int index = 0)
{return PropertiesEditorDockWidget::addEditor(editor,index); }
bool removeEditor(PropertiesEditorWidget *editor)
{ return PropertiesEditorDockWidget::removeEditor(editor); }
private slots:
void selectionChanged();

49
sources/ui/dynamicelementtextmodel.h
View File

@@ -66,8 +66,12 @@ class DynamicElementTextModel : public QStandardItemModel
DynamicElementTextItem *textFromIndex(const QModelIndex &index) const;
DynamicElementTextItem *textFromItem(QStandardItem *item) const;
QModelIndex indexFromText(DynamicElementTextItem *text) const;
QUndoCommand *undoForEditedText(DynamicElementTextItem *deti, QUndoCommand *parent_undo = nullptr) const;
QUndoCommand *undoForEditedGroup(ElementTextItemGroup *group, QUndoCommand *parent_undo = nullptr) const;
QUndoCommand *undoForEditedText(
DynamicElementTextItem *deti,
QUndoCommand *parent_undo = nullptr) const;
QUndoCommand *undoForEditedGroup(
ElementTextItemGroup *group,
QUndoCommand *parent_undo = nullptr) const;
ElementTextItemGroup *groupFromIndex(const QModelIndex &index) const;
ElementTextItemGroup *groupFromItem(QStandardItem *item) const;
@@ -75,8 +79,16 @@ class DynamicElementTextModel : public QStandardItemModel
bool indexIsText(const QModelIndex &index) const;
bool indexIsGroup(const QModelIndex &index) const;
bool canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) const override;
bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
bool canDropMimeData(const QMimeData *data,
Qt::DropAction action,
int row,
int column,
const QModelIndex &parent) const override;
bool dropMimeData(const QMimeData *data,
Qt::DropAction action,
int row,
int column,
const QModelIndex &parent) override;
QMimeData *mimeData(const QModelIndexList &indexes) const override;
QStringList mimeTypes() const override;
@@ -89,22 +101,29 @@ class DynamicElementTextModel : public QStandardItemModel
void removeText(DynamicElementTextItem *deti);
void addGroup(ElementTextItemGroup *group);
void removeGroup(ElementTextItemGroup *group);
void addTextToGroup(DynamicElementTextItem *deti, ElementTextItemGroup *group);
void removeTextFromGroup(DynamicElementTextItem *deti, ElementTextItemGroup *group);
void enableSourceText(DynamicElementTextItem *deti, DynamicElementTextItem::TextFrom tf );
void addTextToGroup(DynamicElementTextItem *deti,
ElementTextItemGroup *group);
void removeTextFromGroup(DynamicElementTextItem *deti,
ElementTextItemGroup *group);
void enableSourceText(DynamicElementTextItem *deti,
DynamicElementTextItem::TextFrom tf );
void enableGroupRotationAndPos(ElementTextItemGroup *group);
void itemDataChanged(QStandardItem *qsi);
void setConnection(DynamicElementTextItem *deti, bool set);
void setConnection(ElementTextItemGroup *group, bool set);
void updateDataFromText(DynamicElementTextItem *deti, DynamicElementTextModel::ValueType type);
void updateDataFromGroup(ElementTextItemGroup *group, DynamicElementTextModel::ValueType type);
void updateDataFromText(DynamicElementTextItem *deti,
DynamicElementTextModel::ValueType type);
void updateDataFromGroup(ElementTextItemGroup *group,
DynamicElementTextModel::ValueType type);
private:
QPointer<Element> m_element;
QHash <DynamicElementTextItem *, QStandardItem *> m_texts_list;
QHash <ElementTextItemGroup *, QStandardItem *> m_groups_list;
QHash <DynamicElementTextItem *, QList<QMetaObject::Connection>> m_hash_text_connect;
QHash <ElementTextItemGroup *, QList<QMetaObject::Connection>> m_hash_group_connect;
QHash <DynamicElementTextItem *,
QList<QMetaObject::Connection>> m_hash_text_connect;
QHash <ElementTextItemGroup *,
QList<QMetaObject::Connection>> m_hash_group_connect;
bool m_block_dataChanged = false;
};
@@ -115,8 +134,12 @@ class DynamicTextItemDelegate : public QStyledItemDelegate
public:
DynamicTextItemDelegate(QObject *parent = Q_NULLPTR);
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
QWidget *createEditor(QWidget *parent,
const QStyleOptionViewItem &option,
const QModelIndex &index) const override;
void setModelData(QWidget *editor,
QAbstractItemModel *model,
const QModelIndex &index) const override;
protected:
bool eventFilter(QObject *object, QEvent *event) override;

29
sources/ui/potentialselectordialog.cpp
View File

@@ -41,15 +41,25 @@ class NewConductorPotentialSelector : public AbstractPotentialSelector
{
Terminal *terminal_1 = conductor->terminal1;
Terminal *terminal_2 = conductor->terminal2;
//We temporarily remove the conductor of his two terminals, to get the two existing potential
//We temporarily remove the conductor of his two terminals,
//to get the two existing potential
terminal_1->removeConductor(conductor);
terminal_2->removeConductor(conductor);
getPotential(terminal_1, m_seq_num_1, m_conductor_number_1, m_properties_list_1, m_conductors_list_1);
getPotential(terminal_2, m_seq_num_2, m_conductor_number_2, m_properties_list_2, m_conductors_list_2);
getPotential(terminal_1,
m_seq_num_1,
m_conductor_number_1,
m_properties_list_1,
m_conductors_list_1);
getPotential(terminal_2,
m_seq_num_2,
m_conductor_number_2,
m_properties_list_2,
m_conductors_list_2);
//There isn't a potential at terminal 1 or 2.
if (m_conductor_number_1 == 0 && m_conductor_number_2 == 0) return;
if (m_conductor_number_1 == 0
&& m_conductor_number_2 == 0) return;
//Re-add conductor to his terminals.
terminal_1->addConductor(conductor);
@@ -69,7 +79,11 @@ class NewConductorPotentialSelector : public AbstractPotentialSelector
@param properties_list
@param c_list
*/
void getPotential(Terminal *terminal, autonum::sequentialNumbers &seq_num , int &number, QList<ConductorProperties> &properties_list, QList<Conductor*> &c_list)
void getPotential(
Terminal *terminal,
autonum::sequentialNumbers &seq_num ,
int &number, QList<ConductorProperties> &properties_list,
QList<Conductor*> &c_list)
{
Conductor *conductor_in_potential = nullptr;
@@ -105,7 +119,8 @@ class NewConductorPotentialSelector : public AbstractPotentialSelector
if (!conductor_in_potential)
return;
seq_num = conductor_in_potential->sequenceNum();
number = conductor_in_potential->relatedPotentialConductors().size()+1; //We add +1 because conductor_in_potential isn't count by relatedPotentialConductors
//We add +1 because conductor_in_potential isn't count by relatedPotentialConductors
number = conductor_in_potential->relatedPotentialConductors().size()+1;
c_list = conductor_in_potential->relatedPotentialConductors().values();
c_list.append(conductor_in_potential);
@@ -131,7 +146,7 @@ class LinkReportPotentialSelector : public AbstractPotentialSelector
{
if ((report->linkType() & Element::AllReport) && !report->isFree())
{
//We temporarily unlink report to get the two existing potential
//We temporarily unlink report to get the two existing potential
Element *other_report = report->linkedElements().first();
report->unlinkAllElements();