Skip to content

Commit e3d57e4

Browse files
author
Ананьев Александр
committed
Correc #1. Remove Update Rate from DisplayDefinitionDialog
1 parent 397eaca commit e3d57e4

8 files changed

Lines changed: 91 additions & 136 deletions

File tree

‎omodsim/controls/outputwidget.cpp‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
struct ListItemData
99
{
1010
int Row;
11-
quint16 Address;
11+
quint32 Address;
1212
QVariant Value;
1313
};
1414
Q_DECLARE_METATYPE(ListItemData)
@@ -71,11 +71,12 @@ QVector<quint16> OutputWidget::data() const
7171
///
7272
/// \brief OutputWidget::setup
7373
/// \param dd
74+
/// \param data
7475
///
75-
void OutputWidget::setup(const DisplayDefinition& dd)
76+
void OutputWidget::setup(const DisplayDefinition& dd, const QModbusDataUnit& data)
7677
{
7778
_displayDefinition = dd;
78-
updateDataWidget(QModbusDataUnit());
79+
updateDataWidget(data);
7980
}
8081

8182
///
@@ -268,7 +269,6 @@ void OutputWidget::updateTraffic(const QModbusResponse& response, int server)
268269
void OutputWidget::updateData(const QModbusDataUnit& data)
269270
{
270271
updateDataWidget(data);
271-
_lastData = data;
272272
}
273273

274274
///
@@ -585,6 +585,14 @@ void OutputWidget::setNotConnectedStatus()
585585
setStatus(tr("NOT CONNECTED!"));
586586
}
587587

588+
///
589+
/// \brief OutputWidget::setInvalidLengthStatus
590+
///
591+
void OutputWidget::setInvalidLengthStatus()
592+
{
593+
setStatus(tr("Invalid Data Length Specified"));
594+
}
595+
588596
///
589597
/// \brief OutputWidget::updateDataWidget
590598
/// \param data
@@ -600,7 +608,7 @@ void OutputWidget::updateDataWidget(const QModbusDataUnit& data)
600608
}
601609

602610
QStringList capstr;
603-
for(quint16 i = 0; i < _displayDefinition.Length; i++)
611+
for(quint32 i = 0; i < _displayDefinition.Length; i++)
604612
{
605613
ListItemData itemData;
606614
itemData.Row = i;
@@ -658,6 +666,8 @@ void OutputWidget::updateDataWidget(const QModbusDataUnit& data)
658666
item->setText(QString(format).arg(addr, valstr));
659667
item->setData(Qt::UserRole, QVariant::fromValue(itemData));
660668
}
669+
670+
_lastData = data;
661671
}
662672

663673
///

‎omodsim/controls/outputwidget.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class OutputWidget : public QWidget
2525

2626
QVector<quint16> data() const;
2727

28-
void setup(const DisplayDefinition& dd);
28+
void setup(const DisplayDefinition& dd, const QModbusDataUnit& data = QModbusDataUnit());
2929

3030
DisplayMode displayMode() const;
3131
void setDisplayMode(DisplayMode mode);
@@ -49,6 +49,8 @@ class OutputWidget : public QWidget
4949
void setFont(const QFont& font);
5050

5151
void setStatus(const QString& status);
52+
void setNotConnectedStatus();
53+
void setInvalidLengthStatus();
5254

5355
void paint(const QRect& rc, QPainter& painter);
5456

@@ -66,7 +68,6 @@ private slots:
6668
void on_listWidget_itemDoubleClicked(QListWidgetItem *item);
6769

6870
private:
69-
void setNotConnectedStatus();
7071
void updateDataWidget(const QModbusDataUnit& data);
7172
void updateTrafficWidget(bool request, int server, const QModbusPdu& pdu);
7273

