Sfoglia il codice sorgente

Merge branch 'release-1.6.4' of https://github.com/N3Roaster/typica into release-1.6.4

Neal Wilson 9 anni fa
parent
commit
6d0f44eca8

+ 5
- 5
src/abouttypica.cpp Vedi File

@@ -1,9 +1,9 @@
1
-/*260:*/
1
+/*265:*/
2 2
 #line 33 "./abouttypica.w"
3 3
 
4 4
 #include "abouttypica.h"
5 5
 
6
-/*261:*/
6
+/*266:*/
7 7
 #line 42 "./abouttypica.w"
8 8
 
9 9
 AboutTypica::AboutTypica():QMainWindow(NULL)
@@ -17,10 +17,10 @@ aboutFile.close();
17 17
 setCentralWidget(banner);
18 18
 }
19 19
 
20
-#line 6340 "./typica.w"
20
+#line 6404 "./typica.w"
21 21
 
22
-/*:261*/
22
+/*:266*/
23 23
 #line 36 "./abouttypica.w"
24 24
 
25 25
 
26
-/*:260*/
26
+/*:265*/

+ 2
- 2
src/abouttypica.h Vedi File

@@ -1,4 +1,4 @@
1
-/*259:*/
1
+/*264:*/
2 2
 #line 14 "./abouttypica.w"
3 3
 
4 4
 #include <QMainWindow> 
@@ -17,4 +17,4 @@ AboutTypica();
17 17
 
18 18
 #endif
19 19
 
20
-/*:259*/
20
+/*:264*/

+ 44
- 37
src/daterangeselector.cpp Vedi File

@@ -1,5 +1,5 @@
1
-/*650:*/
2
-#line 68 "./daterangeselector.w"
1
+/*656:*/
2
+#line 70 "./daterangeselector.w"
3 3
 
4 4
 #include <QCalendarWidget> 
5 5
 #include <QPushButton> 
@@ -11,8 +11,8 @@
11 11
 
12 12
 #include "daterangeselector.h"
13 13
 
14
-/*652:*/
15
-#line 111 "./daterangeselector.w"
14
+/*658:*/
15
+#line 115 "./daterangeselector.w"
16 16
 
17 17
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
18 18
 QWidget(parent,Qt::Popup),startDateSelector(new QCalendarWidget),
@@ -55,16 +55,16 @@ outerLayout->addLayout(buttonLayout);
55 55
 setLayout(outerLayout);
56 56
 }
57 57
 
58
-/*:652*//*653:*/
59
-#line 159 "./daterangeselector.w"
58
+/*:658*//*659:*/
59
+#line 163 "./daterangeselector.w"
60 60
 
61 61
 void CustomDateRangePopup::hideEvent(QHideEvent*)
62 62
 {
63 63
 emit hidingPopup();
64 64
 }
65 65
 
66
-/*:653*//*654:*/
67
-#line 168 "./daterangeselector.w"
66
+/*:659*//*660:*/
67
+#line 172 "./daterangeselector.w"
68 68
 
69 69
 void CustomDateRangePopup::applyRange()
70 70
 {
@@ -78,8 +78,8 @@ endDateSelector->selectedDate().toString(Qt::ISODate)));
78 78
 hide();
79 79
 }
80 80
 
81
-/*:654*//*655:*/
82
-#line 185 "./daterangeselector.w"
81
+/*:660*//*661:*/
82
+#line 189 "./daterangeselector.w"
83 83
 
84 84
 void CustomDateRangePopup::validateRange()
85 85
 {
@@ -93,11 +93,11 @@ applyButton->setEnabled(true);
93 93
 }
94 94
 }
95 95
 
96
-/*:655*/
97
-#line 79 "./daterangeselector.w"
96
+/*:661*/
97
+#line 81 "./daterangeselector.w"
98 98
 
99
-/*656:*/
100
-#line 203 "./daterangeselector.w"
99
+/*662:*/
100
+#line 207 "./daterangeselector.w"
101 101
 
102 102
 DateRangeSelector::DateRangeSelector(QWidget*parent):
103 103
 QWidget(parent),quickSelector(new QComboBox(this)),
@@ -108,8 +108,8 @@ connect(quickSelector,SIGNAL(currentIndexChanged(int)),this,SLOT(updateRange(int
108 108
 QDate currentDate= QDate::currentDate();
109 109
 
110 110
 QHBoxLayout*layout= new QHBoxLayout;
111
-/*657:*/
112
-#line 232 "./daterangeselector.w"
111
+/*663:*/
112
+#line 236 "./daterangeselector.w"
113 113
 
114 114
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
115 115
 currentDate.addDays(-1).toString(Qt::ISODate)));
@@ -188,8 +188,8 @@ quickSelector->insertSeparator(quickSelector->count());
188 188
 quickSelector->addItem("Lifetime");
189 189
 quickSelector->addItem("Custom");
190 190
 
191
-/*:657*/
192
-#line 213 "./daterangeselector.w"
191
+/*:663*/
192
+#line 217 "./daterangeselector.w"
193 193
 
194 194
 QToolButton*customButton= new QToolButton;
195 195
 customButton->setIcon(QIcon::fromTheme("office-calendar",
@@ -201,8 +201,8 @@ setLayout(layout);
201 201
 connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
202 202
 }
203 203
 
204
-/*:656*//*658:*/
205
-#line 315 "./daterangeselector.w"
204
+/*:662*//*664:*/
205
+#line 319 "./daterangeselector.w"
206 206
 
207 207
 void DateRangeSelector::updateRange(int index)
208 208
 {
@@ -217,8 +217,8 @@ emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
217 217
 }
218 218
 }
219 219
 
220
-/*:658*//*659:*/
221
-#line 332 "./daterangeselector.w"
220
+/*:664*//*665:*/
221
+#line 336 "./daterangeselector.w"
222 222
 
223 223
 void DateRangeSelector::popupHidden()
224 224
 {
@@ -227,8 +227,8 @@ customRangeSelector= NULL;
227 227
 quickSelector->setCurrentIndex(lastIndex);
228 228
 }
229 229
 
230
-/*:659*//*660:*/
231
-#line 343 "./daterangeselector.w"
230
+/*:665*//*666:*/
231
+#line 347 "./daterangeselector.w"
232 232
 
233 233
 void DateRangeSelector::setCustomRange(QVariant range)
234 234
 {
@@ -238,8 +238,8 @@ lastIndex= quickSelector->count()-1;
238 238
 quickSelector->setCurrentIndex(lastIndex);
239 239
 }
240 240
 
241
-/*:660*//*661:*/
242
-#line 358 "./daterangeselector.w"
241
+/*:666*//*667:*/
242
+#line 362 "./daterangeselector.w"
243 243
 
244 244
 void DateRangeSelector::toggleCustom()
245 245
 {
@@ -279,24 +279,29 @@ customRangeSelector= NULL;
279 279
 }
280 280
 }
