浏览代码

Update generated files

Neal Wilson 7 年前
父节点
当前提交
03319874c5
共有 10 个文件被更改,包括 1948 次插入1255 次删除
  1. 21
    1
      config/Windows/manuallogentry.xml
  2. 1
    1
      src/abouttypica.cpp
  3. 2
    2
      src/draglabel.cpp
  4. 2
    2
      src/draglabel.h
  5. 1
    1
      src/helpmenu.cpp
  6. 1
    1
      src/licensewindow.cpp
  7. 401
    39
      src/moc_typica.cpp
  8. 6
    6
      src/scale.cpp
  9. 2
    2
      src/scale.h
  10. 1511
    1200
      src/typica.cpp

+ 21
- 1
config/Windows/manuallogentry.xml 查看文件

@@ -418,7 +418,27 @@
418 418
 				query.bind(":files", "{" + fileID + "}");
419 419
 				query.exec();
420 420
 			} else {
421
-				/* Production roast */
421
+				var q = "INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files) VALUES (:time, ";
422
+				q += productionGreenTable.columnArray(0, 32);
423
+				q += ", ";
424
+				for(var i = 0; i < productionGreenTable.data(i, 1, 0).value != ""; i++) {
425
+					productionGreenTable.setData(i, 1, convertToPounds(parseFloat(productionGreenTable.data(i, 1, 0)), produtionGreenUnit.currentText), 32);
426
+				}
427
+				q += productionGreenTable.columnArray(1, 32);
428
+				q += ", ";
429
+				q += roastedItem.currentData();
430
+				q += ", ";
431
+				q += convertToPounds(parseFloat(roastedWeight.text), productionGreenUnit.currentText);
432
+				q += ", 'ROAST', :annotation, ";
433
+				q += selectedRoasterID;
434
+				q += ", :duration, TRUE, NULL, NULL, NULL, NULL, '{";
435
+				q += fileID;
436
+				q += "}')";
437
+				query.prepare(q);
438
+				query.bind(":time", roastTime.text);
439
+				query.bind(":annotation", notes.plainText);
440
+				query.bind(":duration", roastDuration.text);
441
+				query.exec();
422 442
 			}
423 443
 			query = query.invalidate();
424 444
 			window.close();

+ 1
- 1
src/abouttypica.cpp 查看文件

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

+ 2
- 2
src/draglabel.cpp 查看文件

@@ -1,4 +1,4 @@
1
-/*1039:*/
1
+/*1053:*/
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
-/*:1039*/
29
+/*:1053*/

+ 2
- 2
src/draglabel.h 查看文件

@@ -1,4 +1,4 @@
1
-/*1038:*/
1
+/*1052:*/
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
-/*:1038*/
20
+/*:1052*/

+ 1
- 1
src/helpmenu.cpp 查看文件

@@ -42,7 +42,7 @@ LicenseWindow*window= new LicenseWindow;
42 42
 window->show();
43 43
 }
44 44
 
45
-#line 4826 "./typica.w"
45
+#line 4858 "./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 4828 "./typica.w"
14
+#line 4860 "./typica.w"
15 15
 
16 16
 /*:216*/
17 17
 #line 37 "./licensewindow.w"

+ 401
- 39
src/moc_typica.cpp 查看文件

@@ -21,37 +21,40 @@ static const uint qt_meta_data_ScriptQMainWindow[] = {
21 21
        6,       // revision
22 22
        0,       // classname
23 23
        0,    0, // classinfo
24
-       7,   14, // methods
25
-       1,   49, // properties
24
+       9,   14, // methods
25
+       1,   59, // properties
26 26
        0,    0, // enums/sets
27 27
        0,    0, // constructors
28 28
        0,       // flags
29
-       1,       // signalCount
29
+       2,       // signalCount
30 30
 
31 31
  // signals: signature, parameters, type, tag, flags
32 32
       19,   18,   18,   18, 0x05,
33
+      34,   18,   18,   18, 0x05,
33 34
 
34 35
  // slots: signature, parameters, type, tag, flags
35
-      34,   18,   18,   18, 0x0a,
36
-      45,   41,   18,   18, 0x0a,
37
-      74,   41,   18,   18, 0x0a,
38
-     114,  106,   18,   18, 0x0a,
39
-     137,   18,   18,   18, 0x2a,
40
-     160,  153,   18,   18, 0x0a,
36
+      48,   18,   18,   18, 0x0a,
37
+      59,   55,   18,   18, 0x0a,
38
+      88,   55,   18,   18, 0x0a,
39
+     128,  120,   18,   18, 0x0a,
40
+     151,   18,   18,   18, 0x2a,
41
+     174,  167,   18,   18, 0x0a,
42
+     198,   18,   18,   18, 0x0a,
41 43
 
42 44
  // properties: name, type, flags
43
-     192,  184, 0x0a095103,
45
+     222,  214, 0x0a095103,
44 46
 
45 47
        0        // eod
46 48
 };
