Subversion Repositories Code-Repo

Rev

Rev 351 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 351 Rev 353
Line 47... Line 47...
47 
    serialThread = new QThread();
 47 
    serialThread = new QThread();
48 
    serialHelper->moveToThread(serialThread);
 48 
    serialHelper->moveToThread(serialThread);
49 
 
 49 
 
50 
    connect(serialHelper, SIGNAL(UpdateStatus(QString)), this, SIGNAL(UpdateStatus(QString)));
 50 
    connect(serialHelper, SIGNAL(UpdateStatus(QString)), this, SIGNAL(UpdateStatus(QString)));
51 
 
 51 
 
52 
    // Parameters
 - 
 
53 
    connect(this, SIGNAL(Serial_QueryParameters()), serialHelper, SLOT(Serial_QueryParameters()));
 52 
    connect(this, SIGNAL(Serial_QueryParameters()), serialHelper, SLOT(Serial_QueryParameters()));
54 
    connect(serialHelper, SIGNAL(Serial_UpdateParameters(QStringList,QStringList,QStringList,QStringList,QStringList,QStringList)),
 53 
    connect(serialHelper, SIGNAL(Serial_UpdateParameters(QStringList,QStringList,QStringList,QStringList,QStringList,QStringList)),
55 
            this, SLOT(Serial_UpdateParameters(QStringList,QStringList,QStringList,QStringList,QStringList,QStringList)));
 54 
            this, SLOT(Serial_UpdateParameters(QStringList,QStringList,QStringList,QStringList,QStringList,QStringList)));
56 
 
 55 
 
57 
    // Connect
 - 
 
58 
    connect(this, SIGNAL(Serial_Connect(QString,QString,QString,QString,QString,QString)),
 56 
    connect(this, SIGNAL(Serial_Connect(QString,QString,QString,QString,QString,QString)),
59 
            serialHelper, SLOT(Serial_Connect(QString,QString,QString,QString,QString,QString)));
 57 
            serialHelper, SLOT(Serial_Connect(QString,QString,QString,QString,QString,QString)));
60 
    connect(serialHelper, SIGNAL(Serial_Connected()), this, SIGNAL(Serial_Connected()));
 58 
    connect(serialHelper, SIGNAL(Serial_Connected()), this, SIGNAL(Serial_Connected()));
61 
    connect(serialHelper, SIGNAL(Serial_Connected()), this, SLOT(Serial_LocalConnected()));
 59 
    connect(serialHelper, SIGNAL(Serial_Connected()), this, SLOT(Serial_LocalConnected()));
62 
 
 60 
 
63 
    // Disconnect
 - 
 
64 
    connect(this, SIGNAL(Serial_Disconnect()), serialHelper, SLOT(Serial_Disconnect()));
 61 
    connect(this, SIGNAL(Serial_Disconnect()), serialHelper, SLOT(Serial_Disconnect()));
65 
    connect(serialHelper, SIGNAL(Serial_Disconnected()), this, SIGNAL(Serial_Disconnected()));
 62 
    connect(serialHelper, SIGNAL(Serial_Disconnected()), this, SIGNAL(Serial_Disconnected()));
66 
    connect(serialHelper, SIGNAL(Serial_Disconnected()), this, SLOT(Serial_LocalDisconnected()));
 63 
    connect(serialHelper, SIGNAL(Serial_Disconnected()), this, SLOT(Serial_LocalDisconnected()));
67 
 
 64 
 
68 
    // Transmit
 - 
 
69 
    connect(this, SIGNAL(Serial_TransmitString(QString)), serialHelper, SLOT(Serial_TransmitString(QString)));
 65 
    connect(this, SIGNAL(Serial_TransmitString(QString)), serialHelper, SLOT(Serial_TransmitString(QString)));
70 
    connect(this, SIGNAL(Serial_TransmitByteArray(QByteArray)), serialHelper, SLOT(Serial_TransmitByteArray(QByteArray)));
 66 
    connect(this, SIGNAL(Serial_TransmitByteArray(QByteArray)), serialHelper, SLOT(Serial_TransmitByteArray(QByteArray)));
71 
 
 67 
 
72 
    // Receive
 - 
 
73 
    connect(serialHelper, SIGNAL(Serial_ReceivedByte(char)), this, SIGNAL(Serial_ReceivedByte(char)));
 68 
    connect(serialHelper, SIGNAL(Serial_ReceivedByte(char)), this, SIGNAL(Serial_ReceivedByte(char)));
74 
 
 69 
 
75 
    // Threading
 - 
 
76 
    connect(serialThread, SIGNAL(finished()), serialHelper, SLOT(deleteLater()));
 70 
    connect(serialThread, SIGNAL(finished()), serialHelper, SLOT(deleteLater()));
77 
    serialThread->start();
 71 
    serialThread->start();
78 
 
 72 
 
79 
    // Local GUI
 - 
 
80 
    connect(btnSerialConnect, SIGNAL(clicked()), this, SLOT(Serial_ConnectToggleBtn()));
 73 
    connect(btnSerialConnect, SIGNAL(clicked()), this, SLOT(Serial_ConnectToggleBtn()));
81 
    connect(btnSerialRefresh, SIGNAL(clicked()), this, SIGNAL(Serial_QueryParameters()));
 74 
    connect(btnSerialRefresh, SIGNAL(clicked()), this, SIGNAL(Serial_QueryParameters()));
82 
 
 75 
 
83 
    emit Serial_QueryParameters();
 76 
    emit Serial_QueryParameters();
84 
    Serial_LocalDisconnected();
 77 
    Serial_LocalDisconnected();
Line 145... Line 138...
145 
    cboxSerialSpeed->hide();
 138 
    cboxSerialSpeed->hide();
146 
    cboxSerialDataBits->hide();
 139 
    cboxSerialDataBits->hide();
147 
    cboxSerialStopBits->hide();
 140 
    cboxSerialStopBits->hide();
148 
    cboxSerialParity->hide();
 141 
    cboxSerialParity->hide();
149 
    cboxSerialFlowControl->hide();
 142 
    cboxSerialFlowControl->hide();
150 
    emit UpdateStatus("Serial: Connected");
 - 
 
151 
}
 143 
}
152 
 
 144 
 
153 
void SerialController::Serial_LocalDisconnected()
 145 
void SerialController::Serial_LocalDisconnected()
154 
{
 146 
{
155 
    btnSerialConnect->setText("&Connect");
 147 
    btnSerialConnect->setText("&Connect");
Line 171... Line 163...
171 
    cboxSerialSpeed->show();
 163 
    cboxSerialSpeed->show();
172 
    cboxSerialDataBits->show();
 164 
    cboxSerialDataBits->show();
173 
    cboxSerialStopBits->show();
 165 
    cboxSerialStopBits->show();
174 
    cboxSerialParity->show();
 166 
    cboxSerialParity->show();
175 
    cboxSerialFlowControl->show();
 167 
    cboxSerialFlowControl->show();
176 
    emit UpdateStatus("Serial: Disconnected");
 - 
 
177 
}
 168 
}
178 
 
 169 
 
179 
void SerialController::Serial_ConnectToggleBtn()
 170 
void SerialController::Serial_ConnectToggleBtn()
180 
{
 171 
{
181 
    if (serialHelper->connected) {
 172 
    if (serialHelper->connected) {