kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-04-25 22:19:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the lose of the text of element text item tagged "label" in some case.

Browse Source 
See the diff for more information.


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4940 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2017-03-31 17:09:04 +00:00
parent 41040ef97c
commit c03a862151
1 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sources/qetgraphicsitem/element.cpp
View File

@@ -394,7 +394,14 @@ bool Element::valideXml(QDomElement &e) {
@return true si l'import a reussi, false sinon @return true si l'import a reussi, false sinon
*/ */
bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool handle_inputs_rotation) { bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool handle_inputs_rotation)
{
QDomDocument doc = e.ownerDocument();
QDomElement root = doc.documentElement();
double saved_version = -1;
if(root.tagName() == "project")
saved_version = root.attribute("version", "-1").toDouble();
/* /*
les bornes vont maintenant etre recensees pour associer leurs id a leur adresse reelle les bornes vont maintenant etre recensees pour associer leurs id a leur adresse reelle
ce recensement servira lors de la mise en place des fils ce recensement servira lors de la mise en place des fils
@@ -483,6 +490,30 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
{ {
m_element_informations.addValue("formula", m_element_informations["label"]); m_element_informations.addValue("formula", m_element_informations["label"]);
} }
/**
* At the start of the 0.51 devel, if the text item with tagg "label" was edited directly in the diagram,
* the text was not write to the element information value "formula".
* During the devel, this behavior change, when user edit the text item direclty in the diagram,
* the text was also write in the element information.
* Then when open a .qet file, the text item with tagg "label", is write with the value stored in the element information.
* The mistake is :
* if user write directly in the diagram with a version befor the change (so the text is not in the element information),
* and open the project with a version after the change, then the text item with tagg "label" is empty.
* The code below fix this.
*/
if (saved_version > -1 && saved_version <= 0.51)
{
if (ElementTextItem *eti = taggedText("label"))
{
if (m_element_informations["label"].toString().isEmpty() &&
m_element_informations["formula"].toString().isEmpty() &&
!eti->toPlainText().isEmpty())
{
m_element_informations.addValue("formula", eti->toPlainText());
}
}
}
//Position and selection. //Position and selection.
//We directly call setPos from QGraphicsObject, because QetGraphicsItem will snap to grid //We directly call setPos from QGraphicsObject, because QetGraphicsItem will snap to grid