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

Change struct TerminalStripBridge to class

Browse Source 
And move it in a new file
This commit is contained in:
joshua
2021-12-26 18:43:17 +01:00
parent 5709f469fc
commit 1572fafabe
7 changed files with 156 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sources/TerminalStrip/ui/terminalstripmodel.cpp
View File

@@ -20,6 +20,7 @@
#include "../../qetgraphicsitem/element.h"
#include "../physicalterminal.h"
#include "../realterminal.h"
#include "../terminalstripbridge.h"
#include <QDebug>
#include <QBrush>
#include <QVector>
@@ -416,7 +417,7 @@ modelRealTerminalData TerminalStripModel::modelRealTerminalDataForIndex(const QM
void TerminalStripModel::buildBridgePixmap(const QSize &pixmap_size)
{
m_bridges_pixmaps.clear();
for (auto color_ : TerminalStrip::bridgeColor())
for (auto color_ : TerminalStripBridge::bridgeColor())
{
QPen pen;
pen.setColor(color_);
@@ -656,7 +657,7 @@ QPixmap TerminalStripModel::bridgePixmapFor(const QModelIndex &index) const
if (next_t)
next_bridge = next_t->bridge();
auto color_ = bridge_->color_;
auto color_ = bridge_->color();
auto pixmap_ = m_bridges_pixmaps.value(color_);
//Current real terminal between two bridged terminal
@@ -749,7 +750,7 @@ QPixmap TerminalStripModel::bridgePixmapFor(const QModelIndex &index) const
if (previous_bridge == m_terminal_strip->isBridged(next_data.real_terminal))
{
if (previous_bridge) {
return m_bridges_pixmaps.value(previous_bridge->color_).none_;
return m_bridges_pixmaps.value(previous_bridge->color()).none_;
}
}