Neal Wilson 7 роки тому
джерело
коміт
4fccab5c60
9 змінених файлів з 2550 додано та 1415 видалено
  1. 1
    1
      src/abouttypica.cpp
  2. 2
    2
      src/draglabel.cpp
  3. 2
    2
      src/draglabel.h
  4. 1
    1
      src/helpmenu.cpp
  5. 1
    1
      src/licensewindow.cpp
  6. 351
    0
      src/moc_typica.cpp
  7. 6
    6
      src/scale.cpp
  8. 2
    2
      src/scale.h
  9. 2184
    1400
      src/typica.cpp

+ 1
- 1
src/abouttypica.cpp Переглянути файл

@@ -17,7 +17,7 @@ aboutFile.close();
17 17
 setCentralWidget(banner);
18 18
 }
19 19
 
20
-#line 6808 "./typica.w"
20
+#line 6811 "./typica.w"
21 21
 
22 22
 /*:288*/
23 23
 #line 36 "./abouttypica.w"

+ 2
- 2
src/draglabel.cpp Переглянути файл

@@ -1,4 +1,4 @@
1
-/*1054:*/
1
+/*1086:*/
2 2
 #line 33 "./scales.w"
3 3
 
4 4
 #include "draglabel.h"
@@ -26,4 +26,4 @@ drag->exec();
26 26
 }
27 27
 }
28 28
 
29
-/*:1054*/
29
+/*:1086*/

+ 2
- 2
src/draglabel.h Переглянути файл

@@ -1,4 +1,4 @@
1
-/*1053:*/
1
+/*1085:*/
2 2
 #line 13 "./scales.w"
3 3
 
4 4
 #ifndef TypicaDragLabelInclude
@@ -17,4 +17,4 @@ void mousePressEvent(QMouseEvent*event);
17 17
 
18 18
 #endif
19 19
 
20
-/*:1053*/
20
+/*:1085*/

+ 1
- 1
src/helpmenu.cpp Переглянути файл

@@ -42,7 +42,7 @@ LicenseWindow*window= new LicenseWindow;
42 42
 window->show();
43 43
 }
44 44
 
45
-#line 4865 "./typica.w"
45
+#line 4868 "./typica.w"
46 46
 
47 47
 #line 1 "./licensewindow.w"
48 48
 /*:210*/

+ 1
- 1
src/licensewindow.cpp Переглянути файл

@@ -11,7 +11,7 @@
11 11
 #include <QVariant> 
12 12
 #include <QUrl> 
13 13
 
14
-#line 4867 "./typica.w"
14
+#line 4870 "./typica.w"
15 15
 
16 16
 /*:216*/
17 17
 #line 37 "./licensewindow.w"

+ 351
- 0
src/moc_typica.cpp Переглянути файл

@@ -7157,6 +7157,357 @@ int PhidgetsTemperatureSensor::qt_metacall(QMetaObject::Call _c, int _id, void *
7157 7157
     }
7158 7158
     return _id;
7159 7159
 }
