Other paradigm of threading

Author: Zaher220

TSProject.pro

@@ -24,7 +24,8 @@ SOURCES += main.cpp\
     models/TSExaminations.cpp \
     tsanalitics.cpp \
     inputs/tstableview.cpp \
-    tstempanalitic.cpp
+    tstempanalitic.cpp \
+    tsusbdatareader.cpp
 
 HEADERS  += \
     tsmodel.h \
@@ -45,7 +46,8 @@ HEADERS  += \
     inputs/tstableview.h \
     ui_tsprintview.h \
     tstempanalitic.h \
-    extremum.h
+    extremum.h \
+    tsusbdatareader.h
 
 LIBS += -L"dll/*.dll"
 FORMS    += \

TSProject.pro.user.2.5pre1

@@ -3,5 +3,6 @@
 struct extremum {
     int x, y, type;
 };
+enum TSUsbReadingType {ReadAll,ReadForVolZer,ReadForVolVal,ReadForTemp};
 #endif // EXTREMUM_H
 

extremum.h

@@ -103,12 +103,18 @@ TSController::TSController(QWidget *parent) :
     connect(ui->patientsTableView,SIGNAL(deleteRequest(int)),this,SLOT(deletePatient(int)));
     connect(ui->examsTableView,SIGNAL(deleteRequest(int)),this,SLOT(deleteExam(int)));
     connect(ui->printButton,SIGNAL(clicked()),this,SLOT(printReport()));
+
+    //connect(rdr,SIGNAL(done()),this,SIGNAL())
+
     ui->resultsButton->setEnabled(true);
     ui->backPatientProfileButton->installEventFilter(this);
     ui->backPatientListButton->installEventFilter(this);
     ui->backCallibrateButton->installEventFilter(this);
     ui->backExamButton->installEventFilter(this);
-    this->processDataParams();
+    //this->processDataParams();
+    rdr= new TSUsbDataReader();
+    trd = new QThread();
+//    rdr->moveToThread(trd);
 }
 
 TSController::~TSController()
