From bdd67809204d68524b21ee0e5beee99a47586d29 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 7 Oct 2016 10:05:37 +0000 Subject: [PATCH] =?UTF-8?q?widget=20=ED=81=B4=EB=9E=98=EC=8A=A4=EB=93=A4?= =?UTF-8?q?=EC=9D=98=20=EA=B8=B0=EC=B4=88=20=ED=81=B4=EB=9E=98=EC=8A=A4?= =?UTF-8?q?=EB=A5=BC=20QObject=20=EC=97=90=EC=84=9C=20QWidget=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://192.168.0.12/source@299 8346c931-da38-4b9b-9d4c-e48b93cbd075 --- EffectUI/sadddelwidget.cpp | 7 +++++-- EffectUI/sadddelwidget.h | 6 +++--- EffectUI/scompanylistwidget.cpp | 9 ++++++--- EffectUI/scompanylistwidget.h | 5 +++-- EffectUI/srunninglistwidget.cpp | 11 +++++++---- EffectUI/srunninglistwidget.h | 4 ++-- EffectUI/widget.cpp | 16 +++++++--------- 7 files changed, 33 insertions(+), 25 deletions(-) diff --git a/EffectUI/sadddelwidget.cpp b/EffectUI/sadddelwidget.cpp index 688cac7..18ce347 100644 --- a/EffectUI/sadddelwidget.cpp +++ b/EffectUI/sadddelwidget.cpp @@ -4,8 +4,9 @@ #include SAddDelWidget::SAddDelWidget(QWidget *parent): - m_pbtnAdd(new QPushButton(parent)), m_pbtnDel(new QPushButton(parent)), - m_pParent(parent), m_playout(new QVBoxLayout(parent)) + QWidget(parent), + m_pbtnAdd(new QPushButton(this)), m_pbtnDel(new QPushButton(this)), + m_pParent(this), m_playout(new QVBoxLayout(this)) { initButton(); @@ -14,6 +15,7 @@ SAddDelWidget::SAddDelWidget(QWidget *parent): SAddDelWidget::~SAddDelWidget() { + /* if (m_pParent == nullptr) { disconnect(m_pbtnAdd, 0, 0, 0); @@ -21,6 +23,7 @@ SAddDelWidget::~SAddDelWidget() delete m_pbtnAdd; delete m_pbtnDel; } + */ } void SAddDelWidget::initButton() diff --git a/EffectUI/sadddelwidget.h b/EffectUI/sadddelwidget.h index 4252f12..387c3dc 100644 --- a/EffectUI/sadddelwidget.h +++ b/EffectUI/sadddelwidget.h @@ -1,14 +1,14 @@ #ifndef SADDDELWIDGET #define SADDDELWIDGET -#include +#include class QPushButton; class QVBoxLayout; -class QWidget; -class SAddDelWidget: public QObject + +class SAddDelWidget: public QWidget { Q_OBJECT diff --git a/EffectUI/scompanylistwidget.cpp b/EffectUI/scompanylistwidget.cpp index 227ec67..8edbb14 100644 --- a/EffectUI/scompanylistwidget.cpp +++ b/EffectUI/scompanylistwidget.cpp @@ -33,6 +33,7 @@ enum class SCompanyListWidget::E_TABLE_HEADER SCompanyListWidget::~SCompanyListWidget() { + /* if (m_pwParent == nullptr) { delete m_pbtnSearch; @@ -41,12 +42,14 @@ SCompanyListWidget::~SCompanyListWidget() delete m_pdeStart; delete m_ptableWidget; } + */ } SCompanyListWidget::SCompanyListWidget(QWidget* parent): - m_pbtnSearch(new QPushButton(parent)), m_pbtnRefresh(new QPushButton(parent)), - m_ptableWidget(new QTableWidget(parent)), m_pdeStart(new QDateEdit(parent)), - m_pdeEnd(new QDateEdit(parent)), m_playout(new QVBoxLayout(parent)), m_pwParent(parent), + QWidget(parent), + m_pbtnSearch(new QPushButton(this)), m_pbtnRefresh(new QPushButton(this)), + m_ptableWidget(new QTableWidget(this)), m_pdeStart(new QDateEdit(this)), + m_pdeEnd(new QDateEdit(this)), m_playout(new QVBoxLayout(this)), m_pwParent(this), m_pslTableHeader(new QStringList) { diff --git a/EffectUI/scompanylistwidget.h b/EffectUI/scompanylistwidget.h index 8423f95..b4508d6 100644 --- a/EffectUI/scompanylistwidget.h +++ b/EffectUI/scompanylistwidget.h @@ -1,10 +1,11 @@ #ifndef SCOMPANYLISTWIDGET #define SCOMPANYLISTWIDGET -#include +#include #include #include + class QPushButton; class QTableWidget; class QDateEdit; @@ -12,7 +13,7 @@ class QVBoxLayout; class QStringList; class QTableWidgetItem; -class SCompanyListWidget:public QObject +class SCompanyListWidget:public QWidget { Q_OBJECT diff --git a/EffectUI/srunninglistwidget.cpp b/EffectUI/srunninglistwidget.cpp index fb2f069..010d450 100644 --- a/EffectUI/srunninglistwidget.cpp +++ b/EffectUI/srunninglistwidget.cpp @@ -31,10 +31,11 @@ enum class SRunningListWidget::E_TABLE_HEADER }; SRunningListWidget::SRunningListWidget(QWidget* parent) : - m_pwParent(parent), m_pbtnTimerStart(new QPushButton(parent)), - m_pbtnTimerStop(new QPushButton(parent)), m_pbtnForceStart(new QPushButton(parent)), - m_pbtnForceStop(new QPushButton(parent)), m_ptableWidget(new QTableWidget(parent)), - m_playout(new QVBoxLayout(parent)), m_pslTableHeader(new QStringList) + QWidget(parent), + m_pwParent(this), m_pbtnTimerStart(new QPushButton(this)), + m_pbtnTimerStop(new QPushButton(this)), m_pbtnForceStart(new QPushButton(this)), + m_pbtnForceStop(new QPushButton(this)), m_ptableWidget(new QTableWidget(this)), + m_playout(new QVBoxLayout(this)), m_pslTableHeader(new QStringList) { *m_pslTableHeader << "Company" << "Start date" << "End date" << "Event Num" << "Status" << "Last Update Time"; @@ -168,6 +169,7 @@ void SRunningListWidget::resetTableHeader() SRunningListWidget::~SRunningListWidget() { + /* if (m_pwParent == nullptr) { disconnect(m_pbtnForceStart, &QPushButton::released, @@ -188,6 +190,7 @@ SRunningListWidget::~SRunningListWidget() delete m_ptableWidget; delete m_playout; } + */ } diff --git a/EffectUI/srunninglistwidget.h b/EffectUI/srunninglistwidget.h index 362ddf3..7775f64 100644 --- a/EffectUI/srunninglistwidget.h +++ b/EffectUI/srunninglistwidget.h @@ -1,7 +1,7 @@ #ifndef SRUNNINGLISTWIDGET #define SRUNNINGLISTWIDGET -#include +#include #include #include #include @@ -13,7 +13,7 @@ class QDateEdit; class QVBoxLayout; class QStringList; -class SRunningListWidget:public QObject +class SRunningListWidget:public QWidget { Q_OBJECT public: diff --git a/EffectUI/widget.cpp b/EffectUI/widget.cpp index bc73fb8..be38369 100644 --- a/EffectUI/widget.cpp +++ b/EffectUI/widget.cpp @@ -10,17 +10,15 @@ Widget::Widget(QWidget *parent) : ui(new Ui::Widget) { ui->setupUi(this); - QWidget *w1 = new QWidget; - QWidget *w2 = new QWidget; - QWidget *w3 = new QWidget; - SCompanyListWidget *c = new SCompanyListWidget(w1); - SRunningListWidget *d = new SRunningListWidget(w2); - SAddDelWidget *e = new SAddDelWidget(w3); + SCompanyListWidget *c = new SCompanyListWidget; + SRunningListWidget *d = new SRunningListWidget; + SAddDelWidget *e = new SAddDelWidget; QHBoxLayout* mainLayout = new QHBoxLayout(this); - mainLayout->addWidget(w1); - mainLayout->addWidget(w3); - mainLayout->addWidget(w2); + mainLayout->addWidget(c); + mainLayout->addWidget(e); + + mainLayout->addWidget(d); setLayout(mainLayout); show();