47 49
 
48 50
 static const char qt_meta_stringdata_ScriptQMainWindow[] = {
49 51
     "ScriptQMainWindow\0\0aboutToClose()\0"
50
-    "show()\0key\0saveSizeAndPosition(QString)\0"
52
+    "windowReady()\0show()\0key\0"
53
+    "saveSizeAndPosition(QString)\0"
51 54
     "restoreSizeAndPosition(QString)\0message\0"
52 55
     "displayStatus(QString)\0displayStatus()\0"
53
-    "prompt\0setClosePrompt(QString)\0QString\0"
54
-    "closePrompt\0"
56
+    "prompt\0setClosePrompt(QString)\0"
57
+    "setupFinished()\0QString\0closePrompt\0"
55 58
 };
56 59
 
57 60
 void ScriptQMainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
@@ -61,12 +64,14 @@ void ScriptQMainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in
61 64
         ScriptQMainWindow *_t = static_cast<ScriptQMainWindow *>(_o);
62 65
         switch (_id) {
63 66
         case 0: _t->aboutToClose(); break;
64
-        case 1: _t->show(); break;
65
-        case 2: _t->saveSizeAndPosition((*reinterpret_cast< const QString(*)>(_a[1]))); break;
66
-        case 3: _t->restoreSizeAndPosition((*reinterpret_cast< const QString(*)>(_a[1]))); break;
67
-        case 4: _t->displayStatus((*reinterpret_cast< const QString(*)>(_a[1]))); break;
68
-        case 5: _t->displayStatus(); break;
69
-        case 6: _t->setClosePrompt((*reinterpret_cast< QString(*)>(_a[1]))); break;
67
+        case 1: _t->windowReady(); break;
68
+        case 2: _t->show(); break;
69
+        case 3: _t->saveSizeAndPosition((*reinterpret_cast< const QString(*)>(_a[1]))); break;
70
+        case 4: _t->restoreSizeAndPosition((*reinterpret_cast< const QString(*)>(_a[1]))); break;
71
+        case 5: _t->displayStatus((*reinterpret_cast< const QString(*)>(_a[1]))); break;
72
+        case 6: _t->displayStatus(); break;
73
+        case 7: _t->setClosePrompt((*reinterpret_cast< QString(*)>(_a[1]))); break;
74
+        case 8: _t->setupFinished(); break;
70 75
         default: ;
71 76
         }
72 77
     }
@@ -104,9 +109,9 @@ int ScriptQMainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
104 109
     if (_id < 0)
105 110
         return _id;
106 111
     if (_c == QMetaObject::InvokeMetaMethod) {
107
-        if (_id < 7)
112
+        if (_id < 9)
108 113
             qt_static_metacall(this, _c, _id, _a);
109
-        _id -= 7;
114
+        _id -= 9;
110 115
     }
111 116
 #ifndef QT_NO_PROPERTIES