@@ -309,65 +315,66 @@ void TSController::calibrateVolume(){
     Ui::TSProgressDialog dui;
     dui.setupUi(&d);
     d.setWindowTitle(tr("Ïðåäóïðåæäåíèå"));
-    readerThread->setReadingType(ReadForVolZer);
-    readerThread->startRead();
+    //readerThread->setReadingType(ReadForVolZer);
+    //readerThread->startRead();
+    rdr->initDevice(curveBuffer);
+    rdr->setReadingType(ReadForVolZer);
+    connect(trd,SIGNAL(started()),rdr,SLOT(read()));
+    //connect()
+    qDebug()<<"Start reading zero level";
     dui.information->setText(tr("Èäåò ïîäãîòîâêà..."));
     dui.acceptButton->setVisible(false);
-    connect(readerThread,SIGNAL(done()),&d,SLOT(accept()));
-    connect(readerThread,SIGNAL(changeProgress(int)),dui.progressBar,SLOT(setValue(int)));
+    connect(rdr,SIGNAL(done()),&d,SLOT(accept()));
+    connect(rdr,SIGNAL(changeProgress(int)),dui.progressBar,SLOT(setValue(int)));
     switch(d.exec()){
-    case 1:{
-        settings.setValue("volZero",curveBuffer->volumeColibration());
-        dui.information->setText(tr("Ïîäãîòîâêà çàâåðøèíà.\nÍàæìèòå êíîïêó Ok è êà÷àéòå øïðèöåì."));
-        dui.progressBar->setVisible(false);
-        dui.acceptButton->setVisible(true);
-        break;
-    }
-    default: break;
+        case 1:{
+            settings.setValue("volZero",curveBuffer->volumeColibration());
+            dui.information->setText(tr("Ïîäãîòîâêà çàâåðøèíà.\nÍàæìèòå êíîïêó Ok è êà÷àéòå øïðèöåì."));
+            dui.progressBar->setVisible(false);
+            dui.acceptButton->setVisible(true);
+            break;
+        }
+        default: break;
     }
+    qDebug()<<"End reading zero level";
     disconnect(&d,SLOT(accept()));
-    readerThread->stopRead();
-    if(d.exec()==1){
+  /*  if(d.exec()==1){
         dui.acceptButton->setVisible(false);
         connect(&cPlotingTimer,SIGNAL(timeout()),this,SLOT(plotCalibration()));
-        readerThread->setReadingType(ReadForVolVal);
-        readerThread->startRead();
+        rdr->setReadingType(ReadForVolZer);
+        rdr->read();
         cPlotingTimer.start(100);
-        connect(readerThread,SIGNAL(done()),&d,SLOT(accept()));
+        connect(rdr,SIGNAL(done()),&d,SLOT(accept()));
         dui.progressBar->setVisible(true);
         dui.information->setText(tr("Èäåò êàëèáðîâêà. Ïîäîæäèòå..."));
-   }
-/*
-    if(d.exec()==1){
-        int *vol = curveBuffer->volume();
-        tsanalitics ta;
-        for(int i=0;i<curveBuffer->end();i++){
-            ta.append(vol[i]);
-            //f<<vol[i]<<endl;
-        }
-        ta.findExtremums();
-        ta.deleteBadExtremums();
-        settings.setValue("volOutLtr",ta.getMin());
-        settings.setValue("volInLtr",ta.getMax());
-        curveBuffer->setVolumeConverts(ta.getMax(),ta.getMin());
-        readerThread->stopRead();
-        curveBuffer->clean();
-        settings.sync();
-        dui.progressBar->setVisible(false);
-        dui.acceptButton->setVisible(true);
-        dui.information->setText(tr("Êàëèáðîâêà óñïåøíî çàâåðøåíà.\nÍàæìèòå ÎÊ äëÿ ïðîäîëæåíèÿ."));
-    }
-    if(d.exec()==1){
-        ui->mainBox->setCurrentIndex(5);
-        ui->managmentBox->setVisible(true);
-        ui->managmentBox->setEnabled(true);
-        ui->startExam->setEnabled(true);
-        ui->stopExam->setEnabled(true);
-        disconnect(&d,SLOT(accept()));
-        initPaintDevices();
-        plotNow();
-    }*/
-
+   }*/
+
+//    dui.information->setText(tr("Èäåò ïîäãîòîâêà..."));
+//    dui.acceptButton->setVisible(false);
+//    connect(readerThread,SIGNAL(done()),&d,SLOT(accept()));
+//    connect(readerThread,SIGNAL(changeProgress(int)),dui.progressBar,SLOT(setValue(int)));
+//    switch(d.exec()){
+//        case 1:{
+//            settings.setValue("volZero",curveBuffer->volumeColibration());
+//            dui.information->setText(tr("Ïîäãîòîâêà çàâåðøèíà.\nÍàæìèòå êíîïêó Ok è êà÷àéòå øïðèöåì."));
+//            dui.progressBar->setVisible(false);
+//            dui.acceptButton->setVisible(true);
+//            break;
+//        }
+//        default: break;
+//    }
+//    disconnect(&d,SLOT(accept()));
+//    readerThread->stopRead();
+//    if(d.exec()==1){
+//        dui.acceptButton->setVisible(false);
+//        connect(&cPlotingTimer,SIGNAL(timeout()),this,SLOT(plotCalibration()));
+//        readerThread->setReadingType(ReadForVolVal);
+//        readerThread->startRead();
+//        cPlotingTimer.start(100);
+//        connect(readerThread,SIGNAL(done()),&d,SLOT(accept()));
+//        dui.progressBar->setVisible(true);
+//        dui.information->setText(tr("Èäåò êàëèáðîâêà. Ïîäîæäèòå..."));
+//   }
 }
 
 void TSController::calibrateTemperature()