281 281
 
282
-/*:661*//*662:*/
283
-#line 400 "./daterangeselector.w"
282
+/*:667*//*668:*/
283
+#line 404 "./daterangeselector.w"
284 284
 
285 285
 QVariant DateRangeSelector::currentRange()
286 286
 {
287 287
 return quickSelector->itemData(lastIndex);
288 288
 }
289 289
 
290
-/*:662*//*663:*/
291
-#line 408 "./daterangeselector.w"
290
+/*:668*//*669:*/
291
+#line 412 "./daterangeselector.w"
292 292
 
293 293
 void DateRangeSelector::setCurrentIndex(int index)
294 294
 {
295 295
 quickSelector->setCurrentIndex(index);
296 296
 }
297 297
 
298
-/*:663*//*664:*/
299
-#line 423 "./daterangeselector.w"
298
+int DateRangeSelector::currentIndex()
299
+{
300
+return quickSelector->currentIndex();
301
+}
302
+
303
+/*:669*//*670:*/
304
+#line 432 "./daterangeselector.w"
300 305
 
301 306
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
302 307
 {
@@ -304,18 +309,20 @@ quickSelector->setItemData(quickSelector->count()-2,
304 309
 QVariant(QStringList()<<startDate<<endDate));
305 310
 }
306 311
 
307
-/*:664*//*665:*/
308
-#line 433 "./daterangeselector.w"
312
+/*:670*//*671:*/
313
+#line 442 "./daterangeselector.w"
309 314
 
310 315
 void DateRangeSelector::removeIndex(int index)
311 316
 {
312 317
 quickSelector->removeItem(index);
313 318
 }
314 319
 
315
-/*:665*/
316
-#line 80 "./daterangeselector.w"
320
+/*:671*/
321
+#line 82 "./daterangeselector.w"
317 322
 
318 323
 
324
+#if 0
319 325
 #include "moc_daterangeselector.cpp"
326
+#endif
320 327
 
321
-/*:650*/
328
+/*:656*/

+ 7
- 5
src/daterangeselector.h Vedi File

@@ -1,4 +1,4 @@
1
-/*649:*/
1
+/*655:*/
2 2
 #line 30 "./daterangeselector.w"
3 3
 
4 4
 
@@ -9,8 +9,8 @@
9 9
 #ifndef TypicaDateRangeSelectorHeader
10 10
 #define TypicaDateRangeSelectorHeader
11 11
 
12
-/*651:*/
13
-#line 87 "./daterangeselector.w"
12
+/*657:*/
13
+#line 91 "./daterangeselector.w"
14 14
 
15 15
 class CustomDateRangePopup:public QWidget
16 16
 {
@@ -31,17 +31,19 @@ QCalendarWidget*endDateSelector;
31 31
 QPushButton*applyButton;
32 32
 };
33 33
 
34
-/*:651*/
34
+/*:657*/
35 35
 #line 39 "./daterangeselector.w"
36 36
 
37 37
 
38 38
 class DateRangeSelector:public QWidget
39 39
 {
40 40
 Q_OBJECT
41
+Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex)
41 42
 public:
42 43
 DateRangeSelector(QWidget*parent= NULL);
43 44
 void setCustomRange(QVariant range);
44 45
 Q_INVOKABLE QVariant currentRange();
46
+int currentIndex();
45 47
 public slots:
46 48
 void setCurrentIndex(int index);
47 49
 void setLifetimeRange(QString startDate,QString endDate);
@@ -60,4 +62,4 @@ int lastIndex;
60 62
 
61 63
 #endif
62 64
 
63
-/*:649*/
65
+/*:655*/

+ 2
- 2
src/draglabel.cpp Vedi File

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

+ 2
- 2
src/draglabel.h Vedi File

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

+ 23
- 7
src/helpmenu.cpp Vedi File

@@ -1,11 +1,12 @@
1 1
 /*194:*/
2
-#line 35 "./helpmenu.w"
2
+#line 36 "./helpmenu.w"
3 3
 
4 4
 #include "helpmenu.h"
5 5
 #include "abouttypica.h"
6
+#include "licensewindow.h"
6 7
 
7 8
 /*195:*/
8
-#line 47 "./helpmenu.w"
9
+#line 46 "./helpmenu.w"
9 10
 
10 11
 HelpMenu::HelpMenu():QMenu()
