|
@@ -100,12 +100,12 @@ UnsupportedSerialDeviceConfWidget::UnsupportedSerialDeviceConfWidget(DeviceTreeM
|
100
|
100
|
data.chop(2);
|
101
|
101
|
data = data.remove(0, 2);
|
102
|
102
|
}
|
103
|
|
- QStringList keyList = data.split(",");
|
|
103
|
+ QStringList keyList = data.split(", ");
|
104
|
104
|
for(int j = 0; j < keyList.size(); j++)
|
105
|
105
|
{
|
106
|
106
|
deviceSettingsModel->setData(deviceSettingsModel->index(j, column),
|
107
|
107
|
QVariant(keyList.at(j)),
|
108
|
|
- Qt::DisplayRole);
|
|
108
|
+ Qt::EditRole);
|
109
|
109
|
}
|
110
|
110
|
}
|
111
|
111
|
else if(node.attribute("name") == "script")
|
|
@@ -114,7 +114,7 @@ UnsupportedSerialDeviceConfWidget::UnsupportedSerialDeviceConfWidget(DeviceTreeM
|
114
|
114
|
}
|
115
|
115
|
}
|
116
|
116
|
|
117
|
|
- connect(deviceSettingsModel, SIGNAL(dataChanged()),
|
|
117
|
+ connect(deviceSettingsModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
|
118
|
118
|
this, SLOT(updateConfiguration()));
|
119
|
119
|
connect(scriptEditor, SIGNAL(textChanged()), this, SLOT(saveScript()));
|
120
|
120
|
setLayout(dummyLayout);
|
|
@@ -132,7 +132,7 @@ delimiter must be chosen.
|
132
|
132
|
void UnsupportedSerialDeviceConfWidget::updateConfiguration()
|
133
|
133
|
{
|
134
|
134
|
updateAttribute("keys", deviceSettingsModel->arrayLiteral(0, Qt::DisplayRole));
|
135
|
|
- updateAttribute("values", deviceSettingsModel->arrayLiteral(0, Qt::DisplayRole));
|
|
135
|
+ updateAttribute("values", deviceSettingsModel->arrayLiteral(1, Qt::DisplayRole));
|
136
|
136
|
}
|
137
|
137
|
|
138
|
138
|
@ Every time the script text is changed, the new version of the script is
|
|
@@ -200,11 +200,41 @@ UnsupportedDeviceChannelConfWidget::UnsupportedDeviceChannelConfWidget(DeviceTre
|
200
|
200
|
@<Get device configuration data for current node@>@;
|
201
|
201
|
for(int i = 0; i < configData.size(); i++)
|
202
|
202
|
{
|
203
|
|
-
|
|
203
|
+ node = configData.at(i).toElement();
|
|
204
|
+ if(node.attribute("name") == "columnname")
|
|
205
|
+ {
|
|
206
|
+ columnName->setText(node.attribute("value"));
|
|
207
|
+ }
|
|
208
|
+ else if(node.attribute("name") == "hidden")
|
|
209
|
+ {
|
|
210
|
+ hideSeries->setChecked(node.attribute("value") == "true");
|
|
211
|
+ }
|
|
212
|
+ else if(node.attribute("name") == "keys" || node.attribute("name") == "values")
|
|
213
|
+ {
|
|
214
|
+ int column = 0;
|
|
215
|
+ if(node.attribute("name") == "values")
|
|
216
|
+ {
|
|
217
|
+ column = 1;
|
|
218
|
+ }
|
|
219
|
+ QString data = node.attribute("value");
|
|
220
|
+ if(data.length() > 3)
|
|
221
|
+ {
|
|
222
|
+ data.chop(2);
|
|
223
|
+ data = data.remove(0, 2);
|
|
224
|
+ }
|
|
225
|
+ QStringList keyList = data.split(", ");
|
|
226
|
+ for(int j = 0; j < keyList.size(); j++)
|
|
227
|
+ {
|
|
228
|
+ channelSettingsModel->setData(channelSettingsModel->index(j, column),
|
|
229
|
+ QVariant(keyList.at(j)),
|
|
230
|
+ Qt::EditRole);
|
|
231
|
+ }
|
|
232
|
+ }
|
204
|
233
|
}
|
205
|
234
|
connect(columnName, SIGNAL(textEdited(QString)), this, SLOT(updateColumnName(QString)));
|
206
|
235
|
connect(hideSeries, SIGNAL(toggled(bool)), this, SLOT(updateHidden(bool)));
|
207
|
|
- connect(channelSettingsModel, SIGNAL(dataChanged()), this, SLOT(updateConfiguration()));
|
|
236
|
+ connect(channelSettingsModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
|
|
237
|
+ this, SLOT(updateConfiguration()));
|
208
|
238
|
}
|
209
|
239
|
|
210
|
240
|
@ Arbitrary channel configuration data is handled in the same way as device
|
|
@@ -225,7 +255,7 @@ void UnsupportedDeviceChannelConfWidget::updateHidden(bool hidden)
|
225
|
255
|
void UnsupportedDeviceChannelConfWidget::updateConfiguration()
|
226
|
256
|
{
|
227
|
257
|
updateAttribute("keys", channelSettingsModel->arrayLiteral(0, Qt::DisplayRole));
|
228
|
|
- updateAttribute("values", channelSettingsModel->arrayLiteral(0, Qt::DisplayRole));
|
|
258
|
+ updateAttribute("values", channelSettingsModel->arrayLiteral(1, Qt::DisplayRole));
|
229
|
259
|
}
|
230
|
260
|
|
231
|
261
|
@ The configuration widgets need to be registered so they can be instantiated
|