Commit: ae0ab68818cadeb3bd2a07be98bc210e4ecf98cc - QtKarutaNagashi (git)

百人一首かるた 流しの練習用

Commit MetaInfo

• Revision: ae0ab68818cadeb3bd2a07be98bc210e4ecf98cc (tree)
• Time: 2012-10-15 22:58:45
• Author: arakaki <alucky4416@user...>
• Commiter: arakaki

Log Message

CHG: Add FudaImgView Class (QGraphicsView SubClass, MousePressEvent Override) for FudaImage Change. and Delete FudaClick Bottun.

Change Summary

• modified: QtKarutaNagashi.pro
• add: fudaimgview.cpp
• add: fudaimgview.h
• modified: mainwindow.cpp
• modified: mainwindow.h
• modified: mainwindow.ui

Incremental Difference

--- a/QtKarutaNagashi.pro
+++ b/QtKarutaNagashi.pro
@@ -10,10 +10,12 @@ TARGET = QtKarutaNagashi
 TEMPLATE = app
 
 
-SOURCES += main.cpp\
-        mainwindow.cpp
+SOURCES += main.cpp \
+        mainwindow.cpp \
+        fudaimgview.cpp
 
 HEADERS  += mainwindow.h \
+    fudaimgview.h \
     textrsc.h
 
 FORMS    += mainwindow.ui
@@ -22,4 +24,3 @@ RESOURCES += \
     QtKarutaNagashi.qrc
 
 RC_FILE = Icon.rc
-

--- /dev/null
+++ b/fudaimgview.cpp
@@ -0,0 +1,15 @@
+#include "fudaimgview.h"
+
+#include <QDebug>
+
+FudaImgView::FudaImgView(QWidget *parent) :
+    QGraphicsView(parent)
+{
+    ;
+}
+
+void FudaImgView::mousePressEvent(QMouseEvent * event)
+{
+//    qDebug() << __FUNCTION__;
+    emit mousePress();
+}

--- /dev/null
+++ b/fudaimgview.h
@@ -0,0 +1,23 @@
+#ifndef FUDAIMGVIEW_H
+#define FUDAIMGVIEW_H
+
+#include <QtGui>
+
+class FudaImgView : public QGraphicsView
+{
+    Q_OBJECT
+
+public:
+    explicit FudaImgView(QWidget *parent = 0);
+
+protected:
+    void mousePressEvent(QMouseEvent * event);
+
+signals:
+    void mousePress();
+
+public slots:
+    
+};
+
+#endif // FUDAIMGVIEW_H

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -46,6 +46,7 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->Slct_FudaMuki->addItem(tr("ランダム"));
     ui->label_5->setEnabled(false);
 
+    connect(ui->gView_Fuda, SIGNAL(mousePress()), this, SLOT(Fuda_clicked()));
 //    qDebug() << QCoreApplication::applicationDirPath();
 //    qDebug() << QCoreApplication::applicationFilePath();
     AppPath = QCoreApplication::applicationDirPath();
@@ -126,6 +127,21 @@ void MainWindow::TimeoutDone()
     }
 }
 
+void MainWindow::Fuda_clicked()
+{
+    // Update FudaImage
+    if (execflag && mode == 1) {
+        fudaindex++;
+        if (fudaindex >= maisu) {
+//            if (mode == 0) timer->stop();
+            execflag = false;
+            EndingFuda();
+        } else {
+            UpdateFuda();
+        }
+    }
+}
+
 void MainWindow::on_Btn_Start_clicked()
 {
 //    int mode; // モード自動(0)/手動(1)
@@ -149,8 +165,9 @@ void MainWindow::on_Btn_Start_clicked()
     maisu = ui->Num_Count->value();
     waittime = (int)(ui->Num_WaitTime->value() * 1000);
     muki = ui->Slct_FudaMuki->currentIndex();
-    QString msg = QString("mode is %1, maisu is %2, waittime is %3, muki is %4").arg(mode).arg(maisu).arg(waittime).arg(muki);
-    qDebug() << msg;
+
+//    QString msg = QString("mode is %1, maisu is %2, waittime is %3, muki is %4").arg(mode).arg(maisu).arg(waittime).arg(muki);
+//    qDebug() << msg;
 
     // Generate Random Datas
     for (int i = 0; i < 100; i++) {
@@ -193,8 +210,8 @@ void MainWindow::on_Btn_Restart_clicked()
     maisu = ui->Num_Count->value();
     waittime = (int)(ui->Num_WaitTime->value() * 1000 + 1);
     muki = ui->Slct_FudaMuki->currentIndex();
-    QString msg = QString("mode is %1, maisu is %2, waittime is %3, muki is %4").arg(mode).arg(maisu).arg(waittime).arg(muki);
-    qDebug() << msg;
+//    QString msg = QString("mode is %1, maisu is %2, waittime is %3, muki is %4").arg(mode).arg(maisu).arg(waittime).arg(muki);
+//    qDebug() << msg;
 
     execflag = true;
     fudaindex = 0;
@@ -225,10 +242,8 @@ void MainWindow::on_Slct_Mode_currentIndexChanged(int index)
 //    qDebug() << msg;
 
     if (index) {
-        ui->Btn_Fuda->setEnabled(true);
         ui->label_5->setEnabled(true);
     } else {
-        ui->Btn_Fuda->setEnabled(false);
         ui->label_5->setEnabled(false);
     }
 }
@@ -247,7 +262,7 @@ void MainWindow::on_actionExit_triggered()
 
 void MainWindow::on_actionAbout_triggered()
 {
-    QMessageBox::about(this, "About", tr("流しの練習 v0.2"));
+    QMessageBox::about(this, "About", tr("流しの練習 v0.3"));
 }
 
 void MainWindow::on_actionAbout_Qt_triggered()
@@ -255,21 +270,6 @@ void MainWindow::on_actionAbout_Qt_triggered()
     QApplication::aboutQt();
 }
 