11 12
 {
@@ -15,10 +16,16 @@ QAction*aboutTypicaAction= new QAction(tr("About Typica"),this);
15 16
 aboutTypicaAction->setObjectName("aboutTypicaAction");
16 17
 addAction(aboutTypicaAction);
17 18
 connect(aboutTypicaAction,SIGNAL(triggered()),this,SLOT(displayAboutTypica()));
19
+#if 0
20
+QAction*licenseAction= new QAction(tr("License Information"),this);
21
+licenseAction->setObjectName("licenseAction");
22
+addAction(licenseAction);
23
+connect(licenseAction,SIGNAL(triggered()),this,SLOT(displayLicenseWindow()));
24
+#endif
18 25
 }
19 26
 
20 27
 /*:195*//*196:*/
21
-#line 61 "./helpmenu.w"
28
+#line 66 "./helpmenu.w"
22 29
 
23 30
 void HelpMenu::displayAboutTypica()
24 31
 {
@@ -26,11 +33,20 @@ AboutTypica*aboutBox= new AboutTypica;
26 33
 aboutBox->show();
27 34
 }
28 35
 
29
-#line 4614 "./typica.w"
36
+/*:196*//*197:*/
37
+#line 76 "./helpmenu.w"
30 38
 
31
-#line 1 "./feedback.w"
32
-/*:196*/
33
-#line 39 "./helpmenu.w"
39
+void HelpMenu::displayLicenseWindow()
40
+{
41
+LicenseWindow*window= new LicenseWindow;
42
+window->show();
43
+}
44
+
45
+#line 4615 "./typica.w"
46
+
47
+#line 1 "./licensewindow.w"
48
+/*:197*/
49
+#line 41 "./helpmenu.w"
34 50
 
35 51
 
36 52
 /*:194*/

+ 1
- 0
src/helpmenu.h Vedi File

@@ -13,6 +13,7 @@ public:
13 13
 HelpMenu();
14 14
 public slots:
15 15
 void displayAboutTypica();
16
+void displayLicenseWindow();
16 17
 };
17 18
 
18 19
 #endif

+ 32
- 2
src/moc_daterangeselector.cpp Vedi File

@@ -110,7 +110,7 @@ static const uint qt_meta_data_DateRangeSelector[] = {
110 110
        0,       // classname
111 111
        0,    0, // classinfo
112 112
        8,   14, // methods
113
-       0,    0, // properties
113
+       1,   54, // properties
114 114
        0,    0, // enums/sets
115 115
        0,    0, // constructors
116 116
        0,       // flags
@@ -130,6 +130,9 @@ static const uint qt_meta_data_DateRangeSelector[] = {
130 130
  // methods: signature, parameters, type, tag, flags
131 131
      193,   18,  184,   18, 0x02,
132 132
 
133
+ // properties: name, type, flags
134
+     212,  208, 0x02095103,
135
+
133 136
        0        // eod
134 137
 };
135 138
 
@@ -139,7 +142,7 @@ static const char qt_meta_stringdata_DateRangeSelector[] = {
139 142
     "setLifetimeRange(QString,QString)\0"
140 143
     "removeIndex(int)\0toggleCustom()\0"
141 144
     "popupHidden()\0updateRange(int)\0QVariant\0"
142
-    "currentRange()\0"
145
+    "currentRange()\0int\0currentIndex\0"
143 146
 };
144 147
 
145 148
 void DateRangeSelector::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
@@ -198,6 +201,33 @@ int DateRangeSelector::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
198 201
             qt_static_metacall(this, _c, _id, _a);
199 202
         _id -= 8;
200 203
     }
204
+#ifndef QT_NO_PROPERTIES
205
+      else if (_c == QMetaObject::ReadProperty) {
206
+        void *_v = _a[0];
207
+        switch (_id) {
208
+        case 0: *reinterpret_cast< int*>(_v) = currentIndex(); break;
209
+        }
210
+        _id -= 1;
211
+    } else if (_c == QMetaObject::WriteProperty) {
212
+        void *_v = _a[0];
213
+        switch (_id) {
214
+        case 0: setCurrentIndex(*reinterpret_cast< int*>(_v)); break;
215
+        }
216
+        _id -= 1;
217
+    } else if (_c == QMetaObject::ResetProperty) {
218
+        _id -= 1;
219
+    } else if (_c == QMetaObject::QueryPropertyDesignable) {
220
+        _id -= 1;
221
+    } else if (_c == QMetaObject::QueryPropertyScriptable) {
222
+        _id -= 1;
223
+    } else if (_c == QMetaObject::QueryPropertyStored) {
224
+        _id -= 1;
225
+    } else if (_c == QMetaObject::QueryPropertyEditable) {
226
+        _id -= 1;
227
+    } else if (_c == QMetaObject::QueryPropertyUser) {
228
+        _id -= 1;
229
+    }
230
+#endif // QT_NO_PROPERTIES
201 231
     return _id;
202 232
 }
203 233
 

+ 345
- 9
src/moc_typica.cpp Vedi File

@@ -204,6 +204,67 @@ int NumericDelegate::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
204 204
         return _id;
205 205
     return _id;
206 206
 }
