Skip to content

Commit c84453d

Browse files
Alarmbit edit added
1 parent 585d739 commit c84453d

File tree

6 files changed

+281
-85
lines changed

6 files changed

+281
-85
lines changed

src/cdlgmdfregisterbit.cpp

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ CDlgMdfRegisterBit::CDlgMdfRegisterBit(QWidget* parent)
6363

6464
// m_type = mdf_type_unknown;
6565
m_pbit = nullptr;
66-
66+
m_index = 0;
67+
m_type = mdf_type_unknown;
6768
vscpworks* pworks = (vscpworks*)QCoreApplication::instance();
6869

6970
setInitialFocus();
@@ -84,7 +85,7 @@ CDlgMdfRegisterBit::~CDlgMdfRegisterBit()
8485
//
8586

8687
void
87-
CDlgMdfRegisterBit::initDialogData(CMDF_Bit* pbit, int index)
88+
CDlgMdfRegisterBit::initDialogData(CMDF_Bit* pbit, int index, mdf_record_type type)
8889
{
8990
QString str;
9091

@@ -94,6 +95,8 @@ CDlgMdfRegisterBit::initDialogData(CMDF_Bit* pbit, int index)
9495
}
9596

9697
m_pbit = pbit;
98+
m_index = index;
99+
m_type = type;
97100

98101
setName(pbit->getName().c_str());
99102
setPos(pbit->getPos());
@@ -136,6 +139,27 @@ CDlgMdfRegisterBit::initDialogData(CMDF_Bit* pbit, int index)
136139
ui->editName->setFocus();
137140
break;
138141
}
142+
143+
if (mdf_type_register == type) {
144+
setWindowTitle("Register bit definitions");
145+
}
146+
else if (mdf_type_remotevar == type) {
147+
setWindowTitle("Remote variable bit definitions");
148+
}
149+
else if (mdf_type_alarm == type) {
150+
setWindowTitle("Alarm bit definitions");
151+
ui->spinWidth->setValue(1);
152+
ui->spinWidth->setEnabled(false);
153+
ui->spinDefault->setValue(0);
154+
ui->spinDefault->setEnabled(false);
155+
ui->spinMin->setValue(0);
156+
ui->spinMin->setEnabled(false);
157+
ui->spinMax->setValue(1);
158+
ui->spinMax->setEnabled(false);
159+
ui->comboAccess->setCurrentIndex(3);
160+
ui->comboAccess->setEnabled(false);
161+
}
162+
139163
}
140164

141165
///////////////////////////////////////////////////////////////////////////////

src/cdlgmdfregisterbit.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class CDlgMdfRegisterBit : public QDialog {
6868
@param index Selected file item
6969
7070
*/
71-
void initDialogData(CMDF_Bit* pbit, int index = 0);
71+
void initDialogData(CMDF_Bit* pbit, int index = 0, mdf_record_type type = mdf_type_register);
7272

7373
// ----------------------------------------------------------------------------
7474
// Getters & Setters
@@ -117,6 +117,12 @@ public slots:
117117

118118
/// Pointer to bit information
119119
CMDF_Bit* m_pbit;
120+
121+
/// Selected field in dialog
122+
int m_index;
123+
124+
/// MDF record owner type we are editing
125+
mdf_record_type m_type;
120126
};
121127

122128
#endif // CDLGMDFREGISTERBIT_H

0 commit comments

Comments
 (0)