에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit c25b83f42d88e18d275928450bde792c2e1ff497

Authored by 김태훈
1 parent e567eba26a
Exists in master and in 2 other branches fhd, fhd-demo

전원 켜짐 기록 기능 제거

Showing 1 changed file with 1 additions and 28 deletions   Show diff stats
app/gui/oven_control/haccp.cpp
  Diff comments   View file @c25b83f
@@ -41,7 +41,6 @@ struct Data @@ -41,7 +41,6 @@ struct Data
41 QList<Stamp> records; 41 QList<Stamp> records;
42 } data; 42 } data;
43 43
44 -QDateTime initializedTime;  
45 int processCount; 44 int processCount;
46 QTimer checkTimer; 45 QTimer checkTimer;
47 QTime lastStampedTime; 46 QTime lastStampedTime;
@@ -75,7 +74,6 @@ void init() @@ -75,7 +74,6 @@ void init()
75 // make the directory if it doesn't exist 74 // make the directory if it doesn't exist
76 QDir().mkpath("/prime/haccp"); 75 QDir().mkpath("/prime/haccp");
77 76
78 - initializedTime = QDateTime::currentDateTime();  
79 processCount = figureProcessCount() + 1; 77 processCount = figureProcessCount() + 1;
80 78
81 checkTimer.setInterval(100); 79 checkTimer.setInterval(100);
@@ -95,8 +93,6 @@ void autoStart(const QString &amp;path) @@ -95,8 +93,6 @@ void autoStart(const QString &amp;path)
95 93
96 void manualStart() 94 void manualStart()
97 { 95 {
98 - qDebug() << __FUNCTION__;  
99 -  
100 initData(Manual); 96 initData(Manual);
101 start(); 97 start();
102 } 98 }
@@ -120,7 +116,6 @@ void engineeringStart() @@ -120,7 +116,6 @@ void engineeringStart()
120 116
121 void done() 117 void done()
122 { 118 {
123 - qDebug() << __FUNCTION__;  
124 if (data.type == Invalid) 119 if (data.type == Invalid)
125 return; 120 return;
126 121
@@ -361,15 +356,7 @@ void initData(Type type) @@ -361,15 +356,7 @@ void initData(Type type)
361 data.autoConfig.clear(); 356 data.autoConfig.clear();
362 data.washType = 0; 357 data.washType = 0;
363 data.records.clear(); 358 data.records.clear();
364 -  
365 - if (initializedTime.isValid())  
366 - {  
367 - data.startedAt = initializedTime;  
368 - stampStart();  
369 - }  
370 - else  
371 - data.startedAt = QDateTime::currentDateTime();  
372 - 359 + data.startedAt = QDateTime::currentDateTime();
373 } 360 }
374 361
375 void start() 362 void start()
@@ -424,15 +411,11 @@ void stamp(QString caption) @@ -424,15 +411,11 @@ void stamp(QString caption)
424 411
425 void stampStart() 412 void stampStart()
426 { 413 {
427 - qDebug() << __FUNCTION__;  
428 -  
429 stamp("START (POWER ON)"); 414 stamp("START (POWER ON)");
430 } 415 }
431 416
432 void stampMode(Define::Mode mode) 417 void stampMode(Define::Mode mode)
433 { 418 {
434 - qDebug() << __FUNCTION__;  
435 -  
436 switch (mode) 419 switch (mode)
437 { 420 {
438 case Define::SteamMode: 421 case Define::SteamMode:
@@ -451,30 +434,22 @@ void stampMode(Define::Mode mode) @@ -451,30 +434,22 @@ void stampMode(Define::Mode mode)
451 434
452 void stampFan(int fan) 435 void stampFan(int fan)
453 { 436 {
454 - qDebug() << __FUNCTION__;  
455 -  
456 lastFan = fan; 437 lastFan = fan;
457 stamp(QString("FAN = %1").arg(fan)); 438 stamp(QString("FAN = %1").arg(fan));
458 } 439 }
459 440
460 void stampDamper() 441 void stampDamper()
461 { 442 {
462 - qDebug() << __FUNCTION__;  
463 -  
464 stamp("DAMPER"); 443 stamp("DAMPER");
465 } 444 }
466 445
467 void stampSideNozzle() 446 void stampSideNozzle()
468 { 447 {
469 - qDebug() << __FUNCTION__;  
470 -  
471 stamp("SIDE NOZZLE"); 448 stamp("SIDE NOZZLE");
472 } 449 }
473 450
474 void stampEnd() 451 void stampEnd()
475 { 452 {
476 - qDebug() << __FUNCTION__;  
477 -  
478 stamp("END"); 453 stamp("END");
479 } 454 }
480 455
@@ -485,8 +460,6 @@ void stampError(QString error) @@ -485,8 +460,6 @@ void stampError(QString error)
485 460
486 void saveData() 461 void saveData()
487 { 462 {
488 - qDebug() << __FUNCTION__;  
489 -  
490 if (data.records.isEmpty()) 463 if (data.records.isEmpty())
491 { 464 {
492 data.type = Invalid; 465 data.type = Invalid;