207
+static const uint qt_meta_data_ScriptValidator[] = {
208
+
209
+ // content:
210
+       6,       // revision
211
+       0,       // classname
212
+       0,    0, // classinfo
213
+       0,    0, // methods
214
+       0,    0, // properties
215
+       0,    0, // enums/sets
216
+       0,    0, // constructors
217
+       0,       // flags
218
+       0,       // signalCount
219
+
220
+       0        // eod
221
+};
222
+
223
+static const char qt_meta_stringdata_ScriptValidator[] = {
224
+    "ScriptValidator\0"
225
+};
226
+
227
+void ScriptValidator::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
228
+{
229
+    Q_UNUSED(_o);
230
+    Q_UNUSED(_id);
231
+    Q_UNUSED(_c);
232
+    Q_UNUSED(_a);
233
+}
234
+
235
+const QMetaObjectExtraData ScriptValidator::staticMetaObjectExtraData = {
236
+    0,  qt_static_metacall 
237
+};
238
+
239
+const QMetaObject ScriptValidator::staticMetaObject = {
240
+    { &QValidator::staticMetaObject, qt_meta_stringdata_ScriptValidator,
241
+      qt_meta_data_ScriptValidator, &staticMetaObjectExtraData }
242
+};
243
+
244
+#ifdef Q_NO_DATA_RELOCATION
245
+const QMetaObject &ScriptValidator::getStaticMetaObject() { return staticMetaObject; }
246
+#endif //Q_NO_DATA_RELOCATION
247
+
248
+const QMetaObject *ScriptValidator::metaObject() const
249
+{
250
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
251
+}
252
+
253
+void *ScriptValidator::qt_metacast(const char *_clname)
254
+{
255
+    if (!_clname) return 0;
256
+    if (!strcmp(_clname, qt_meta_stringdata_ScriptValidator))
257
+        return static_cast<void*>(const_cast< ScriptValidator*>(this));
258
+    return QValidator::qt_metacast(_clname);
259
+}
260
+
261
+int ScriptValidator::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
262
+{
263
+    _id = QValidator::qt_metacall(_c, _id, _a);
264
+    if (_id < 0)
265
+        return _id;
266
+    return _id;
267
+}
207 268
 static const uint qt_meta_data_DAQ[] = {
208 269
 
209 270
  // content:
@@ -1839,7 +1900,7 @@ static const uint qt_meta_data_TimerDisplay[] = {
1839 1900
        0,       // classname
1840 1901
        0,    0, // classinfo
1841 1902
       18,   14, // methods
1842
-       6,  104, // properties
1903
+       7,  104, // properties
1843 1904
        0,    0, // enums/sets
1844 1905
        0,    0, // constructors
1845 1906
        0,       // flags
@@ -1874,6 +1935,7 @@ static const uint qt_meta_data_TimerDisplay[] = {
1874 1935
      370,  333, 0x0f095103,
1875 1936
      389,  381, 0x0a095103,
1876 1937
      403,  357, 0x01095103,
1938
+     120,  381, 0x0a095001,
1877 1939
 
1878 1940
        0        // eod
1879 1941
 };
@@ -1968,8 +2030,9 @@ int TimerDisplay::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
1968 2030
         case 3: *reinterpret_cast< QTime*>(_v) = resetValue(); break;
1969 2031
         case 4: *reinterpret_cast< QString*>(_v) = displayFormat(); break;
1970 2032
         case 5: *reinterpret_cast< bool*>(_v) = autoReset(); break;
2033
+        case 6: *reinterpret_cast< QString*>(_v) = value(); break;
1971 2034
         }
1972
-        _id -= 6;
2035
+        _id -= 7;
1973 2036
     } else if (_c == QMetaObject::WriteProperty) {
1974 2037
         void *_v = _a[0];
1975 2038
         switch (_id) {
@@ -1979,19 +2042,19 @@ int TimerDisplay::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
1979 2042
         case 4: setDisplayFormat(*reinterpret_cast< QString*>(_v)); break;
1980 2043
         case 5: setAutoReset(*reinterpret_cast< bool*>(_v)); break;
1981 2044
         }
1982
-        _id -= 6;
2045
+        _id -= 7;
1983 2046
     } else if (_c == QMetaObject::ResetProperty) {
1984
-        _id -= 6;
2047
+        _id -= 7;
1985 2048
     } else if (_c == QMetaObject::QueryPropertyDesignable) {
1986
-        _id -= 6;
2049
+        _id -= 7;
1987 2050
     } else if (_c == QMetaObject::QueryPropertyScriptable) {
1988
-        _id -= 6;
2051
+        _id -= 7;
1989 2052
     } else if (_c == QMetaObject::QueryPropertyStored) {
1990
-        _id -= 6;
2053
+        _id -= 7;
1991 2054
     } else if (_c == QMetaObject::QueryPropertyEditable) {
1992
-        _id -= 6;
2055
+        _id -= 7;
1993 2056
     } else if (_c == QMetaObject::QueryPropertyUser) {
1994
-        _id -= 6;
2057
+        _id -= 7;
1995 2058
     }
1996 2059
 #endif // QT_NO_PROPERTIES
1997 2060
     return _id;
@@ -6708,6 +6771,279 @@ int LinearSplineInterpolationConfWidget::qt_metacall(QMetaObject::Call _c, int _
6708 6771
     }
6709 6772
     return _id;
6710 6773
 }
