git-svn-id: svn://db.shs.com.ru/libs@123 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2016-09-20 20:12:24 +00:00
parent 72a1d2cffd
commit 211d498061
17 changed files with 585 additions and 68 deletions

View File

@@ -56,6 +56,10 @@ config(piqt(config_), QIODevice::ReadWrite) {
ui->treeCDK->setModel(kmodel);
delegate = new CDKDelegate();
ui->treeCDK->setItemDelegateForColumn(4, delegate);
CONNECTU(&K, sended, this, pip_sendSucceed);
CONNECTU(&K, sendFailed, this, pip_sendFailed);
CONNECTU(&K, received, this, pip_receiveSucceed);
CONNECTU(&K, receiveFailed, this, pip_receiveFailed);
connect(this, SIGNAL(q_k_sendFailed()), this, SLOT(k_sendFailed()), Qt::QueuedConnection);
connect(this, SIGNAL(q_k_sendSucceed()), this, SLOT(k_sendSucceed()), Qt::QueuedConnection);
connect(this, SIGNAL(q_k_receiveFailed()), this, SLOT(k_receiveFailed()), Qt::QueuedConnection);
@@ -68,6 +72,7 @@ config(piqt(config_), QIODevice::ReadWrite) {
connect(ui->lineKSearch, SIGNAL(textChanged(QString)), this, SLOT(filterTree()));
session.load();
on_spinBuffer_editingFinished();
K.reinitConnection(K.pultConfig());
K.configure(config_);
K.readFile();
updateKDesc();
@@ -234,11 +239,6 @@ void CD_Pult::makeTreeSection(CDSection & ks, QTreeWidgetItem * pi) {
}
void CD_Pult::received(bool ok) {
if (!ok) return;
}
void CD_Pult::on_treeK_itemClicked(QTreeWidgetItem * item, int column) {
Qt::ItemFlags f = Qt::ItemIsEnabled | Qt::ItemIsSelectable;
if (column == 2) f |= Qt::ItemIsEditable;
@@ -256,7 +256,8 @@ void CD_Pult::on_treeK_itemChanged(QTreeWidgetItem * item, int column) {
void CD_Pult::on_buttonSendK_clicked() {
on_buttonWrite_clicked();
// on_buttonWrite_clicked();
K.send();
//coeffs.sendCoeffs();
if (timer != 0) killTimer(timer);
timer = startTimer(100);
@@ -264,6 +265,8 @@ void CD_Pult::on_buttonSendK_clicked() {
void CD_Pult::on_buttonReceiveK_clicked() {
K.request();
// K.se
//coeffs.receiveCoeffs();
if (timer != 0) killTimer(timer);
timer = startTimer(100);
@@ -319,30 +322,27 @@ void CD_Pult::on_buttonSetCDesc_clicked() {
void CD_Pult::k_sendFailed() {
stopWait();
addToList(trUtf8("K not sended"), Qt::darkRed);
if (timer != 0) killTimer(timer);
}
void CD_Pult::k_sendSucceed() {
stopWait();
addToList(trUtf8("K sended"), Qt::darkGreen);
addToList(trUtf8("K sended"), Qt::darkGreen);;
if (timer != 0) killTimer(timer);
}
void CD_Pult::k_receiveFailed() {
stopWait();
addToList(trUtf8("K not received"), Qt::darkRed);
if (timer != 0) killTimer(timer);
}
void CD_Pult::k_receiveSucceed() {
stopWait();
addToList(trUtf8("K received"), Qt::darkGreen);
//addToList(trUtf8("Write K file \"%1\": %2 coeffs, %3 bytes").arg(PI2QString(coeffs.fileName())).arg(K.size_s()).arg(coeffs.k_content.size_s()), Qt::darkMagenta);
//ui->spinSize->setValue(K.size_s());
if (timer != 0) killTimer(timer);
updateTree();
//ui->table->setK(coeffsK.k()->data(), coeffsK.count());
}
@@ -351,13 +351,6 @@ void CD_Pult::on_spinBuffer_editingFinished() {
}
void CD_Pult::stopWait() {
killTimer(timer);
timer = 0;
ui->labelWait->setText(" ");
}
void CD_Pult::updateGraph() {
ui->graphic->updateGraphics();
}