112 117
       else if (_c == QMetaObject::ReadProperty) {
@@ -143,6 +148,12 @@ void ScriptQMainWindow::aboutToClose()
143 148
 {
144 149
     QMetaObject::activate(this, &staticMetaObject, 0, 0);
145 150
 }
151
+
152
+// SIGNAL 1
153
+void ScriptQMainWindow::windowReady()
154
+{
155
+    QMetaObject::activate(this, &staticMetaObject, 1, 0);
156
+}
146 157
 static const uint qt_meta_data_NumericDelegate[] = {
147 158
 
148 159
  // content:
@@ -1470,7 +1481,7 @@ static const uint qt_meta_data_ZoomLog[] = {
1470 1481
        6,       // revision
1471 1482
        0,       // classname
1472 1483
        0,    0, // classinfo
1473
-      23,   14, // methods
1484
+      24,   14, // methods
1474 1485
        0,    0, // properties
1475 1486
        0,    0, // enums/sets
1476 1487
        0,    0, // constructors
@@ -1502,7 +1513,8 @@ static const uint qt_meta_data_ZoomLog[] = {
1502 1513
      549,    8,    8,    8, 0x0a,
1503 1514
 
1504 1515
  // methods: signature, parameters, type, tag, flags
1505
-     585,    8,  573,    8, 0x02,
1516
+     577,    8,  573,    8, 0x02,
1517
+     600,    8,  588,    8, 0x02,
1506 1518
 
1507 1519
        0        // eod
1508 1520
 };
@@ -1525,8 +1537,8 @@ static const char qt_meta_stringdata_ZoomLog[] = {
1525 1537
     "clearOutputColumns()\0scale\0"
1526 1538
     "setDisplayUnits(Units::Unit)\0"
1527 1539
     "addToCurrentColumnSet(int)\0"
1528
-    "clearCurrentColumnSet()\0Units::Unit\0"
1529
-    "displayUnits()\0"
1540
+    "clearCurrentColumnSet()\0int\0rowCount()\0"
1541
+    "Units::Unit\0displayUnits()\0"
1530 1542
 };
1531 1543
 
1532 1544
 void ZoomLog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
@@ -1557,7 +1569,9 @@ void ZoomLog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, voi
1557 1569
         case 19: _t->setDisplayUnits((*reinterpret_cast< Units::Unit(*)>(_a[1]))); break;
1558 1570
         case 20: _t->addToCurrentColumnSet((*reinterpret_cast< int(*)>(_a[1]))); break;
1559 1571
         case 21: _t->clearCurrentColumnSet(); break;
1560
-        case 22: { Units::Unit _r = _t->displayUnits();
1572
+        case 22: { int _r = _t->rowCount();
1573
+            if (_a[0]) *reinterpret_cast< int*>(_a[0]) = _r; }  break;
1574
+        case 23: { Units::Unit _r = _t->displayUnits();
1561 1575
             if (_a[0]) *reinterpret_cast< Units::Unit*>(_a[0]) = _r; }  break;
1562 1576
         default: ;
1563 1577
         }
@@ -1596,9 +1610,9 @@ int ZoomLog::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
1596 1610
     if (_id < 0)
1597 1611
         return _id;
1598 1612
     if (_c == QMetaObject::InvokeMetaMethod) {
1599
-        if (_id < 23)
1613
+        if (_id < 24)
1600 1614
             qt_static_metacall(this, _c, _id, _a);
1601
-        _id -= 23;
1615
+        _id -= 24;
1602 1616
     }
1603 1617
     return _id;
1604 1618
 }
@@ -3102,21 +3116,29 @@ static const uint qt_meta_data_PluginAction[] = {
3102 3116
        6,       // revision
3103 3117
        0,       // classname
3104 3118
        0,    0, // classinfo
3105
-       1,   14, // methods
3106
-       0,    0, // properties
3119
+       3,   14, // methods
3120
+       2,   29, // properties
3107 3121
        0,    0, // enums/sets
3108 3122
        0,    0, // constructors
3109 3123
        0,       // flags
3110 3124
        0,       // signalCount
3111 3125
 
3112 3126
  // slots: signature, parameters, type, tag, flags
3113
-      14,   13,   13,   13, 0x08,
3127
+      21,   14,   13,   13, 0x0a,
3128
+      40,   14,   13,   13, 0x0a,
3129
+      60,   13,   13,   13, 0x08,
3130
+
3131
+ // properties: name, type, flags
3132
+      80,   72, 0x0a095103,
3133
+      87,   72, 0x0a095103,
3114 3134
 
3115 3135
        0        // eod
3116 3136
 };
3117 3137
 
3118 3138
 static const char qt_meta_stringdata_PluginAction[] = {
3119
-    "PluginAction\0\0runScript()\0"
3139
+    "PluginAction\0\0script\0setPreRun(QString)\0"
3140
+    "setPostRun(QString)\0runScript()\0QString\0"
3141
+    "preRun\0postRun\0"
3120 3142
 };
3121 3143
 
3122 3144
 void PluginAction::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
@@ -3125,11 +3147,12 @@ void PluginAction::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id
3125 3147
         Q_ASSERT(staticMetaObject.cast(_o));
3126 3148
         PluginAction *_t = static_cast<PluginAction *>(_o);
3127 3149
         switch (_id) {
3128
-        case 0: _t->runScript(); break;
3150
+        case 0: _t->setPreRun((*reinterpret_cast< const QString(*)>(_a[1]))); break;
3151
+        case 1: _t->setPostRun((*reinterpret_cast< const QString(*)>(_a[1]))); break;
3152
+        case 2: _t->runScript(); break;
3129 3153
         default: ;
3130 3154
         }
3131 3155
     }
3132
-    Q_UNUSED(_a);
3133 3156
 }