6774
+static const uint qt_meta_data_CoolingTimerConfWidget[] = {
6775
+
6776
+ // content:
6777
+       6,       // revision
6778
+       0,       // classname
6779
+       0,    0, // classinfo
6780
+       1,   14, // methods
6781
+       0,    0, // properties
6782
+       0,    0, // enums/sets
6783
+       1,   19, // constructors
6784
+       0,       // flags
6785
+       0,       // signalCount
6786
+
6787
+ // slots: signature, parameters, type, tag, flags
6788
+      29,   24,   23,   23, 0x08,
6789
+
6790
+ // constructors: signature, parameters, type, tag, flags
6791
+      64,   52,   23,   23, 0x0e,
6792
+
6793
+       0        // eod
6794
+};
6795
+
6796
+static const char qt_meta_stringdata_CoolingTimerConfWidget[] = {
6797
+    "CoolingTimerConfWidget\0\0time\0"
6798
+    "updateResetTime(QTime)\0model,index\0"
6799
+    "CoolingTimerConfWidget(DeviceTreeModel*,QModelIndex)\0"
6800
+};
6801
+
6802
+void CoolingTimerConfWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
6803
+{
6804
+    if (_c == QMetaObject::CreateInstance) {
6805
+        switch (_id) {
6806
+        case 0: { CoolingTimerConfWidget *_r = new CoolingTimerConfWidget((*reinterpret_cast< DeviceTreeModel*(*)>(_a[1])),(*reinterpret_cast< const QModelIndex(*)>(_a[2])));
6807
+            if (_a[0]) *reinterpret_cast<QObject**>(_a[0]) = _r; } break;
6808
+        }
6809
+    } else if (_c == QMetaObject::InvokeMetaMethod) {
6810
+        Q_ASSERT(staticMetaObject.cast(_o));
6811
+        CoolingTimerConfWidget *_t = static_cast<CoolingTimerConfWidget *>(_o);
6812
+        switch (_id) {
6813
+        case 0: _t->updateResetTime((*reinterpret_cast< QTime(*)>(_a[1]))); break;
6814
+        default: ;
6815
+        }
6816
+    }
6817
+}
6818
+
6819
+const QMetaObjectExtraData CoolingTimerConfWidget::staticMetaObjectExtraData = {
6820
+    0,  qt_static_metacall 
6821
+};
6822
+
6823
+const QMetaObject CoolingTimerConfWidget::staticMetaObject = {
6824
+    { &BasicDeviceConfigurationWidget::staticMetaObject, qt_meta_stringdata_CoolingTimerConfWidget,
6825
+      qt_meta_data_CoolingTimerConfWidget, &staticMetaObjectExtraData }
6826
+};
6827
+
6828
+#ifdef Q_NO_DATA_RELOCATION
6829
+const QMetaObject &CoolingTimerConfWidget::getStaticMetaObject() { return staticMetaObject; }
6830
+#endif //Q_NO_DATA_RELOCATION
6831
+
6832
+const QMetaObject *CoolingTimerConfWidget::metaObject() const
6833
+{
6834
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
6835
+}
6836
+
6837
+void *CoolingTimerConfWidget::qt_metacast(const char *_clname)
6838
+{
6839
+    if (!_clname) return 0;
6840
+    if (!strcmp(_clname, qt_meta_stringdata_CoolingTimerConfWidget))
6841
+        return static_cast<void*>(const_cast< CoolingTimerConfWidget*>(this));
6842
+    return BasicDeviceConfigurationWidget::qt_metacast(_clname);
6843
+}
6844
+
6845
+int CoolingTimerConfWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
6846
+{
6847
+    _id = BasicDeviceConfigurationWidget::qt_metacall(_c, _id, _a);
6848
+    if (_id < 0)
6849
+        return _id;
6850
+    if (_c == QMetaObject::InvokeMetaMethod) {
6851
+        if (_id < 1)
6852
+            qt_static_metacall(this, _c, _id, _a);
6853
+        _id -= 1;
6854
+    }
6855
+    return _id;
6856
+}
6857
+static const uint qt_meta_data_RangeTimerConfWidget[] = {
6858
+
6859
+ // content:
6860
+       6,       // revision
6861
+       0,       // classname
6862
+       0,    0, // classinfo
6863
+       8,   14, // methods
6864
+       0,    0, // properties
6865
+       0,    0, // enums/sets
6866
+       1,   54, // constructors
6867
+       0,       // flags
6868
+       0,       // signalCount
6869
+
6870
+ // slots: signature, parameters, type, tag, flags
6871
+      27,   22,   21,   21, 0x08,
6872
+      58,   22,   21,   21, 0x08,
6873
+      88,   22,   21,   21, 0x08,
6874
+     119,   22,   21,   21, 0x08,
6875
+     149,   22,   21,   21, 0x08,
6876
+     175,   22,   21,   21, 0x08,
6877
+     207,  200,   21,   21, 0x08,
6878
+     231,  200,   21,   21, 0x08,
6879
+
6880
+ // constructors: signature, parameters, type, tag, flags
6881
+     266,  254,   21,   21, 0x0e,
6882
+
6883
+       0        // eod
6884
+};
6885
+
6886
+static const char qt_meta_stringdata_RangeTimerConfWidget[] = {
6887
+    "RangeTimerConfWidget\0\0text\0"
6888
+    "updateStartButtonText(QString)\0"
6889
+    "updateStopButtonText(QString)\0"
6890
+    "updateStartColumnName(QString)\0"
6891
+    "updateStopColumnName(QString)\0"
6892
+    "updateStartValue(QString)\0"
6893
+    "updateStopValue(QString)\0option\0"
6894
+    "updateStartTrigger(int)\0updateStopTrigger(int)\0"
6895
+    "model,index\0"
6896
+    "RangeTimerConfWidget(DeviceTreeModel*,QModelIndex)\0"
6897
+};
6898
+
6899
+void RangeTimerConfWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
6900
+{
6901
+    if (_c == QMetaObject::CreateInstance) {
6902
+        switch (_id) {
6903
+        case 0: { RangeTimerConfWidget *_r = new RangeTimerConfWidget((*reinterpret_cast< DeviceTreeModel*(*)>(_a[1])),(*reinterpret_cast< const QModelIndex(*)>(_a[2])));
6904
+            if (_a[0]) *reinterpret_cast<QObject**>(_a[0]) = _r; } break;
6905
+        }
6906
+    } else if (_c == QMetaObject::InvokeMetaMethod) {
6907
+        Q_ASSERT(staticMetaObject.cast(_o));
6908
+        RangeTimerConfWidget *_t = static_cast<RangeTimerConfWidget *>(_o);
6909
+        switch (_id) {
6910
+        case 0: _t->updateStartButtonText((*reinterpret_cast< const QString(*)>(_a[1]))); break;
6911
+        case 1: _t->updateStopButtonText((*reinterpret_cast< const QString(*)>(_a[1]))); break;
6912
+        case 2: _t->updateStartColumnName((*reinterpret_cast< const QString(*)>(_a[1]))); break;
6913
+        case 3: _t->updateStopColumnName((*reinterpret_cast< const QString(*)>(_a[1]))); break;
6914
+        case 4: _t->updateStartValue((*reinterpret_cast< const QString(*)>(_a[1]))); break;
6915
+        case 5: _t->updateStopValue((*reinterpret_cast< const QString(*)>(_a[1]))); break;
6916
+        case 6: _t->updateStartTrigger((*reinterpret_cast< int(*)>(_a[1]))); break;
6917
+        case 7: _t->updateStopTrigger((*reinterpret_cast< int(*)>(_a[1]))); break;
6918
+        default: ;
6919
+        }
6920
+    }
6921
+}
6922
+
6923
+const QMetaObjectExtraData RangeTimerConfWidget::staticMetaObjectExtraData = {
6924
+    0,  qt_static_metacall 
6925
+};
6926
+
6927
+const QMetaObject RangeTimerConfWidget::staticMetaObject = {
6928
+    { &BasicDeviceConfigurationWidget::staticMetaObject, qt_meta_stringdata_RangeTimerConfWidget,
6929
+      qt_meta_data_RangeTimerConfWidget, &staticMetaObjectExtraData }
6930
+};
6931
+
6932
+#ifdef Q_NO_DATA_RELOCATION
6933
+const QMetaObject &RangeTimerConfWidget::getStaticMetaObject() { return staticMetaObject; }
6934
+#endif //Q_NO_DATA_RELOCATION
6935
+
6936
+const QMetaObject *RangeTimerConfWidget::metaObject() const
6937
+{
6938
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
6939
+}
6940
+
6941
+void *RangeTimerConfWidget::qt_metacast(const char *_clname)
6942
+{
6943
+    if (!_clname) return 0;
6944
+    if (!strcmp(_clname, qt_meta_stringdata_RangeTimerConfWidget))
6945
+        return static_cast<void*>(const_cast< RangeTimerConfWidget*>(this));
6946
+    return BasicDeviceConfigurationWidget::qt_metacast(_clname);
6947
+}
6948
+
6949
+int RangeTimerConfWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
6950
+{
6951
+    _id = BasicDeviceConfigurationWidget::qt_metacall(_c, _id, _a);
6952
+    if (_id < 0)
6953
+        return _id;
6954
+    if (_c == QMetaObject::InvokeMetaMethod) {
6955
+        if (_id < 8)
6956
+            qt_static_metacall(this, _c, _id, _a);
6957
+        _id -= 8;
6958
+    }
6959
+    return _id;
6960
+}
6961
+static const uint qt_meta_data_MultiRangeTimerConfWidget[] = {
6962
+
6963
+ // content:
6964
+       6,       // revision
6965
+       0,       // classname
6966
+       0,    0, // classinfo
6967
+       2,   14, // methods
6968
+       0,    0, // properties
6969
+       0,    0, // enums/sets
6970
+       1,   24, // constructors
6971
+       0,       // flags
6972
+       0,       // signalCount
6973
+
6974
+ // slots: signature, parameters, type, tag, flags
6975
+      32,   27,   26,   26, 0x08,
6976
+      58,   26,   26,   26, 0x08,
6977
+
6978
+ // constructors: signature, parameters, type, tag, flags
6979
+      88,   76,   26,   26, 0x0e,
6980
+
6981
+       0        // eod
6982
+};
6983
+
6984
+static const char qt_meta_stringdata_MultiRangeTimerConfWidget[] = {
6985
+    "MultiRangeTimerConfWidget\0\0text\0"
6986
+    "updateColumnName(QString)\0updateRangeData()\0"
6987
+    "model,index\0"
6988
+    "MultiRangeTimerConfWidget(DeviceTreeModel*,QModelIndex)\0"
6989
+};
6990
+
6991
+void MultiRangeTimerConfWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
6992
+{
6993
+    if (_c == QMetaObject::CreateInstance) {
6994
+        switch (_id) {
6995
+        case 0: { MultiRangeTimerConfWidget *_r = new MultiRangeTimerConfWidget((*reinterpret_cast< DeviceTreeModel*(*)>(_a[1])),(*reinterpret_cast< const QModelIndex(*)>(_a[2])));
6996
+            if (_a[0]) *reinterpret_cast<QObject**>(_a[0]) = _r; } break;
6997
+        }
6998
+    } else if (_c == QMetaObject::InvokeMetaMethod) {
6999
+        Q_ASSERT(staticMetaObject.cast(_o));
7000
+        MultiRangeTimerConfWidget *_t = static_cast<MultiRangeTimerConfWidget *>(_o);
7001
+        switch (_id) {
7002
+        case 0: _t->updateColumnName((*reinterpret_cast< const QString(*)>(_a[1]))); break;
7003
+        case 1: _t->updateRangeData(); break;
7004
+        default: ;
7005
+        }
7006
+    }
7007
+}
7008
+
7009
+const QMetaObjectExtraData MultiRangeTimerConfWidget::staticMetaObjectExtraData = {
7010
+    0,  qt_static_metacall 
7011
+};
7012
+
7013
+const QMetaObject MultiRangeTimerConfWidget::staticMetaObject = {
7014
+    { &BasicDeviceConfigurationWidget::staticMetaObject, qt_meta_stringdata_MultiRangeTimerConfWidget,
7015
+      qt_meta_data_MultiRangeTimerConfWidget, &staticMetaObjectExtraData }
7016
+};
7017
+
7018
+#ifdef Q_NO_DATA_RELOCATION
7019
+const QMetaObject &MultiRangeTimerConfWidget::getStaticMetaObject() { return staticMetaObject; }
7020
+#endif //Q_NO_DATA_RELOCATION
7021
+
7022
+const QMetaObject *MultiRangeTimerConfWidget::metaObject() const
7023
+{
7024
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
7025
+}
7026
+
7027
+void *MultiRangeTimerConfWidget::qt_metacast(const char *_clname)
7028
+{
7029
+    if (!_clname) return 0;
7030
+    if (!strcmp(_clname, qt_meta_stringdata_MultiRangeTimerConfWidget))
7031
+        return static_cast<void*>(const_cast< MultiRangeTimerConfWidget*>(this));
7032
+    return BasicDeviceConfigurationWidget::qt_metacast(_clname);
7033
+}
7034
+
7035
+int MultiRangeTimerConfWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
7036
+{
7037
+    _id = BasicDeviceConfigurationWidget::qt_metacall(_c, _id, _a);
7038
+    if (_id < 0)
7039
+        return _id;
7040
+    if (_c == QMetaObject::InvokeMetaMethod) {
7041
+        if (_id < 2)
7042
+            qt_static_metacall(this, _c, _id, _a);
7043
+        _id -= 2;
7044
+    }
7045
+    return _id;
7046
+}
6711 7047
 static const uint qt_meta_data_TranslationConfWidget[] = {
6712 7048
 
6713 7049
  // content:

+ 6
- 6
src/scale.cpp Vedi File

@@ -1,4 +1,4 @@
1
-/*978:*/
1
+/*998:*/
2 2
 #line 131 "./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
-/*:978*//*979:*/
13
+/*:998*//*999:*/
14 14
 #line 149 "./scales.w"
15 15
 
16 16
 void SerialScale::dataAvailable()
@@ -24,7 +24,7 @@ responseBuffer.clear();
24 24
 }