‎omodsim/dialogs/dialogdisplaydefinition.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@ DialogDisplayDefinition::DialogDisplayDefinition(FormModSim* parent) :
1212
ui(new Ui::DialogDisplayDefinition)
1313
{
1414
ui->setupUi(this);
15-
ui->lineEditUpdateRate->setInputRange(20, 10000);
1615
ui->lineEditPointAddress->setInputRange(ModbusLimits::addressRange());
1716
ui->lineEditLength->setInputRange(ModbusLimits::lengthRange());
1817
ui->lineEditSlaveAddress->setInputRange(ModbusLimits::slaveRange());
1918

2019
const auto dd = parent->displayDefinition();
21-
ui->lineEditUpdateRate->setValue(dd.UpdateRate);
2220
ui->lineEditPointAddress->setValue(dd.PointAddress);
2321
ui->lineEditSlaveAddress->setValue(dd.DeviceId);
2422
ui->lineEditLength->setValue(dd.Length);
@@ -45,7 +43,6 @@ void DialogDisplayDefinition::accept()
4543
dd.PointAddress = ui->lineEditPointAddress->value<int>();
4644
dd.PointType = ui->comboBoxPointType->currentPointType();
4745
dd.Length = ui->lineEditLength->value<int>();
48-
dd.UpdateRate = ui->lineEditUpdateRate->value<int>();
4946
((FormModSim*)parentWidget())->setDisplayDefinition(dd);
5047

5148
QFixedSizeDialog::accept();

‎omodsim/dialogs/dialogdisplaydefinition.ui‎

Lines changed: 2 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -6,80 +6,14 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>350</width>
10-
<height>262</height>
9+
<width>321</width>
10+
<height>243</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Display Definition</string>
1515
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout">
17-
<item>
18-
<layout class="QHBoxLayout" name="horizontalLayout">
19-
<item>
20-
<spacer name="horizontalSpacer">
21-
<property name="orientation">
22-
<enum>Qt::Horizontal</enum>
23-
</property>
24-
<property name="sizeHint" stdset="0">
25-
<size>
26-
<width>40</width>
27-
<height>20</height>
28-
</size>
29-
</property>
30-
</spacer>
31-
</item>
32-
<item>
33-
<widget class="QLabel" name="labelUpdateRate">
34-
<property name="text">
35-
<string>Update Rate: </string>
36-
</property>
37-
</widget>
38-
</item>
39-
<item>
40-
<widget class="NumericLineEdit" name="lineEditUpdateRate">
41-
<property name="sizePolicy">
42-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
43-
<horstretch>0</horstretch>
44-
<verstretch>0</verstretch>
45-
</sizepolicy>
46-
</property>
47-
<property name="minimumSize">
48-
<size>
49-
<width>0</width>
50-
<height>25</height>
51-
</size>
52-
</property>
53-
<property name="maximumSize">
54-
<size>
55-
<width>60</width>
56-
<height>16777215</height>
57-
</size>
58-
</property>
59-
</widget>
60-
</item>
61-
<item>
62-
<widget class="QLabel" name="label">
63-
<property name="text">
64-
<string>(msecs)</string>
65-
</property>
66-
</widget>
67-
</item>
68-
<item>
69-
<spacer name="horizontalSpacer_2">
70-
<property name="orientation">
71-
<enum>Qt::Horizontal</enum>
72-
</property>
73-
<property name="sizeHint" stdset="0">
74-
<size>
75-
<width>40</width>
76-
<height>20</height>
77-
</size>
78-
</property>
79-
</spacer>
80-
</item>
81-
</layout>
82-
</item>
8317
<item>
8418
<widget class="QGroupBox" name="groupBox">
8519
<property name="sizePolicy">
@@ -242,7 +176,6 @@
242176
</customwidget>
243177
</customwidgets>
244178
<tabstops>
245-
<tabstop>lineEditUpdateRate</tabstop>
246179
<tabstop>lineEditSlaveAddress</tabstop>
247180
<tabstop>comboBoxPointType</tabstop>
248181
<tabstop>lineEditPointAddress</tabstop>

0 commit comments

Comments
 (0)