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

Merge pull request #351 from plc-user/master

Browse Source 
FIX copy-and-paste in element-editor: set paste-position to meaningful values
This commit is contained in:
Laurent Trinques 2025-02-11 06:41:40 +01:00 committed by GitHub
commit 3a43fbfa61
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sources/editor/elementscene.cpp
View File

@ -517,11 +517,11 @@ QRectF ElementScene::boundingRectFromXml(const QDomDocument &xml_document)
ElementContent loaded_content = loadContent(xml_document);
if (loaded_content.isEmpty()) return(QRectF());
// calcule the boundingRect
// calculate the boundingRect
// calcule le boundingRect
QRectF bounding_rect = elementContentBoundingRect(loaded_content);
// destroy charged parties
// destroy loaded parts
// detruit les parties chargees
qDeleteAll(loaded_content);

41
sources/editor/elementview.cpp
View File

@ -307,10 +307,12 @@ ElementContent ElementView::pasteAreaDefined(const QRectF &target_rect) {
@param pos Coin superieur gauche du rectangle cible
*/
ElementContent ElementView::paste(const QDomDocument &xml_document, const QPointF &pos) {
// object to retrieve content added to the scheme by pasting
// objet pour recuperer le contenu ajoute au schema par le coller
ElementContent content_pasted;
m_scene -> fromXml(xml_document, pos, false, &content_pasted);
// if something has actually been added to the scheme, an undo object is created
// si quelque chose a effectivement ete ajoute au schema, on cree un objet d'annulation
if (content_pasted.count()) {
m_scene -> clearSelection();
@ -321,10 +323,12 @@ ElementContent ElementView::paste(const QDomDocument &xml_document, const QPoint
}
/**
Paste the XML document "xml_document" at position pos
Colle le document XML xml_document a la position pos
@param xml_document Document XML a coller
*/
ElementContent ElementView::pasteWithOffset(const QDomDocument &xml_document) {
// object to retrieve content added to the scheme by pasting
// objet pour recuperer le contenu ajoute au schema par le coller
ElementContent content_pasted;
@ -332,32 +336,25 @@ ElementContent ElementView::pasteWithOffset(const QDomDocument &xml_document) {
QRectF pasted_content_bounding_rect = m_scene -> boundingRectFromXml(xml_document);
if (pasted_content_bounding_rect.isEmpty()) return(content_pasted);
// copier/coller avec decalage
QRectF final_pasted_content_bounding_rect;
++ offset_paste_count_;
if (!offset_paste_count_) {
// the pasted content was cut
start_top_left_corner_ = pasted_content_bounding_rect.topLeft();
final_pasted_content_bounding_rect = pasted_content_bounding_rect;
}
else {
// the pasted content was copied
if (offset_paste_count_ == 1) {
start_top_left_corner_ = pasted_content_bounding_rect.topLeft();
} else {
pasted_content_bounding_rect.moveTopLeft(start_top_left_corner_);
}
// ok ... there is something to do for us!
int initialOffsetX = 10 + (qRound((pasted_content_bounding_rect.width())/10) * 10);
// on applique le decalage qui convient
final_pasted_content_bounding_rect = applyMovement(
pasted_content_bounding_rect,
QETElementEditor::pasteOffset()
);
}
// paste copied parts with offset
// copier/coller avec decalage
QRectF final_pasted_content_bounding_rect;
QPointF offset(initialOffsetX, 0);
++ offset_paste_count_; // == 0 when selection was cut to clipboard
// place pasted parts right from copied selection or already pasted parts
offset.setX(initialOffsetX * offset_paste_count_);
offset.setY(0);
final_pasted_content_bounding_rect = pasted_content_bounding_rect.translated(offset);
start_top_left_corner_ = pasted_content_bounding_rect.topLeft();
QPointF old_start_top_left_corner = start_top_left_corner_;
start_top_left_corner_ = final_pasted_content_bounding_rect.topLeft();
m_scene -> fromXml(xml_document, start_top_left_corner_, false, &content_pasted);
// if something has actually been added to the scheme, a cancel object is created
// si quelque chose a effectivement ete ajoute au schema, on cree un objet d'annulation
if (content_pasted.count()) {
m_scene -> clearSelection();
@ -591,10 +588,12 @@ void ElementView::drawBackground(QPainter *p, const QRectF &r) {
@return
*/
QRectF ElementView::applyMovement(const QRectF &start, const QPointF &offset) {
// calculates the offset to be applied from the offset
// calcule le decalage a appliquer a partir de l'offset
QPointF final_offset;
final_offset.rx() = start.width() + offset.x();
// applies the calculated offset
// applique le decalage ainsi calcule
return(start.translated(final_offset));
}

6
sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp
View File

@ -274,7 +274,7 @@ void QetGraphicsTableItem::paint(
offset += m_header_item->sectionSize(i);
}
//Calcule the number of rows to display.
//calculate the number of rows to display.
auto row_count = m_model->rowCount();
if (m_previous_table) //Remove the number of row already displayed by previous tables
@ -516,7 +516,7 @@ int QetGraphicsTableItem::displayedRowCount() const
return 0;
}
//Calcule the number of rows to display.
//calculate the number of rows to display.
auto row_count = m_model->rowCount();
if (m_previous_table) //Remove the number of row already displayed by previous tables
@ -858,7 +858,7 @@ void QetGraphicsTableItem::modelReseted()
/**
@brief QetGraphicsTableItem::setUpColumnAndRowMinimumSize
Calcule the minimum row height and the minimum column width for each columns
Calculate the minimum row height and the minimum column width for each columns
this function doesn't change the geometry of the table.
*/
void QetGraphicsTableItem::setUpColumnAndRowMinimumSize()