diff --git a/cd_utils/cdutils_core.cpp b/cd_utils/cdutils_core.cpp index 80bd2b0..13db1bd 100644 --- a/cd_utils/cdutils_core.cpp +++ b/cd_utils/cdutils_core.cpp @@ -173,14 +173,19 @@ void CDUtils::CDCore::dataReceived(const PIString & from, const PIByteArray & da else { CDPacketType pt = (CDPacketType)sig; switch(pt) { - case CD_Ping: - //piCoutObj << "ping"; - break; - default: break; + case CD_Ping: { + //piCoutObj << "ping"; + } break; + case CD_KDirectChange: { + PIByteArray ba = data; + PacketKDirectChange p; + ba >> p; + k_[p.path].setValue(p.value); + } break; + default: break; } } } - } } @@ -232,6 +237,18 @@ void CDCore::K_Request() { } +void CDUtils::CDCore::K_DirectChange(PIDeque path, PIString value) { + PacketKDirectChange p; + p.header.session_id = 0; + p.header.type = CD_KDirectChange; + p.path = path; + p.value = value; + PIByteArray ba; + ba << p; + connection.writeByName("cd", ba); +} + + void CDCore::sendThread() { bool ok = datatr.send(send_data); CDPacketType pt = (CDPacketType)wheader.type; diff --git a/cd_utils/cdutils_core.h b/cd_utils/cdutils_core.h index 07d0f43..ec52629 100644 --- a/cd_utils/cdutils_core.h +++ b/cd_utils/cdutils_core.h @@ -37,6 +37,7 @@ public: EVENT(K_ChangedGlobal) EVENT_HANDLER(void, K_Send); EVENT_HANDLER(void, K_Request); + EVENT_HANDLER2(void, K_DirectChange, PIDeque, path, PIString, value); void k_write(PIIODevice * d); void k_read(PIIODevice * d); diff --git a/cd_utils/cdutils_protocol.h b/cd_utils/cdutils_protocol.h index d644adc..48af806 100644 --- a/cd_utils/cdutils_protocol.h +++ b/cd_utils/cdutils_protocol.h @@ -5,7 +5,7 @@ namespace CDUtils { -enum CDPacketType {CD_Ping, CD_Pong, CD_KQuery, CD_KSend, CD_Command, CD_XData, CD_XQuery}; +enum CDPacketType {CD_Ping, CD_Pong, CD_KQuery, CD_KSend, CD_KDirectChange, CD_XData, CD_XQuery, CD_Command}; # pragma pack(push,1) @@ -14,12 +14,21 @@ enum CDPacketType {CD_Ping, CD_Pong, CD_KQuery, CD_KSend, CD_Command, CD_XData, int session_id; }; + struct PacketKDirectChange { + PacketHeader header; + PIDeque path; + PIString value; + }; + # pragma pack(pop) inline PIByteArray & operator <<(PIByteArray & s, const PacketHeader & v) {s << v.type << v.session_id; return s;} inline PIByteArray & operator >>(PIByteArray & s, PacketHeader & v) {s >> v.type >> v.session_id; return s;} +inline PIByteArray & operator <<(PIByteArray & s, const PacketKDirectChange & v) {s << v.header << v.path << v.value; return s;} +inline PIByteArray & operator >>(PIByteArray & s, PacketKDirectChange & v) {s >> v.header >> v.path >> v.value; return s;} + } #endif // CDUTILS_PROTOCOL_H diff --git a/qad/application/qad_application.qrc b/qad/application/qad_application.qrc index 6a82538..019fa87 100644 --- a/qad/application/qad_application.qrc +++ b/qad/application/qad_application.qrc @@ -1,33 +1,30 @@ lang/qad_application_ru.ts + ../icons/application-exit.png ../icons/dialog-close.png ../icons/edit-clear.png - ../icons/edit-guides.png - ../icons/view-grid.png - ../icons/zoom-fit-best.png + ../icons/edit-copy.png + ../icons/edit-delete.png ../icons/configure.png + ../icons/document-edit.png + ../icons/document-new.png ../icons/document-save.png + ../icons/document-save-all.png + ../icons/document-save-as.png + ../icons/document-open.png + ../icons/document-close.png ../icons/edit-clear-locationbar-rtl.png ../icons/edit-find.png ../icons/list-add.png ../icons/edit-delete.png - ../icons/item.png - ../icons/node-add.png - ../icons/node.png ../icons/edit-copy.png ../icons/edit-paste.png - ../icons/expand_s_x.png - ../icons/expand_s_y.png - ../icons/expand_x.png - ../icons/expand_y.png + ../icons/edit-undo.png + ../icons/edit-redo.png ../icons/border-line.png - ../icons/legend.png - ../icons/graphic.png ../icons/edockwidget.png - ../icons/layer-visible-off.png - ../icons/layer-visible-on.png ../icons/historyview.png ../icons/clear-history.png - + diff --git a/qcd_utils/pult/cd_pult.conf b/qcd_utils/pult/cd_pult.conf deleted file mode 100644 index e69de29..0000000 diff --git a/qcd_utils/pult/cd_pult.cpp b/qcd_utils/pult/cd_pult.cpp deleted file mode 100644 index 8e06458..0000000 --- a/qcd_utils/pult/cd_pult.cpp +++ /dev/null @@ -1,494 +0,0 @@ -#include -#include -#include -#include "cd_pult.h" -#include "ui_cd_pult.h" -#include "piqt.h" -#include "pifile.h" -#include "qpiconfig.h" - -using namespace CDUtils; - - -CD_Pult::CD_Pult(): QMainWindow(), config_("cd_pult.conf"), -config(piqt(config_), QIODevice::ReadWrite) { - //cout << sizeof(coeffsK.k_protocol->to_k) << endl; - ui = new Ui::CD_Pult(); - ui->setupUi(this); - ui->configWidget->setQPIConfig(&config); - ui->configWidget->expandAll(); - ui->list->viewport()->installEventFilter(this); - ui->treeCDK->viewport()->installEventFilter(this); - ui->scrollArea->setAutoFillBackground(false); - ui->scrollAreaWidgetContents->setAutoFillBackground(false); - ui->widget->setAutoFillBackground(false); - log_menu.addAction(ui->actionClear); - show_x = config.getValue("show_x", true); - if (!show_x) - ui->tabWidget->removeTab(1); - session.setFile("session_cd_pult.conf"); - session.addEntry(this); - session.addEntry(ui->tabWidget); - session.addEntry(ui->checkKHideNormal); - session.addEntry(ui->checkKHideExpressions); - session.addEntry(ui->checkKAutoCalculate); - session.addEntry(ui->spinHistory); - session.addEntry(ui->spinBuffer); - needWrite = isPause = false; - timer = 0; - //x.resize(KX_X_PACKET_NUM); - //k.resize(K_NUM); - QPalette pal = palette(); - QColor col; - ui->graphic->setGraphicsCount(0); - //renew(); - /*ui->treeK->setColumnWidth(0, 60); - ui->treeK->setColumnWidth(1, 250); - ui->treeK->setColumnWidth(3, 100); - ui->treeK->setColumnWidth(4, 100);*/ - //ui->table->setK(coeffsK.k()->data(), coeffsK.count()); - //addToList(trUtf8("Read K file \"%1\": %2 coeffs, %3 bytes").arg(PI2QString(coeffs.fileName())).arg(K.size_s()).arg(coeffs.k_content.size_s()), Qt::darkMagenta); - /*CONNECT(void, &coeffs, sendFailed, this, pip_sendFailed); - CONNECT(void, &coeffs, sendSucceed, this, pip_sendSucceed); - CONNECT(void, &coeffs, receiveFailed, this, pip_receiveFailed); - CONNECT(void, &coeffs, receiveSucceed, this, pip_receiveSucceed);*/ - 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); - connect(this, SIGNAL(q_k_receiveSucceed()), this, SLOT(k_receiveSucceed()), Qt::QueuedConnection); - connect(&timer_diag, SIGNAL(timeout()), this, SLOT(updateDiag())); - connect(&session, SIGNAL(loading(QPIConfig&)), this, SLOT(loading(QPIConfig&))); - connect(&session, SIGNAL(saving(QPIConfig&)), this, SLOT(saving(QPIConfig&))); - connect(ui->checkKHideNormal, SIGNAL(toggled(bool)), this, SLOT(filterTree())); - connect(ui->checkKHideExpressions, SIGNAL(toggled(bool)), this, SLOT(filterTree())); - connect(ui->lineKSearch, SIGNAL(textChanged(QString)), this, SLOT(filterTree())); - session.load(); - on_spinBuffer_editingFinished(); - K.reinitConnection(K.pultConfig()); - K.configure(config_); - K.readFile(); - updateKDesc(); - updateCDesc(); - timer_diag.start(40); -} - - -CD_Pult::~CD_Pult() { - session.save(); -} - - -void CD_Pult::loading(QPIConfig & conf) { - kdesc_file = Q2PIString(conf.getValue("kdesc_file").stringValue()); - cdesc_file = Q2PIString(conf.getValue("cdesc_file").stringValue()); -} - - -void CD_Pult::saving(QPIConfig & conf) { - conf.setValue("kdesc_file", PI2QString(kdesc_file)); - conf.setValue("cdesc_file", PI2QString(cdesc_file)); -} - - -bool CD_Pult::eventFilter(QObject * o, QEvent * e) { - if (o == ui->list->viewport()) { - if (e->type() == QEvent::ContextMenu) { - clear_target = 0; - log_menu.popup(((QContextMenuEvent*)e)->globalPos()); - } - return QMainWindow::eventFilter(o, e); - } - if (o == ui->treeCDK->viewport()) { - if (e->type() == QEvent::ContextMenu) { - clear_target = 1; - log_menu.popup(((QContextMenuEvent*)e)->globalPos()); - } - return QMainWindow::eventFilter(o, e); - } - //int ind = o->property("index").toInt(); - //qDebug() << "event" << i << e->type(); - switch (e->type()) { - case QEvent::Enter: - ui->graphic->setAutoUpdate(false); - //for (int i = 0; i < KX_X_PACKET_NUM; ++i) - // ui->graphic->setGraphicLineWidth(ind == i ? 3. : 1., i); - ui->graphic->setAutoUpdate(true); - ui->graphic->update(); - break; - case QEvent::Leave: - ui->graphic->setAutoUpdate(false); - //for (int i = 0; i < KX_X_PACKET_NUM; ++i) - // ui->graphic->setGraphicLineWidth(1., i); - ui->graphic->setAutoUpdate(true); - ui->graphic->update(); - break; - default: break; - } - return QMainWindow::eventFilter(o, e); -} - - -void CD_Pult::timerEvent(QTimerEvent * e) { - /*if (e->timerId() == timer_update) { - if (need_update) { - need_update = false; - ui->graphic->updateGraphics(); - } - }*/ - if (e->timerId() == timer) { - static QString sPI = QString::number(atan(1) * 4., 'f', 14).leftJustified(14); - static int cnt = 0; - int si = qMax(cnt - 6, 0); - ++cnt; - cnt %= 23; - ui->labelWait->setText(QString(si, QChar(' ')) + sPI.mid(cnt - 6, 6).trimmed()); - //if (!coeffs.isReady()) return; - //ui->table->setK(coeffsK.k()->data(), coeffsK.count()); - //ui->table->showK(); - } -} - - -void CD_Pult::addToList(const QString & s, const QColor & c) { - ui->list->addItem(QDateTime::currentDateTime().toString("dd/MM/yyyy hh:ss - ") + s); - ui->list->item(ui->list->count() - 1)->setTextColor(c); - ui->list->scrollToBottom(); -} - - -void CD_Pult::on_actionClear_triggered() { - switch (clear_target) { - case 0: - ui->list->clear(); - break; - case 1: - clearSelected(); - break; - default: break; - } -} - - -void CD_Pult::clearSelected() { - /*QList si = ui->treeK->selectedItems(); - ui->treeK->setUpdatesEnabled(false); - ui->treeK->blockSignals(true); - foreach (QTreeWidgetItem * i, si) { -// int ki = i->text(0).toInt(); - i->setText(2, ""); - //coeffs.setFormula(ki, ""); - } - ui->treeK->blockSignals(false); - ui->treeK->setUpdatesEnabled(true); - if (ui->checkKAutoCalculate->isChecked()) { - QApplication::processEvents(); - //calculate(); - }*/ -} - - -QString CD_Pult::typeName(const QString & n) const { - if (n.isEmpty()) return ""; - switch (n[0].toLatin1()) { - case 'l': return trUtf8("list"); break; - case 'b': return trUtf8("bool"); break; - case 'n': return trUtf8("int"); break; - case 'f': return trUtf8("double"); break; - case 'c': return trUtf8("color"); break; - case 'r': return trUtf8("rect"); break; - case 'a': return trUtf8("rect"); break; - case 'p': return trUtf8("point"); break; - case 'v': return trUtf8("vector"); break; - case 'i': return trUtf8("IP"); break; - case 'e': return trUtf8("enum"); break; - case 'F': return trUtf8("file"); break; - case 'D': return trUtf8("dir"); break; - } - return trUtf8("double"); -} - - -void CD_Pult::makeTreeSection(CDSection & ks, QTreeWidgetItem * pi) { - PIMap::iterator ki; - for (ki = ks.k.begin(); ki != ks.k.end(); ++ki) { - QTreeWidgetItem * ti = new QTreeWidgetItem(pi); - 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::iterator si; - for (si = ks.s.begin(); si != ks.s.end(); ++si) { - QTreeWidgetItem * ti = new QTreeWidgetItem(pi); - 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(cs, ti); - } -} - - -void CD_Pult::on_treeK_itemClicked(QTreeWidgetItem * item, int column) { - Qt::ItemFlags f = Qt::ItemIsEnabled | Qt::ItemIsSelectable; - if (column == 2) f |= Qt::ItemIsEditable; - item->setFlags(f); -} - - -void CD_Pult::on_treeK_itemChanged(QTreeWidgetItem * item, int column) { - if (column != 2) return; -// int ki = item->text(0).toInt(); - //coeffs.setFormula(ki, piqt(item->text(column))); - if (ui->checkKAutoCalculate->isChecked()) - ;//calculate(); -} - - -void CD_Pult::on_buttonSendK_clicked() { -// on_buttonWrite_clicked(); - K.send(); - //coeffs.sendCoeffs(); - if (timer != 0) killTimer(timer); - timer = startTimer(100); -} - - -void CD_Pult::on_buttonReceiveK_clicked() { - K.request(); -// K.se - //coeffs.receiveCoeffs(); - if (timer != 0) killTimer(timer); - timer = startTimer(100); -} - - -void CD_Pult::on_buttonShowAll_clicked() { - /*for (int i = 0; i < KX_X_PACKET_NUM; ++i) { - checks[i]->check.setChecked(true); - //ui->graphic->setGraphicVisible(true, i); - }*/ -} - - -void CD_Pult::on_buttonHideAll_clicked() { - /*for (int i = 0; i < KX_X_PACKET_NUM; ++i) { - checks[i]->check.setChecked(false); - //ui->graphic->setGraphicVisible(false, i); - }*/ -} - - -void CD_Pult::on_buttonRead_clicked() { - K.readFile(); - addToList(trUtf8("Read K file \"%1\": %2 coeffs, %3 bytes").arg(PI2QString(K.file())).arg(K.count()).arg(K.fileSize()), Qt::darkMagenta); - updateTree(); -} - - -void CD_Pult::on_buttonWrite_clicked() { - K.writeFile(); - addToList(trUtf8("Write K file \"%1\": %2 coeffs, %3 bytes").arg(PI2QString(K.file())).arg(K.count()).arg(K.fileSize()), Qt::darkMagenta); -} - - -void CD_Pult::on_buttonSetKDesc_clicked() { - QString ret = QFileDialog::getOpenFileName(this, trUtf8("Select *.h file with K description"), PI2QString(kdesc_file), "C/C++ header files(*.h *.hpp);;All files(*)"); - if (ret.isEmpty()) return; - kdesc_file = Q2PIString(QDir::current().relativeFilePath(ret)); - PIFile f(kdesc_file, PIIODevice::ReadOnly); - piCout << "open description:" << Q2PIString(ret); - //K.update(&f); - updateKDesc(true); -} - - -void CD_Pult::on_buttonSetCDesc_clicked() { - QString ret = QFileDialog::getOpenFileName(this, trUtf8("Select *.h file with C description"), PI2QString(cdesc_file), "C/C++ header files(*.h *.hpp);;All files(*)"); - if (ret.isEmpty()) return; - cdesc_file = Q2PIString(QDir::current().relativeFilePath(ret)); - updateCDesc(); -} - - -void CD_Pult::k_sendFailed() { - addToList(trUtf8("K not sended"), Qt::darkRed); - if (timer != 0) killTimer(timer); -} - - -void CD_Pult::k_sendSucceed() { - addToList(trUtf8("K sended"), Qt::darkGreen);; - if (timer != 0) killTimer(timer); -} - - -void CD_Pult::k_receiveFailed() { - addToList(trUtf8("K not received"), Qt::darkRed); - if (timer != 0) killTimer(timer); -} - - -void CD_Pult::k_receiveSucceed() { - addToList(trUtf8("K received"), Qt::darkGreen); - if (timer != 0) killTimer(timer); - updateTree(); -} - - -void CD_Pult::on_spinBuffer_editingFinished() { - ui->graphic->setHistorySize(ui->spinBuffer->value()); -} - - -void CD_Pult::updateGraph() { - ui->graphic->updateGraphics(); -} - - -void CD_Pult::updateDiag() { - /*ui->labelKReceiver->setText(piqt(coeffs.k_protocol->receiverDeviceName() + " - " + coeffs.k_protocol->receiverDeviceState())); - ui->labelKSender->setText(piqt(coeffs.k_protocol->senderDeviceName())); - ui->spinKSended->setValue(coeffs.k_protocol->sendCount()); - ui->spinKReceived->setValue(coeffs.k_protocol->receiveCount()); - ui->spinKWrong->setValue(coeffs.k_protocol->wrongCount()); - ui->spinKMissed->setValue(coeffs.k_protocol->missedCount()); - ui->labelKType->setText("0x" + QString::number(coeffs.k_protocol->from_k.type, 16).toUpper().rightJustified(2, '0')); - ui->labelKAddrPult->setText("0x" + QString::number(coeffs.k_protocol->from_k.addr_to, 16).toUpper().rightJustified(2, '0')); - ui->labelKAddr->setText("0x" + QString::number(coeffs.k_protocol->to_k.addr_to, 16).toUpper().rightJustified(2, '0')); - - ui->labelXReceiver->setText(piqt(prot_x->receiverDeviceName() + " - " + prot_x->receiverDeviceState())); - ui->labelXSender->setText(piqt(prot_x->senderDeviceName())); - ui->spinXSended->setValue(prot_x->sendCount()); - ui->spinXReceived->setValue(prot_x->receiveCount()); - ui->spinXWrong->setValue(prot_x->wrongCount()); - ui->spinXMissed->setValue(prot_x->missedCount()); - ui->labelXType->setText("0x" + QString::number(prot_x->from_x.type, 16).toUpper().rightJustified(2, '0')); - ui->labelXAddrPult->setText("0x" + QString::number(prot_x->from_x.addr_to, 16).toUpper().rightJustified(2, '0')); - ui->labelXAddr->setText("0x" + QString::number(prot_x->to_x.addr_to, 16).toUpper().rightJustified(2, '0')); - - ui->labelCReceiver->setText(piqt(prot_c->receiverDeviceName() + " - " + prot_c->receiverDeviceState())); - ui->labelCSender->setText(piqt(prot_c->senderDeviceName())); - ui->spinCSended->setValue(prot_c->sendCount()); - ui->spinCReceived->setValue(prot_c->receiveCount()); - ui->spinCWrong->setValue(prot_c->wrongCount()); - ui->spinCMissed->setValue(prot_c->missedCount()); - ui->labelCType->setText("0x" + QString::number(prot_c->from_c.type, 16).toUpper().rightJustified(2, '0')); - ui->labelCAddrPult->setText("0x" + QString::number(prot_c->from_c.addr_to, 16).toUpper().rightJustified(2, '0')); - ui->labelCAddr->setText("0x" + QString::number(prot_c->to_c.addr_to, 16).toUpper().rightJustified(2, '0')); - */ -} - - -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.root() = CDSection(); - K.update(&f); - updateTree(ask_move); -} - - -void CD_Pult::updateCDesc() { - //parseHeader(cdesc_file, cdesc); - updateCommands(); -} - - -bool stringComp(const QString & s1, const QString & s2) { - if (s1.size() != s2.size()) - return s1.size() > s2.size(); - return s1 > s2; -} - - -void CD_Pult::updateTree(bool move) { -} - - -void CD_Pult::updateCommands() { - while (ui->layoutCommands->count() > 0) - delete ui->layoutCommands->itemAt(0)->widget(); - /*QMapIterator it(cdesc); - while (it.hasNext()) { - it.next(); - KDesc kd = it.value(); - QPushButton * b = new QPushButton(); - QString text = kd.name; - if (!kd.comment.isEmpty()) - text += QString("\n(%1)").arg(kd.comment); - b->setText(text); - b->setProperty("_command", kd.index); - connect(b, SIGNAL(clicked()), this, SLOT(commandClicked())); - ui->layoutCommands->addWidget(b); - }*/ -} - - -void CD_Pult::filterTree() { - /*bool hn = ui->checkKHideNormal->isChecked(); - bool hs = ui->checkKHideExpressions->isChecked(); - bool ok = false; - QString fl = ui->lineKSearch->text(); - int lc = ui->treeK->topLevelItemCount(); - for (int i = 0; i < lc; ++i) { - QTreeWidgetItem * ti = ui->treeK->topLevelItem(i); - if (fl.isEmpty()) - ti->setHidden(false); - else - ti->setHidden(!ti->text(0).contains(fl, Qt::CaseInsensitive) && - !ti->text(1).contains(fl, Qt::CaseInsensitive) && - !ti->text(2).contains(fl, Qt::CaseInsensitive) && - !ti->text(3).contains(fl, Qt::CaseInsensitive) && - !ti->text(4).contains(fl, Qt::CaseInsensitive)); - if (hn) - if (ti->data(0, Qt::UserRole).toBool()) - ti->setHidden(true); - if (hs) { - ti->data(2, Qt::DisplayRole).toDouble(&ok); - if (!ok) - ti->setHidden(true); - } - }*/ -} - - -void CD_Pult::markError(QTreeWidgetItem * item, const QString & tool_tip) { - int cc = item->columnCount(); - for (int i = 0; i < cc; ++i) - item->setBackgroundColor(i, QColor(255, 200, 200)); - if (item->toolTip(2).isEmpty()) - item->setToolTip(2, tool_tip); - if (item->toolTip(3).isEmpty()) - item->setToolTip(3, tool_tip); - item->setData(0, Qt::UserRole, false); - item->setText(3, "Error"); -} - - -void CD_Pult::markNormal(QTreeWidgetItem * item) { - int cc = item->columnCount(); - for (int i = 0; i < cc; ++i) - item->setBackground(i, Qt::NoBrush); - item->setToolTip(2, QString()); - item->setToolTip(3, QString()); - item->setData(0, Qt::UserRole, true); -} - - -void CD_Pult::progress(int val, int max) { -} - - -void CD_Pult::commandClicked() { - QPushButton * b = qobject_cast(sender()); - if (!b) return; - //prot_c->sendCommand(b->property("_command").toInt()); -} diff --git a/qcd_utils/pult/cd_pult.h b/qcd_utils/pult/cd_pult.h deleted file mode 100644 index 8c2d274..0000000 --- a/qcd_utils/pult/cd_pult.h +++ /dev/null @@ -1,116 +0,0 @@ -#ifndef CD_PULT_H -#define CD_PULT_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "piqt.h" -#include "session_manager.h" -#include "qpievaluator.h" -#include "cdutils_core.h" -#include "cdutils_k.h" -#include "qcd_kmodel.h" - - -namespace Ui { - class CD_Pult; -} - -class CD_Pult: public QMainWindow, public PIObject -{ - Q_OBJECT - PIOBJECT(CD_Pult) -public: - CD_Pult(); - ~CD_Pult(); - -private: - bool eventFilter(QObject * o, QEvent * e); - void timerEvent(QTimerEvent * ); - void addToList(const QString & s, const QColor & c); - QColor invertColor(QColor col) {return QColor(255 - col.red(), 255 - col.green(), 255 - col.blue());} - void stopWait(); - bool calculateExpression(int i, QVector trace); - void markError(QTreeWidgetItem * item, const QString & tool_tip = QString()); - void markNormal(QTreeWidgetItem * item); - void progress(int val, int max); - void clearSelected(); - QString typeName(const QString & n) const; - void makeTreeSection(CDUtils::CDSection & ks, QTreeWidgetItem * pi); - - EVENT_HANDLER(void, pip_sendFailed) {emit q_k_sendFailed();} - EVENT_HANDLER(void, pip_sendSucceed) {emit q_k_sendSucceed();} - EVENT_HANDLER(void, pip_receiveFailed) {emit q_k_receiveFailed();} - EVENT_HANDLER(void, pip_receiveSucceed) {emit q_k_receiveSucceed();} - - Ui::CD_Pult * ui; - PIString config_, name_x, name_c; - PIString kdesc_file, cdesc_file, xdesc_file; - QMenu log_menu; - QTimer timer_diag; - SessionManager session; - QPIConfig config; - //QVector k, x; - int clear_target, timer; - bool needWrite, isPause, need_update, show_x; - -private slots: - void loading(QPIConfig & conf); - void saving(QPIConfig & conf); - void updateGraph(); - void updateDiag(); - void updateKDesc(bool ask_move = false); - void updateCDesc(); - void updateTree(bool move = false); - void updateCommands(); - void filterTree(); - //void calculate(); - //void renew(bool write = true); - void commandClicked(); - void k_sendFailed(); - void k_sendSucceed(); - void k_receiveFailed(); - void k_receiveSucceed(); - void on_spinBuffer_editingFinished(); - void on_buttonSendK_clicked(); - void on_buttonReceiveK_clicked(); - void on_buttonShowAll_clicked(); - void on_buttonHideAll_clicked(); - void on_buttonRead_clicked(); - void on_buttonWrite_clicked(); - void on_buttonSetKDesc_clicked(); - void on_buttonReparseKDesc_clicked() {updateKDesc(true);} - void on_buttonSetCDesc_clicked(); - void on_buttonReparseCDesc_clicked() {updateCDesc();} - //void on_buttonCalculate_clicked() {calculate();} - //void on_buttonApply_clicked() {renew();} - void on_buttonPause_toggled(bool on) {isPause = on;} - void on_treeK_itemClicked(QTreeWidgetItem * item, int column); - void on_treeK_itemChanged(QTreeWidgetItem * item, int column); - void on_actionClear_triggered(); - -signals: - void q_k_sendFailed(); - void q_k_sendSucceed(); - void q_k_receiveFailed(); - void q_k_receiveSucceed(); - -}; - -#endif // CD_PULT_H - diff --git a/qcd_utils/pult/cd_pult.qrc b/qcd_utils/pult/cd_pult.qrc deleted file mode 100644 index 99f4688..0000000 --- a/qcd_utils/pult/cd_pult.qrc +++ /dev/null @@ -1,40 +0,0 @@ - - - icons/dialog-close.png - icons/edit-clear-.png - icons/edit-guides.png - icons/view-grid.png - icons/zoom-fit-best.png - icons/configure.png - icons/alpha.png - icons/document-save.png - icons/edit-clear-locationbar-rtl.png - icons/edit-find.png - icons/list-add.png - icons/edit-delete.png - icons/item-add.png - icons/item.png - icons/node-add.png - icons/node.png - icons/edit-copy.png - icons/edit-paste.png - icons/expand_s_x.png - icons/expand_s_y.png - icons/expand_x.png - icons/expand_y.png - icons/media-playback-pause.png - icons/media-playback-stop.png - icons/media-record.png - icons/application-exit.png - icons/document-save-.png - icons/view-refresh.png - icons/document-open.png - icons/archive-extract.png - icons/document-export.png - icons/document-import.png - icons/zoom-fit-height.png - icons/layer-visible-off.png - icons/layer-visible-on.png - icons/accessories-calculator.png - - diff --git a/qcd_utils/pult/cd_pult.ui b/qcd_utils/pult/cd_pult.ui deleted file mode 100644 index 7cd129f..0000000 --- a/qcd_utils/pult/cd_pult.ui +++ /dev/null @@ -1,1238 +0,0 @@ - - - CD_Pult - - - - 0 - 0 - 1035 - 728 - - - - CD Pult - - - - - - - 0 - - - - Coefficients (K) - - - - - - - - Update - - - - :/icons/view-refresh.png:/icons/view-refresh.png - - - - - - - Read - - - - :/icons/archive-extract.png:/icons/archive-extract.png - - - - - - - Send - - - - :/icons/document-export.png:/icons/document-export.png - - - - - - - - 0 - 0 - - - - Qt::CustomContextMenu - - - QAbstractItemView::NoEditTriggers - - - QAbstractItemView::NoSelection - - - QAbstractItemView::ScrollPerPixel - - - QAbstractItemView::ScrollPerPixel - - - - - - - Receive - - - - :/icons/document-import.png:/icons/document-import.png - - - - - - - - 0 - 0 - - - - - 200 - 0 - - - - - - - - - - - Write - - - - :/icons/document-save-.png:/icons/document-save-.png - - - - - - - Make ... - - - - :/icons/document-open.png:/icons/document-open.png - - - - - - - - - - - Hide expressions - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 20 - 20 - - - - - - - - Show only errors - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 20 - 20 - - - - - - - - :/icons/edit-find.png - - - Qt::AlignCenter - - - - - - - Search: - - - - - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 40 - 20 - - - - - - - - Auto calculate - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 20 - 20 - - - - - - - - Calculate - - - Calculate - - - - :/icons/accessories-calculator.png:/icons/accessories-calculator.png - - - - - - - 100 - - - Calculate %p% - - - - - - - - - QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed - - - true - - - QAbstractItemView::ExtendedSelection - - - QAbstractItemView::ScrollPerPixel - - - QAbstractItemView::ScrollPerPixel - - - 20 - - - - - - - - Commands (C) - - - - - - - - Set C desc file ... - - - - :/icons/document-open.png:/icons/document-open.png - - - - - - - Reparse C desc - - - - :/icons/view-refresh.png:/icons/view-refresh.png - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - Commands - - - - - - QFrame::NoFrame - - - true - - - - - 0 - 0 - 819 - 613 - - - - - 0 - - - 0 - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 66 - 441 - - - - - - - - - - - - - - - - - - Graphics (X) - - - - - - - 10 - - - - - - - - - - - 0 - 0 - - - - Show all - - - - :/icons/layer-visible-on.png:/icons/layer-visible-on.png - - - - - - - - 0 - 0 - - - - Hide all - - - - :/icons/layer-visible-off.png:/icons/layer-visible-off.png - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Start record - - - - :/icons/media-record.png:/icons/media-record.png - - - - - - - - - - - Pause - - - - :/icons/media-playback-pause.png:/icons/media-playback-pause.png - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Show - - - - - - - - 0 - 0 - - - - с - - - 1 - - - 0.100000000000000 - - - 9999.000000000000000 - - - 10.000000000000000 - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 40 - 20 - - - - - - - - Save - - - - - - - - 0 - 0 - - - - с - - - 1 - - - 0.100000000000000 - - - 9999.000000000000000 - - - 60.000000000000000 - - - - - - - - - Graphic::Autofit|Graphic::BorderInputs|Graphic::Clear|Graphic::Configure|Graphic::CursorAxis|Graphic::Grid|Graphic::OnlyExpandX|Graphic::OnlyExpandY|Graphic::Save - - - false - - - false - - - 60.000000000000000 - - - 10.000000000000000 - - - - - - - - Configuration - - - - - - K - - - - QFormLayout::AllNonFixedFieldsGrow - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - receiver: - - - - - - - - - - - - - - sender: - - - - - - - - - - - - - - sended count: - - - - - - - true - - - 0 - - - 1999999999 - - - - - - - received count: - - - - - - - true - - - 0 - - - 1999999999 - - - - - - - wrong received count: - - - - - - - true - - - 0 - - - 1999999999 - - - - - - - type: - - - - - - - - - - - - - - address K: - - - - - - - - - - - - - - - - - - - - - missed received count: - - - - - - - true - - - 0 - - - 1999999999 - - - - - - - address pult: - - - - - - - - - - X - - - - QFormLayout::AllNonFixedFieldsGrow - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - receiver: - - - - - - - - - - - - - - sender: - - - - - - - - - - - - - - type: - - - - - - - - - - - - - - address X: - - - - - - - address pult: - - - - - - - - - - - - - - sended count: - - - - - - - true - - - 0 - - - 1999999999 - - - - - - - received count: - - - - - - - true - - - 0 - - - 1999999999 - - - - - - - wrong received count: - - - - - - - true - - - 0 - - - 1999999999 - - - - - - - - - - - - - - missed received count: - - - - - - - true - - - 0 - - - 1999999999 - - - - - - - - - - C - - - - QFormLayout::AllNonFixedFieldsGrow - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - receiver: - - - - - - - - - - - - - - sender: - - - - - - - - - - - - - - type: - - - - - - - - - - - - - - address C: - - - - - - - address pult: - - - - - - - - - - - - - - sended count: - - - - - - - true - - - 0 - - - 1999999999 - - - - - - - received count: - - - - - - - true - - - 0 - - - 1999999999 - - - - - - - wrong received count: - - - - - - - true - - - 0 - - - 1999999999 - - - - - - - - - - - - - - missed received count: - - - - - - - true - - - 0 - - - 1999999999 - - - - - - - - - - - - true - - - true - - - true - - - false - - - 20 - - - - - - - Apply - - - - :/icons/document-save-.png:/icons/document-save-.png - - - - - - - - - - - - - - - :/icons/edit-clear-.png:/icons/edit-clear-.png - - - Clear - - - - - - Graphic - QFrame -
graphic.h
- - - CLineEdit - QLineEdit -
clineedit.h
- - - QPIConfigWidget - QTreeWidget -
qpiconfigwidget.h
- - - CDKView - QTreeView -
qcd_kview.h
- - busyStatusChanged(bool) - sendK() - receiveK() - saveK() - loadK() - clear() - clearK() - refresh() - - - - - - - - - - spinHistory - valueChanged(double) - graphic - setMaxVisibleTime(double) - - - 919 - 107 - - - 932 - 132 - - - - - diff --git a/qcd_utils/pult/cdpultwindow.cpp b/qcd_utils/pult/cdpultwindow.cpp new file mode 100644 index 0000000..3d18ac7 --- /dev/null +++ b/qcd_utils/pult/cdpultwindow.cpp @@ -0,0 +1,13 @@ +#include "cdpultwindow.h" +#include "ui_cdpultwindow.h" + + +CDPultWindow::CDPultWindow(QWidget *parent) : EMainWindow(parent), ui(new Ui::CDPultWindow) { + ui->setupUi(this); + +} + + +CDPultWindow::~CDPultWindow() { + delete ui; +} diff --git a/qcd_utils/pult/cdpultwindow.h b/qcd_utils/pult/cdpultwindow.h new file mode 100644 index 0000000..37381df --- /dev/null +++ b/qcd_utils/pult/cdpultwindow.h @@ -0,0 +1,33 @@ +#ifndef CDPULTWINDOW_H +#define CDPULTWINDOW_H + +#include "emainwindow.h" + + +namespace Ui { +class CDPultWindow; +} + +class CDPultWindow : public EMainWindow +{ + Q_OBJECT + +public: + explicit CDPultWindow(QWidget *parent = 0); + ~CDPultWindow(); + +private: + void closeEvent(QCloseEvent * ); + void timerEvent(QTimerEvent *); + void reset(bool full = false); + bool load(const QString & path); + bool save(const QString & path); + void loadingSession(QPIConfig & conf); + void savingSession(QPIConfig & conf); + void addToErrorList(QString msg); + QString loadFilter() {return "CD file(*.dat)";} + QString saveFilter() {return "CD file(*.dat)";} + Ui::CDPultWindow *ui; +}; + +#endif // CDPULTWINDOW_H diff --git a/qcd_utils/pult/cdpultwindow.ui b/qcd_utils/pult/cdpultwindow.ui new file mode 100644 index 0000000..9fc05c3 --- /dev/null +++ b/qcd_utils/pult/cdpultwindow.ui @@ -0,0 +1,118 @@ + + + CDPultWindow + + + + 0 + 0 + 800 + 600 + + + + Form + + + + + 0 + 0 + 800 + 21 + + + + + Main + + + + + + + + + + + + + + + + :/icons/document-open.png:/icons/document-open.png + + + Open + + + Ctrl+O + + + + + + :/icons/document-save.png:/icons/document-save.png + + + Save + + + Ctrl+S + + + + + SaveAs... + + + Ctrl+Shift+S + + + + + Send K + + + Ctrl+D + + + + + Receive_K + + + Ctrl+R + + + + + Parse... + + + Ctrl+Shift+P + + + + + + + + + + + + + + + EMainWindow + QMainWindow +
emainwindow.h
+ 1 + + + + + + + diff --git a/qcd_utils/pult/form.cpp b/qcd_utils/pult/form.cpp deleted file mode 100644 index caf4243..0000000 --- a/qcd_utils/pult/form.cpp +++ /dev/null @@ -1,186 +0,0 @@ -#include "form.h" -#include "ui_form.h" -#include -#include -#include "cdutils_k.h" -#include "cdutils_core.h" -#include "qcd_core.h" -#include "qcd_kmodel.h" -#include "pifile.h" -#include "evalspinbox.h" - - -using namespace CDUtils; - -PIStringList takeMembers(PIString &in) { - int slen = in.length(); - int st = -1, bcnt = 0; - PIChar cc; - PIStringList ret; - int rst = -1; - for (int i = 0; i < slen; i++) { - cc = in.at(i); - if (cc == '{') { - if (bcnt == 0) st = i; - bcnt++; - } - if (cc == '}' && st >= 0) { - bcnt--; - if (bcnt == 0) { - in.remove(st, i-st); - return ret; - } - } - if (cc == ';' && bcnt == 1) { - if (rst < 0) rst = st; - ret << in.mid(rst+1, i-rst-1); - rst = i; - } - } - return ret; -} - - -void parseStruct(PIString &in, CDSection * root, const PIStringList &c_types, PIVector §ions, PIVector &enums); - - -void parseEnum(PIString &in, CDSection * root, const PIStringList &c_types, PIVector §ions, PIVector &enums) { - PIString n = in.takeCWord(); - //piCout << n; - PIVariantTypes::Enum e; - e.enum_name = n; - PIString ev = in.inBrackets('{', '}'); - e << ev.split(","); - if (root) { - CDType & cdt((*root)[root->count(false)]); - cdt = CDType(cdt.index(), n, "e", "", "", "", CDType::cdK); - cdt.setEnumValues(e); - enums << cdt; - } else { - enums << CDType(0, n, "e", "", "", "", CDType::cdK); - enums.back().setEnumValues(e); - } - in.removeAll("{"+in+"}"); -} - - -void parseMember(PIString &in, CDSection * root, const PIStringList &c_types, PIVector §ions, PIVector &enums) { - PIString t = in.takeCWord(); - if (t == "struct") { - parseStruct(in, root, c_types, sections, enums); - } - if (t == "enum") { - parseEnum(in, root, c_types, sections, enums); - } - if (root) { - if (c_types.contains(t) && root) { - PIString tt = "s"; - if (t == "bool") tt = "b"; - if (t == "int") tt = "n"; - if (t == "double") tt = "f"; - CDType & cdt((*root)[root->count(false)]); - cdt = CDType(cdt.index(), in.takeCWord(), tt, "", "", "", CDType::cdK); - } - piForeach(CDSection cd, sections) { - if (t == cd.name) { - cd.alias = in.takeCWord(); - root->section(root->sectionsCount()) = cd; - } - } - piForeach(CDType en, enums) { - if (t == en.name()) { - in.takeCWord(); - (*root)[root->count(false)] = en; - } - } - } -} - -void parseStruct(PIString &in, CDSection * root, const PIStringList &c_types, PIVector §ions, PIVector &enums) { - PIString t = in.takeCWord(); - CDSection * c; - if (root) c = &(root->section(root->sectionsCount())); - else c = new CDSection(); - c->name = t; - c->alias = t; - PIStringList members = takeMembers(in); - //piCout << members; - piForeach(PIString &s, members) { - if (s.trim().isEmpty()) continue; - parseMember(s, c, c_types, sections, enums); - } - sections << *c; -} - - -Form::Form(QWidget *parent) : QWidget(parent), ui(new Ui::Form) { - CDCore::instance()->initPult(); - ui->setupUi(this); - ui->treeView->setKFile(""); - EvalSpinBox * ev = new EvalSpinBox(); - ev->setValue(2); - ui->groupBox->layout()->addWidget(ev); - - PIFile f; - piCout << f.open("test.kh", PIIODevice::ReadOnly); - PIStringList c_types; - c_types << "bool" << "int" << "double" << "string" << "PIString"; - PIString in; - while (!f.isEnd()) { - PIStringList s = f.readLine().trim().split("//"); - if (!s.isEmpty()) - in += s[0]; - } - PIVector sections; - PIVector enums; - int i=0; - while (!in.isEmpty() && i<100) { - if (!in[0].isAlpha()) in.takeSymbol(); - parseMember(in, 0, c_types, sections, enums); - i++; - } - piForeach(CDSection cd, sections) { - if (cd.name == "K") K.root() = cd; - } - - ui->treeView->refresh(); -} - - -Form::~Form() { - delete ui; -} - - -void Form::on_pushButton_3_clicked() { - ui->treeView->setKFile(QFileDialog::getSaveFileName(this, "Save")); - ui->treeView->saveK(); - ui->treeView->setKFile(""); -} - - -void Form::on_pushButton_4_clicked() { - ui->treeView->setKFile(QFileDialog::getOpenFileName(this, "Open")); - ui->treeView->loadK(); - ui->treeView->setKFile(""); - qDebug() << QCDCore::instance()->bindWindow(this); - QCDCore::instance()->bindWidget(ui->spinRadar_Antenna_SwitchRate, K["NVA.NVA_FrameStitch"]); -} - - -void Form::on_pushButton_6_clicked() { - QString fn = QFileDialog::getOpenFileName(this, trUtf8("Select *.h file with K description"), "k_description.h", "C/C++ header files(*.h *.hpp);;All files(*)"); - if (fn.isEmpty()) return; - if (mode_dlg.exec() == QDialog::Rejected) return; - ui->treeView->buildFromHeader(fn, mode_dlg.mode()); - /*piCout << K.root()["Radar_WaveFreqTune"]; - piCout << K.root()["11.NVA_PulseGenFineTune"]; - piCout << K.root()[".NVA.NVA_PulseGenFineTune"]; - piCout << K.root()["NVA_A.1.NVA_Clk"];*/ -} - - -void Form::on_buttonCalc_clicked() { - ui->treeView->calculateK(); - ui->treeView->refresh(); -} diff --git a/qcd_utils/pult/form.h b/qcd_utils/pult/form.h deleted file mode 100644 index 700ecdc..0000000 --- a/qcd_utils/pult/form.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef FORM_H -#define FORM_H - -#include -#include - -namespace Ui { -class Form; -} - -class Form : public QWidget -{ - Q_OBJECT - -public: - explicit Form(QWidget *parent = 0); - ~Form(); - -private slots: - void on_pushButton_3_clicked(); - void on_pushButton_4_clicked(); - void on_pushButton_6_clicked(); - void on_buttonCalc_clicked(); - -private: - Ui::Form * ui; - QCDModeDialog mode_dlg; - -}; - -#endif // FORM_H diff --git a/qcd_utils/pult/form.ui b/qcd_utils/pult/form.ui deleted file mode 100644 index 0100fa2..0000000 --- a/qcd_utils/pult/form.ui +++ /dev/null @@ -1,249 +0,0 @@ - - - Form - - - - 0 - 0 - 731 - 508 - - - - Form - - - - - - Qt::Horizontal - - - - - - - Save - - - - - - - Load - - - - - - - Send - - - - - - - Receive - - - - - - - update from KDescription - - - - - - - Clear - - - - - - - Calculate - - - - - - - Refresh - - - - - - - - - - - - 0 - 0 - - - - GroupBox - - - - - - CheckBox - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - SpinSlider - QWidget -
spinslider.h
- - - CDKView - QTreeView -
qcd_kview.h
- - busyStatusChanged(bool) - sendK() - receiveK() - saveK() - loadK() - clear() - clearK() - refresh() - - - - - - - pushButton_2 - clicked() - treeView - receiveK() - - - 264 - 60 - - - 264 - 152 - - - - - treeView - busyStatusChanged(bool) - pushButton_2 - setDisabled(bool) - - - 264 - 174 - - - 264 - 60 - - - - - pushButton_5 - clicked() - treeView - clearK() - - - 264 - 89 - - - 264 - 188 - - - - - pushButton - clicked() - treeView - sendK() - - - 137 - 60 - - - 198 - 152 - - - - - treeView - busyStatusChanged(bool) - pushButton - setDisabled(bool) - - - 177 - 246 - - - 98 - 46 - - - - - buttonRefresh - clicked() - treeView - refresh() - - - 223 - 114 - - - 217 - 134 - - - - - diff --git a/qcd_utils/pult/icons/accessories-calculator.png b/qcd_utils/pult/icons/accessories-calculator.png deleted file mode 100644 index 1b1dd1e..0000000 Binary files a/qcd_utils/pult/icons/accessories-calculator.png and /dev/null differ diff --git a/qcd_utils/pult/icons/alpha.png b/qcd_utils/pult/icons/alpha.png deleted file mode 100644 index 5435669..0000000 Binary files a/qcd_utils/pult/icons/alpha.png and /dev/null differ diff --git a/qcd_utils/pult/icons/application-exit.png b/qcd_utils/pult/icons/application-exit.png deleted file mode 100644 index ed5f8b2..0000000 Binary files a/qcd_utils/pult/icons/application-exit.png and /dev/null differ diff --git a/qcd_utils/pult/icons/archive-extract.png b/qcd_utils/pult/icons/archive-extract.png deleted file mode 100644 index f6f2a5d..0000000 Binary files a/qcd_utils/pult/icons/archive-extract.png and /dev/null differ diff --git a/qcd_utils/pult/icons/configure.png b/qcd_utils/pult/icons/configure.png deleted file mode 100644 index 5ce478b..0000000 Binary files a/qcd_utils/pult/icons/configure.png and /dev/null differ diff --git a/qcd_utils/pult/icons/dialog-close.png b/qcd_utils/pult/icons/dialog-close.png deleted file mode 100644 index 2c2f99e..0000000 Binary files a/qcd_utils/pult/icons/dialog-close.png and /dev/null differ diff --git a/qcd_utils/pult/icons/document-export.png b/qcd_utils/pult/icons/document-export.png deleted file mode 100644 index 9e1b6a6..0000000 Binary files a/qcd_utils/pult/icons/document-export.png and /dev/null differ diff --git a/qcd_utils/pult/icons/document-import.png b/qcd_utils/pult/icons/document-import.png deleted file mode 100644 index 97e683a..0000000 Binary files a/qcd_utils/pult/icons/document-import.png and /dev/null differ diff --git a/qcd_utils/pult/icons/document-open.png b/qcd_utils/pult/icons/document-open.png deleted file mode 100644 index 8ba5441..0000000 Binary files a/qcd_utils/pult/icons/document-open.png and /dev/null differ diff --git a/qcd_utils/pult/icons/document-save-.png b/qcd_utils/pult/icons/document-save-.png deleted file mode 100644 index aee3e22..0000000 Binary files a/qcd_utils/pult/icons/document-save-.png and /dev/null differ diff --git a/qcd_utils/pult/icons/document-save.png b/qcd_utils/pult/icons/document-save.png deleted file mode 100644 index 8072aea..0000000 Binary files a/qcd_utils/pult/icons/document-save.png and /dev/null differ diff --git a/qcd_utils/pult/icons/edit-clear-.png b/qcd_utils/pult/icons/edit-clear-.png deleted file mode 100644 index 631ed44..0000000 Binary files a/qcd_utils/pult/icons/edit-clear-.png and /dev/null differ diff --git a/qcd_utils/pult/icons/edit-clear-locationbar-rtl.png b/qcd_utils/pult/icons/edit-clear-locationbar-rtl.png deleted file mode 100644 index 6c4b83b..0000000 Binary files a/qcd_utils/pult/icons/edit-clear-locationbar-rtl.png and /dev/null differ diff --git a/qcd_utils/pult/icons/edit-clear.png b/qcd_utils/pult/icons/edit-clear.png deleted file mode 100644 index 19a1665..0000000 Binary files a/qcd_utils/pult/icons/edit-clear.png and /dev/null differ diff --git a/qcd_utils/pult/icons/edit-copy.png b/qcd_utils/pult/icons/edit-copy.png deleted file mode 100644 index 5cdeb5f..0000000 Binary files a/qcd_utils/pult/icons/edit-copy.png and /dev/null differ diff --git a/qcd_utils/pult/icons/edit-delete.png b/qcd_utils/pult/icons/edit-delete.png deleted file mode 100644 index 87cd0b0..0000000 Binary files a/qcd_utils/pult/icons/edit-delete.png and /dev/null differ diff --git a/qcd_utils/pult/icons/edit-find-.png b/qcd_utils/pult/icons/edit-find-.png deleted file mode 100644 index 64a1e28..0000000 Binary files a/qcd_utils/pult/icons/edit-find-.png and /dev/null differ diff --git a/qcd_utils/pult/icons/edit-find.png b/qcd_utils/pult/icons/edit-find.png deleted file mode 100644 index 9a462c0..0000000 Binary files a/qcd_utils/pult/icons/edit-find.png and /dev/null differ diff --git a/qcd_utils/pult/icons/edit-guides.png b/qcd_utils/pult/icons/edit-guides.png deleted file mode 100644 index d264839..0000000 Binary files a/qcd_utils/pult/icons/edit-guides.png and /dev/null differ diff --git a/qcd_utils/pult/icons/edit-paste.png b/qcd_utils/pult/icons/edit-paste.png deleted file mode 100644 index a4e0a02..0000000 Binary files a/qcd_utils/pult/icons/edit-paste.png and /dev/null differ diff --git a/qcd_utils/pult/icons/expand_s_x.png b/qcd_utils/pult/icons/expand_s_x.png deleted file mode 100644 index b66cb40..0000000 Binary files a/qcd_utils/pult/icons/expand_s_x.png and /dev/null differ diff --git a/qcd_utils/pult/icons/expand_s_y.png b/qcd_utils/pult/icons/expand_s_y.png deleted file mode 100644 index c2e8f78..0000000 Binary files a/qcd_utils/pult/icons/expand_s_y.png and /dev/null differ diff --git a/qcd_utils/pult/icons/expand_x.png b/qcd_utils/pult/icons/expand_x.png deleted file mode 100644 index 217e3ea..0000000 Binary files a/qcd_utils/pult/icons/expand_x.png and /dev/null differ diff --git a/qcd_utils/pult/icons/expand_y.png b/qcd_utils/pult/icons/expand_y.png deleted file mode 100644 index fedf936..0000000 Binary files a/qcd_utils/pult/icons/expand_y.png and /dev/null differ diff --git a/qcd_utils/pult/icons/item-add.png b/qcd_utils/pult/icons/item-add.png deleted file mode 100644 index 8a422c7..0000000 Binary files a/qcd_utils/pult/icons/item-add.png and /dev/null differ diff --git a/qcd_utils/pult/icons/item.png b/qcd_utils/pult/icons/item.png deleted file mode 100644 index 50bfddb..0000000 Binary files a/qcd_utils/pult/icons/item.png and /dev/null differ diff --git a/qcd_utils/pult/icons/layer-visible-off.png b/qcd_utils/pult/icons/layer-visible-off.png deleted file mode 100644 index 5f87dce..0000000 Binary files a/qcd_utils/pult/icons/layer-visible-off.png and /dev/null differ diff --git a/qcd_utils/pult/icons/layer-visible-on.png b/qcd_utils/pult/icons/layer-visible-on.png deleted file mode 100644 index b240552..0000000 Binary files a/qcd_utils/pult/icons/layer-visible-on.png and /dev/null differ diff --git a/qcd_utils/pult/icons/list-add.png b/qcd_utils/pult/icons/list-add.png deleted file mode 100644 index 1e03be9..0000000 Binary files a/qcd_utils/pult/icons/list-add.png and /dev/null differ diff --git a/qcd_utils/pult/icons/media-playback-pause.png b/qcd_utils/pult/icons/media-playback-pause.png deleted file mode 100644 index 5c7d128..0000000 Binary files a/qcd_utils/pult/icons/media-playback-pause.png and /dev/null differ diff --git a/qcd_utils/pult/icons/media-playback-stop.png b/qcd_utils/pult/icons/media-playback-stop.png deleted file mode 100644 index 650874f..0000000 Binary files a/qcd_utils/pult/icons/media-playback-stop.png and /dev/null differ diff --git a/qcd_utils/pult/icons/media-record.png b/qcd_utils/pult/icons/media-record.png deleted file mode 100644 index f926a8f..0000000 Binary files a/qcd_utils/pult/icons/media-record.png and /dev/null differ diff --git a/qcd_utils/pult/icons/node-add.png b/qcd_utils/pult/icons/node-add.png deleted file mode 100644 index 80b5c61..0000000 Binary files a/qcd_utils/pult/icons/node-add.png and /dev/null differ diff --git a/qcd_utils/pult/icons/node.png b/qcd_utils/pult/icons/node.png deleted file mode 100644 index fc8194e..0000000 Binary files a/qcd_utils/pult/icons/node.png and /dev/null differ diff --git a/qcd_utils/pult/icons/view-grid.png b/qcd_utils/pult/icons/view-grid.png deleted file mode 100644 index 0f1d70c..0000000 Binary files a/qcd_utils/pult/icons/view-grid.png and /dev/null differ diff --git a/qcd_utils/pult/icons/view-refresh.png b/qcd_utils/pult/icons/view-refresh.png deleted file mode 100644 index afa2a9d..0000000 Binary files a/qcd_utils/pult/icons/view-refresh.png and /dev/null differ diff --git a/qcd_utils/pult/icons/zoom-fit-best.png b/qcd_utils/pult/icons/zoom-fit-best.png deleted file mode 100644 index 07cfc98..0000000 Binary files a/qcd_utils/pult/icons/zoom-fit-best.png and /dev/null differ diff --git a/qcd_utils/pult/icons/zoom-fit-height.png b/qcd_utils/pult/icons/zoom-fit-height.png deleted file mode 100644 index 32e2190..0000000 Binary files a/qcd_utils/pult/icons/zoom-fit-height.png and /dev/null differ diff --git a/qcd_utils/pult/main.cpp b/qcd_utils/pult/main.cpp index f5233e0..8ba665d 100644 --- a/qcd_utils/pult/main.cpp +++ b/qcd_utils/pult/main.cpp @@ -1,10 +1,10 @@ #include -#include "form.h" +#include "cdpultwindow.h" int main(int argc, char *argv[]) { QApplication a(argc, argv); - Form w; + CDPultWindow w; w.show(); return a.exec(); }