kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-01-06 05:10:52 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Minor fix : folio-report information 'tension_protocol' isn't displayed

Browse Source 
When a folio report have a text item witch must display the information
'tension protocol' the text is empty.
Replace the string 'tension/protocol' by 'tension_protocol' in
QETInformation namespace.
Move the static QStrings of the namespace QETInformation from
qetinformation.cpp to qetinformation.h to be use everywhere in the code.
This commit is contained in:
Claveau Joshua
2020-12-04 21:07:42 +01:00
parent 77e6248ac9
commit b22741732b
3 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sources/qetgraphicsitem/dynamicelementtextitem.cpp
View File

@@ -1,4 +1,4 @@
/*
/*
Copyright 2006-2020 The QElectroTech Team
This file is part of QElectroTech.
@@ -16,7 +16,6 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/
#include "dynamicelementtextitem.h"
#include "qet.h"
#include "element.h"
#include "qetapp.h"
#include "diagram.h"
@@ -25,6 +24,7 @@
#include "conductor.h"
#include "elementtextitemgroup.h"
#include "crossrefitem.h"
#include "qetinformation.h"
#include <QDomDocument>
#include <QDomElement>
@@ -1153,13 +1153,13 @@ void DynamicElementTextItem::conductorPropertiesChanged()
{
if(m_text_from == ElementInfo)
{
if(m_info_name == "function")
if(m_info_name == QETInformation::COND_FUNCTION)
setPlainText(m_watched_conductor? m_watched_conductor.data()->properties().m_function : "");
else if (m_info_name == "tension_protocol")
else if (m_info_name == QETInformation::COND_TENSION_PROTOCOL)
setPlainText(m_watched_conductor? m_watched_conductor.data()->properties().m_tension_protocol : "");
else if (m_info_name == "conductor_color")
else if (m_info_name == QETInformation::COND_COLOR)
setPlainText(m_watched_conductor? m_watched_conductor.data()->properties().m_wire_color : "");
else if (m_info_name == "conductor_section")
else if (m_info_name == QETInformation::COND_SECTION)
setPlainText(m_watched_conductor? m_watched_conductor.data()->properties().m_wire_section : "");
}
else if (m_text_from == CompositeText) {