Commit eea7d3d590cb5cc3d649265d27db8421c6310638
1 parent
fe9efe64fe
Exists in
master
and in
2 other branches
Segmentation Fault 원인 제거
Showing
10 changed files
with
44 additions
and
12 deletions
Show diff stats
app/gui/oven_control/engineermenuwindow.cpp
@@ -13,10 +13,10 @@ EngineerMenuWindow::EngineerMenuWindow(QWidget *parent) : | @@ -13,10 +13,10 @@ EngineerMenuWindow::EngineerMenuWindow(QWidget *parent) : | ||
13 | { | 13 | { |
14 | ui->setupUi(this); | 14 | ui->setupUi(this); |
15 | 15 | ||
16 | - //ui->clockContainer->setParent(ui->upperStack); | ||
17 | - //setAttribute(Qt::WA_DeleteOnClose); | 16 | + ui->clockContainer->setParent(ui->upperStack); |
17 | + setAttribute(Qt::WA_DeleteOnClose); | ||
18 | 18 | ||
19 | - connect(ui->backButton, SIGNAL(released()), this, SLOT(deleteLater())); | 19 | + connect(ui->backButton, SIGNAL(released()), this, SLOT(close())); |
20 | 20 | ||
21 | } | 21 | } |
22 | 22 |
app/gui/oven_control/historylistwindow.cpp
@@ -14,6 +14,9 @@ HistoryListWindow::HistoryListWindow(QWidget *parent) : | @@ -14,6 +14,9 @@ HistoryListWindow::HistoryListWindow(QWidget *parent) : | ||
14 | { | 14 | { |
15 | ui->setupUi(this); | 15 | ui->setupUi(this); |
16 | 16 | ||
17 | + ui->clockContainer->setParent(ui->upperStack); | ||
18 | + setAttribute(Qt::WA_DeleteOnClose); | ||
19 | + | ||
17 | m_ctrlErrorNameLabel = ui->ctrlLabelErrPartName; | 20 | m_ctrlErrorNameLabel = ui->ctrlLabelErrPartName; |
18 | 21 | ||
19 | m_ctrlFirstTimeLabels[0] = ui->ctrlLabelStarTime_1; | 22 | m_ctrlFirstTimeLabels[0] = ui->ctrlLabelStarTime_1; |
@@ -71,7 +74,7 @@ HistoryListWindow::~HistoryListWindow() | @@ -71,7 +74,7 @@ HistoryListWindow::~HistoryListWindow() | ||
71 | 74 | ||
72 | void HistoryListWindow::on_ctrlBtnBack_clicked() | 75 | void HistoryListWindow::on_ctrlBtnBack_clicked() |
73 | { | 76 | { |
74 | - deleteLater(); | 77 | + close(); |
75 | } | 78 | } |
76 | 79 | ||
77 | void HistoryListWindow::reloadDataset(void){ | 80 | void HistoryListWindow::reloadDataset(void){ |
app/gui/oven_control/operationtimeheat.cpp
@@ -7,6 +7,10 @@ OperationTimeHeat::OperationTimeHeat(QWidget *parent) : | @@ -7,6 +7,10 @@ OperationTimeHeat::OperationTimeHeat(QWidget *parent) : | ||
7 | ui(new Ui::OperationTimeHeat) | 7 | ui(new Ui::OperationTimeHeat) |
8 | { | 8 | { |
9 | ui->setupUi(this); | 9 | ui->setupUi(this); |
10 | + | ||
11 | + ui->clockContainer->setParent(ui->upperStack); | ||
12 | + setAttribute(Qt::WA_DeleteOnClose); | ||
13 | + | ||
10 | reloadUI(); | 14 | reloadUI(); |
11 | 15 | ||
12 | } | 16 | } |
@@ -58,5 +62,5 @@ void OperationTimeHeat::reloadUI(void){ | @@ -58,5 +62,5 @@ void OperationTimeHeat::reloadUI(void){ | ||
58 | 62 | ||
59 | void OperationTimeHeat::on_backButton_clicked() | 63 | void OperationTimeHeat::on_backButton_clicked() |
60 | { | 64 | { |
61 | - deleteLater(); | 65 | + close(); |
62 | } | 66 | } |
app/gui/oven_control/operationtimemain.cpp
@@ -9,6 +9,9 @@ OperationTimeMain::OperationTimeMain(QWidget *parent) : | @@ -9,6 +9,9 @@ OperationTimeMain::OperationTimeMain(QWidget *parent) : | ||
9 | ui(new Ui::OperationTimeMain) | 9 | ui(new Ui::OperationTimeMain) |
10 | { | 10 | { |
11 | ui->setupUi(this); | 11 | ui->setupUi(this); |
12 | + | ||
13 | + ui->clockContainer->setParent(ui->upperStack); | ||
14 | + setAttribute(Qt::WA_DeleteOnClose); | ||
12 | } | 15 | } |
13 | 16 | ||
14 | OperationTimeMain::~OperationTimeMain() | 17 | OperationTimeMain::~OperationTimeMain() |
@@ -39,5 +42,5 @@ void OperationTimeMain::on_btnPartsTime_clicked() | @@ -39,5 +42,5 @@ void OperationTimeMain::on_btnPartsTime_clicked() | ||
39 | 42 | ||
40 | void OperationTimeMain::on_backButton_clicked() | 43 | void OperationTimeMain::on_backButton_clicked() |
41 | { | 44 | { |
42 | - deleteLater(); | 45 | + close(); |
43 | } | 46 | } |
app/gui/oven_control/operationtimemode.cpp
@@ -7,6 +7,10 @@ OperationTimeMode::OperationTimeMode(QWidget *parent) : | @@ -7,6 +7,10 @@ OperationTimeMode::OperationTimeMode(QWidget *parent) : | ||
7 | ui(new Ui::OperationTimeMode) | 7 | ui(new Ui::OperationTimeMode) |
8 | { | 8 | { |
9 | ui->setupUi(this); | 9 | ui->setupUi(this); |
10 | + | ||
11 | + ui->clockContainer->setParent(ui->upperStack); | ||
12 | + setAttribute(Qt::WA_DeleteOnClose); | ||
13 | + | ||
10 | reloadUi(); | 14 | reloadUi(); |
11 | } | 15 | } |
12 | 16 | ||
@@ -17,7 +21,7 @@ OperationTimeMode::~OperationTimeMode() | @@ -17,7 +21,7 @@ OperationTimeMode::~OperationTimeMode() | ||
17 | 21 | ||
18 | void OperationTimeMode::on_backButton_clicked() | 22 | void OperationTimeMode::on_backButton_clicked() |
19 | { | 23 | { |
20 | - deleteLater(); | 24 | + close(); |
21 | } | 25 | } |
22 | 26 | ||
23 | 27 |
app/gui/oven_control/operationtimeparts.cpp
@@ -9,8 +9,12 @@ OperationTimeParts::OperationTimeParts(QWidget *parent) : | @@ -9,8 +9,12 @@ OperationTimeParts::OperationTimeParts(QWidget *parent) : | ||
9 | { | 9 | { |
10 | int i=0; | 10 | int i=0; |
11 | OvenStatistics* ovs = OvenStatistics::getInstance(); | 11 | OvenStatistics* ovs = OvenStatistics::getInstance(); |
12 | + | ||
12 | ui->setupUi(this); | 13 | ui->setupUi(this); |
13 | 14 | ||
15 | + ui->clockContainer->setParent(ui->upperStack); | ||
16 | + setAttribute(Qt::WA_DeleteOnClose); | ||
17 | + | ||
14 | m_arrTimeLabels[0] = ui->m_ctrlLbListTime_1; | 18 | m_arrTimeLabels[0] = ui->m_ctrlLbListTime_1; |
15 | m_arrTimeLabels[1] = ui->m_ctrlLbListTime_2; | 19 | m_arrTimeLabels[1] = ui->m_ctrlLbListTime_2; |
16 | m_arrTimeLabels[2] = ui->m_ctrlLbListTime_3; | 20 | m_arrTimeLabels[2] = ui->m_ctrlLbListTime_3; |
@@ -62,7 +66,7 @@ OperationTimeParts::~OperationTimeParts() | @@ -62,7 +66,7 @@ OperationTimeParts::~OperationTimeParts() | ||
62 | 66 | ||
63 | void OperationTimeParts::on_backButton_clicked() | 67 | void OperationTimeParts::on_backButton_clicked() |
64 | { | 68 | { |
65 | - deleteLater(); | 69 | + close(); |
66 | } | 70 | } |
67 | 71 | ||
68 | void OperationTimeParts::reloadUi(void){ | 72 | void OperationTimeParts::reloadUi(void){ |
app/gui/oven_control/realtimemain.cpp
@@ -8,6 +8,9 @@ RealtimeMain::RealtimeMain(QWidget *parent) : | @@ -8,6 +8,9 @@ RealtimeMain::RealtimeMain(QWidget *parent) : | ||
8 | ui(new Ui::RealtimeMain) | 8 | ui(new Ui::RealtimeMain) |
9 | { | 9 | { |
10 | ui->setupUi(this); | 10 | ui->setupUi(this); |
11 | + | ||
12 | + ui->clockContainer->setParent(ui->upperStack); | ||
13 | + setAttribute(Qt::WA_DeleteOnClose); | ||
11 | } | 14 | } |
12 | 15 | ||
13 | RealtimeMain::~RealtimeMain() | 16 | RealtimeMain::~RealtimeMain() |
@@ -31,5 +34,5 @@ void RealtimeMain::on_btnTemperatureReal_clicked() | @@ -31,5 +34,5 @@ void RealtimeMain::on_btnTemperatureReal_clicked() | ||
31 | 34 | ||
32 | void RealtimeMain::on_backButton_clicked() | 35 | void RealtimeMain::on_backButton_clicked() |
33 | { | 36 | { |
34 | - deleteLater(); | 37 | + close(); |
35 | } | 38 | } |
app/gui/oven_control/realtimepartswindow.cpp
@@ -8,6 +8,9 @@ RealtimePartsWindow::RealtimePartsWindow(QWidget *parent) : | @@ -8,6 +8,9 @@ RealtimePartsWindow::RealtimePartsWindow(QWidget *parent) : | ||
8 | { | 8 | { |
9 | ui->setupUi(this); | 9 | ui->setupUi(this); |
10 | 10 | ||
11 | + ui->clockContainer->setParent(ui->upperStack); | ||
12 | + setAttribute(Qt::WA_DeleteOnClose); | ||
13 | + | ||
11 | // for(i=0;i<CONTROL_LIST_COL_MAX;i++){ | 14 | // for(i=0;i<CONTROL_LIST_COL_MAX;i++){ |
12 | // for(j=0;i<CONTROL_LIST_ITEM_MAX;j++){ | 15 | // for(j=0;i<CONTROL_LIST_ITEM_MAX;j++){ |
13 | // m_arrLbState[i][j]=NULL; | 16 | // m_arrLbState[i][j]=NULL; |
@@ -53,7 +56,7 @@ RealtimePartsWindow::~RealtimePartsWindow() | @@ -53,7 +56,7 @@ RealtimePartsWindow::~RealtimePartsWindow() | ||
53 | 56 | ||
54 | void RealtimePartsWindow::on_backButton_clicked() | 57 | void RealtimePartsWindow::on_backButton_clicked() |
55 | { | 58 | { |
56 | - deleteLater(); | 59 | + close(); |
57 | } | 60 | } |
58 | 61 | ||
59 | void RealtimePartsWindow::reloadUi(void){ | 62 | void RealtimePartsWindow::reloadUi(void){ |
app/gui/oven_control/realtimesensorwindow.cpp
@@ -8,8 +8,12 @@ RealtimeSensorWindow::RealtimeSensorWindow(QWidget *parent) : | @@ -8,8 +8,12 @@ RealtimeSensorWindow::RealtimeSensorWindow(QWidget *parent) : | ||
8 | { | 8 | { |
9 | OvenStatistics* ovs = OvenStatistics::getInstance(); | 9 | OvenStatistics* ovs = OvenStatistics::getInstance(); |
10 | int i = 0; | 10 | int i = 0; |
11 | + | ||
11 | ui->setupUi(this); | 12 | ui->setupUi(this); |
12 | 13 | ||
14 | + ui->clockContainer->setParent(ui->upperStack); | ||
15 | + setAttribute(Qt::WA_DeleteOnClose); | ||
16 | + | ||
13 | m_arrLbState[0][0] = ui->m_ctrlLbListState_1_1; | 17 | m_arrLbState[0][0] = ui->m_ctrlLbListState_1_1; |
14 | m_arrLbState[0][1] = ui->m_ctrlLbListState_1_2; | 18 | m_arrLbState[0][1] = ui->m_ctrlLbListState_1_2; |
15 | m_arrLbState[0][2] = ui->m_ctrlLbListState_1_3; | 19 | m_arrLbState[0][2] = ui->m_ctrlLbListState_1_3; |
@@ -63,7 +67,7 @@ RealtimeSensorWindow::~RealtimeSensorWindow() | @@ -63,7 +67,7 @@ RealtimeSensorWindow::~RealtimeSensorWindow() | ||
63 | 67 | ||
64 | void RealtimeSensorWindow::on_backButton_clicked() | 68 | void RealtimeSensorWindow::on_backButton_clicked() |
65 | { | 69 | { |
66 | - deleteLater(); | 70 | + close(); |
67 | } | 71 | } |
68 | 72 | ||
69 | uint16_t i_temp1,i_temp2; | 73 | uint16_t i_temp1,i_temp2; |
app/gui/oven_control/servicehistorymain.cpp
@@ -7,7 +7,11 @@ ServiceHistoryMain::ServiceHistoryMain(QWidget *parent) : | @@ -7,7 +7,11 @@ ServiceHistoryMain::ServiceHistoryMain(QWidget *parent) : | ||
7 | ui(new Ui::ServiceHistoryMain) | 7 | ui(new Ui::ServiceHistoryMain) |
8 | { | 8 | { |
9 | ui->setupUi(this); | 9 | ui->setupUi(this); |
10 | - connect(ui->backButton, SIGNAL(released()), this, SLOT(deleteLater())); | 10 | + |
11 | + ui->clockContainer->setParent(ui->upperStack); | ||
12 | + setAttribute(Qt::WA_DeleteOnClose); | ||
13 | + | ||
14 | + connect(ui->backButton, SIGNAL(released()), this, SLOT(close())); | ||
11 | } | 15 | } |
12 | 16 | ||
13 | ServiceHistoryMain::~ServiceHistoryMain() | 17 | ServiceHistoryMain::~ServiceHistoryMain() |