3134 3157
 
3135 3158
 const QMetaObjectExtraData PluginAction::staticMetaObjectExtraData = {
@@ -3164,10 +3187,39 @@ int PluginAction::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
3164 3187
     if (_id < 0)
3165 3188
         return _id;
3166 3189
     if (_c == QMetaObject::InvokeMetaMethod) {
3167
-        if (_id < 1)
3190
+        if (_id < 3)
3168 3191
             qt_static_metacall(this, _c, _id, _a);
3169
-        _id -= 1;
3192
+        _id -= 3;
3193
+    }
3194
+#ifndef QT_NO_PROPERTIES
3195
+      else if (_c == QMetaObject::ReadProperty) {
3196
+        void *_v = _a[0];
3197
+        switch (_id) {
3198
+        case 0: *reinterpret_cast< QString*>(_v) = preRun(); break;
3199
+        case 1: *reinterpret_cast< QString*>(_v) = postRun(); break;
3200
+        }
3201
+        _id -= 2;
3202
+    } else if (_c == QMetaObject::WriteProperty) {
3203
+        void *_v = _a[0];
3204
+        switch (_id) {
3205
+        case 0: setPreRun(*reinterpret_cast< QString*>(_v)); break;
3206
+        case 1: setPostRun(*reinterpret_cast< QString*>(_v)); break;
3207
+        }
3208
+        _id -= 2;
3209
+    } else if (_c == QMetaObject::ResetProperty) {
3210
+        _id -= 2;
3211
+    } else if (_c == QMetaObject::QueryPropertyDesignable) {
3212
+        _id -= 2;
3213
+    } else if (_c == QMetaObject::QueryPropertyScriptable) {
3214
+        _id -= 2;
3215
+    } else if (_c == QMetaObject::QueryPropertyStored) {
3216
+        _id -= 2;
3217
+    } else if (_c == QMetaObject::QueryPropertyEditable) {
3218
+        _id -= 2;
3219
+    } else if (_c == QMetaObject::QueryPropertyUser) {
3220
+        _id -= 2;
3170 3221
     }
3222
+#endif // QT_NO_PROPERTIES
3171 3223
     return _id;
3172 3224
 }
