diff --git a/cd_utils/CMakeLists.txt b/cd_utils/CMakeLists.txt index dc879d5..e3833f9 100644 --- a/cd_utils/CMakeLists.txt +++ b/cd_utils/CMakeLists.txt @@ -24,8 +24,8 @@ else () endif () target_link_libraries(${PROJECT_NAME} ${PIP_LIBRARY}) -add_executable(cdutilsngtest "cdutilstest.cpp") -target_link_libraries(cdutilsngtest ${PIP_LIBRARY} ${PROJECT_NAME}) +add_executable(cdutilstest "cdutilstest.cpp") +target_link_libraries(cdutilstest ${PIP_LIBRARY} ${PROJECT_NAME}) if (NOT DEFINED ENV{QNX_HOST}) if (PULT) diff --git a/cd_utils/cdutils_core.cpp b/cd_utils/cdutils_core.cpp index e8a8117..136092c 100644 --- a/cd_utils/cdutils_core.cpp +++ b/cd_utils/cdutils_core.cpp @@ -67,7 +67,7 @@ __Core_Initializer__::__Core_Initializer__() { __Core_Initializer__::~__Core_Initializer__() { count_--; - if (count_ > 1) return; + if (count_ > 0) return; //piCout << "delete PIInit"; if (__instance__ != 0) { delete __instance__; @@ -136,6 +136,7 @@ void Core::k_update(PIIODevice * d) { K_KeepNamesRequest(&kn); } uk.update(k_, kn); + piCout << k_.count() << uk.count(); k_ = uk; } diff --git a/cd_utils/pult/cd_pult.cpp b/cd_utils/pult/cd_pult.cpp index 71078a3..8152497 100644 --- a/cd_utils/pult/cd_pult.cpp +++ b/cd_utils/pult/cd_pult.cpp @@ -29,6 +29,8 @@ config(piqt(config_), QIODevice::ReadWrite) { 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); @@ -58,6 +60,7 @@ config(piqt(config_), QIODevice::ReadWrite) { connect(ui->checkKHideExpressions, SIGNAL(toggled(bool)), this, SLOT(filterTree())); connect(ui->lineKSearch, SIGNAL(textChanged(QString)), this, SLOT(filterTree())); session.load(); + on_spinBuffer_editingFinished(); K.configure(config_); K.readFile(); updateKDesc(); @@ -98,7 +101,7 @@ bool CD_Pult::eventFilter(QObject * o, QEvent * e) { } return QMainWindow::eventFilter(o, e); } - int ind = o->property("index").toInt(); + //int ind = o->property("index").toInt(); //qDebug() << "event" << i << e->type(); switch (e->type()) { case QEvent::Enter: @@ -296,6 +299,7 @@ void CD_Pult::on_buttonSetKDesc_clicked() { 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); }