@@ -1013,6 +1020,13 @@ void TSController::breakExam()
 
 void TSController::processDataParams(){
 
+    TSCurveBuffer *cb= new TSCurveBuffer;
+
+    readerThread->readd();
+    //TSUsb3000Reader *rdr= readerThread->getReader();
+    //rdr->read();
+    //rdr->initDevice(cb);
+    /*rdr->read();*/
     qDebug()<<"this is result button !";
     QTableWidget *qtw = ui->resultsTable;
     qtw->setColumnCount(2);

tscontroller.cpp

@@ -14,6 +14,7 @@
 #include "models/TSPatients.h"
 #include <QTableWidget>
 #include "ui_tsprintview.h"
+#include "tsusbdatareader.h"
 namespace Ui {
     class TSView;
     class TSProgressDialog;
@@ -125,6 +126,8 @@ public slots:
     QSqlDatabase patientsConnection;
     QSqlDatabase examinationsConnection;
     bool isInitialized;
+    TSUsbDataReader *rdr;
+    QThread *trd;
 };
 
 #endif // TSVIEW_H

tscontroller.h

@@ -1,21 +1,25 @@
 #include "tsreaderthread.h"
 #include "conio.h"
 
-TSReaderThread::TSReaderThread(TSCurveBuffer *b, QObject *parent) :QThread(parent){
+TSReaderThread::TSReaderThread(TSCurveBuffer *b, QObject *parent) :QObject(parent){
     buffer = b;
-    moveToThread(this);
-}
-void TSReaderThread::f1 (){
-    qDebug()<<"-----Thread is open for command----";
+    //connect(reader,SIGNAL(done()),this,SLOT(trd_done()));
+    //connect(reader,SIGNAL(changeProgress(int)),this,SLOT(trd_progress(int)));
+    //moveToThread(this);
 }
 void TSReaderThread::startRead (){
     ReadingStarted = true;
+    //TSUsb3000Reader *rdr= new  TSUsb3000Reader();
+    QThread *trd = new QThread();
+    reader->initDevice(buffer);
+    reader->moveToThread(trd);
+    //reader->read();
 
-    this->start();
+    //this->start();
 }
 void TSReaderThread::stopRead (){
     ReadingStarted=false;
-    this->terminate();
+    //this->terminate();
     if(reader!=0){
         //delete reader;
         reader = 0;
@@ -24,7 +28,7 @@ void TSReaderThread::stopRead (){
 
 
 void TSReaderThread::run(){
-    reader = new TSUsb3000Reader(this);
+/*    reader = new TSUsb3000Reader(this);
     reader->initDevice(buffer);
 
     switch (readingType)
@@ -94,7 +98,7 @@ void TSReaderThread::run(){
     delete reader;
     reader = 0;
     emit done();
-    exec();
+    exec();*/
 }
 
 void TSReaderThread::setReadingType(TSUsbReadingType type)
@@ -106,3 +110,23 @@ bool TSReaderThread::doWork()
 {
     return works;
 }
+
+void TSReaderThread::readd()
+{
+     reader->read();
+}
+
+TSUsb3000Reader *TSReaderThread::getReader()
+{
+    return reader;
+}
+
+void TSReaderThread::trd_done()
+{
+    emit done();
+}
+
+void TSReaderThread::trd_progress(int value)
+{
+    emit changeProgress(value);
+}

tsreaderthread.cpp

@@ -3,24 +3,26 @@
 
 #include <QThread>
 #include "tsusb3000reader.h"
+#include "extremum.h"
 
-enum TSUsbReadingType {ReadAll,ReadForVolZer,ReadForVolVal,ReadForTemp};
-
-class TSReaderThread : public QThread
+class TSReaderThread : public QObject
 {
     Q_OBJECT
 public:
     explicit TSReaderThread(TSCurveBuffer *b,QObject *parent = 0);
     void run();
-    void f1();
     void stopRead();
     void startRead();
     void setReadingType(TSUsbReadingType type);
     bool doWork();
+    void readd();
+    TSUsb3000Reader* getReader();
 signals:
     void done();
     void changeProgress(int value);
 public slots:
+    void trd_done();
+    void trd_progress(int value);
 private:
     TSCurveBuffer *buffer;
     bool ReadingStarted;