Commit: 45b29a9648190cea28a7fde757a372ddf02ce039 - QtKarutaEishow (git)

百人一首かるた自動読み上げソフト

Commit MetaInfo

• Révision: 45b29a9648190cea28a7fde757a372ddf02ce039 (tree)
• l'heure: 2011-12-26 19:40:33
• Auteur: arakaki <alucky4416@user...>
• Commiter: arakaki

Message de Log

ADD: TestPlay on OptDialog.

Change Summary

• modified: mainwindow.cpp
• modified: optiondialog.cpp
• modified: optiondialog.h

Modification

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -303,7 +303,7 @@ void MainWindow::on_actionOption_triggered()
 {
     if (flag_playseqstate) return; // disable when Playing
 
-    OptionDialog *dlg = new OptionDialog(this, SelectVoice, EnableOptMusic);
+    OptionDialog *dlg = new OptionDialog(this, SelectVoice, EnableOptMusic, PlaySeqTh);
 
 //    dlg->Set_Opt_voice_select(SelectVoice);
 

--- a/optiondialog.cpp
+++ b/optiondialog.cpp
@@ -1,6 +1,8 @@
 #include "optiondialog.h"
 #include "ui_optiondialog.h"
 
+#include <QDebug>
+
 //void OptionDialog::Set_Opt_voice_select(int select)
 //{
 //    opt_voice_select = select;
@@ -11,11 +13,24 @@ int OptionDialog::Get_Opt_voice_select()
     return opt_voice_select;
 }
 
-OptionDialog::OptionDialog(QWidget *parent, int select, bool enableOptMusic) :
+void OptionDialog::TimeoutDone()
+{
+    if (PlaySeqTh) {
+        if (PlaySeqTh->GetPlayStatus() == 0) {
+            ui->Btn_TestPlay->setEnabled(true);
+            interval_timer->stop(); // TimerStop
+//            qDebug() << "TestPlay Ended.";
+        }
+    }
+}
+
+OptionDialog::OptionDialog(QWidget *parent, int select, bool enableOptMusic, PlaySequenceThread *pTh) :
     QDialog(parent),
     ui(new Ui::OptionDialog)
 {
     ui->setupUi(this);
+    interval_timer = new QTimer(this);
+    connect(interval_timer, SIGNAL(timeout()), this, SLOT(TimeoutDone()));
 
     if (enableOptMusic) {
         ui->radioButton_2->setEnabled(true);
@@ -23,6 +38,14 @@ OptionDialog::OptionDialog(QWidget *parent, int select, bool enableOptMusic) :
         ui->radioButton_2->setEnabled(false);
     }
 
+    if (pTh) {
+        PlaySeqTh = pTh;
+        ui->Btn_TestPlay->setEnabled(true);
+    } else {
+        PlaySeqTh = NULL;
+        ui->Btn_TestPlay->setEnabled(false);
+    }
+
     opt_voice_select = select;
     if (opt_voice_select == 0) {
         ui->radioButton_1->setChecked(true);
@@ -35,6 +58,13 @@ OptionDialog::OptionDialog(QWidget *parent, int select, bool enableOptMusic) :
 
 OptionDialog::~OptionDialog()
 {
+    if (PlaySeqTh) {
+        PlaySeqTh->Abort();
+    }
+
+    interval_timer->stop();
+    delete interval_timer;
+
     delete ui;
 }
 
@@ -54,6 +84,26 @@ void OptionDialog::on_buttonBox_rejected()
 
 void OptionDialog::on_Btn_TestPlay_clicked()
 {
-    // select Voice Test Playing
-    ;
+    // Test Playing
+    QList<int> *PlayFudaList;
+    PlayFudaList = new QList<int>;
+    PlayFudaList->clear();
+    PlayFudaList->insert(0, 0); // fudaN=0 insert to top
+
+    int select = 0;
+    if (ui->radioButton_1->isChecked()) {
+        select = 0;
+    } else {
+        select = 1;
+    }
+    // Set Play Setting
+    PlaySeqTh->SetPlaySetting(select, 1, 1);
+
+    // Set Play list
+    PlaySeqTh->SetPlayNumList(PlayFudaList);
+
+    ui->Btn_TestPlay->setEnabled(false);
+    interval_timer->setInterval(1000);
+    interval_timer->start(); // TimerStart
+    PlaySeqTh->Start();
 }

--- a/optiondialog.h
+++ b/optiondialog.h
@@ -2,6 +2,9 @@
 #define OPTIONDIALOG_H
 
 #include <QDialog>
+#include <QTimer>
+
+#include "PlaySequenceThread.h"
 
 namespace Ui {
     class OptionDialog;
@@ -12,7 +15,7 @@ class OptionDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit OptionDialog(QWidget *parent = 0, int select = 0, bool enableOptMusic = false);
+    explicit OptionDialog(QWidget *parent = 0, int select = 0, bool enableOptMusic = false, PlaySequenceThread *PlaySeqTh = 0);
     ~OptionDialog();
 
 //    void Set_Opt_voice_select(int select);
@@ -24,9 +27,14 @@ private slots:
 
     void on_Btn_TestPlay_clicked();
 
+    void TimeoutDone();
+
 private:
     Ui::OptionDialog *ui;
 
+    QTimer *interval_timer;
+    PlaySequenceThread *PlaySeqTh; // PlaySeqThread for TestPlay
+
     int opt_voice_select; // select Music Files Group, 0 or 1
 };