Commit: 1c28ea63bc3a5bd76d38f8f0f141df7cd6d7beaf - SampleLCDOutput_DAQmxBase (git)

Commit MetaInfo

• Revision: 1c28ea63bc3a5bd76d38f8f0f141df7cd6d7beaf (tree)
• Time: 2013-05-25 16:19:25
• Author: alucky4416 <alucky4416@user...>
• Commiter: alucky4416

Log Message

feature: add Init Button, add SIG/SLOT DIO&LCD ready -> enable Buttons.

Change Summary

• modified: mainwindow.cpp
• modified: mainwindow.h
• modified: mainwindow.ui
• modified: thlcdoutput.cpp
• modified: thlcdoutput.h

Incremental Difference

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -10,7 +10,11 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->setupUi(this);
 
     ThLCDOut = new ThLCDOutput(this);
+    connect(ThLCDOut, SIGNAL(notify_dio_ready(int)),
+            this, SLOT(slot_dio_ready(int)));
     ThLCDOut->start();
+
+    ui->statusBar->showMessage("DIO & LCD initialize...");
 }
 
 MainWindow::~MainWindow()
@@ -22,6 +26,25 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
+void MainWindow::slot_dio_ready(int status)
+{
+    qDebug() << "DIO Ready.";
+    ui->statusBar->showMessage("Idle...");
+    ui->pushButton_Init->setEnabled(true);
+    ui->pushButton_Clear->setEnabled(true);
+    ui->pushButton_Enter->setEnabled(true);
+}
+
+void MainWindow::on_pushButton_Init_clicked()
+{
+    ThLCDOut->sendEvent_Init();
+}
+
+void MainWindow::on_pushButton_Clear_clicked()
+{
+    ThLCDOut->sendEvent_Clear();
+}
+
 void MainWindow::on_pushButton_Enter_clicked()
 {
     if (ui->lineEdit_LCDOutputText->text().isEmpty()) {
@@ -33,7 +56,3 @@ void MainWindow::on_pushButton_Enter_clicked()
     }
 }
 
-void MainWindow::on_pushButton_Clear_clicked()
-{
-    ThLCDOut->sendEvent_Clear();
-}

--- a/mainwindow.h
+++ b/mainwindow.h
@@ -18,9 +18,11 @@ public:
     ~MainWindow();
     
 private slots:
-    void on_pushButton_Enter_clicked();
+    void slot_dio_ready(int status);
 
+    void on_pushButton_Init_clicked();
     void on_pushButton_Clear_clicked();
+    void on_pushButton_Enter_clicked();
 
 private:
     Ui::MainWindow *ui;

--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>354</width>
-    <height>151</height>
+    <width>364</width>
+    <height>182</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -31,6 +31,9 @@
     </property>
    </widget>
    <widget class="QPushButton" name="pushButton_Enter">
+    <property name="enabled">
+     <bool>false</bool>
+    </property>
     <property name="geometry">
      <rect>
       <x>250</x>
@@ -57,9 +60,12 @@
     </property>
    </widget>
    <widget class="QPushButton" name="pushButton_Clear">
+    <property name="enabled">
+     <bool>false</bool>
+    </property>
     <property name="geometry">
      <rect>
-      <x>70</x>
+      <x>100</x>
       <y>60</y>
       <width>80</width>
       <height>25</height>
@@ -69,13 +75,29 @@
      <string>Clear</string>
     </property>
    </widget>
+   <widget class="QPushButton" name="pushButton_Init">
+    <property name="enabled">
+     <bool>false</bool>
+    </property>
+    <property name="geometry">
+     <rect>
+      <x>20</x>
+      <y>60</y>
+      <width>80</width>
+      <height>25</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Init</string>
+    </property>
+   </widget>
   </widget>
   <widget class="QMenuBar" name="menuBar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>354</width>
+     <width>364</width>
      <height>26</height>
     </rect>
    </property>

--- a/thlcdoutput.cpp
+++ b/thlcdoutput.cpp
@@ -30,7 +30,7 @@ int ThLCDOutput::dio_init()
 #endif
 
 #if DAQDRIVER_INSTALLED
-    return 0;
+    return error;
 Error:
     if (DAQmxFailed (error)) {
         DAQmxBaseGetExtendedErrorInfo (errBuff, 2048);
@@ -44,6 +44,7 @@ Error:
         //   printf ("DAQmxBase Error %ld: %s\n", error, errBuff);
         qDebug() << "DAQmxBase Error : " << errBuff;
     }
+    ret = error;
 #endif
 
     return ret;
@@ -261,8 +262,10 @@ void ThLCDOutput::run()
     EventData event;
     int event_id;
     char text[128];
+    int err;
 
-    dio_init();
+    err = dio_init();
+    emit notify_dio_ready(err);
 
     lcd_init();
 
@@ -273,6 +276,9 @@ void ThLCDOutput::run()
             event = EvtQue->dequeue();
             event_id = event.id;
             switch(event_id) {
+            case Ev_Init:
+                lcd_init();
+                break;
             case Ev_Clear:
                 lcd_clear();
                 break;
@@ -292,15 +298,14 @@ void ThLCDOutput::run()
 
     dio_final();
 }
-
-void ThLCDOutput::sendEvent_OutputText(QString text)
+void ThLCDOutput::sendEvent_Init()
 {
     EventData evt;
 
-    evt.id = Ev_OutputString;
-    evt.param = text;
+    evt.id = Ev_Init;
     EvtQue->enqueue(evt);
 }
+
 void ThLCDOutput::sendEvent_Clear()
 {
     EventData evt;
@@ -308,3 +313,12 @@ void ThLCDOutput::sendEvent_Clear()
     evt.id = Ev_Clear;
     EvtQue->enqueue(evt);
 }
+
+void ThLCDOutput::sendEvent_OutputText(QString text)
+{
+    EventData evt;
+
+    evt.id = Ev_OutputString;
+    evt.param = text;
+    EvtQue->enqueue(evt);
+}

--- a/thlcdoutput.h
+++ b/thlcdoutput.h
@@ -23,11 +23,13 @@ public:
     ~ThLCDOutput();
     void stop();
 
-    void sendEvent_OutputText(QString text);
+    void sendEvent_Init();
     void sendEvent_Clear();
+    void sendEvent_OutputText(QString text);
 
 signals:
-    
+    void notify_dio_ready(int status); // dio ready signal.
+
 public slots:
 
 protected:
@@ -39,6 +41,7 @@ private:
     // Event ID
     enum {
         Ev_Nop = 0,
+        Ev_Init,
         Ev_Clear,
         Ev_OutputString
     };