From 98420153f9c499b4ffb70070a6ebfa7493c8f501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 27 Jun 2019 11:45:09 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@567 a8b55f48-bf90-11e4-a774-851b48703e85 --- piqt_utils/piintrospector/CMakeLists.txt | 4 ++-- piqt_utils/piintrospector/containers_view.cpp | 1 + piqt_utils/piintrospector/piintrospector.cpp | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/piqt_utils/piintrospector/CMakeLists.txt b/piqt_utils/piintrospector/CMakeLists.txt index 52e72d8..db74bc3 100644 --- a/piqt_utils/piintrospector/CMakeLists.txt +++ b/piqt_utils/piintrospector/CMakeLists.txt @@ -1,10 +1,10 @@ project(piintrospector) file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts") set(PII_ROOT "../../pip/src_main/introspection") -pip_code_model(CCM "${PII_ROOT}/piintrospection_server_p.h" "${PII_ROOT}/piintrospection_threads_p.h" OPTIONS "-DPIP_EXPORT" "-Es") +pip_code_model(PII_CCM "${PII_ROOT}/piintrospection_server_p.h" "${PII_ROOT}/piintrospection_threads_p.h" OPTIONS "-DPIP_EXPORT" "-Es") find_qt(${QtVersions} Core Gui) qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM) -qt_add_executable(${PROJECT_NAME} WIN32 out_CPP CCM) +qt_add_executable(${PROJECT_NAME} WIN32 out_CPP PII_CCM) qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets qad_application piqt_utils) message(STATUS "Building ${PROJECT_NAME}") if(LIB) diff --git a/piqt_utils/piintrospector/containers_view.cpp b/piqt_utils/piintrospector/containers_view.cpp index 3d58792..a3d6ac5 100644 --- a/piqt_utils/piintrospector/containers_view.cpp +++ b/piqt_utils/piintrospector/containers_view.cpp @@ -156,6 +156,7 @@ Qt::ItemFlags ContainersModel::flags(const QModelIndex & index) const { void ContainersModel::setChangesMode(bool yes) { mode_changes = yes; + if (typeids.isEmpty()) return; dataChanged(index(0, ccCount), index(typeids.size_s() - 1, columnCount())); emit headerDataChanged(Qt::Horizontal, ccCount, columnCount()); } diff --git a/piqt_utils/piintrospector/piintrospector.cpp b/piqt_utils/piintrospector/piintrospector.cpp index 14ea52e..c813201 100644 --- a/piqt_utils/piintrospector/piintrospector.cpp +++ b/piqt_utils/piintrospector/piintrospector.cpp @@ -174,6 +174,7 @@ void QPIIntrospector::peerReceived(const PIString & from, const PIByteArray & da case PIIntrospection::itProcStat: { cs.get(pba); PIIntrospection::unpackProcStat(pba, stat); + widgetThreads->setStat(stat.threads); //showInfo(info); } break; case PIIntrospection::itContainers: {