파일 위치 변경

김태훈
1 parent 6d5da5fca8
Showing 6 changed files with 17 additions and 64 deletions Show diff stats
app/app-prime-modbus/include/dirtylevel.cpp
app/app-prime-modbus/include/dirtylevel.h
app/gui/oven_control/images/not_recognized/config_service/108_wash_icon.png
app/gui/oven_control/images/symbol/wash.png
app/gui/oven_control/washwarnicon.cpp
app/gui/oven_control/washwarnicon.h
@@ -1,51 +0,0 @@
-#include "dirtylevel.h"
-
-#include <QDateTime>
-
-namespace {
-QDateTime cookStartTime;
-qint64 cookingTime;
-int cookingCount;
-}
-
-
-void DirtyLevel::cookStart()
-{
-    cookStartTime = QDateTime.currentDateTime();
-    cookingCount++;
-}
-
-void DirtyLevel::cookEnd()
-{
-    cookingTime += cookStartTime.secsTo(QDateTime.currentDateTime());
-}
-
-int DirtyLevel::dirty()
-{
-    if (cookingCount < 1)
-        return 0;
-    if (cookingTime < 1 * 3600)
-        return 1;
-    if (cookingTime < 3 * 3600)
-        return 2;
-    if (cookingTime < 5 * 3600)
-        return 3;
-    if (cookingTime < 7 * 3600)
-        return 4;
-    return 5;
-}
-
-int DirtyLevel::state()
-{
-    if (cookingCount < 1)
-        return 0;
-    if (cookingCount < 4)
-        return 1;
-    if (cookingCount < 7)
-        return 2;
-    if (cookingCount < 10)
-        return 3;
-    if (cookingCount < 13)
-        return 4;
-    return 5;
-}
@@ -1,13 +0,0 @@
-#ifndef DIRTYLEVEL_H
-#define DIRTYLEVEL_H
-
-
-namespace DirtyLevel {
-void cookStart();
-void cookEnd();
-
-int dirty();
-int state();
-}
-
-#endif // DIRTYLEVEL_H
@@ -0,0 +1,6 @@
+#include "washwarnicon.h"
+
+WashWarnIcon::WashWarnIcon()
+{
+
+}
@@ -0,0 +1,11 @@
+#ifndef WASHWARNICON_H
+#define WASHWARNICON_H
+
+
+class WashWarnIcon : public QLabel
+{
+public:
+    WashWarnIcon();
+};
+
+#endif // WASHWARNICON_H
 \ No newline at end of file
...	...	@@ -1,51 +0,0 @@
1		-#include "dirtylevel.h"
2		-
3		-#include <QDateTime>
4		-
5		-namespace {
6		-QDateTime cookStartTime;
7		-qint64 cookingTime;
8		-int cookingCount;
9		-}
10		-
11		-
12		-void DirtyLevel::cookStart()
13		-{
14		- cookStartTime = QDateTime.currentDateTime();
15		- cookingCount++;
16		-}
17		-
18		-void DirtyLevel::cookEnd()
19		-{
20		- cookingTime += cookStartTime.secsTo(QDateTime.currentDateTime());
21		-}
22		-
23		-int DirtyLevel::dirty()
24		-{
25		- if (cookingCount < 1)
26		- return 0;
27		- if (cookingTime < 1 * 3600)
28		- return 1;
29		- if (cookingTime < 3 * 3600)
30		- return 2;
31		- if (cookingTime < 5 * 3600)
32		- return 3;
33		- if (cookingTime < 7 * 3600)
34		- return 4;
35		- return 5;
36		-}
37		-
38		-int DirtyLevel::state()
39		-{
40		- if (cookingCount < 1)
41		- return 0;
42		- if (cookingCount < 4)
43		- return 1;
44		- if (cookingCount < 7)
45		- return 2;
46		- if (cookingCount < 10)
47		- return 3;
48		- if (cookingCount < 13)
49		- return 4;
50		- return 5;
51		-}
...	...	@@ -1,13 +0,0 @@
1		-#ifndef DIRTYLEVEL_H
2		-#define DIRTYLEVEL_H
3		-
4		-
5		-namespace DirtyLevel {
6		-void cookStart();
7		-void cookEnd();
8		-
9		-int dirty();
10		-int state();
11		-}
12		-
13		-#endif // DIRTYLEVEL_H
...	...	@@ -0,0 +1,6 @@
	1	+#include "washwarnicon.h"
	2	+
	3	+WashWarnIcon::WashWarnIcon()
	4	+{
	5	+
	6	+}
...	...
...	...	@@ -0,0 +1,11 @@
	1	+#ifndef WASHWARNICON_H
	2	+#define WASHWARNICON_H
	3	+
	4	+
	5	+class WashWarnIcon : public QLabel
	6	+{
	7	+public:
	8	+ WashWarnIcon();
	9	+};
	10	+
	11	+#endif // WASHWARNICON_H
0	12	\ No newline at end of file
...	...