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

This commit is contained in:
2016-08-15 09:03:18 +00:00
parent 8052406e54
commit fd3a7435e8
15 changed files with 420 additions and 43 deletions

View File

@@ -6,6 +6,8 @@
#include "piqt.h"
#include "qpiconfig.h"
using namespace CDUtils;
CD_Pult::CD_Pult(): QMainWindow(), config_("cd_pult.conf"),
config(piqt(config_), QIODevice::ReadWrite) {
@@ -49,6 +51,8 @@ config(piqt(config_), QIODevice::ReadWrite) {
CONNECT(void, &coeffs, sendSucceed, this, pip_sendSucceed);
CONNECT(void, &coeffs, receiveFailed, this, pip_receiveFailed);
CONNECT(void, &coeffs, receiveSucceed, this, pip_receiveSucceed);*/
kmodel = new CDKItemModel();
ui->treeCDK->setModel(kmodel);
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);
@@ -170,7 +174,7 @@ void CD_Pult::clearSelected() {
ui->treeK->setUpdatesEnabled(false);
ui->treeK->blockSignals(true);
foreach (QTreeWidgetItem * i, si) {
int ki = i->text(0).toInt();
// int ki = i->text(0).toInt();
i->setText(2, "");
//coeffs.setFormula(ki, "");
}
@@ -218,11 +222,11 @@ void CD_Pult::makeTreeSection(CDSection & ks, QTreeWidgetItem * pi) {
PIMap<int, CDSection>::iterator si;
for (si = ks.s.begin(); si != ks.s.end(); ++si) {
QTreeWidgetItem * ti = new QTreeWidgetItem(pi);
const CDSection & cs(si.value());
CDSection & cs(si.value());
ti->setText(0, QString("[%1]").arg(si.key()));
ti->setText(1, PI2QString(cs.alias));
ti->setText(2, PI2QString(cs.name));
makeTreeSection(const_cast<CDSection&>(cs), ti);
makeTreeSection(cs, ti);
}
}
@@ -241,7 +245,7 @@ void CD_Pult::on_treeK_itemClicked(QTreeWidgetItem * item, int column) {
void CD_Pult::on_treeK_itemChanged(QTreeWidgetItem * item, int column) {
if (column != 2) return;
int ki = item->text(0).toInt();
// int ki = item->text(0).toInt();
//coeffs.setFormula(ki, piqt(item->text(column)));
if (ui->checkKAutoCalculate->isChecked())
;//calculate();
@@ -419,7 +423,8 @@ void CD_Pult::updateTree(bool move) {
ui->treeK->clear();
ui->treeK->setUpdatesEnabled(false);
eval.clearCustomVariables();
makeTreeSection(const_cast<CDSection&>(K.root()), ui->treeK->invisibleRootItem());
CDSection r = K.root();
makeTreeSection(r, ui->treeK->invisibleRootItem());
/*for (int i = 0; i < K.size_s(); ++i) {
QTreeWidgetItem * ti = new QTreeWidgetItem();
KDesc kd = kdesc[i];
@@ -456,6 +461,7 @@ void CD_Pult::updateTree(bool move) {
ui->treeK->verticalScrollBar()->setValue(sp);
//calculate();
filterTree();
kmodel->rebuildModel();
}