3173 3225
 static const uint qt_meta_data_FormArray[] = {
@@ -3516,7 +3568,7 @@ static const uint qt_meta_data_DeviceTreeModel[] = {
3516 3568
        6,       // revision
3517 3569
        0,       // classname
3518 3570
        0,    0, // classinfo
3519
-       1,   14, // methods
3571
+       3,   14, // methods
3520 3572
        0,    0, // properties
3521 3573
        0,    0, // enums/sets
3522 3574
        0,    0, // constructors
@@ -3526,12 +3578,18 @@ static const uint qt_meta_data_DeviceTreeModel[] = {
3526 3578
  // slots: signature, parameters, type, tag, flags
3527 3579
       36,   17,   16,   16, 0x0a,
3528 3580
 
3581
+ // methods: signature, parameters, type, tag, flags
3582
+      84,   77,   73,   16, 0x02,
3583
+     106,   16,   73,   16, 0x22,
3584
+
3529 3585
        0        // eod
3530 3586
 };
3531 3587
 
3532 3588
 static const char qt_meta_stringdata_DeviceTreeModel[] = {
3533 3589
     "DeviceTreeModel\0\0name,driver,parent\0"
3534 3590
     "newNode(QString,QString,QModelIndex)\0"
3591
+    "int\0parent\0rowCount(QModelIndex)\0"
3592
+    "rowCount()\0"
3535 3593
 };
3536 3594
 
3537 3595
 void DeviceTreeModel::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
@@ -3541,6 +3599,10 @@ void DeviceTreeModel::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int
3541 3599
         DeviceTreeModel *_t = static_cast<DeviceTreeModel *>(_o);
3542 3600
         switch (_id) {
3543 3601
         case 0: _t->newNode((*reinterpret_cast< const QString(*)>(_a[1])),(*reinterpret_cast< const QString(*)>(_a[2])),(*reinterpret_cast< const QModelIndex(*)>(_a[3]))); break;
3602
+        case 1: { int _r = _t->rowCount((*reinterpret_cast< const QModelIndex(*)>(_a[1])));
3603
+            if (_a[0]) *reinterpret_cast< int*>(_a[0]) = _r; }  break;
3604
+        case 2: { int _r = _t->rowCount();
3605
+            if (_a[0]) *reinterpret_cast< int*>(_a[0]) = _r; }  break;
3544 3606
         default: ;
3545 3607
         }
3546 3608
     }
@@ -3578,9 +3640,9 @@ int DeviceTreeModel::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
3578 3640
     if (_id < 0)
3579 3641
         return _id;
3580 3642
     if (_c == QMetaObject::InvokeMetaMethod) {
3581
-        if (_id < 1)
3643
+        if (_id < 3)
3582 3644
             qt_static_metacall(this, _c, _id, _a);
3583
-        _id -= 1;
3645
+        _id -= 3;
3584 3646
     }
3585 3647
     return _id;
3586 3648
 }
@@ -7691,6 +7753,306 @@ int RateOfChangeConfWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a
7691 7753
     }
7692 7754
     return _id;
7693 7755
 }
