From cddc0b6d917a8fedd014d8fd649f7a4da3223e41 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 7 Aug 2022 22:07:43 +0300 Subject: [PATCH] remove pidumper, new SHSTKMacros --- cmake/FindQAD.cmake | 2 +- utils/pidumper/CMakeLists.txt | 15 --- utils/pidumper/pidumper.cpp | 146 ---------------------- utils/pidumper/pidumper.h | 35 ------ utils/pidumper/pidumper.ui | 207 ------------------------------- utils/pidumper/pidumper_main.cpp | 11 -- 6 files changed, 1 insertion(+), 415 deletions(-) delete mode 100644 utils/pidumper/CMakeLists.txt delete mode 100644 utils/pidumper/pidumper.cpp delete mode 100644 utils/pidumper/pidumper.h delete mode 100644 utils/pidumper/pidumper.ui delete mode 100644 utils/pidumper/pidumper_main.cpp diff --git a/cmake/FindQAD.cmake b/cmake/FindQAD.cmake index 10c7976..c48b56c 100644 --- a/cmake/FindQAD.cmake +++ b/cmake/FindQAD.cmake @@ -27,7 +27,7 @@ endif() shstk_is_parent_exists(hasParent PARENT_DIRECTORY) -shstk_set_find_dirs(qad) +shstk_set_find_dirs(qad QAD) set(_SEARCH_DIR ${qad_LIBDIR}) qad_find_qt(Core QUIET) diff --git a/utils/pidumper/CMakeLists.txt b/utils/pidumper/CMakeLists.txt deleted file mode 100644 index b9c6bd0..0000000 --- a/utils/pidumper/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -find_package(PIP) -if (PIP_FOUND) - - project(pidumper) - if(APPLE) - set(APP_ICON "") - elseif(WIN32) - set(APP_ICON "") - else() - set(APP_ICON "") - endif() - set(APP_INFO "PIConnection GUI editor") - qad_application(pidumper "Gui;Widgets" "qad_utils;qad_widgets;qad_piqt_utils") - -endif() diff --git a/utils/pidumper/pidumper.cpp b/utils/pidumper/pidumper.cpp deleted file mode 100644 index 4cfb522..0000000 --- a/utils/pidumper/pidumper.cpp +++ /dev/null @@ -1,146 +0,0 @@ -#include "pidumper.h" -#include "pifile.h" -#include "pitime.h" -#include "pidir.h" -//#include "ccm.h" -#include -#ifdef CC_GCC -# include -#endif - -PIDumper::PIDumper(QWidget * parent): QMainWindow(parent) { - setupUi(this); -#if QT_VERSION >= 0x050000 - treeDump->header()->setSectionResizeMode(QHeaderView::ResizeToContents); -#else - treeDump->header()->setResizeMode(QHeaderView::ResizeToContents); -#endif -} - - -void PIDumper::changeEvent(QEvent * e) { - QMainWindow::changeEvent(e); - switch (e->type()) { - case QEvent::LanguageChange: - retranslateUi(this); - break; - default: - break; - } -} - - -void PIDumper::buildDump() { - treeDump->clear(); - if (!dump.contains('{')) return; - PIString app = dump.takeWord(); - if (app != "application") return; - dump.takeLine(); - QTreeWidgetItem * ti; - while (!dump.isEmpty()) { - PIString line = dump.takeLine(); - if (line.contains('{')) { - ti = new QTreeWidgetItem(); - dump.prepend(line + "\n"); - buildDumpSection(ti, dump); - treeDump->addTopLevelItem(ti); - continue; - } - int colon = line.find(":"); - if (colon < 0) continue; - PIString name = line.takeLeft(colon).trim(); - PIString value = line.cutLeft(1).trim(); - if (value.startsWith("\"")) value.cutLeft(1); - if (value.endsWith("\"")) value.cutRight(1); - ti = new QTreeWidgetItem(QStringList() << PI2QString(name) << PI2QString(value)); - treeDump->addTopLevelItem(ti); - } - on_checkDumpHideService_toggled(checkDumpHideService->isChecked()); -} - - -void PIDumper::buildDumpSection(QTreeWidgetItem * pi, PIString & str) { - PIString section = str.takeLeft(str.find("{")).trim(); - PIString value; - if (section.contains('(')) { - value = section; - section = value.takeLeft(value.find('(')); - value = value.takeRange("(", ")"); - } - pi->setText(0, piqt(section)); - pi->setText(1, piqt(value)); - //if (section == "PIObjects") - PIString range = str.takeRange("{", "}"); - QTreeWidgetItem * ti; - PIString fs; - if (section == "PIObjects" || section == "properties") fs = ":"; - if (section == "methodsEH") fs = " "; - if (section == "connections") fs = "->"; - while (!range.isEmpty()) { - PIString line = range.takeLine().trim(); - if (line.contains('{')) { - ti = new QTreeWidgetItem(pi); - range.prepend(line + "\n"); - buildDumpSection(ti, range); - //treeDump->addTopLevelItem(ti); - continue; - } - if (line.left(line.find(":")).trim() == "count") { - pi->setText(1, "[" + PI2QString(line.right(line.length() - line.find(":") - 1).trim()) + "]"); - continue; - } - int colon = line.find(fs); - if (colon < 0) continue; - PIString name = line.takeLeft(colon).trim(); - PIString value = line.cutLeft(fs.size_s()).trim(); - if (value.startsWith("\"")) value.cutLeft(1); - if (value.endsWith("\"")) value.cutRight(1); - if (name.endsWith(":")) name.cutRight(1); - if (name.isEmpty() && value.isEmpty()) continue; - ti = new QTreeWidgetItem(pi, QStringList() << PI2QString(name) << PI2QString(value)); - //treeDump->addTopLevelItem(ti); - } -} - - -void PIDumper::on_buttonDumpMake_clicked() { - if (radioDumpCurrent->isChecked()) { - PICout::setBufferActive(true, true); - dumpApplication(); - dump = PICout::buffer(); - PICout::setBufferActive(false); - } else { - int pid = lineDumpCustom->text().toInt(); - if (pid == 0) return; - if (system(QString("kill -USR1 %1").arg(pid).toLatin1().constData()) < 0) return; - PIString dp = PIDir::home().path() + "/_PIP_DUMP_" + PIString::fromNumber(pid); - PITimeMeasurer tm; - while (tm.elapsed_s() < 5. && !PIFile::isExists(dp)) { - piMSleep(10); - } - //piSleep(2.); - PIFile f(dp, PIIODevice::ReadOnly); - if (!f.isOpened()) return; - dump = PIString(f.readAll()); - f.remove(); - } - buildDump(); -} - - -void PIDumper::on_buttonDumpClipboard_clicked() { - dump = Q2PIString(QApplication::clipboard()->text()); - buildDump(); -} - - -void PIDumper::on_checkDumpHideService_toggled(bool on) { - QList il = treeDump->findItems("", Qt::MatchContains | Qt::MatchRecursive); - foreach (QTreeWidgetItem * i, il) { - if (on) { - if (i->text(0).startsWith("class")) - i->setHidden(i->text(1).contains("__S__")); - } else - i->setHidden(false); - } -} diff --git a/utils/pidumper/pidumper.h b/utils/pidumper/pidumper.h deleted file mode 100644 index 852475d..0000000 --- a/utils/pidumper/pidumper.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef PIDUMPER_H -#define PIDUMPER_H - -#include "ui_pidumper.h" -#include -#include -#include -#include -#include "piqt.h" -#include "piconnection.h" - -class PIDumper: public QMainWindow, private Ui::PIDumper -{ - Q_OBJECT -public: - PIDumper(QWidget * parent = 0); - -protected: - void changeEvent(QEvent * e); - - void buildDump(); - void buildDumpSection(QTreeWidgetItem * pi, PIString & str); - - PIString dump; - -private slots: - void on_buttonDumpMake_clicked(); - void on_buttonDumpClipboard_clicked(); - void on_checkDumpHideService_toggled(bool on); - -public slots: - -}; - -#endif // PIDUMPER_H diff --git a/utils/pidumper/pidumper.ui b/utils/pidumper/pidumper.ui deleted file mode 100644 index fdce675..0000000 --- a/utils/pidumper/pidumper.ui +++ /dev/null @@ -1,207 +0,0 @@ - - - PIDumper - - - - 0 - 0 - 1134 - 854 - - - - PIP dump viewer - - - - - - - Hide service objects - - - - - - - - - - - Make PIP dump - - - - - - - Take PIP dump from clipboard - - - - - - - - - Process - - - - - - - 0 - 0 - - - - Current - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - Custom: - - - - - - - false - - - - 0 - 0 - - - - - - - - - - - Qt::Horizontal - - - - 1 - 20 - - - - - - - - - - QAbstractItemView::NoEditTriggers - - - true - - - QAbstractItemView::ScrollPerPixel - - - QAbstractItemView::ScrollPerPixel - - - true - - - 2 - - - false - - - 20 - - - - 1 - - - - - 2 - - - - - - - - - - - radioDumpCustom - toggled(bool) - lineDumpCustom - setEnabled(bool) - - - 439 - 91 - - - 480 - 90 - - - - - radioDumpCustom - clicked() - lineDumpCustom - setFocus() - - - 453 - 91 - - - 480 - 86 - - - - - - configChanged() - updateMap() - - diff --git a/utils/pidumper/pidumper_main.cpp b/utils/pidumper/pidumper_main.cpp deleted file mode 100644 index edbe584..0000000 --- a/utils/pidumper/pidumper_main.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "pidumper.h" - - -int main(int argc, char * argv[]) { - QApplication a(argc, argv); - enableHighDPI(); - PIDumper w; - w.show(); - return a.exec(); -}