diff --git a/PacketLib.xcodeproj/project.xcworkspace/xcshareddata/PacketLib.xccheckout b/PacketLib.xcodeproj/project.xcworkspace/xcshareddata/PacketLib.xccheckout index 46757d4fb62aea3c299f5d6f017512068a3f5a32..756e580aed3d1bc3bd3413c8b9742e7cb4e91b39 100644 --- a/PacketLib.xcodeproj/project.xcworkspace/xcshareddata/PacketLib.xccheckout +++ b/PacketLib.xcodeproj/project.xcworkspace/xcshareddata/PacketLib.xccheckout @@ -5,7 +5,7 @@ <key>IDESourceControlProjectFavoriteDictionaryKey</key> <false/> <key>IDESourceControlProjectIdentifier</key> - <string>E78724CD-2D6E-4FB5-8CA7-AC2C1C56AE1B</string> + <string>AD920CA7-23AA-4A38-B382-B72E4C2959FA</string> <key>IDESourceControlProjectName</key> <string>PacketLib</string> <key>IDESourceControlProjectOriginsDictionary</key> diff --git a/PacketLib.xcodeproj/project.xcworkspace/xcuserdata/bulgarelli.xcuserdatad/UserInterfaceState.xcuserstate b/PacketLib.xcodeproj/project.xcworkspace/xcuserdata/bulgarelli.xcuserdatad/UserInterfaceState.xcuserstate index 0e85b5d212b1125aa5bea98a7ae4e4fb7c304d73..523a950e88b6efed08576183e464261397997481 100644 Binary files a/PacketLib.xcodeproj/project.xcworkspace/xcuserdata/bulgarelli.xcuserdatad/UserInterfaceState.xcuserstate and b/PacketLib.xcodeproj/project.xcworkspace/xcuserdata/bulgarelli.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/include/SDFBlock.h b/include/SDFBlock.h index 667f592d82e80d079db73056a5119fe20f07d160..6a8315237cffddc014c1cab17e6b9d795a714ccd 100644 --- a/include/SDFBlock.h +++ b/include/SDFBlock.h @@ -408,6 +408,15 @@ public: { return type->numberOfRBlocks; } + + /// Returns the number of blocks for each rblock (for each data type) (if numberOfBlockFixed is true) or max number of blocks (if numberOfBlockFixed is false) in the structure of source data field. + /// This value is read from .packet configuration file. + /// This variable not represent the effective number of + /// block into the stream of data. + virtual word getMaxNumberOfBlocks(word rblockIndex = 0) + { + return type->maxNumberOfBlock[rblockIndex]; + } PartOfPacket fixed; diff --git a/include/SourceDataField.h b/include/SourceDataField.h index 68c4f67f3f8781a2998d218d775d9b22d20e6841..432784a0974409ed65b7c9df44167530982e7099 100644 --- a/include/SourceDataField.h +++ b/include/SourceDataField.h @@ -35,16 +35,15 @@ public: virtual bool loadFields(InputText& fp) throw(PacketException*); - /// Get a block of number nblock of the group of blocks of the rblock - /// with the index rBlockIndex. + /// Get a block of number nblock of the group of blocks of the rblock with the index rBlockIndex. /// \param nblock the number of the block /// \param rBlockIndex the number of the rblock virtual SDFBlock* getBlock(word nblock, word rBlockIndex=0); - ///Get the fixed part of the source data field + ///Get the fixed part of the source data field. virtual ByteStreamPtr getFixedPart() { return block[0].fixed.getByteStream(); }; - ///Get the variable part of the source data field + ///Get the variable part of the source data field. //virtual ByteStreamPtr getVariablePart(); /// Returns a pointer of a field in the fixed part of this source data field. @@ -58,27 +57,27 @@ public: /// \param index Represent the index in the list. virtual word getFieldValue(word index); - /// See PartOfPacket for documentation + /// See PartOfPacket for documentation. /// \param index Represent the index in the list. virtual signed short getFieldValue_16i(word index); - /// See PartOfPacket for documentation + /// See PartOfPacket for documentation. /// \param index Represent the index in the list. virtual word getFieldValue_16ui(word index); - /// See PartOfPacket for documentation + /// See PartOfPacket for documentation. /// \param index Represent the index in the list. virtual signed long getFieldValue_32i(word index); - /// See PartOfPacket for documentation + /// See PartOfPacket for documentation. /// \param index Represent the index in the list. unsigned long getFieldValue_32ui(word index); - /// See PartOfPacket for documentation + /// See PartOfPacket for documentation. /// \param index Represent the index in the list. virtual float getFieldValue_32f(word index); - /// See PartOfPacket for documentation + /// See PartOfPacket for documentation. /// \param index Represent the index in the list. virtual double getFieldValue_64f(word index); @@ -164,7 +163,8 @@ public: /// \param fieldname Represent the name of the field. virtual double getFieldValue_64f(string fieldname); - /// Sets the value of a field in the list of fields of this part of packet. Remember that + /// Sets the value of a field in the list of fields of this part of packet. + /// Remember that /// if a predefined value is specified in the .stream, this method has not effect and the /// value contained in the .stream is used. /// \param fieldname Represent the name of the field. @@ -195,16 +195,14 @@ public: /// \param value The 32 bit unsigned integer value. virtual void setFieldValue_32ui(string fieldname, unsigned long value); - /// Set the value of a field. The value is interpreted as a real single - /// precision (IEEE 754). + /// Set the value of a field. The value is interpreted as a real single precision (IEEE 754). /// This corresponds with the PTC=5, PFC = 1. /// See setFieldValue(word index, word value) for general considerations. /// \param fieldname Represent the name of the field. /// \param value The real single precision value virtual void setFieldValue_32f(string fieldname, float value); - /// Set the value of a field. The value is interpreted as a real double - /// precision (IEEE 754). + /// Set the value of a field. The value is interpreted as a real double precision (IEEE 754). /// This corresponds with the PTC=5, PFC = 2. /// See setFieldValue(word index, word value) for general considerations. /// \param fieldname Represent the name of the field. @@ -215,10 +213,13 @@ public: /// Returns the number of fields. virtual word getNumberOfFields(); + /// The max dimension of the SDF in bytes (dependes by the logical model described in the configuration files). virtual dword sizeMax(); + /// Dimension of the SDF in bytes. virtual dword size(); + /// Dimension of the SDF fixed part in bytes. virtual dword sizeFixedPart(); using PartOfPacket::setByteStream;