From f9d9508b2c4b3b17c6ff3d6a364011beb738f780 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: Wed, 30 Nov 2016 12:20:21 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@137 a8b55f48-bf90-11e4-a774-851b48703e85 --- piqt_utils/CMakeLists.txt | 8 +- piqt_utils/ccm.cpp | 442 ---------------------------- piqt_utils/ccm.h | 19 -- piqt_utils/pidumper.cpp | 2 +- piqt_utils/piqt_connection_view.cpp | 2 +- 5 files changed, 7 insertions(+), 466 deletions(-) delete mode 100644 piqt_utils/ccm.cpp delete mode 100644 piqt_utils/ccm.h diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt index a231826..6211fd6 100644 --- a/piqt_utils/CMakeLists.txt +++ b/piqt_utils/CMakeLists.txt @@ -1,9 +1,10 @@ project(piqt_utils) cmake_minimum_required(VERSION 2.6) find_package(Qt4 REQUIRED) -if (NOT LIBPROJECT) - find_package(PIP REQUIRED) +if (LIBPROJECT) + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../pip) endif () +find_package(PIP REQUIRED) if (MINGW) find_package(MinGW REQUIRED) endif() @@ -15,7 +16,8 @@ if (DEBUG) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") endif () set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PIP_LIBRARY} qad_widgets qad_utils qad_blockview) -file(GLOB CPPS_UTILS "piqt_*.cpp" "ccm.cpp") +pip_code_model("../pip/src/io/piiodevice.h" CCM OPTIONS "-I${CMAKE_CURRENT_SOURCE_DIR}/../pip/src/io/" "-I${CMAKE_CURRENT_SOURCE_DIR}/../pip/src/core/" "-DPIP_EXPORT" "-Es") +file(GLOB CPPS_UTILS "piqt_*.cpp" ${CCM}) file(GLOB HDRS_UTILS "piqt_*.h") file(GLOB UIS_UTILS "piqt_*.ui") qt4_wrap_cpp(CMOCS_UTILS ${HDRS_UTILS} OPTIONS -nw) diff --git a/piqt_utils/ccm.cpp b/piqt_utils/ccm.cpp deleted file mode 100644 index ae76825..0000000 --- a/piqt_utils/ccm.cpp +++ /dev/null @@ -1,442 +0,0 @@ -// Generated by "PIP Code model generator" 23.11.2014 13:46:47 - -#include -#include "ccm.h" - -using namespace PICodeInfo; - - - -__ClassInfo_CCM_H_Initializer__::__ClassInfo_CCM_H_Initializer__() { - if (_inited_) return; - _inited_ = true; - - EnumInfo * ei; - (*enumsInfo)[""] = new EnumInfo(); - -// Enums - - ei = new EnumInfo(); - (*enumsInfo)["PICoutSpecialChar"] = ei; - ei->name = "PICoutSpecialChar"; - ei->members << PICodeInfo::EnumeratorInfo("Null", 0); - ei->members << PICodeInfo::EnumeratorInfo("NewLine", 1); - ei->members << PICodeInfo::EnumeratorInfo("Tab", 2); - ei->members << PICodeInfo::EnumeratorInfo("Esc", 3); - ei->members << PICodeInfo::EnumeratorInfo("Quote", 4); - - ei = new EnumInfo(); - (*enumsInfo)["PICoutAction"] = ei; - ei->name = "PICoutAction"; - ei->members << PICodeInfo::EnumeratorInfo("Flush", 0); - ei->members << PICodeInfo::EnumeratorInfo("Backspace", 1); - ei->members << PICodeInfo::EnumeratorInfo("ShowCursor", 2); - ei->members << PICodeInfo::EnumeratorInfo("HideCursor", 3); - ei->members << PICodeInfo::EnumeratorInfo("ClearScreen", 4); - ei->members << PICodeInfo::EnumeratorInfo("SaveContol", 5); - ei->members << PICodeInfo::EnumeratorInfo("RestoreControl", 6); - - ei = new EnumInfo(); - (*enumsInfo)["PICoutControl"] = ei; - ei->name = "PICoutControl"; - ei->members << PICodeInfo::EnumeratorInfo("AddNone", 0); - ei->members << PICodeInfo::EnumeratorInfo("AddSpaces", 1); - ei->members << PICodeInfo::EnumeratorInfo("AddNewLine", 2); - ei->members << PICodeInfo::EnumeratorInfo("AddQuotes", 4); - ei->members << PICodeInfo::EnumeratorInfo("AddAll", -1); - - ei = new EnumInfo(); - (*enumsInfo)["PICoutFormat"] = ei; - ei->name = "PICoutFormat"; - ei->members << PICodeInfo::EnumeratorInfo("Bin", 1); - ei->members << PICodeInfo::EnumeratorInfo("Oct", 2); - ei->members << PICodeInfo::EnumeratorInfo("Dec", 4); - ei->members << PICodeInfo::EnumeratorInfo("Hex", 8); - ei->members << PICodeInfo::EnumeratorInfo("Bold", 16); - ei->members << PICodeInfo::EnumeratorInfo("Faint", 32); - ei->members << PICodeInfo::EnumeratorInfo("Italic", 64); - ei->members << PICodeInfo::EnumeratorInfo("Underline", 128); - ei->members << PICodeInfo::EnumeratorInfo("Blink", 256); - ei->members << PICodeInfo::EnumeratorInfo("Black", 1024); - ei->members << PICodeInfo::EnumeratorInfo("Red", 2048); - ei->members << PICodeInfo::EnumeratorInfo("Green", 4096); - ei->members << PICodeInfo::EnumeratorInfo("Blue", 8192); - ei->members << PICodeInfo::EnumeratorInfo("Yellow", 16384); - ei->members << PICodeInfo::EnumeratorInfo("Magenta", 32768); - ei->members << PICodeInfo::EnumeratorInfo("Cyan", 65536); - ei->members << PICodeInfo::EnumeratorInfo("White", 131072); - ei->members << PICodeInfo::EnumeratorInfo("BackBlack", 262144); - ei->members << PICodeInfo::EnumeratorInfo("BackRed", 524288); - ei->members << PICodeInfo::EnumeratorInfo("BackGreen", 1048576); - ei->members << PICodeInfo::EnumeratorInfo("BackBlue", 2097152); - ei->members << PICodeInfo::EnumeratorInfo("BackYellow", 4194304); - ei->members << PICodeInfo::EnumeratorInfo("BackMagenta", 8388608); - ei->members << PICodeInfo::EnumeratorInfo("BackCyan", 16777216); - ei->members << PICodeInfo::EnumeratorInfo("BackWhite", 33554432); - ei->members << PICodeInfo::EnumeratorInfo("Default", 67108864); - - ei = new EnumInfo(); - (*enumsInfo)["PIMathSolver::Method"] = ei; - ei->name = "PIMathSolver::Method"; - ei->members << PICodeInfo::EnumeratorInfo("Global", -1); - ei->members << PICodeInfo::EnumeratorInfo("Eyler_1", 1); - ei->members << PICodeInfo::EnumeratorInfo("Eyler_2", 2); - ei->members << PICodeInfo::EnumeratorInfo("EylerKoshi", 3); - ei->members << PICodeInfo::EnumeratorInfo("RungeKutta_4", 14); - ei->members << PICodeInfo::EnumeratorInfo("AdamsBashfortMoulton_2", 22); - ei->members << PICodeInfo::EnumeratorInfo("AdamsBashfortMoulton_3", 23); - ei->members << PICodeInfo::EnumeratorInfo("AdamsBashfortMoulton_4", 24); - ei->members << PICodeInfo::EnumeratorInfo("PolynomialApproximation_2", 32); - ei->members << PICodeInfo::EnumeratorInfo("PolynomialApproximation_3", 33); - ei->members << PICodeInfo::EnumeratorInfo("PolynomialApproximation_4", 34); - ei->members << PICodeInfo::EnumeratorInfo("PolynomialApproximation_5", 35); - - ei = new EnumInfo(); - (*enumsInfo)["PIVariant::Type"] = ei; - ei->name = "PIVariant::Type"; - ei->members << PICodeInfo::EnumeratorInfo("Invalid", 0); - ei->members << PICodeInfo::EnumeratorInfo("Bool", 1); - ei->members << PICodeInfo::EnumeratorInfo("Char", 2); - ei->members << PICodeInfo::EnumeratorInfo("UChar", 3); - ei->members << PICodeInfo::EnumeratorInfo("Short", 4); - ei->members << PICodeInfo::EnumeratorInfo("UShort", 5); - ei->members << PICodeInfo::EnumeratorInfo("Int", 6); - ei->members << PICodeInfo::EnumeratorInfo("UInt", 7); - ei->members << PICodeInfo::EnumeratorInfo("Long", 8); - ei->members << PICodeInfo::EnumeratorInfo("ULong", 9); - ei->members << PICodeInfo::EnumeratorInfo("LLong", 10); - ei->members << PICodeInfo::EnumeratorInfo("ULLong", 11); - ei->members << PICodeInfo::EnumeratorInfo("Float", 12); - ei->members << PICodeInfo::EnumeratorInfo("Double", 13); - ei->members << PICodeInfo::EnumeratorInfo("LDouble", 14); - ei->members << PICodeInfo::EnumeratorInfo("Complexd", 15); - ei->members << PICodeInfo::EnumeratorInfo("Complexld", 16); - ei->members << PICodeInfo::EnumeratorInfo("BitArray", 17); - ei->members << PICodeInfo::EnumeratorInfo("ByteArray", 18); - ei->members << PICodeInfo::EnumeratorInfo("String", 19); - ei->members << PICodeInfo::EnumeratorInfo("StringList", 20); - ei->members << PICodeInfo::EnumeratorInfo("Time", 21); - ei->members << PICodeInfo::EnumeratorInfo("Date", 22); - ei->members << PICodeInfo::EnumeratorInfo("DateTime", 23); - ei->members << PICodeInfo::EnumeratorInfo("SystemTime", 24); - ei->members << PICodeInfo::EnumeratorInfo("Custom", 255); - - ei = new EnumInfo(); - (*enumsInfo)["PIThread::Priority"] = ei; - ei->name = "PIThread::Priority"; - ei->members << PICodeInfo::EnumeratorInfo("piLowerst", 0); - ei->members << PICodeInfo::EnumeratorInfo("piLow", 1); - ei->members << PICodeInfo::EnumeratorInfo("piNormal", 2); - ei->members << PICodeInfo::EnumeratorInfo("piHigh", 3); - ei->members << PICodeInfo::EnumeratorInfo("piHighest", 4); - - ei = new EnumInfo(); - (*enumsInfo)["PITimer::TimerImplementation"] = ei; - ei->name = "PITimer::TimerImplementation"; - ei->members << PICodeInfo::EnumeratorInfo("Thread", 1); - ei->members << PICodeInfo::EnumeratorInfo("ThreadRT", 2); - ei->members << PICodeInfo::EnumeratorInfo("Pool", 4); - - ei = new EnumInfo(); - (*enumsInfo)["PIKbdListener::SpecialSymbol"] = ei; - ei->name = "PIKbdListener::SpecialSymbol"; - ei->members << PICodeInfo::EnumeratorInfo("UpArrow", -1); - ei->members << PICodeInfo::EnumeratorInfo("DownArrow", -2); - ei->members << PICodeInfo::EnumeratorInfo("RightArrow", -3); - ei->members << PICodeInfo::EnumeratorInfo("LeftArrow", -4); - ei->members << PICodeInfo::EnumeratorInfo("CtrlUpArrow", -5); - ei->members << PICodeInfo::EnumeratorInfo("CtrlDownArrow", -6); - ei->members << PICodeInfo::EnumeratorInfo("CtrlRightArrow", -7); - ei->members << PICodeInfo::EnumeratorInfo("CtrlLeftArrow", -8); - - ei = new EnumInfo(); - (*enumsInfo)["PIIODevice::DeviceMode"] = ei; - ei->name = "PIIODevice::DeviceMode"; - ei->members << PICodeInfo::EnumeratorInfo("ReadOnly", 1); - ei->members << PICodeInfo::EnumeratorInfo("WriteOnly", 2); - ei->members << PICodeInfo::EnumeratorInfo("ReadWrite", 3); - - ei = new EnumInfo(); - (*enumsInfo)["PISerial::Parameters"] = ei; - ei->name = "PISerial::Parameters"; - ei->members << PICodeInfo::EnumeratorInfo("ParityControl", 1); - ei->members << PICodeInfo::EnumeratorInfo("ParityOdd", 2); - ei->members << PICodeInfo::EnumeratorInfo("TwoStopBits", 4); - - ei = new EnumInfo(); - (*enumsInfo)["PISerial::Speed"] = ei; - ei->name = "PISerial::Speed"; - ei->members << PICodeInfo::EnumeratorInfo("S50", 50); - ei->members << PICodeInfo::EnumeratorInfo("S75", 75); - ei->members << PICodeInfo::EnumeratorInfo("S110", 110); - ei->members << PICodeInfo::EnumeratorInfo("S300", 300); - ei->members << PICodeInfo::EnumeratorInfo("S600", 600); - ei->members << PICodeInfo::EnumeratorInfo("S1200", 1200); - ei->members << PICodeInfo::EnumeratorInfo("S2400", 2400); - ei->members << PICodeInfo::EnumeratorInfo("S4800", 4800); - ei->members << PICodeInfo::EnumeratorInfo("S9600", 9600); - ei->members << PICodeInfo::EnumeratorInfo("S19200", 19200); - ei->members << PICodeInfo::EnumeratorInfo("S38400", 38400); - ei->members << PICodeInfo::EnumeratorInfo("S57600", 57600); - ei->members << PICodeInfo::EnumeratorInfo("S115200", 115200); - ei->members << PICodeInfo::EnumeratorInfo("S1500000", 1500000); - ei->members << PICodeInfo::EnumeratorInfo("S2000000", 2000000); - ei->members << PICodeInfo::EnumeratorInfo("S2500000", 2500000); - ei->members << PICodeInfo::EnumeratorInfo("S3000000", 3000000); - ei->members << PICodeInfo::EnumeratorInfo("S3500000", 3500000); - ei->members << PICodeInfo::EnumeratorInfo("S4000000", 4000000); - - ei = new EnumInfo(); - (*enumsInfo)["PIEthernet::Type"] = ei; - ei->name = "PIEthernet::Type"; - ei->members << PICodeInfo::EnumeratorInfo("UDP", 0); - ei->members << PICodeInfo::EnumeratorInfo("TCP_Client", 1); - ei->members << PICodeInfo::EnumeratorInfo("TCP_Server", 2); - ei->members << PICodeInfo::EnumeratorInfo("TCP_SingleTCP", 3); - - ei = new EnumInfo(); - (*enumsInfo)["PIEthernet::Parameters"] = ei; - ei->name = "PIEthernet::Parameters"; - ei->members << PICodeInfo::EnumeratorInfo("ReuseAddress", 1); - ei->members << PICodeInfo::EnumeratorInfo("Broadcast", 2); - - ei = new EnumInfo(); - (*enumsInfo)["PIEthernet::InterfaceFlag"] = ei; - ei->name = "PIEthernet::InterfaceFlag"; - ei->members << PICodeInfo::EnumeratorInfo("ifActive", 1); - ei->members << PICodeInfo::EnumeratorInfo("ifRunning", 2); - ei->members << PICodeInfo::EnumeratorInfo("ifBroadcast", 4); - ei->members << PICodeInfo::EnumeratorInfo("ifMulticast", 8); - ei->members << PICodeInfo::EnumeratorInfo("ifLoopback", 16); - ei->members << PICodeInfo::EnumeratorInfo("ifPTP", 32); - - ei = new EnumInfo(); - (*enumsInfo)["PIPacketExtractor::SplitMode"] = ei; - ei->name = "PIPacketExtractor::SplitMode"; - ei->members << PICodeInfo::EnumeratorInfo("None", 0); - ei->members << PICodeInfo::EnumeratorInfo("Header", 1); - ei->members << PICodeInfo::EnumeratorInfo("Footer", 2); - ei->members << PICodeInfo::EnumeratorInfo("HeaderAndFooter", 3); - ei->members << PICodeInfo::EnumeratorInfo("Size", 4); - ei->members << PICodeInfo::EnumeratorInfo("Timeout", 5); - - ei = new EnumInfo(); - (*enumsInfo)["PIProtocol::Type"] = ei; - ei->name = "PIProtocol::Type"; - ei->members << PICodeInfo::EnumeratorInfo("None", 0); - ei->members << PICodeInfo::EnumeratorInfo("Serial", 1); - ei->members << PICodeInfo::EnumeratorInfo("Ethernet", 2); - - ei = new EnumInfo(); - (*enumsInfo)["PIProtocol::Quality"] = ei; - ei->name = "PIProtocol::Quality"; - ei->members << PICodeInfo::EnumeratorInfo("Unknown", 1); - ei->members << PICodeInfo::EnumeratorInfo("Failure", 2); - ei->members << PICodeInfo::EnumeratorInfo("Bad", 3); - ei->members << PICodeInfo::EnumeratorInfo("Average", 4); - ei->members << PICodeInfo::EnumeratorInfo("Good", 5); - - ei = new EnumInfo(); - (*enumsInfo)["PIDiagnostics::Quality"] = ei; - ei->name = "PIDiagnostics::Quality"; - ei->members << PICodeInfo::EnumeratorInfo("Unknown", 1); - ei->members << PICodeInfo::EnumeratorInfo("Failure", 2); - ei->members << PICodeInfo::EnumeratorInfo("Bad", 3); - ei->members << PICodeInfo::EnumeratorInfo("Average", 4); - ei->members << PICodeInfo::EnumeratorInfo("Good", 5); - - ei = new EnumInfo(); - (*enumsInfo)["PIConsole::Format"] = ei; - ei->name = "PIConsole::Format"; - ei->members << PICodeInfo::EnumeratorInfo("Normal", 1); - ei->members << PICodeInfo::EnumeratorInfo("Bold", 2); - ei->members << PICodeInfo::EnumeratorInfo("Faint", 4); - ei->members << PICodeInfo::EnumeratorInfo("Italic", 8); - ei->members << PICodeInfo::EnumeratorInfo("Underline", 16); - ei->members << PICodeInfo::EnumeratorInfo("Blink", 32); - ei->members << PICodeInfo::EnumeratorInfo("Inverse", 64); - ei->members << PICodeInfo::EnumeratorInfo("Black", 256); - ei->members << PICodeInfo::EnumeratorInfo("Red", 512); - ei->members << PICodeInfo::EnumeratorInfo("Green", 1024); - ei->members << PICodeInfo::EnumeratorInfo("Yellow", 2048); - ei->members << PICodeInfo::EnumeratorInfo("Blue", 4096); - ei->members << PICodeInfo::EnumeratorInfo("Magenta", 8192); - ei->members << PICodeInfo::EnumeratorInfo("Cyan", 16384); - ei->members << PICodeInfo::EnumeratorInfo("White", 32768); - ei->members << PICodeInfo::EnumeratorInfo("BackBlack", 65536); - ei->members << PICodeInfo::EnumeratorInfo("BackRed", 131072); - ei->members << PICodeInfo::EnumeratorInfo("BackGreen", 262144); - ei->members << PICodeInfo::EnumeratorInfo("BackYellow", 524288); - ei->members << PICodeInfo::EnumeratorInfo("BackBlue", 1048576); - ei->members << PICodeInfo::EnumeratorInfo("BackMagenta", 2097152); - ei->members << PICodeInfo::EnumeratorInfo("BackCyan", 4194304); - ei->members << PICodeInfo::EnumeratorInfo("BackWhite", 8388608); - ei->members << PICodeInfo::EnumeratorInfo("Dec", 16777216); - ei->members << PICodeInfo::EnumeratorInfo("Hex", 33554432); - ei->members << PICodeInfo::EnumeratorInfo("Oct", 67108864); - ei->members << PICodeInfo::EnumeratorInfo("Bin", 134217728); - ei->members << PICodeInfo::EnumeratorInfo("Scientific", 268435456); - ei->members << PICodeInfo::EnumeratorInfo("SystemTimeSplit", 536870912); - ei->members << PICodeInfo::EnumeratorInfo("SystemTimeSeconds", 1073741824); - - ei = new EnumInfo(); - (*enumsInfo)["PIConsole::Alignment"] = ei; - ei->name = "PIConsole::Alignment"; - ei->members << PICodeInfo::EnumeratorInfo("Nothing", 0); - ei->members << PICodeInfo::EnumeratorInfo("Left", 1); - ei->members << PICodeInfo::EnumeratorInfo("Right", 2); - - ei = new EnumInfo(); - (*enumsInfo)["PIConsole::ConnectedState"] = ei; - ei->name = "PIConsole::ConnectedState"; - ei->members << PICodeInfo::EnumeratorInfo("Disconnected", 0); - ei->members << PICodeInfo::EnumeratorInfo("FetchingData", 1); - ei->members << PICodeInfo::EnumeratorInfo("Committing", 2); - ei->members << PICodeInfo::EnumeratorInfo("Connected", 3); - - ei = new EnumInfo(); - (*enumsInfo)["eType"] = ei; - ei->name = "eType"; - ei->members << PICodeInfo::EnumeratorInfo("etNumber", 0); - ei->members << PICodeInfo::EnumeratorInfo("etOperator", 1); - ei->members << PICodeInfo::EnumeratorInfo("etVariable", 2); - ei->members << PICodeInfo::EnumeratorInfo("etFunction", 3); - - ei = new EnumInfo(); - (*enumsInfo)["Operation"] = ei; - ei->name = "Operation"; - ei->members << PICodeInfo::EnumeratorInfo("oNone", 0); - ei->members << PICodeInfo::EnumeratorInfo("oAdd", 1); - ei->members << PICodeInfo::EnumeratorInfo("oSubtract", 2); - ei->members << PICodeInfo::EnumeratorInfo("oMultiply", 3); - ei->members << PICodeInfo::EnumeratorInfo("oDivide", 4); - ei->members << PICodeInfo::EnumeratorInfo("oResidue", 5); - ei->members << PICodeInfo::EnumeratorInfo("oPower", 6); - ei->members << PICodeInfo::EnumeratorInfo("oEqual", 7); - ei->members << PICodeInfo::EnumeratorInfo("oNotEqual", 8); - ei->members << PICodeInfo::EnumeratorInfo("oGreater", 9); - ei->members << PICodeInfo::EnumeratorInfo("oSmaller", 10); - ei->members << PICodeInfo::EnumeratorInfo("oGreaterEqual", 11); - ei->members << PICodeInfo::EnumeratorInfo("oSmallerEqual", 12); - ei->members << PICodeInfo::EnumeratorInfo("oAnd", 13); - ei->members << PICodeInfo::EnumeratorInfo("oOr", 14); - ei->members << PICodeInfo::EnumeratorInfo("oFunction", 15); - - ei = new EnumInfo(); - (*enumsInfo)["BaseFunctions"] = ei; - ei->name = "BaseFunctions"; - ei->members << PICodeInfo::EnumeratorInfo("bfUnknown", 0); - ei->members << PICodeInfo::EnumeratorInfo("bfSin", 1); - ei->members << PICodeInfo::EnumeratorInfo("bfCos", 2); - ei->members << PICodeInfo::EnumeratorInfo("bfTg", 3); - ei->members << PICodeInfo::EnumeratorInfo("bfCtg", 4); - ei->members << PICodeInfo::EnumeratorInfo("bfArcsin", 5); - ei->members << PICodeInfo::EnumeratorInfo("bfArccos", 6); - ei->members << PICodeInfo::EnumeratorInfo("bfArctg", 7); - ei->members << PICodeInfo::EnumeratorInfo("bfArcctg", 8); - ei->members << PICodeInfo::EnumeratorInfo("bfExp", 9); - ei->members << PICodeInfo::EnumeratorInfo("bfRandom", 10); - ei->members << PICodeInfo::EnumeratorInfo("bfSh", 11); - ei->members << PICodeInfo::EnumeratorInfo("bfCh", 12); - ei->members << PICodeInfo::EnumeratorInfo("bfTh", 13); - ei->members << PICodeInfo::EnumeratorInfo("bfCth", 14); - ei->members << PICodeInfo::EnumeratorInfo("bfSqrt", 15); - ei->members << PICodeInfo::EnumeratorInfo("bfSqr", 16); - ei->members << PICodeInfo::EnumeratorInfo("bfPow", 17); - ei->members << PICodeInfo::EnumeratorInfo("bfAbs", 18); - ei->members << PICodeInfo::EnumeratorInfo("bfLn", 19); - ei->members << PICodeInfo::EnumeratorInfo("bfLg", 20); - ei->members << PICodeInfo::EnumeratorInfo("bfLog", 21); - ei->members << PICodeInfo::EnumeratorInfo("bfSign", 22); - ei->members << PICodeInfo::EnumeratorInfo("bfIm", 23); - ei->members << PICodeInfo::EnumeratorInfo("bfRe", 24); - ei->members << PICodeInfo::EnumeratorInfo("bfArg", 25); - ei->members << PICodeInfo::EnumeratorInfo("bfLen", 26); - ei->members << PICodeInfo::EnumeratorInfo("bfConj", 27); - ei->members << PICodeInfo::EnumeratorInfo("bfRad", 28); - ei->members << PICodeInfo::EnumeratorInfo("bfDeg", 29); - ei->members << PICodeInfo::EnumeratorInfo("bfJ0", 30); - ei->members << PICodeInfo::EnumeratorInfo("bfJ1", 31); - ei->members << PICodeInfo::EnumeratorInfo("bfJN", 32); - ei->members << PICodeInfo::EnumeratorInfo("bfY0", 33); - ei->members << PICodeInfo::EnumeratorInfo("bfY1", 34); - ei->members << PICodeInfo::EnumeratorInfo("bfYN", 35); - ei->members << PICodeInfo::EnumeratorInfo("bfMin", 36); - ei->members << PICodeInfo::EnumeratorInfo("bfMax", 37); - ei->members << PICodeInfo::EnumeratorInfo("bfClamp", 38); - ei->members << PICodeInfo::EnumeratorInfo("bfStep", 39); - ei->members << PICodeInfo::EnumeratorInfo("bfMix", 40); - ei->members << PICodeInfo::EnumeratorInfo("bfDefined", 41); - ei->members << PICodeInfo::EnumeratorInfo("bfCustom", 65535); - - ei = new EnumInfo(); - (*enumsInfo)["PISignals::Signal"] = ei; - ei->name = "PISignals::Signal"; - ei->members << PICodeInfo::EnumeratorInfo("Interrupt", 1); - ei->members << PICodeInfo::EnumeratorInfo("Illegal", 2); - ei->members << PICodeInfo::EnumeratorInfo("Abort", 4); - ei->members << PICodeInfo::EnumeratorInfo("FPE", 8); - ei->members << PICodeInfo::EnumeratorInfo("SegFault", 16); - ei->members << PICodeInfo::EnumeratorInfo("Termination", 32); - ei->members << PICodeInfo::EnumeratorInfo("Hangup", 64); - ei->members << PICodeInfo::EnumeratorInfo("Quit", 128); - ei->members << PICodeInfo::EnumeratorInfo("Kill", 256); - ei->members << PICodeInfo::EnumeratorInfo("BrokenPipe", 512); - ei->members << PICodeInfo::EnumeratorInfo("Timer", 1024); - ei->members << PICodeInfo::EnumeratorInfo("UserDefined1", 2048); - ei->members << PICodeInfo::EnumeratorInfo("UserDefined2", 4096); - ei->members << PICodeInfo::EnumeratorInfo("ChildStopped", 8192); - ei->members << PICodeInfo::EnumeratorInfo("Continue", 16384); - ei->members << PICodeInfo::EnumeratorInfo("StopProcess", 32768); - ei->members << PICodeInfo::EnumeratorInfo("StopTTY", 65536); - ei->members << PICodeInfo::EnumeratorInfo("StopTTYInput", 131072); - ei->members << PICodeInfo::EnumeratorInfo("StopTTYOutput", 262144); - ei->members << PICodeInfo::EnumeratorInfo("All", 1048575); - - ei = new EnumInfo(); - (*enumsInfo)["PIBinaryLog::PlayMode"] = ei; - ei->name = "PIBinaryLog::PlayMode"; - ei->members << PICodeInfo::EnumeratorInfo("PlayRealTime", 0); - ei->members << PICodeInfo::EnumeratorInfo("PlayVariableSpeed", 1); - ei->members << PICodeInfo::EnumeratorInfo("PlayStaticDelay", 2); - - ei = new EnumInfo(); - (*enumsInfo)["PIBinaryLog::SplitMode"] = ei; - ei->name = "PIBinaryLog::SplitMode"; - ei->members << PICodeInfo::EnumeratorInfo("SplitNone", 0); - ei->members << PICodeInfo::EnumeratorInfo("SplitTime", 1); - ei->members << PICodeInfo::EnumeratorInfo("SplitSize", 2); - ei->members << PICodeInfo::EnumeratorInfo("SplitCount", 3); - - ei = new EnumInfo(); - (*enumsInfo)["PIUSB::Endpoint::Direction"] = ei; - ei->name = "PIUSB::Endpoint::Direction"; - ei->members << PICodeInfo::EnumeratorInfo("Write", 0); - ei->members << PICodeInfo::EnumeratorInfo("Read", 1); - - ei = new EnumInfo(); - (*enumsInfo)["PIUSB::Endpoint::TransferType"] = ei; - ei->name = "PIUSB::Endpoint::TransferType"; - ei->members << PICodeInfo::EnumeratorInfo("Control", 0); - ei->members << PICodeInfo::EnumeratorInfo("Isochronous", 1); - ei->members << PICodeInfo::EnumeratorInfo("Bulk", 2); - ei->members << PICodeInfo::EnumeratorInfo("Interrupt", 3); - - ei = new EnumInfo(); - (*enumsInfo)["PIUSB::Endpoint::SynchronisationType"] = ei; - ei->name = "PIUSB::Endpoint::SynchronisationType"; - ei->members << PICodeInfo::EnumeratorInfo("NoSynchonisation", 0); - ei->members << PICodeInfo::EnumeratorInfo("Asynchronous", 2); - ei->members << PICodeInfo::EnumeratorInfo("Adaptive", 1); - ei->members << PICodeInfo::EnumeratorInfo("Synchronous", 3); - - ei = new EnumInfo(); - (*enumsInfo)["PIUSB::Endpoint::UsageType"] = ei; - ei->name = "PIUSB::Endpoint::UsageType"; - ei->members << PICodeInfo::EnumeratorInfo("DataEndpoint", 0); - ei->members << PICodeInfo::EnumeratorInfo("FeedbackEndpoint", 2); - ei->members << PICodeInfo::EnumeratorInfo("ExplicitFeedbackDataEndpoint", 1); -} - - -bool __ClassInfo_CCM_H_Initializer__::_inited_ = false; diff --git a/piqt_utils/ccm.h b/piqt_utils/ccm.h deleted file mode 100644 index a77b1bd..0000000 --- a/piqt_utils/ccm.h +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by "PIP Code model generator" 23.11.2014 13:46:47 - -#ifndef CCM_H -#define CCM_H - -#include "pivariant.h" -#include "picodeinfo.h" - - -class __ClassInfo_CCM_H_Initializer__ { -public: - __ClassInfo_CCM_H_Initializer__(); - static bool _inited_; -}; - -static __ClassInfo_CCM_H_Initializer__ __classinfo_ccm_h_initializer__; - - -#endif // CCM_H diff --git a/piqt_utils/pidumper.cpp b/piqt_utils/pidumper.cpp index d8c9236..2817395 100644 --- a/piqt_utils/pidumper.cpp +++ b/piqt_utils/pidumper.cpp @@ -2,7 +2,7 @@ #include "pifile.h" #include "pitime.h" #include "pidir.h" -#include "ccm.h" +//#include "ccm.h" #include diff --git a/piqt_utils/piqt_connection_view.cpp b/piqt_utils/piqt_connection_view.cpp index 1b109ce..0cdafa2 100644 --- a/piqt_utils/piqt_connection_view.cpp +++ b/piqt_utils/piqt_connection_view.cpp @@ -126,7 +126,7 @@ DeviceItem * ConnectionView::addDevice(const QString & name, const QString & pat ret = new DeviceItem(); PIString dp; PIIODevice::DeviceMode dm; - PIConnection::splitFullPathWithMode(Q2PIString(path), &dp, &dm); + PIIODevice::splitFullPath(Q2PIString(path), &dp, &dm); ret->setPos(0, 0); ret->setName(name); ret->setPath(PI2QString(dp));