7160
+static const uint qt_meta_data_PhidgetConfWidget[] = {
7161
+
7162
+ // content:
7163
+       6,       // revision
7164
+       0,       // classname
7165
+       0,    0, // classinfo
7166
+       1,   14, // methods
7167
+       0,    0, // properties
7168
+       0,    0, // enums/sets
7169
+       1,   19, // constructors
7170
+       0,       // flags
7171
+       0,       // signalCount
7172
+
7173
+ // slots: signature, parameters, type, tag, flags
7174
+      19,   18,   18,   18, 0x08,
7175
+
7176
+ // constructors: signature, parameters, type, tag, flags
7177
+      44,   32,   18,   18, 0x0e,
7178
+
7179
+       0        // eod
7180
+};
7181
+
7182
+static const char qt_meta_stringdata_PhidgetConfWidget[] = {
7183
+    "PhidgetConfWidget\0\0addChannel()\0"
7184
+    "model,index\0PhidgetConfWidget(DeviceTreeModel*,QModelIndex)\0"
7185
+};
7186
+
7187
+void PhidgetConfWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
7188
+{
7189
+    if (_c == QMetaObject::CreateInstance) {
7190
+        switch (_id) {
7191
+        case 0: { PhidgetConfWidget *_r = new PhidgetConfWidget((*reinterpret_cast< DeviceTreeModel*(*)>(_a[1])),(*reinterpret_cast< const QModelIndex(*)>(_a[2])));
7192
+            if (_a[0]) *reinterpret_cast<QObject**>(_a[0]) = _r; } break;
7193
+        }
7194
+    } else if (_c == QMetaObject::InvokeMetaMethod) {
7195
+        Q_ASSERT(staticMetaObject.cast(_o));
7196
+        PhidgetConfWidget *_t = static_cast<PhidgetConfWidget *>(_o);
7197
+        switch (_id) {
7198
+        case 0: _t->addChannel(); break;
7199
+        default: ;
7200
+        }
7201
+    }
7202
+}
7203
+
7204
+const QMetaObjectExtraData PhidgetConfWidget::staticMetaObjectExtraData = {
7205
+    0,  qt_static_metacall 
7206
+};
7207
+
7208
+const QMetaObject PhidgetConfWidget::staticMetaObject = {
7209
+    { &BasicDeviceConfigurationWidget::staticMetaObject, qt_meta_stringdata_PhidgetConfWidget,
7210
+      qt_meta_data_PhidgetConfWidget, &staticMetaObjectExtraData }
7211
+};
7212
+
7213
+#ifdef Q_NO_DATA_RELOCATION
7214
+const QMetaObject &PhidgetConfWidget::getStaticMetaObject() { return staticMetaObject; }
7215
+#endif //Q_NO_DATA_RELOCATION
7216
+
7217
+const QMetaObject *PhidgetConfWidget::metaObject() const
7218
+{
7219
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
7220
+}
7221
+
7222
+void *PhidgetConfWidget::qt_metacast(const char *_clname)
7223
+{
7224
+    if (!_clname) return 0;
7225
+    if (!strcmp(_clname, qt_meta_stringdata_PhidgetConfWidget))
7226
+        return static_cast<void*>(const_cast< PhidgetConfWidget*>(this));
7227
+    return BasicDeviceConfigurationWidget::qt_metacast(_clname);
7228
+}
7229
+
7230
+int PhidgetConfWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
7231
+{
7232
+    _id = BasicDeviceConfigurationWidget::qt_metacall(_c, _id, _a);
7233
+    if (_id < 0)
7234
+        return _id;
7235
+    if (_c == QMetaObject::InvokeMetaMethod) {
7236
+        if (_id < 1)
7237
+            qt_static_metacall(this, _c, _id, _a);
7238
+        _id -= 1;
7239
+    }
7240
+    return _id;
7241
+}
7242
+static const uint qt_meta_data_PhidgetChannelSelector[] = {
7243
+
7244
+ // content:
7245
+       6,       // revision
7246
+       0,       // classname
7247
+       0,    0, // classinfo
7248
+       0,    0, // methods
7249
+       0,    0, // properties
7250
+       0,    0, // enums/sets
7251
+       0,    0, // constructors
7252
+       0,       // flags
7253
+       0,       // signalCount
7254
+
7255
+       0        // eod
7256
+};
7257
+
7258
+static const char qt_meta_stringdata_PhidgetChannelSelector[] = {
7259
+    "PhidgetChannelSelector\0"
7260
+};
7261
+
7262
+void PhidgetChannelSelector::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
7263
+{
7264
+    Q_UNUSED(_o);
7265
+    Q_UNUSED(_id);
7266
+    Q_UNUSED(_c);
7267
+    Q_UNUSED(_a);
7268
+}
7269
+
7270
+const QMetaObjectExtraData PhidgetChannelSelector::staticMetaObjectExtraData = {
7271
+    0,  qt_static_metacall 
7272
+};
7273
+
7274
+const QMetaObject PhidgetChannelSelector::staticMetaObject = {
7275
+    { &QComboBox::staticMetaObject, qt_meta_stringdata_PhidgetChannelSelector,
7276
+      qt_meta_data_PhidgetChannelSelector, &staticMetaObjectExtraData }
7277
+};
7278
+
7279
+#ifdef Q_NO_DATA_RELOCATION
7280
+const QMetaObject &PhidgetChannelSelector::getStaticMetaObject() { return staticMetaObject; }
7281
+#endif //Q_NO_DATA_RELOCATION
7282
+
7283
+const QMetaObject *PhidgetChannelSelector::metaObject() const
7284
+{
7285
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
7286
+}
7287
+
7288
+void *PhidgetChannelSelector::qt_metacast(const char *_clname)
7289
+{
7290
+    if (!_clname) return 0;
7291
+    if (!strcmp(_clname, qt_meta_stringdata_PhidgetChannelSelector))
7292
+        return static_cast<void*>(const_cast< PhidgetChannelSelector*>(this));
7293
+    return QComboBox::qt_metacast(_clname);
7294
+}
7295
+
7296
+int PhidgetChannelSelector::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
7297
+{
7298
+    _id = QComboBox::qt_metacall(_c, _id, _a);
7299
+    if (_id < 0)
7300
+        return _id;
7301
+    return _id;
7302
+}
7303
+static const uint qt_meta_data_PhidgetChannelConfWidget[] = {
7304
+
7305
+ // content:
7306
+       6,       // revision
7307
+       0,       // classname
7308
+       0,    0, // classinfo
7309
+      10,   14, // methods
7310
+       0,    0, // properties
7311
+       0,    0, // enums/sets
7312
+       1,   64, // constructors
7313
+       0,       // flags
7314
+       0,       // signalCount
7315
+
7316
+ // slots: signature, parameters, type, tag, flags
7317
+      32,   26,   25,   25, 0x0a,
7318
+      65,   59,   25,   25, 0x0a,
7319
+      93,   59,   25,   25, 0x0a,
7320
+     116,   59,   25,   25, 0x0a,
7321
+     139,   59,   25,   25, 0x0a,
7322
+     165,   59,   25,   25, 0x0a,
7323
+     188,   59,   25,   25, 0x0a,
7324
+     206,   59,   25,   25, 0x0a,
7325
+     225,   59,   25,   25, 0x0a,
7326
+     246,   59,   25,   25, 0x0a,
7327
+
7328
+ // constructors: signature, parameters, type, tag, flags
7329
+     276,  264,   25,   25, 0x0e,
7330
+
7331
+       0        // eod
7332
+};
7333
+
7334
+static const char qt_meta_stringdata_PhidgetChannelConfWidget[] = {
7335
+    "PhidgetChannelConfWidget\0\0index\0"
7336
+    "changeSelectedChannel(int)\0value\0"
7337
+    "updateSerialNumber(QString)\0"
7338
+    "updateChannel(QString)\0updateHubPort(QString)\0"
7339
+    "updateColumnName(QString)\0"
7340
+    "updateChannelType(int)\0updateTCType(int)\0"
7341
+    "updateRTDType(int)\0updateRTDWiring(int)\0"
7342
+    "updateHidden(int)\0model,index\0"
7343
+    "PhidgetChannelConfWidget(DeviceTreeModel*,QModelIndex)\0"
7344
+};
7345
+
7346
+void PhidgetChannelConfWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
7347
+{
7348
+    if (_c == QMetaObject::CreateInstance) {
7349
+        switch (_id) {
7350
+        case 0: { PhidgetChannelConfWidget *_r = new PhidgetChannelConfWidget((*reinterpret_cast< DeviceTreeModel*(*)>(_a[1])),(*reinterpret_cast< const QModelIndex(*)>(_a[2])));
7351
+            if (_a[0]) *reinterpret_cast<QObject**>(_a[0]) = _r; } break;
7352
+        }
7353
+    } else if (_c == QMetaObject::InvokeMetaMethod) {
7354
+        Q_ASSERT(staticMetaObject.cast(_o));
7355
+        PhidgetChannelConfWidget *_t = static_cast<PhidgetChannelConfWidget *>(_o);
7356
+        switch (_id) {
7357
+        case 0: _t->changeSelectedChannel((*reinterpret_cast< int(*)>(_a[1]))); break;
7358
+        case 1: _t->updateSerialNumber((*reinterpret_cast< const QString(*)>(_a[1]))); break;
7359
+        case 2: _t->updateChannel((*reinterpret_cast< const QString(*)>(_a[1]))); break;
7360
+        case 3: _t->updateHubPort((*reinterpret_cast< const QString(*)>(_a[1]))); break;
7361
+        case 4: _t->updateColumnName((*reinterpret_cast< const QString(*)>(_a[1]))); break;
7362
+        case 5: _t->updateChannelType((*reinterpret_cast< int(*)>(_a[1]))); break;
7363
+        case 6: _t->updateTCType((*reinterpret_cast< int(*)>(_a[1]))); break;
7364
+        case 7: _t->updateRTDType((*reinterpret_cast< int(*)>(_a[1]))); break;
7365
+        case 8: _t->updateRTDWiring((*reinterpret_cast< int(*)>(_a[1]))); break;
7366
+        case 9: _t->updateHidden((*reinterpret_cast< int(*)>(_a[1]))); break;
7367
+        default: ;
7368
+        }
7369
+    }
7370
+}
7371
+
7372
+const QMetaObjectExtraData PhidgetChannelConfWidget::staticMetaObjectExtraData = {
7373
+    0,  qt_static_metacall 
7374
+};
7375
+
7376
+const QMetaObject PhidgetChannelConfWidget::staticMetaObject = {
7377
+    { &BasicDeviceConfigurationWidget::staticMetaObject, qt_meta_stringdata_PhidgetChannelConfWidget,
7378
+      qt_meta_data_PhidgetChannelConfWidget, &staticMetaObjectExtraData }
7379
+};
7380
+
7381
+#ifdef Q_NO_DATA_RELOCATION
7382
+const QMetaObject &PhidgetChannelConfWidget::getStaticMetaObject() { return staticMetaObject; }
7383
+#endif //Q_NO_DATA_RELOCATION
7384
+
7385
+const QMetaObject *PhidgetChannelConfWidget::metaObject() const
7386
+{
7387
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
7388
+}
7389
+
7390
+void *PhidgetChannelConfWidget::qt_metacast(const char *_clname)
7391
+{
7392
+    if (!_clname) return 0;
7393
+    if (!strcmp(_clname, qt_meta_stringdata_PhidgetChannelConfWidget))
7394
+        return static_cast<void*>(const_cast< PhidgetChannelConfWidget*>(this));
7395
+    return BasicDeviceConfigurationWidget::qt_metacast(_clname);
7396
+}
7397
+
7398
+int PhidgetChannelConfWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
7399
+{
7400
+    _id = BasicDeviceConfigurationWidget::qt_metacall(_c, _id, _a);
7401
+    if (_id < 0)
7402
+        return _id;
7403
+    if (_c == QMetaObject::InvokeMetaMethod) {
7404
+        if (_id < 10)
7405
+            qt_static_metacall(this, _c, _id, _a);
7406
+        _id -= 10;
7407
+    }
7408
+    return _id;
7409
+}
7410
+static const uint qt_meta_data_Phidget22[] = {
7411
+
7412
+ // content:
7413
+       6,       // revision
7414
+       0,       // classname
7415
+       0,    0, // classinfo
7416
+       6,   14, // methods
7417
+       0,    0, // properties
7418
+       0,    0, // enums/sets
7419
+       1,   44, // constructors
7420
+       0,       // flags
7421
+       0,       // signalCount
7422
+
7423
+ // slots: signature, parameters, type, tag, flags
7424
+      11,   10,   10,   10, 0x0a,
7425
+      19,   10,   10,   10, 0x0a,
7426
+
7427
+ // methods: signature, parameters, type, tag, flags
7428
+      30,   10,   26,   10, 0x02,
7429
+      58,   50,   45,   10, 0x02,
7430
+      87,   50,   79,   10, 0x02,
7431
+     110,   50,   79,   10, 0x02,
7432
+
7433
+ // constructors: signature, parameters, type, tag, flags
7434
+     148,  136,   10,   10, 0x0e,
7435
+
7436
+       0        // eod
7437
+};
7438
+
7439
+static const char qt_meta_stringdata_Phidget22[] = {
7440
+    "Phidget22\0\0start()\0stop()\0int\0"
7441
+    "channelCount()\0bool\0channel\0"
7442
+    "isChannelHidden(int)\0QString\0"
7443
+    "channelColumnName(int)\0channelIndicatorText(int)\0"
7444
+    "deviceIndex\0Phidget22(QModelIndex)\0"
7445
+};
7446
+
7447
+void Phidget22::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
7448
+{
7449
+    if (_c == QMetaObject::CreateInstance) {
7450
+        switch (_id) {
7451
+        case 0: { Phidget22 *_r = new Phidget22((*reinterpret_cast< const QModelIndex(*)>(_a[1])));
7452
+            if (_a[0]) *reinterpret_cast<QObject**>(_a[0]) = _r; } break;
7453
+        }
7454
+    } else if (_c == QMetaObject::InvokeMetaMethod) {
7455
+        Q_ASSERT(staticMetaObject.cast(_o));
7456
+        Phidget22 *_t = static_cast<Phidget22 *>(_o);
7457
+        switch (_id) {
7458
+        case 0: _t->start(); break;
7459
+        case 1: _t->stop(); break;
7460
+        case 2: { int _r = _t->channelCount();
7461
+            if (_a[0]) *reinterpret_cast< int*>(_a[0]) = _r; }  break;
7462
+        case 3: { bool _r = _t->isChannelHidden((*reinterpret_cast< int(*)>(_a[1])));
7463
+            if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; }  break;
7464
+        case 4: { QString _r = _t->channelColumnName((*reinterpret_cast< int(*)>(_a[1])));
7465
+            if (_a[0]) *reinterpret_cast< QString*>(_a[0]) = _r; }  break;
7466
+        case 5: { QString _r = _t->channelIndicatorText((*reinterpret_cast< int(*)>(_a[1])));
7467
+            if (_a[0]) *reinterpret_cast< QString*>(_a[0]) = _r; }  break;
7468
+        default: ;
7469
+        }
7470
+    }
7471
+}
7472
+
7473
+const QMetaObjectExtraData Phidget22::staticMetaObjectExtraData = {
7474
+    0,  qt_static_metacall 
7475
+};
7476
+
7477
+const QMetaObject Phidget22::staticMetaObject = {
7478
+    { &QObject::staticMetaObject, qt_meta_stringdata_Phidget22,
7479
+      qt_meta_data_Phidget22, &staticMetaObjectExtraData }
7480
+};
7481
+
7482
+#ifdef Q_NO_DATA_RELOCATION
7483
+const QMetaObject &Phidget22::getStaticMetaObject() { return staticMetaObject; }
7484
+#endif //Q_NO_DATA_RELOCATION
7485
+
7486
+const QMetaObject *Phidget22::metaObject() const
7487
+{
7488
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
7489
+}
7490
+
7491
+void *Phidget22::qt_metacast(const char *_clname)
7492
+{
7493
+    if (!_clname) return 0;
7494
+    if (!strcmp(_clname, qt_meta_stringdata_Phidget22))
7495
+        return static_cast<void*>(const_cast< Phidget22*>(this));
7496
+    return QObject::qt_metacast(_clname);
7497
+}
7498
+
7499
+int Phidget22::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
7500
+{
7501
+    _id = QObject::qt_metacall(_c, _id, _a);
7502
+    if (_id < 0)
7503
+        return _id;
7504
+    if (_c == QMetaObject::InvokeMetaMethod) {
7505
+        if (_id < 6)
7506
+            qt_static_metacall(this, _c, _id, _a);
7507
+        _id -= 6;
7508
+    }
7509
+    return _id;
7510
+}
7160 7511
 static const uint qt_meta_data_LinearSplineInterpolationConfWidget[] = {
7161 7512
 
7162 7513
  // content:

+ 6
- 6
src/scale.cpp Переглянути файл

@@ -1,4 +1,4 @@
1
-/*1060:*/
1
+/*1092:*/
2 2
 #line 135 "./scales.w"
3 3
 
4 4
 #include "scale.h"
@@ -10,7 +10,7 @@ QextSerialPort(port,QextSerialPort::EventDriven)
10 10
 connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
11 11
 }
