realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

Improve code style

Browse Source
This commit is contained in:
Simon De Backer 2020-08-16 14:23:25 +02:00
parent 574609abf5
commit 8a484ef901
5 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources/diagramevent/diagrameventaddelement.cpp
View File

@ -243,7 +243,7 @@ void DiagramEventAddElement::addElement()
if (m_diagram->freezeNewConductors() || m_diagram->project()->isFreezeNewConductors()) {
conductor->setFreezeLabel(true);
}
}
}
m_diagram -> undoStack().push(undo_object);
element->setUpFormula();

22
sources/diagramevent/diagrameventaddimage.cpp
View File

@ -27,11 +27,11 @@
@param diagram : diagram where operate this event
*/
DiagramEventAddImage::DiagramEventAddImage(Diagram *diagram) :
DiagramEventInterface(diagram),
m_image (nullptr),
m_is_added (false)
DiagramEventInterface(diagram),
m_image (nullptr),
m_is_added (false)
{
openDialog();
openDialog();
}
/**
@ -39,14 +39,14 @@ DiagramEventAddImage::DiagramEventAddImage(Diagram *diagram) :
*/
DiagramEventAddImage::~DiagramEventAddImage()
{
if (m_running || m_abort)
{
if (m_is_added) m_diagram->removeItem(m_image);
delete m_image;
}
if (m_running || m_abort)
{
if (m_is_added) m_diagram->removeItem(m_image);
delete m_image;
}
foreach (QGraphicsView *view, m_diagram->views())
view->setContextMenuPolicy((Qt::DefaultContextMenu));
foreach (QGraphicsView *view, m_diagram->views())
view->setContextMenuPolicy((Qt::DefaultContextMenu));
}
/**

26
sources/diagramevent/diagrameventaddimage.h
View File

@ -29,23 +29,23 @@ class DiagramImageItem;
*/
class DiagramEventAddImage : public DiagramEventInterface
{
Q_OBJECT
Q_OBJECT
public:
DiagramEventAddImage(Diagram *diagram);
~DiagramEventAddImage() override;
public:
DiagramEventAddImage(Diagram *diagram);
~DiagramEventAddImage() override;
void mousePressEvent (QGraphicsSceneMouseEvent *event) override;
void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override;
void wheelEvent (QGraphicsSceneWheelEvent *event) override;
void mousePressEvent (QGraphicsSceneMouseEvent *event) override;
void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override;
void wheelEvent (QGraphicsSceneWheelEvent *event) override;
bool isNull () const;
private:
void openDialog();
bool isNull () const;
private:
void openDialog();
DiagramImageItem *m_image;
bool m_is_added;
DiagramImageItem *m_image;
bool m_is_added;
};
#endif // DIAGRAMEVENTADDIMAGE_H

22
sources/diagramevent/diagrameventaddtext.cpp
View File

@ -27,7 +27,7 @@
@param diagram : the diagram where this event must operate
*/
DiagramEventAddText::DiagramEventAddText(Diagram *diagram) :
DiagramEventInterface(diagram)
DiagramEventInterface(diagram)
{}
/**
@ -42,13 +42,17 @@ DiagramEventAddText::~DiagramEventAddText()
*/
void DiagramEventAddText::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
if (event->button() == Qt::LeftButton)
{
IndependentTextItem *text = new IndependentTextItem();
m_diagram -> undoStack().push(new AddItemCommand<IndependentTextItem *>(text, m_diagram, event->scenePos()));
text->setTextInteractionFlags(Qt::TextEditorInteraction);
text->setFocus(Qt::MouseFocusReason);
emit finish();
if (event->button() == Qt::LeftButton)
{
IndependentTextItem *text = new IndependentTextItem();
m_diagram -> undoStack().push(
new AddItemCommand<IndependentTextItem *>(
text,
m_diagram,
event->scenePos()));
text->setTextInteractionFlags(Qt::TextEditorInteraction);
text->setFocus(Qt::MouseFocusReason);
emit finish();
event->setAccepted(true);
}
}
}

10
sources/diagramevent/diagrameventaddtext.h
View File

@ -28,13 +28,13 @@ class Diagram;
*/
class DiagramEventAddText : public DiagramEventInterface
{
Q_OBJECT
Q_OBJECT
public:
DiagramEventAddText(Diagram *diagram);
~DiagramEventAddText() override;
public:
DiagramEventAddText(Diagram *diagram);
~DiagramEventAddText() override;
void mousePressEvent (QGraphicsSceneMouseEvent *event) override;
void mousePressEvent (QGraphicsSceneMouseEvent *event) override;
};
#endif // DIAGRAMEVENTADDTEXT_H