25 25
 else
26 26
 {
27
-/*980:*/
27
+/*1000:*/
28 28
 #line 189 "./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
-/*:980*/
56
+/*:1000*/
57 57
 #line 161 "./scales.w"
58 58
 
59 59
 responseBuffer.clear();
@@ -61,7 +61,7 @@ responseBuffer.clear();
61 61
 }
62 62
 }
63 63
 
64
-/*:979*//*981:*/
64
+/*:999*//*1001:*/
65 65
 #line 220 "./scales.w"
66 66
 
67 67
 void SerialScale::tare()
@@ -74,4 +74,4 @@ void SerialScale::weigh()
74 74
 write("!KP\x0D");
75 75
 }
76 76
 
77
-/*:981*/
77
+/*:1001*/

+ 2
- 2
src/scale.h Vedi File

@@ -1,4 +1,4 @@
1
-/*977:*/
1
+/*997:*/
2 2
 #line 103 "./scales.w"
3 3
 
4 4
 #ifndef TypicaScaleInclude
@@ -25,4 +25,4 @@ QByteArray responseBuffer;
25 25
 
26 26
 #endif
27 27
 
28
-/*:977*/
28
+/*:997*/

+ 2602
- 2027
src/typica.cpp
File diff soppresso perché troppo grande
Vedi File