12 12
 
13
-/*:1060*//*1061:*/
13
+/*:1092*//*1093:*/
14 14
 #line 153 "./scales.w"
15 15
 
16 16
 void SerialScale::dataAvailable()
@@ -24,7 +24,7 @@ responseBuffer.clear();
24 24
 }
25 25
 else
26 26
 {
27
-/*1062:*/
27
+/*1094:*/
28 28
 #line 193 "./scales.w"
29 29
 
30 30
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
@@ -53,7 +53,7 @@ unit= Units::Ounce;
53 53
 }
54 54
 emit newMeasurement(weight,unit);
55 55
 
56
-/*:1062*/
56
+/*:1094*/
57 57
 #line 165 "./scales.w"
58 58
 
59 59
 responseBuffer.clear();
@@ -61,7 +61,7 @@ responseBuffer.clear();
61 61
 }
62 62
 }
63 63
 
64
-/*:1061*//*1063:*/
64
+/*:1093*//*1095:*/
65 65
 #line 224 "./scales.w"
66 66
 
67 67
 void SerialScale::tare()
@@ -96,4 +96,4 @@ commandTerminator= "\x0A";
96 96
 }
97 97
 }
98 98
 
99
-/*:1063*/
99
+/*:1095*/

+ 2
- 2
src/scale.h Переглянути файл

@@ -1,4 +1,4 @@
1
-/*1059:*/
1
+/*1091:*/
2 2
 #line 103 "./scales.w"
3 3
 
4 4
 #ifndef TypicaScaleInclude
@@ -29,4 +29,4 @@ QByteArray commandTerminator;
29 29
 
30 30
 #endif
31 31
 
32
-/*:1059*/
32
+/*:1091*/

+ 2184
- 1400
src/typica.cpp
Різницю між файлами не показано, бо вона завелика
Переглянути файл


Завантаження…
Відмінити
Зберегти