7756
+static const uint qt_meta_data_MergeSeries[] = {
7757
+
7758
+ // content:
7759
+       6,       // revision
7760
+       0,       // classname
7761
+       0,    0, // classinfo
7762
+       3,   14, // methods
7763
+       0,    0, // properties
7764
+       0,    0, // enums/sets
7765
+       0,    0, // constructors
7766
+       0,       // flags
7767
+       1,       // signalCount
7768
+
7769
+ // signals: signature, parameters, type, tag, flags
7770
+      21,   13,   12,   12, 0x05,
7771
+
7772
+ // slots: signature, parameters, type, tag, flags
7773
+      42,   13,   12,   12, 0x0a,
7774
+      59,   13,   12,   12, 0x0a,
7775
+
7776
+       0        // eod
7777
+};
7778
+
7779
+static const char qt_meta_stringdata_MergeSeries[] = {
7780
+    "MergeSeries\0\0measure\0newData(Measurement)\0"
7781
+    "in1(Measurement)\0in2(Measurement)\0"
7782
+};
7783
+
7784
+void MergeSeries::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
7785
+{
7786
+    if (_c == QMetaObject::InvokeMetaMethod) {
7787
+        Q_ASSERT(staticMetaObject.cast(_o));
7788
+        MergeSeries *_t = static_cast<MergeSeries *>(_o);
7789
+        switch (_id) {
7790
+        case 0: _t->newData((*reinterpret_cast< Measurement(*)>(_a[1]))); break;
7791
+        case 1: _t->in1((*reinterpret_cast< Measurement(*)>(_a[1]))); break;
7792
+        case 2: _t->in2((*reinterpret_cast< Measurement(*)>(_a[1]))); break;
7793
+        default: ;
7794
+        }
7795
+    }
7796
+}
7797
+
7798
+const QMetaObjectExtraData MergeSeries::staticMetaObjectExtraData = {
7799
+    0,  qt_static_metacall 
7800
+};
7801
+
7802
+const QMetaObject MergeSeries::staticMetaObject = {
7803
+    { &QObject::staticMetaObject, qt_meta_stringdata_MergeSeries,
7804
+      qt_meta_data_MergeSeries, &staticMetaObjectExtraData }
7805
+};
7806
+
7807
+#ifdef Q_NO_DATA_RELOCATION
7808
+const QMetaObject &MergeSeries::getStaticMetaObject() { return staticMetaObject; }
7809
+#endif //Q_NO_DATA_RELOCATION
7810
+
7811
+const QMetaObject *MergeSeries::metaObject() const
7812
+{
7813
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
7814
+}
7815
+
7816
+void *MergeSeries::qt_metacast(const char *_clname)
7817
+{
7818
+    if (!_clname) return 0;
7819
+    if (!strcmp(_clname, qt_meta_stringdata_MergeSeries))
7820
+        return static_cast<void*>(const_cast< MergeSeries*>(this));
7821
+    return QObject::qt_metacast(_clname);
7822
+}
7823
+
7824
+int MergeSeries::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
7825
+{
7826
+    _id = QObject::qt_metacall(_c, _id, _a);
7827
+    if (_id < 0)
7828
+        return _id;
7829
+    if (_c == QMetaObject::InvokeMetaMethod) {
7830
+        if (_id < 3)
7831
+            qt_static_metacall(this, _c, _id, _a);
7832
+        _id -= 3;
7833
+    }
7834
+    return _id;
7835
+}
7836
+
7837
+// SIGNAL 0
7838
+void MergeSeries::newData(Measurement _t1)
7839
+{
7840
+    void *_a[] = { 0, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) };
7841
+    QMetaObject::activate(this, &staticMetaObject, 0, _a);
7842
+}
7843
+static const uint qt_meta_data_DifferenceSeries[] = {
7844
+
7845
+ // content:
7846
+       6,       // revision
7847
+       0,       // classname
7848
+       0,    0, // classinfo
7849
+       0,    0, // methods
7850
+       0,    0, // properties
7851
+       0,    0, // enums/sets
7852
+       0,    0, // constructors
7853
+       0,       // flags
7854
+       0,       // signalCount
7855
+
7856
+       0        // eod
7857
+};
7858
+
7859
+static const char qt_meta_stringdata_DifferenceSeries[] = {
7860
+    "DifferenceSeries\0"
7861
+};
7862
+
7863
+void DifferenceSeries::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
7864
+{
7865
+    Q_UNUSED(_o);
7866
+    Q_UNUSED(_id);
7867
+    Q_UNUSED(_c);
7868
+    Q_UNUSED(_a);
7869
+}
7870
+
7871
+const QMetaObjectExtraData DifferenceSeries::staticMetaObjectExtraData = {
7872
+    0,  qt_static_metacall 
7873
+};
7874
+
7875
+const QMetaObject DifferenceSeries::staticMetaObject = {
7876
+    { &MergeSeries::staticMetaObject, qt_meta_stringdata_DifferenceSeries,
7877
+      qt_meta_data_DifferenceSeries, &staticMetaObjectExtraData }
7878
+};
7879
+
7880
+#ifdef Q_NO_DATA_RELOCATION
7881
+const QMetaObject &DifferenceSeries::getStaticMetaObject() { return staticMetaObject; }
7882
+#endif //Q_NO_DATA_RELOCATION
7883
+
7884
+const QMetaObject *DifferenceSeries::metaObject() const
7885
+{
7886
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
7887
+}
7888
+
7889
+void *DifferenceSeries::qt_metacast(const char *_clname)
7890
+{
7891
+    if (!_clname) return 0;
7892
+    if (!strcmp(_clname, qt_meta_stringdata_DifferenceSeries))
7893
+        return static_cast<void*>(const_cast< DifferenceSeries*>(this));
7894
+    return MergeSeries::qt_metacast(_clname);
7895
+}
7896
+
7897
+int DifferenceSeries::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
7898
+{
7899
+    _id = MergeSeries::qt_metacall(_c, _id, _a);
7900
+    if (_id < 0)
7901
+        return _id;
7902
+    return _id;
7903
+}
7904
+static const uint qt_meta_data_MeanSeries[] = {
7905
+
7906
+ // content:
7907
+       6,       // revision
7908
+       0,       // classname
7909
+       0,    0, // classinfo
7910
+       0,    0, // methods
7911
+       0,    0, // properties
7912
+       0,    0, // enums/sets
7913
+       0,    0, // constructors
7914
+       0,       // flags
7915
+       0,       // signalCount
7916
+
7917
+       0        // eod
7918
+};
7919
+
7920
+static const char qt_meta_stringdata_MeanSeries[] = {
7921
+    "MeanSeries\0"
7922
+};
7923
+
7924
+void MeanSeries::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
7925
+{
7926
+    Q_UNUSED(_o);
7927
+    Q_UNUSED(_id);
7928
+    Q_UNUSED(_c);
7929
+    Q_UNUSED(_a);
7930
+}
7931
+
7932
+const QMetaObjectExtraData MeanSeries::staticMetaObjectExtraData = {
7933
+    0,  qt_static_metacall 
7934
+};
7935
+
7936
+const QMetaObject MeanSeries::staticMetaObject = {
7937
+    { &MergeSeries::staticMetaObject, qt_meta_stringdata_MeanSeries,
7938
+      qt_meta_data_MeanSeries, &staticMetaObjectExtraData }
7939
+};
7940
+
7941
+#ifdef Q_NO_DATA_RELOCATION
7942
+const QMetaObject &MeanSeries::getStaticMetaObject() { return staticMetaObject; }
7943
+#endif //Q_NO_DATA_RELOCATION
7944
+
7945
+const QMetaObject *MeanSeries::metaObject() const
7946
+{
7947
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
7948
+}
7949
+
7950
+void *MeanSeries::qt_metacast(const char *_clname)
7951
+{
7952
+    if (!_clname) return 0;
7953
+    if (!strcmp(_clname, qt_meta_stringdata_MeanSeries))
7954
+        return static_cast<void*>(const_cast< MeanSeries*>(this));
7955
+    return MergeSeries::qt_metacast(_clname);
7956
+}
7957
+
7958
+int MeanSeries::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
7959
+{
7960
+    _id = MergeSeries::qt_metacall(_c, _id, _a);
7961
+    if (_id < 0)
7962
+        return _id;
7963
+    return _id;
7964
+}
7965
+static const uint qt_meta_data_MergeSeriesConfWidget[] = {
7966
+
7967
+ // content:
7968
+       6,       // revision
7969
+       0,       // classname
7970
+       0,    0, // classinfo
7971
+       4,   14, // methods
7972
+       0,    0, // properties
7973
+       0,    0, // enums/sets
7974
+       1,   34, // constructors
7975
+       0,       // flags
7976
+       0,       // signalCount
7977
+
7978
+ // slots: signature, parameters, type, tag, flags
7979
+      30,   23,   22,   22, 0x08,
7980
+      53,   23,   22,   22, 0x08,
7981
+      76,   23,   22,   22, 0x08,
7982
+     103,   98,   22,   22, 0x08,
7983
+
7984
+ // constructors: signature, parameters, type, tag, flags
7985
+     131,  119,   22,   22, 0x0e,
7986
+
7987
+       0        // eod
7988
+};
7989
+
7990
+static const char qt_meta_stringdata_MergeSeriesConfWidget[] = {
7991
+    "MergeSeriesConfWidget\0\0column\0"
7992
+    "updateColumn1(QString)\0updateColumn2(QString)\0"
7993
+    "updateOutput(QString)\0type\0updateType(int)\0"
7994
+    "model,index\0"
7995
+    "MergeSeriesConfWidget(DeviceTreeModel*,QModelIndex)\0"
7996
+};
7997
+
7998
+void MergeSeriesConfWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
7999
+{
8000
+    if (_c == QMetaObject::CreateInstance) {
8001
+        switch (_id) {
8002
+        case 0: { MergeSeriesConfWidget *_r = new MergeSeriesConfWidget((*reinterpret_cast< DeviceTreeModel*(*)>(_a[1])),(*reinterpret_cast< const QModelIndex(*)>(_a[2])));
8003
+            if (_a[0]) *reinterpret_cast<QObject**>(_a[0]) = _r; } break;
8004
+        }
8005
+    } else if (_c == QMetaObject::InvokeMetaMethod) {
8006
+        Q_ASSERT(staticMetaObject.cast(_o));
8007
+        MergeSeriesConfWidget *_t = static_cast<MergeSeriesConfWidget *>(_o);
8008
+        switch (_id) {
8009
+        case 0: _t->updateColumn1((*reinterpret_cast< const QString(*)>(_a[1]))); break;
8010
+        case 1: _t->updateColumn2((*reinterpret_cast< const QString(*)>(_a[1]))); break;
8011
+        case 2: _t->updateOutput((*reinterpret_cast< const QString(*)>(_a[1]))); break;
8012
+        case 3: _t->updateType((*reinterpret_cast< int(*)>(_a[1]))); break;
8013
+        default: ;
8014
+        }
8015
+    }
8016
+}
8017
+
8018
+const QMetaObjectExtraData MergeSeriesConfWidget::staticMetaObjectExtraData = {
8019
+    0,  qt_static_metacall 
8020
+};
8021
+
8022
+const QMetaObject MergeSeriesConfWidget::staticMetaObject = {
8023
+    { &BasicDeviceConfigurationWidget::staticMetaObject, qt_meta_stringdata_MergeSeriesConfWidget,
8024
+      qt_meta_data_MergeSeriesConfWidget, &staticMetaObjectExtraData }
8025
+};
8026
+
8027
+#ifdef Q_NO_DATA_RELOCATION
8028
+const QMetaObject &MergeSeriesConfWidget::getStaticMetaObject() { return staticMetaObject; }
8029
+#endif //Q_NO_DATA_RELOCATION
8030
+
8031
+const QMetaObject *MergeSeriesConfWidget::metaObject() const
8032
+{
8033
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
8034
+}
8035
+
8036
+void *MergeSeriesConfWidget::qt_metacast(const char *_clname)
8037
+{
8038
+    if (!_clname) return 0;
8039
+    if (!strcmp(_clname, qt_meta_stringdata_MergeSeriesConfWidget))
8040
+        return static_cast<void*>(const_cast< MergeSeriesConfWidget*>(this));
8041
+    return BasicDeviceConfigurationWidget::qt_metacast(_clname);
8042
+}
8043
+
8044
+int MergeSeriesConfWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
8045
+{
8046
+    _id = BasicDeviceConfigurationWidget::qt_metacall(_c, _id, _a);
8047
+    if (_id < 0)
8048
+        return _id;
8049
+    if (_c == QMetaObject::InvokeMetaMethod) {
8050
+        if (_id < 4)
8051
+            qt_static_metacall(this, _c, _id, _a);
8052
+        _id -= 4;
8053
+    }
8054
+    return _id;
8055
+}
7694 8056
 static const uint qt_meta_data_DataqSdkDevice[] = {
7695 8057
 
7696 8058
  // content:

+ 6
- 6
src/scale.cpp 查看文件

@@ -1,4 +1,4 @@
1
-/*1045:*/
1
+/*1059:*/
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
-/*:1045*//*1046:*/
13
+/*:1059*//*1060:*/
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
-/*1047:*/
27
+/*1061:*/
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
-/*:1047*/
56
+/*:1061*/
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
-/*:1046*//*1048:*/
64
+/*:1060*//*1062:*/
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
-/*:1048*/
99
+/*:1062*/

+ 2
- 2
src/scale.h 查看文件

@@ -1,4 +1,4 @@
1
-/*1044:*/
1
+/*1058:*/
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
-/*:1044*/
32
+/*:1058*/

+ 1511
- 1200
src/typica.cpp
文件差异内容过多而无法显示
查看文件


正在加载...
取消
保存