Skip to content

Commit 93b9129

Browse files
committed
Fix bugs
1 parent 3ac4be1 commit 93b9129

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

src/core/gui/dialogs/core_dialogdataviewitem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ void mbCoreDialogDataViewItem::initializeBaseUi()
113113
// Register Order
114114
cmb = m_ui.cmbRegisterOrder;
115115
ls = mb::enumDataOrderKeyList();
116-
for (int i = 1; i < mb::enumDataOrderKeyCount(); i++) // i = 1 (i != 0) => pass 'DefaultOrder' for byte order
117-
cmb->addItem(ls.at(i));
116+
Q_FOREACH (const QString &s, ls)
117+
cmb->addItem(s);
118118
cmb->setCurrentIndex(0);
119119

120120
// ByteArray format

src/modbus/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.5) # 2.2 - case insensitive syntax
22

3-
project(ModbusLib VERSION 0.1.0 LANGUAGES C CXX)
3+
project(ModbusLib VERSION 0.1.1 LANGUAGES C CXX)
44

55
configure_file(Modbus_config.h.in Modbus_config.h)
66

src/server/gui/server_ui.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,9 @@ void mbServerUi::initialize()
252252
QAction *a = ui->toolBar->addWidget(lb);
253253
a->setVisible(true);
254254
m_cmbFormat = new QComboBox(ui->toolBar);
255-
int end = mb::enumDigitalFormatValueByIndex(mb::enumDigitalFormatKeyCount()-1);
256-
for (int i = mb::Bin; i <= end; i++)
257-
{
258-
QString s = mb::enumDigitalFormatKeyByIndex(i);
259-
m_cmbFormat->addItem(s);
260-
}
255+
QStringList ls = mb::enumDigitalFormatKeyList();
256+
for (int i = 1 ; i < ls.count(); i++)
257+
m_cmbFormat->addItem(ls.at(i));
261258
m_cmbFormat->setCurrentIndex(m_format);
262259
connect(m_cmbFormat, SIGNAL(currentIndexChanged(int)), this, SLOT(setFormat(int)));
263260
a = ui->toolBar->addWidget(m_cmbFormat);

0 commit comments

Comments
 (0)