-void MainWindow::on_Btn_Fuda_clicked()
-{
-    // Update FudaImage
-    if (execflag && mode == 1) {
-        fudaindex++;
-        if (fudaindex >= maisu) {
-//            if (mode == 0) timer->stop();
-            execflag = false;
-            EndingFuda();
-        } else {
-            UpdateFuda();
-        }
-    }
-}
-
 void MainWindow::on_checkBox_DispKaminoku_stateChanged(int chk)
 {
     if (chk) {

--- a/mainwindow.h
+++ b/mainwindow.h
@@ -35,14 +35,14 @@ private slots:
 
     void TimeoutDone();
 
+    void Fuda_clicked();
+
     void on_actionExit_triggered();
 
     void on_actionAbout_triggered();
 
     void on_actionAbout_Qt_triggered();
 
-    void on_Btn_Fuda_clicked();
-
     void on_checkBox_DispKaminoku_stateChanged(int );
 
 private:

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -32,7 +32,7 @@
    <string>競技かるた - 流しの練習</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="KarutaNagashi.qrc">
+   <iconset resource="QtKarutaNagashi.qrc">
     <normaloff>:/images/KarutaNagashiIcon.png</normaloff>:/images/KarutaNagashiIcon.png</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
@@ -157,7 +157,7 @@ p, li { white-space: pre-wrap; }
      <number>-1</number>
     </property>
    </widget>
-   <widget class="QGraphicsView" name="gView_Fuda">
+   <widget class="FudaImgView" name="gView_Fuda">
     <property name="enabled">
      <bool>true</bool>
     </property>
@@ -270,15 +270,18 @@ p, li { white-space: pre-wrap; }
    <widget class="QLabel" name="label_5">
     <property name="geometry">
      <rect>
-      <x>390</x>
+      <x>360</x>
       <y>330</y>
-      <width>161</width>
+      <width>221</width>
       <height>16</height>
      </rect>
     </property>
     <property name="text">
      <string>手動の時は札をクリックしてください。</string>
     </property>
+    <property name="alignment">
+     <set>Qt::AlignCenter</set>
+    </property>
    </widget>
    <widget class="QLabel" name="label_6">
     <property name="geometry">
@@ -304,37 +307,12 @@ p, li { white-space: pre-wrap; }
      <string/>
     </property>
     <property name="pixmap">
-     <pixmap resource="KarutaNagashi.qrc">:/images/NagashiTitle.png</pixmap>
+     <pixmap resource="QtKarutaNagashi.qrc">:/images/NagashiTitle.png</pixmap>
     </property>
     <property name="alignment">
      <set>Qt::AlignCenter</set>
     </property>
    </widget>
-   <widget class="QPushButton" name="Btn_Fuda">
-    <property name="enabled">
-     <bool>false</bool>
-    </property>
-    <property name="geometry">
-     <rect>
-      <x>360</x>
-      <y>40</y>
-      <width>221</width>
-      <height>291</height>
-     </rect>
-    </property>
-    <property name="focusPolicy">
-     <enum>Qt::NoFocus</enum>
-    </property>
-    <property name="autoFillBackground">
-     <bool>false</bool>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-    <property name="flat">
-     <bool>true</bool>
-    </property>
-   </widget>
    <widget class="QPlainTextEdit" name="TextEdit_Kaminoku">
     <property name="enabled">
      <bool>true</bool>
@@ -399,7 +377,7 @@ p, li { white-space: pre-wrap; }
      <string>開始</string>
     </property>
     <property name="icon">
-     <iconset resource="KarutaNagashi.qrc">
+     <iconset resource="QtKarutaNagashi.qrc">
       <normaloff>:/images/Play.png</normaloff>:/images/Play.png</iconset>
     </property>
    </widget>
@@ -424,7 +402,7 @@ p, li { white-space: pre-wrap; }
      <string>もう一度</string>
     </property>
     <property name="icon">
-     <iconset resource="KarutaNagashi.qrc">
+     <iconset resource="QtKarutaNagashi.qrc">
       <normaloff>:/images/RePlay.png</normaloff>:/images/RePlay.png</iconset>
     </property>
    </widget>
@@ -449,7 +427,7 @@ p, li { white-space: pre-wrap; }
      <string>中止</string>
     </property>
     <property name="icon">
-     <iconset resource="KarutaNagashi.qrc">
+     <iconset resource="QtKarutaNagashi.qrc">
       <normaloff>:/images/Stop.png</normaloff>:/images/Stop.png</iconset>
     </property>
    </widget>
@@ -460,7 +438,7 @@ p, li { white-space: pre-wrap; }
      <x>0</x>
      <y>0</y>
      <width>600</width>
-     <height>19</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -508,8 +486,15 @@ p, li { white-space: pre-wrap; }
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
+ <customwidgets>
+  <customwidget>
+   <class>FudaImgView</class>
+   <extends>QGraphicsView</extends>
+   <header>fudaimgview.h</header>
+  </customwidget>
+ </customwidgets>
  <resources>
-  <include location="KarutaNagashi.qrc"/>
+  <include location="QtKarutaNagashi.qrc"/>
  </resources>
  <connections/>
 </ui>