Fixes to make extended multiplexing code work properly, implementation

of nested multiplexing in main screen for interpretation.

Overall, it's ugly but mostly functional at this point.
This commit is contained in:
Collin Kidder
2021-02-25 21:24:21 -05:00
parent bcfaffbe5d
commit af0194c5a5
7 changed files with 150 additions and 44 deletions
+4
View File
@@ -116,6 +116,7 @@ public: //TODO: this is sloppy. It shouldn't all be public!
bool processAsInt(const CANFrame &frame, int32_t &outValue);
bool processAsDouble(const CANFrame &frame, double &outValue);
QString makePrettyOutput(double floatVal, int64_t intVal, bool outputName = true, bool isInteger = false);
QString processSignalTree(const CANFrame &frame);
DBC_ATTRIBUTE_VALUE *findAttrValByName(QString name);
DBC_ATTRIBUTE_VALUE *findAttrValByIdx(int idx);
@@ -123,6 +124,9 @@ public: //TODO: this is sloppy. It shouldn't all be public!
{
return (l.name.toLower() < r.name.toLower());
}
private:
bool isSignalInMessage(const CANFrame &frame);
bool _sigInMsgPriv(const CANFrame &frame, DBC_SIGNAL *multiplexor);
};
class DBCSignalHandler; //forward declaration to keep from having to include dbchandler.h in this file and thus create a loop