Neal Wilson hace 11 años
padre
commit
3246613c97
Se han modificado 6 ficheros con 19 adiciones y 19 borrados
  1. 5
    5
      src/abouttypica.cpp
  2. 2
    2
      src/abouttypica.h
  3. 6
    6
      src/helpmenu.cpp
  4. 2
    2
      src/helpmenu.h
  5. 2
    2
      src/typica.cpp
  6. 2
    2
      src/typica.w

+ 5
- 5
src/abouttypica.cpp Ver fichero

1
-/*223:*/
1
+/*224:*/
2
 #line 29 "./abouttypica.w"
2
 #line 29 "./abouttypica.w"
3
 
3
 
4
 #include "abouttypica.h"
4
 #include "abouttypica.h"
5
 
5
 
6
-/*224:*/
6
+/*225:*/
7
 #line 38 "./abouttypica.w"
7
 #line 38 "./abouttypica.w"
8
 
8
 
9
 AboutTypica::AboutTypica():QMainWindow(NULL)
9
 AboutTypica::AboutTypica():QMainWindow(NULL)
11
 
11
 
12
 }
12
 }
13
 
13
 
14
-#line 5650 "./typica.w"
14
+#line 5656 "./typica.w"
15
 
15
 
16
-/*:224*/
16
+/*:225*/
17
 #line 32 "./abouttypica.w"
17
 #line 32 "./abouttypica.w"
18
 
18
 
19
 
19
 
20
-/*:223*/
20
+/*:224*/

+ 2
- 2
src/abouttypica.h Ver fichero

1
-/*222:*/
1
+/*223:*/
2
 #line 12 "./abouttypica.w"
2
 #line 12 "./abouttypica.w"
3
 
3
 
4
 #include <QMainWindow> 
4
 #include <QMainWindow> 
15
 
15
 
16
 #endif
16
 #endif
17
 
17
 
18
-/*:222*/
18
+/*:223*/

+ 6
- 6
src/helpmenu.cpp Ver fichero

1
-/*167:*/
1
+/*168:*/
2
 #line 35 "./helpmenu.w"
2
 #line 35 "./helpmenu.w"
3
 
3
 
4
 #include "helpmenu.h"
4
 #include "helpmenu.h"
5
 #include "abouttypica.h"
5
 #include "abouttypica.h"
6
 
6
 
7
-/*168:*/
7
+/*169:*/
8
 #line 47 "./helpmenu.w"
8
 #line 47 "./helpmenu.w"
9
 
9
 
10
 HelpMenu::HelpMenu():QMenu()
10
 HelpMenu::HelpMenu():QMenu()
17
 connect(aboutTypicaAction,SIGNAL(triggered()),this,SLOT(displayAboutTypica()));
17
 connect(aboutTypicaAction,SIGNAL(triggered()),this,SLOT(displayAboutTypica()));
18
 }
18
 }
19
 
19
 
20
-/*:168*//*169:*/
20
+/*:169*//*170:*/
21
 #line 61 "./helpmenu.w"
21
 #line 61 "./helpmenu.w"
22
 
22
 
23
 void HelpMenu::displayAboutTypica()
23
 void HelpMenu::displayAboutTypica()
26
 aboutBox->show();
26
 aboutBox->show();
27
 }
27
 }
28
 
28
 
29
-#line 4031 "./typica.w"
29
+#line 4037 "./typica.w"
30
 
30
 
31
-/*:169*/
31
+/*:170*/
32
 #line 39 "./helpmenu.w"
32
 #line 39 "./helpmenu.w"
33
 
33
 
34
 
34
 
35
-/*:167*/
35
+/*:168*/

+ 2
- 2
src/helpmenu.h Ver fichero

1
-/*166:*/
1
+/*167:*/
2
 #line 16 "./helpmenu.w"
2
 #line 16 "./helpmenu.w"
3
 
3
 
4
 #include <QMenu> 
4
 #include <QMenu> 
17
 
17
 
18
 #endif
18
 #endif
19
 
19
 
20
-/*:166*/
20
+/*:167*/

+ 2
- 2
src/typica.cpp Ver fichero

3575
 /*330:*/
3575
 /*330:*/
3576
 #line 8247 "./typica.w"
3576
 #line 8247 "./typica.w"
3577
 
3577
 
3578
-if(lastMeasurement[tempcolumn].time()<measure.time()
3578
+if(lastMeasurement[tempcolumn].time()<measure.time())
3579
 {
3579
 {
3580
 QList<QTime> timelist;
3580
 QList<QTime> timelist;
3581
-for(QTime i= lastMeasurement[tempcolumn].addSecs(1);i<measure.time();i= i.addSecs(1))
3581
+for(QTime i= lastMeasurement[tempcolumn].time().addSecs(1);i<measure.time();i= i.addSecs(1))
3582
 {
3582
 {
3583
 timelist.append(i);
3583
 timelist.append(i);
3584
 }
3584
 }

+ 2
- 2
src/typica.w Ver fichero

8245
 reviewing the batch.
8245
 reviewing the batch.
8246
 
8246
 
8247
 @<Synthesize measurements for slow hardware@>=
8247
 @<Synthesize measurements for slow hardware@>=
8248
-if(lastMeasurement[tempcolumn].time() < measure.time()
8248
+if(lastMeasurement[tempcolumn].time() < measure.time())
8249
 {
8249
 {
8250
 	QList<QTime> timelist;
8250
 	QList<QTime> timelist;
8251
-	for(QTime i = lastMeasurement[tempcolumn].addSecs(1); i < measure.time(); i = i.addSecs(1))
8251
+	for(QTime i = lastMeasurement[tempcolumn].time().addSecs(1); i < measure.time(); i = i.addSecs(1))
8252
 	{
8252
 	{
8253
 		timelist.append(i);
8253
 		timelist.append(i);
8254
 	}
8254
 	}

Loading…
Cancelar
Guardar