+ 23
- 10
src/units.cpp Vedi File

@@ -1,10 +1,11 @@
1
-/*264:*/
1
+/*269:*/
2 2
 #line 42 "./units.w"
3 3
 
4 4
 #include "units.h"
5
+#include <QtDebug> 
5 6
 
6
-/*:264*//*265:*/
7
-#line 52 "./units.w"
7
+/*:269*//*270:*/
8
+#line 53 "./units.w"
8 9
 
9 10
 bool Units::isTemperatureUnit(Unit unit)
10 11
 {
@@ -14,8 +15,8 @@ unit==Kelvin||
14 15
 unit==Rankine);
15 16
 }
16 17
 
17
-/*:265*//*266:*/
18
-#line 70 "./units.w"
18
+/*:270*//*271:*/
19
+#line 71 "./units.w"
19 20
 
20 21
 double Units::convertTemperature(double value,Unit fromUnit,Unit toUnit)
21 22
 {
@@ -40,6 +41,9 @@ break;
40 41
 case Rankine:
41 42
 return value+459.67;
42 43
 break;
44
+default:
45
+qDebug()<<"Warning: Non-sensical unit conversion.";
46
+break;
43 47
 }
44 48
 break;
45 49
 case Celsius:
@@ -57,6 +61,9 @@ break;
57 61
 case Rankine:
58 62
 return(value+273.15)*9.0/5.0;
59 63
 break;
64
+default:
65
+qDebug()<<"Warning: Non-sensical unit conversion.";
66
+break;
60 67
 }
61 68
 break;
62 69
 case Kelvin:
@@ -74,6 +81,9 @@ break;
74 81
 case Rankine:
75 82
 return value*9.0/5.0;
76 83
 break;
84
+default:
85
+qDebug()<<"Warning: Non-sensical unit conversion.";
86
+break;
77 87
 }
78 88
 break;
79 89
 case Rankine:
@@ -91,6 +101,9 @@ break;
91 101
 case Rankine:
92 102
 return value;
93 103
 break;
104
+default:
105
+qDebug()<<"Warning: Non-sensical unit conversion.";
106
+break;
94 107
 }
95 108
 break;
96 109
 default:
@@ -100,8 +113,8 @@ break;
100 113
 return 0;
101 114
 }
102 115
 
103
-/*:266*//*267:*/
104
-#line 156 "./units.w"
116
+/*:271*//*272:*/
117
+#line 169 "./units.w"
105 118
 
106 119
 double Units::convertRelativeTemperature(double value,Unit fromUnit,Unit toUnit)
107 120
 {
@@ -198,8 +211,8 @@ break;
198 211
 return 0;
199 212
 }
200 213
 
