diff --git a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp index 208450a06..076ba5c95 100644 --- a/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp +++ b/sources/qetgraphicsitem/ViewItem/qetgraphicstableitem.cpp @@ -58,9 +58,10 @@ void QetGraphicsTableItem::adjustTableToFolio( auto size_ = table->size(); size_.setWidth(int(drawable_rect.width() - (margins.left() + margins.right()))); - //Size must be a multiple of 10, because the table adjust itself by step of 10. + //Size must be a multiple of 10, because the table adjusts itself by step of 10. while (size_.width()%10) { - --size_.rwidth(); } + --size_.rwidth(); + } table->setSize(size_); //Calculate the maximum row to display to fit the nomenclature into diagram diff --git a/sources/qetgraphicsitem/element.cpp b/sources/qetgraphicsitem/element.cpp index 8a20472e6..86d3a5dc8 100644 --- a/sources/qetgraphicsitem/element.cpp +++ b/sources/qetgraphicsitem/element.cpp @@ -805,13 +805,13 @@ bool Element::fromXml(QDomElement &e, // orientation bool conv_ok; int read_ori = e.attribute(QStringLiteral("orientation")).toInt(&conv_ok); - if (!conv_ok || read_ori < 0 || read_ori > 3) { + if (!(conv_ok) || (read_ori < 0) || (read_ori > 3)) { read_ori = 0; } setRotation(90*read_ori); //Before loading the dynamic text field, - //we remove the dynamic text field created from the description of this element, to avoid doublons. + //we remove the dynamic text field created from the description of this element, to avoid doubles. for(DynamicElementTextItem *deti : m_dynamic_text_list) delete deti; m_dynamic_text_list.clear();