kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-20 08:10:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better handling of conductors when moving

Browse Source 
For conductors, the setPos() function can result in negative
coordinates.
For unknown reasons, this can lead to an offset in the scene coordinate
system, resulting in a free space above and to the left of the drawing
frame. This free space could not be removed.

It is better to set the conductors using the conductor::updatePath()
function. If the conductor text has been moved by the user, the new
position of the text must be calculated.
It is important to position the elements first and then 'connect' the
conductors.
Setting the conductor position via setPos() was done in elemntsmover.cpp
(corrected here) and in Diagram::fromXML (corrected in the commit
'Better handling of conductors when creating from XML').
This commit is contained in:
achim
2025-08-11 23:13:46 +02:00
parent 0f179a5d49
commit 29c362fe4c
3 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
sources/undocommand/movegraphicsitemcommand.cpp
View File

@@ -22,6 +22,7 @@
#include "../qetgraphicsitem/conductor.h"
#include "../qetgraphicsitem/elementtextitemgroup.h"
#include "../qetgraphicsitem/conductortextitem.h"
#include "../diagram.h"
@@ -65,6 +66,7 @@ void MoveGraphicsItemCommand::undo()
m_diagram->showMe();
m_anim_group.setDirection(QAnimationGroup::Forward);
m_anim_group.start();
updateConductors(false);
}
QUndoCommand::undo();
}
@@ -87,6 +89,7 @@ void MoveGraphicsItemCommand::redo()
{
m_anim_group.setDirection(QAnimationGroup::Backward);
m_anim_group.start();
updateConductors(true);
}
}
QUndoCommand::redo();
@@ -137,19 +140,6 @@ void MoveGraphicsItemCommand::move(const QPointF &movement)
qgi->setPos(qgi->pos() + movement);
}
}
//Move some conductors
for (const auto &conductor : qAsConst(m_content.m_conductors_to_move)) {
setupAnimation(conductor,
"pos",
conductor->pos(),
conductor->pos() + movement);
}
//Recalculate the path of other conductors
for (const auto &conductor : qAsConst(m_content.m_conductors_to_update)) {
setupAnimation(conductor, "animPath", 1, 1);
}
}
/**
@@ -167,9 +157,34 @@ void MoveGraphicsItemCommand::setupAnimation(QObject *target,
const QVariant &end)
{
QPropertyAnimation *animation{new QPropertyAnimation(target, property_name)};
animation->setDuration(300);
// duration must be set to 0, otherwise the conductors will not be updated
animation->setDuration(0);
animation->setStartValue(start);
animation->setEndValue(end);
animation->setEasingCurve(QEasingCurve::OutQuad);
m_anim_group.addAnimation(animation);
}
/**
* @brief MoveGraphicsItemCommand::connectConductors
* @param is_redo
*/
void MoveGraphicsItemCommand::updateConductors(bool is_redo)
{
//Recalculate the path of 'conductors_to_move'
for (const auto &conductor : qAsConst(m_content.m_conductors_to_move)) {
conductor->updatePath();
if(conductor->textItem()->wasMovedByUser() == true){
if(is_redo)
conductor->textItem()->setPos(conductor->textItem()->pos() + m_movement);
else
conductor->textItem()->setPos(conductor->textItem()->pos() - m_movement);
}
}
// Recalculate the path of 'conductors_to_update'
for (const auto &conductor : qAsConst(m_content.m_conductors_to_update)) {
conductor->updatePath();
}
}