From 4140673498bea4854f187957133f887a45ddd253 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 27 Feb 2010 10:55:07 +0100 Subject: [PATCH] =?utf8?q?Inserimento=20Led,=20Modifiche=20Layout=20E'=20sta?= =?utf8?q?to=20inserito=20un=20led=20di=20stato=20e=20delle=20modifiche=20al?= =?utf8?q?=20layout=20dell'applicazione.=20Le=20modifiche=20sono=20state=20f?= =?utf8?q?atte=20con=20Widows,=20ci=20sono=20dei=20problemi=20con=20funzione?= =?utf8?q?=20quick=5Fexit()=20in=20mainwindows.cpp=20(=E8=20stata=20modifica?= =?utf8?q?=20con=20exit(0))?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- crazybutton.cpp | 2 +- mainwindow.cpp | 27 ++++--- mainwindow.h | 2 + mainwindow.ui | 229 +++++++++++++++++++++++++------------------------------ testThread.cpp | 4 +- testThread.h | 2 +- ui_mainwindow.h | 119 ++++++++++++++++++++++------- 7 files changed, 219 insertions(+), 166 deletions(-) diff --git a/crazybutton.cpp b/crazybutton.cpp index abc81ee..04285f5 100644 --- a/crazybutton.cpp +++ b/crazybutton.cpp @@ -12,7 +12,7 @@ void CrazyButton::changeColor(){ QPalette palettea; if(col){ - this->setStyleSheet("background-color:green;"); + this->setStyleSheet("background-color:red;"); col=false; } else{ diff --git a/mainwindow.cpp b/mainwindow.cpp index 178e2a1..2c29cfc 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -9,8 +9,15 @@ MainWindow::MainWindow(QWidget *parent) : { ui->setupUi(this); + statusLed = new QLed(ui->verticalLayoutWidget); + statusLed->setLayout(ui->horizontalLayout_4); + statusLed->setOnColor(QLed::Red); + statusLed->setOffColor(QLed::Green); + statusLed->setGeometry(QRect(0,0,100,100)); + setCentralWidget(ui->verticalLayoutWidget); connect(&tread,SIGNAL(generate(int)),this,SLOT(cliccaBottone(int))); - connect(&tread,SIGNAL(score(int)),this,SLOT(sbagliato(int))); + connect(&tread,SIGNAL(score(int)),ui->lcdNumber,SLOT(display(int))); + connect(&tread,SIGNAL(exit(int)),this,SLOT(sbagliato(int))); connect(&tread,SIGNAL(disableInterface()),this,SLOT(disableAll())); connect(&tread,SIGNAL(enableInterface()),this,SLOT(enableAll())); connect(this,SIGNAL(cliccatoIlBottone(int)),&tread,SLOT(updateCaption(int))); @@ -26,7 +33,7 @@ MainWindow::MainWindow(QWidget *parent) : tread.start(); - setStyleSheet("QPushButton {" + setStyleSheet("CrazyButton {" "color: white;" "background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #88d, stop: 0.1 #99e, stop: 0.49 #77c, stop: 0.5 #66b, stop: 1 #77c);" "border-width: 1px;" @@ -37,10 +44,10 @@ MainWindow::MainWindow(QWidget *parent) : "font-size: 50px;" "padding-left: 5px;" "padding-right: 5px;" - "min-width: 150px;" - "max-width: 150px;" - "min-height: 113px;" - "max-height: 113px;" + "min-width: 15px;" + "max-width: 300px;" + "min-height: 11px;" + "max-height: 300px;" "}" "QPushButton:pressed {" "padding-top: 15px;" @@ -48,11 +55,11 @@ MainWindow::MainWindow(QWidget *parent) : //showMaximized(); } void MainWindow::sbagliato(int score){ - QString sscore("Score:"); + QString sscore("Score "); sscore.append(QString::number(score)); - QMessageBox::warning(this, tr("Sbagliato"),sscore,QMessageBox::Escape); + QMessageBox::warning(this, tr("End Game"),sscore,QMessageBox::Escape); //tread.genera(); - quick_exit(0); + exit(0); } void MainWindow::disableAll(){ @@ -65,6 +72,7 @@ void MainWindow::disableAll(){ ui->pushButton_7->setEnabled(false); ui->pushButton_8->setEnabled(false); ui->pushButton_9->setEnabled(false); + statusLed->setValue(true); } void MainWindow::enableAll(){ @@ -77,6 +85,7 @@ void MainWindow::enableAll(){ ui->pushButton_7->setEnabled(true); ui->pushButton_8->setEnabled(true); ui->pushButton_9->setEnabled(true); + statusLed->setValue(false); } diff --git a/mainwindow.h b/mainwindow.h index fa4bd1a..e1ab34a 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -3,6 +3,7 @@ #include #include "testThread.h" +#include "qled.h" namespace Ui { class MainWindow; @@ -37,6 +38,7 @@ protected: Ui::MainWindow *ui; QList sequenza; TestThread tread; + QLed *statusLed; }; #endif // MAINWINDOW_H diff --git a/mainwindow.ui b/mainwindow.ui index 0fef0bf..b27faea 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -17,137 +17,114 @@ true - - - - 330 - 40 - 100 - 100 - - - - - 16777215 - 16777215 - - - - 2 - - - - - - 510 - 40 - 100 - 100 - - - - 3 - - - - - - 150 - 180 - 100 - 100 - - - - 4 - - - - - - 330 - 180 - 100 - 100 - - - - 5 - - - - - - 510 - 180 - 100 - 100 - - - - 6 - - - + 150 - 320 - 100 - 100 - - - - 7 - - - - - - 330 - 320 - 100 - 100 + 140 + 241 + 120 - - 8 - - - - - - 510 - 320 - 100 - 100 - - - - 9 - - - - - - 150 - 40 - 101 - 100 - - - - - 0 - 100 - - - - - - - 1 - + + + + + + + + + + + + + + + 0 + 0 + + + + + + + 1 + + + + + + + + 16777215 + 16777215 + + + + 2 + + + + + + + 3 + + + + + + + + + + + 4 + + + + + + + 5 + + + + + + + 6 + + + + + + + + + + + 7 + + + + + + + 8 + + + + + + + 9 + + + + + + diff --git a/testThread.cpp b/testThread.cpp index e8d0477..4c7dfb6 100644 --- a/testThread.cpp +++ b/testThread.cpp @@ -53,14 +53,14 @@ void TestThread::updateCaption(int inputUser){ { index++; _score++; - + emit score(_score); if(index==sequenza.size()){ attendiInputUtente=false; index=0; } } else{ - emit score(_score); + emit exit(_score); _score=0; sequenza.clear(); index=0; diff --git a/testThread.h b/testThread.h index 1a50226..fdb6855 100644 --- a/testThread.h +++ b/testThread.h @@ -13,7 +13,7 @@ public: ~TestThread(); signals: void generate(int a); - void exit(); + void exit(int); void score(int); void disableInterface(); void enableInterface(); diff --git a/ui_mainwindow.h b/ui_mainwindow.h index a12c31a..ed062e7 100644 --- a/ui_mainwindow.h +++ b/ui_mainwindow.h @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading UI file 'mainwindow.ui' ** -** Created: Fri Feb 26 16:31:30 2010 -** by: Qt User Interface Compiler version 4.6.1 +** Created: Sat 27. Feb 10:40:53 2010 +** by: Qt User Interface Compiler version 4.6.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -14,8 +14,11 @@ #include #include #include +#include #include +#include #include +#include #include #include "crazybutton.h" @@ -25,15 +28,22 @@ class Ui_MainWindow { public: QWidget *centralWidget; + QWidget *verticalLayoutWidget; + QVBoxLayout *verticalLayout; + QHBoxLayout *horizontalLayout_4; + QLCDNumber *lcdNumber; + QHBoxLayout *horizontalLayout; + CrazyButton *pushButton; CrazyButton *pushButton_2; CrazyButton *pushButton_3; + QHBoxLayout *horizontalLayout_2; CrazyButton *pushButton_4; CrazyButton *pushButton_5; CrazyButton *pushButton_6; + QHBoxLayout *horizontalLayout_3; CrazyButton *pushButton_7; CrazyButton *pushButton_8; CrazyButton *pushButton_9; - CrazyButton *pushButton; void setupUi(QMainWindow *MainWindow) { @@ -43,38 +53,93 @@ public: MainWindow->setAutoFillBackground(true); centralWidget = new QWidget(MainWindow); centralWidget->setObjectName(QString::fromUtf8("centralWidget")); - pushButton_2 = new CrazyButton(centralWidget); + verticalLayoutWidget = new QWidget(centralWidget); + verticalLayoutWidget->setObjectName(QString::fromUtf8("verticalLayoutWidget")); + verticalLayoutWidget->setGeometry(QRect(150, 140, 241, 120)); + verticalLayout = new QVBoxLayout(verticalLayoutWidget); + verticalLayout->setSpacing(6); + verticalLayout->setContentsMargins(11, 11, 11, 11); + verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); + verticalLayout->setContentsMargins(0, 0, 0, 0); + horizontalLayout_4 = new QHBoxLayout(); + horizontalLayout_4->setSpacing(6); + horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4")); + lcdNumber = new QLCDNumber(verticalLayoutWidget); + lcdNumber->setObjectName(QString::fromUtf8("lcdNumber")); + + horizontalLayout_4->addWidget(lcdNumber); + + + verticalLayout->addLayout(horizontalLayout_4); + + horizontalLayout = new QHBoxLayout(); + horizontalLayout->setSpacing(6); + horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); + pushButton = new CrazyButton(verticalLayoutWidget); + pushButton->setObjectName(QString::fromUtf8("pushButton")); + pushButton->setMinimumSize(QSize(0, 0)); +#ifndef QT_NO_TOOLTIP + pushButton->setToolTip(QString::fromUtf8("")); +#endif // QT_NO_TOOLTIP + + horizontalLayout->addWidget(pushButton); + + pushButton_2 = new CrazyButton(verticalLayoutWidget); pushButton_2->setObjectName(QString::fromUtf8("pushButton_2")); - pushButton_2->setGeometry(QRect(330, 40, 100, 100)); pushButton_2->setMaximumSize(QSize(16777215, 16777215)); - pushButton_3 = new CrazyButton(centralWidget); + + horizontalLayout->addWidget(pushButton_2); + + pushButton_3 = new CrazyButton(verticalLayoutWidget); pushButton_3->setObjectName(QString::fromUtf8("pushButton_3")); - pushButton_3->setGeometry(QRect(510, 40, 100, 100)); - pushButton_4 = new CrazyButton(centralWidget); + + horizontalLayout->addWidget(pushButton_3); + + + verticalLayout->addLayout(horizontalLayout); + + horizontalLayout_2 = new QHBoxLayout(); + horizontalLayout_2->setSpacing(6); + horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2")); + pushButton_4 = new CrazyButton(verticalLayoutWidget); pushButton_4->setObjectName(QString::fromUtf8("pushButton_4")); - pushButton_4->setGeometry(QRect(150, 180, 100, 100)); - pushButton_5 = new CrazyButton(centralWidget); + + horizontalLayout_2->addWidget(pushButton_4); + + pushButton_5 = new CrazyButton(verticalLayoutWidget); pushButton_5->setObjectName(QString::fromUtf8("pushButton_5")); - pushButton_5->setGeometry(QRect(330, 180, 100, 100)); - pushButton_6 = new CrazyButton(centralWidget); + + horizontalLayout_2->addWidget(pushButton_5); + + pushButton_6 = new CrazyButton(verticalLayoutWidget); pushButton_6->setObjectName(QString::fromUtf8("pushButton_6")); - pushButton_6->setGeometry(QRect(510, 180, 100, 100)); - pushButton_7 = new CrazyButton(centralWidget); + + horizontalLayout_2->addWidget(pushButton_6); + + + verticalLayout->addLayout(horizontalLayout_2); + + horizontalLayout_3 = new QHBoxLayout(); + horizontalLayout_3->setSpacing(6); + horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3")); + pushButton_7 = new CrazyButton(verticalLayoutWidget); pushButton_7->setObjectName(QString::fromUtf8("pushButton_7")); - pushButton_7->setGeometry(QRect(150, 320, 100, 100)); - pushButton_8 = new CrazyButton(centralWidget); + + horizontalLayout_3->addWidget(pushButton_7); + + pushButton_8 = new CrazyButton(verticalLayoutWidget); pushButton_8->setObjectName(QString::fromUtf8("pushButton_8")); - pushButton_8->setGeometry(QRect(330, 320, 100, 100)); - pushButton_9 = new CrazyButton(centralWidget); + + horizontalLayout_3->addWidget(pushButton_8); + + pushButton_9 = new CrazyButton(verticalLayoutWidget); pushButton_9->setObjectName(QString::fromUtf8("pushButton_9")); - pushButton_9->setGeometry(QRect(510, 320, 100, 100)); - pushButton = new CrazyButton(centralWidget); - pushButton->setObjectName(QString::fromUtf8("pushButton")); - pushButton->setGeometry(QRect(150, 40, 101, 100)); - pushButton->setMinimumSize(QSize(0, 100)); -#ifndef QT_NO_TOOLTIP - pushButton->setToolTip(QString::fromUtf8("")); -#endif // QT_NO_TOOLTIP + + horizontalLayout_3->addWidget(pushButton_9); + + + verticalLayout->addLayout(horizontalLayout_3); + MainWindow->setCentralWidget(centralWidget); retranslateUi(MainWindow); @@ -85,6 +150,7 @@ public: void retranslateUi(QMainWindow *MainWindow) { MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8)); + pushButton->setText(QApplication::translate("MainWindow", "1", 0, QApplication::UnicodeUTF8)); pushButton_2->setText(QApplication::translate("MainWindow", "2", 0, QApplication::UnicodeUTF8)); pushButton_3->setText(QApplication::translate("MainWindow", "3", 0, QApplication::UnicodeUTF8)); pushButton_4->setText(QApplication::translate("MainWindow", "4", 0, QApplication::UnicodeUTF8)); @@ -93,7 +159,6 @@ public: pushButton_7->setText(QApplication::translate("MainWindow", "7", 0, QApplication::UnicodeUTF8)); pushButton_8->setText(QApplication::translate("MainWindow", "8", 0, QApplication::UnicodeUTF8)); pushButton_9->setText(QApplication::translate("MainWindow", "9", 0, QApplication::UnicodeUTF8)); - pushButton->setText(QApplication::translate("MainWindow", "1", 0, QApplication::UnicodeUTF8)); } // retranslateUi }; -- 1.7.9.5