201
-/*:267*//*268:*/
202
-#line 254 "./units.w"
214
+/*:272*//*273:*/
215
+#line 267 "./units.w"
203 216
 
204 217
 double Units::convertWeight(double value,Unit fromUnit,Unit toUnit)
205 218
 {
@@ -303,4 +316,4 @@ unit==Ounce||
303 316
 unit==Gram);
304 317
 }
305 318
 
306
-/*:268*/
319
+/*:273*/

+ 2
- 2
src/units.h Vedi File

@@ -1,4 +1,4 @@
1
-/*263:*/
1
+/*268:*/
2 2
 #line 8 "./units.w"
3 3
 
4 4
 #include <QObject> 
@@ -32,4 +32,4 @@ static bool isWeightUnit(Unit unit);
32 32
 
33 33
 #endif
34 34
 
35
-/*:263*/
35
+/*:268*/

+ 5
- 5
src/webelement.cpp Vedi File

@@ -1,9 +1,9 @@
1
-/*557:*/
1
+/*563:*/
2 2
 #line 368 "./webview.w"
3 3
 
4 4
 #include "webelement.h"
5 5
 
6
-/*555:*/
6
+/*561:*/
7 7
 #line 311 "./webview.w"
8 8
 
9 9
 TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
@@ -11,7 +11,7 @@ TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
11 11
 
12 12
 }
13 13
 
14
-/*:555*//*556:*/
14
+/*:561*//*562:*/
15 15
 #line 320 "./webview.w"
16 16
 
17 17
 void TypicaWebElement::appendInside(const QString&markup)
@@ -59,8 +59,8 @@ void TypicaWebElement::setPlainText(const QString&text)
59 59
 e.setPlainText(text);
60 60
 }
61 61
 
62
-/*:556*/
62
+/*:562*/
63 63
 #line 371 "./webview.w"
64 64
 
65 65
 
66
-/*:557*/
66
+/*:563*/

+ 2
- 2
src/webelement.h Vedi File

@@ -1,4 +1,4 @@
1
-/*550:*/
1
+/*556:*/
2 2
 #line 248 "./webview.w"
3 3
 
4 4
 #include <QWebElement> 
@@ -27,4 +27,4 @@ QWebElement e;
27 27
 
28 28
 #endif
29 29
 
30
-/*:550*/
30
+/*:556*/

+ 11
- 11
src/webview.cpp Vedi File

@@ -1,9 +1,9 @@
1
-/*535:*/
1
+/*541:*/
2 2
 #line 50 "./webview.w"
3 3
 
4 4
 #include "webview.h"
5 5
 
6
-/*536:*/
6
+/*542:*/
7 7
 #line 57 "./webview.w"
8 8
 
9 9
 TypicaWebView::TypicaWebView():QWebView()
@@ -12,7 +12,7 @@ page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
12 12
 connect(page(),SIGNAL(linkClicked(QUrl)),this,SLOT(linkDelegate(QUrl)));
13 13
 }
14 14
 
15
-/*:536*//*537:*/
15
+/*:542*//*543:*/
16 16
 #line 73 "./webview.w"
17 17
 
18 18
 void TypicaWebView::linkDelegate(const QUrl&url)
@@ -20,7 +20,7 @@ void TypicaWebView::linkDelegate(const QUrl&url)
20 20
 if(url.scheme()=="typica")
21 21
 {
22 22
 QString address(url.toEncoded());
23
-/*538:*/
23
+/*544:*/
24 24
 #line 91 "./webview.w"
25 25
 
26 26
 if(address=="typica://aboutqt")
@@ -29,10 +29,10 @@ QMessageBox::aboutQt(this);
29 29
 return;
30 30
 }
31 31
 
32
-/*:538*/
32
+/*:544*/
33 33
 #line 79 "./webview.w"
34 34
 
35
-/*539:*/
35
+/*545:*/
36 36
 #line 100 "./webview.w"
37 37
 
38 38
 if(address.startsWith("typica://script/"))
@@ -41,7 +41,7 @@ emit scriptLinkClicked(address.remove(0,16));
41 41
 return;
42 42
 }
43 43
 
44
-/*:539*/
44
+/*:545*/
45 45
 #line 80 "./webview.w"
46 46
 
47 47
 }
@@ -51,7 +51,7 @@ QDesktopServices::openUrl(url);
51 51
 }
52 52
 }
53 53
 
54
-/*:537*//*540:*/
54
+/*:543*//*546:*/
55 55
 #line 112 "./webview.w"
56 56
 
57 57
 void TypicaWebView::load(const QString&url)
@@ -88,7 +88,7 @@ QString TypicaWebView::saveXml()
88 88
 return page()->currentFrame()->documentElement().toOuterXml();
89 89
 }
90 90
 
91
-/*:540*//*546:*/
91
+/*:546*//*552:*/
92 92
 #line 205 "./webview.w"
93 93
 
94 94
 QWebElement TypicaWebView::documentElement()
@@ -101,8 +101,8 @@ QWebElement TypicaWebView::findFirstElement(const QString&selector)
101 101
 return page()->mainFrame()->findFirstElement(selector);
102 102
 }
103 103
 
104
-/*:546*/
104
+/*:552*/
105 105
 #line 53 "./webview.w"
106 106
 
107 107
 
108
-/*:535*/
108
+/*:541*/

+ 2
- 2
src/webview.h Vedi File

@@ -1,4 +1,4 @@
1
-/*534:*/
1
+/*540:*/
2 2
 #line 14 "./webview.w"
3 3
 
4 4
 #include <QWebView> 
@@ -34,4 +34,4 @@ void linkDelegate(const QUrl&url);
34 34
 
35 35
 #endif
36 36
 
37
-/*:534*/
37
+/*:540*/

Loading…
Annulla
Salva