SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Бычков Андрей
2016-08-09 15:33:56 +00:00
parent b5923b7ba3
commit f24b7172b7
17 changed files with 383 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cd_utils/pult/cd_pult.cpp
View File

@@ -200,29 +200,29 @@ QString CD_Pult::typeName(const QString & n) const {
case 'F': return trUtf8("file"); break;
case 'D': return trUtf8("dir"); break;
}
return "";
return trUtf8("double");
}
void CD_Pult::makeTreeSection(KSection & ks, QTreeWidgetItem * pi) {
PIMap<int, KType>::iterator ki;
void CD_Pult::makeTreeSection(CDSection & ks, QTreeWidgetItem * pi) {
PIMap<int, CDType>::iterator ki;
for (ki = ks.k.begin(); ki != ks.k.end(); ++ki) {
QTreeWidgetItem * ti = new QTreeWidgetItem(pi);
const KType & ck(ki.value());
const CDType & ck(ki.value());
ti->setText(0, QString::number(ck.index()));
ti->setText(1, PI2QString(ck.name()));
ti->setText(2, typeName(PI2QString(ck.type())));
ti->setText(3, PI2QString(ck.formula()));
ti->setText(5, PI2QString(ck.comment()));
}
PIMap<int, KSection>::iterator si;
PIMap<int, CDSection>::iterator si;
for (si = ks.s.begin(); si != ks.s.end(); ++si) {
QTreeWidgetItem * ti = new QTreeWidgetItem(pi);
const KSection & cs(si.value());
const 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<KSection&>(cs), ti);
makeTreeSection(const_cast<CDSection&>(cs), ti);
}
}
@@ -298,7 +298,7 @@ void CD_Pult::on_buttonSetKDesc_clicked() {
kdesc_file = Q2PIString(QDir::current().relativeFilePath(ret));
PIFile f(kdesc_file, PIIODevice::ReadOnly);
piCout << "open description:" << Q2PIString(ret);
K.update(&f);
//K.update(&f);
updateKDesc(true);
}
@@ -393,6 +393,7 @@ void CD_Pult::updateDiag() {
void CD_Pult::updateKDesc(bool ask_move) {
addToList(trUtf8("Update K description file \"%1\"").arg(PI2QString(kdesc_file)), Qt::darkMagenta);
PIFile f(kdesc_file, PIIODevice::ReadOnly);
//piCout << "call K.update():";
K.update(&f);
updateTree(ask_move);
}
@@ -418,7 +419,7 @@ void CD_Pult::updateTree(bool move) {
ui->treeK->clear();
ui->treeK->setUpdatesEnabled(false);
eval.clearCustomVariables();
makeTreeSection(const_cast<KSection&>(K.root()), ui->treeK->invisibleRootItem());
makeTreeSection(const_cast<CDSection&>(K.root()), ui->treeK->invisibleRootItem());
/*for (int i = 0; i < K.size_s(); ++i) {
QTreeWidgetItem * ti = new QTreeWidgetItem();
KDesc kd = kdesc[i];