21668989262

Committed 04 Feb 2026 11:04AM UTC coverage: 77.413% (+0.2%) from 77.238%

Build # 21668989262

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #963 from DomCR/issue-962_dynamic-parameter-rotation-translation

issue-962

Run Details

8111 of 11339 branches covered (71.53%)

Branch coverage included in aggregate %.

273 of 301 new or added lines in 16 files covered. (90.7%)

11 existing lines in 2 files now uncovered.

29385 of 37097 relevant lines covered (79.21%)

148585.46 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

98.33

/src/ACadSharp/IO/DWG/DwgStreamReaders/DwgObjectReader.Objects.cs

﻿using ACadSharp.IO.Templates;
using ACadSharp.Objects;
using ACadSharp.Objects.Evaluations;

namespace ACadSharp.IO.DWG;

internal partial class DwgObjectReader : DwgSectionIO
{
        private void readBlock1PtParameter(CadBlock1PtParameterTemplate template)
        {
                this.readBlockParameter(template);

                //1010 1020 1030
                template.Block1PtParameter.Location = this._mergedReaders.Read3BitDouble();
                //170
                template.Block1PtParameter.Value170 = this._mergedReaders.ReadBitShort();
                //171
                template.Block1PtParameter.Value171 = this._mergedReaders.ReadBitShort();
                //93
                template.Block1PtParameter.Value93 = this._mergedReaders.ReadBitLong();
        }

        private void readBlock2PtParameter(CadBlock2PtParameterTemplate template)
        {
                this.readBlockParameter(template);

                //1010 1020 1030
                template.Block2PtParameter.FirstPoint = this._mergedReaders.Read3BitDouble();
                //1011 1021 1031
                template.Block2PtParameter.SecondPoint = this._mergedReaders.Read3BitDouble();

                //170 (always 4)
                for (int i = 0; i < 4; i++)
                {
                        //171 172 173 174
                        short n = this._mergedReaders.ReadBitShort();
                        for (int j = 0; j < n; j++)
                        {
                                //94 95 (I guess 96 97)
                                var d = this._mergedReaders.ReadBitLong();
                                //303 304
                                var e = this._mergedReaders.ReadVariableText();
                        }
                }

                for (int k = 0; k < 4; k++)
                {
                        //91 values
                        var f = this._mergedReaders.ReadBitLong();
                }

                var value177 = this._mergedReaders.ReadBitShort();
        }

        private void readBlockAction(CadBlockActionTemplate template)
        {
                this.readBlockElement(template);

                BlockAction blockAction = template.BlockAction;

                // 1010, 1020, 1030
                blockAction.ActionPoint = this._mergedReaders.Read3BitDouble();

                //71
                short entityCount = this._objectReader.ReadBitShort();
                for (int i = 0; i < entityCount; i++)
                {
                        ulong entityHandle = this.handleReference();
                        template.EntityHandles.Add(entityHandle);
                }

                // 70
                blockAction.Value70 = this._mergedReaders.ReadBitShort();
        }

        private void readBlockActionBasePt(CadBlockActionBasePtTemplate template)
        {
                this.readBlockAction(template);

                BlockActionBasePt blockActionBasePt = template.CadObject as BlockActionBasePt;

                blockActionBasePt.Value1011 = this._mergedReaders.Read3BitDouble();
                
                blockActionBasePt.Value92 = this._mergedReaders.ReadBitLong();
                blockActionBasePt.Value301 = this._mergedReaders.ReadVariableText();
                blockActionBasePt.Value93 = this._mergedReaders.ReadBitLong();
                blockActionBasePt.Value302 = this._mergedReaders.ReadVariableText();
                
                blockActionBasePt.Value280 = this._mergedReaders.ReadBit();
                blockActionBasePt.Value1012 = this._mergedReaders.Read3BitDouble();
        }

        private void readBlockElement(CadBlockElementTemplate template)
        {
                this.readEvaluationExpression(template);

                //300 name
                template.BlockElement.ElementName = this._mergedReaders.ReadVariableText();
                //98
                template.BlockElement.Value98 = this._mergedReaders.ReadBitLong();
                //99
                template.BlockElement.Value99 = this._mergedReaders.ReadBitLong();
                //1071
                template.BlockElement.Value1071 = this._mergedReaders.ReadBitLong();
        }

        private void readBlockGrip(CadBlockGripTemplate template)
        {
                this.readBlockElement(template);

                var blockGrip = template.CadObject as BlockGrip;

                blockGrip.Value91 = this._mergedReaders.ReadBitLong();
                blockGrip.Value92 = this._mergedReaders.ReadBitLong();
                blockGrip.Location = this._mergedReaders.Read3BitDouble();
                blockGrip.Value280 = this._mergedReaders.ReadBitAsShort();
                blockGrip.Value93 = this._mergedReaders.ReadBitLong();
        }

        private CadTemplate readBlockGripLocationComponent()
        {
                BlockGripExpression gripExpression = new BlockGripExpression();
                CadBlockGripExpressionTemplate template = new CadBlockGripExpressionTemplate(gripExpression);

                this.readEvaluationExpression(template);

                return template;
        }

        private void readBlockParameter(CadBlockParameterTemplate template)
        {
                this.readBlockElement(template);

                //280
                template.BlockParameter.Value280 = this._mergedReaders.ReadBit();
                //281
                template.BlockParameter.Value281 = this._mergedReaders.ReadBit();
        }

        private CadTemplate readBlockRepresentationData()
        {
                BlockRepresentationData representation = new BlockRepresentationData();
                CadBlockRepresentationDataTemplate template = new CadBlockRepresentationDataTemplate(representation);

                this.readCommonNonEntityData(template);

                representation.Value70 = this._mergedReaders.ReadBitShort();
                template.BlockHandle = this.handleReference();

                return template;
        }

        private CadTemplate readBlockRotateAction()
        {
                BlockRotationAction rotationAction = new();
                CadBlockRotationActionTemplate template = new(rotationAction);

                this.readBlockActionBasePt(template);

                rotationAction.Value94 = this._mergedReaders.ReadBitLong();
                rotationAction. Value303 = this._mergedReaders.ReadVariableText();

                return template;
        }

        private CadTemplate readBlockRotationParameter()
        {
                BlockRotationParameter blockRotationParameter = new();
                CadBlockRotationParameterTemplate template = new CadBlockRotationParameterTemplate(blockRotationParameter);

                this.readBlock2PtParameter(template);

                //1011 1021 1031
                blockRotationParameter.Point = this._mergedReaders.Read3BitDouble();
                //305
                blockRotationParameter.Name = this._mergedReaders.ReadVariableText();
                //306
                blockRotationParameter.Description = this._mergedReaders.ReadVariableText();
                //140
                blockRotationParameter.NameOffset = this._mergedReaders.ReadBitDouble();

                //307 missing text?

                blockRotationParameter.Value96 = this._mergedReaders.ReadBitLong();
                blockRotationParameter.Value141 = this._mergedReaders.ReadBitDouble();
                blockRotationParameter.Value142 = this._mergedReaders.ReadBitDouble();
                blockRotationParameter.Value143 = this._mergedReaders.ReadBitDouble();

                blockRotationParameter.Value175 = this._mergedReaders.ReadBitLong();

                return template;
        }

        private CadTemplate readBlockVisibilityParameter()
        {
                BlockVisibilityParameter blockVisibilityParameter = new BlockVisibilityParameter();
                CadBlockVisibilityParameterTemplate template = new CadBlockVisibilityParameterTemplate(blockVisibilityParameter);

                this.readBlock1PtParameter(template);

                //281
                blockVisibilityParameter.Value281 = this._mergedReaders.ReadBit();
                //301
                blockVisibilityParameter.Name = this._mergedReaders.ReadVariableText();
                //302
                blockVisibilityParameter.Description = this._mergedReaders.ReadVariableText();
                //missing bit??        91 should be an int
                blockVisibilityParameter.Value91 = this._mergedReaders.ReadBit();

                //DXF 93 Total entities count
                var totalEntitiesCount = this._objectReader.ReadBitLong();
                for (int i = 0; i < totalEntitiesCount; i++)
                {
                        //331
                        template.EntityHandles.Add(this.handleReference());
                }

                //DXF 92 states count
                var nstates = this._objectReader.ReadBitLong();
                for (int j = 0; j < nstates; j++)
                {
                        template.StateTemplates.Add(this.readState());
                }

                return template;
        }

        private void readEvaluationExpression(CadEvaluationExpressionTemplate template)
        {
                this.readCommonNonEntityData(template);

                //AcDbEvalExpr
                var unknown = this._objectReader.ReadBitLong();

                //98
                template.CadObject.Value98 = this._objectReader.ReadBitLong();
                //99
                template.CadObject.Value99 = this._objectReader.ReadBitLong();

                //Code value
                short code = this._mergedReaders.ReadBitShort();
                if (code > 0)
                {
                        var groupValue = GroupCodeValue.TransformValue(code);
                        switch (groupValue)
                        {
                                case GroupCodeValueType.Double:
                                case GroupCodeValueType.ExtendedDataDouble:
                                        this._mergedReaders.ReadBitDouble();
                                        break;
                                default:
                                        throw new System.NotImplementedException($"[EvaluationExpression] Code not implemented {groupValue}");
                        }
                }

                //90
                template.CadObject.Id = this._objectReader.ReadBitLong();
        }

        private CadBlockVisibilityParameterTemplate.StateTemplate readState()
        {
                CadBlockVisibilityParameterTemplate.StateTemplate template = new CadBlockVisibilityParameterTemplate.StateTemplate();

                template.State.Name = this._textReader.ReadVariableText();

                //DXF 94 subset count 1
                int n1 = this._objectReader.ReadBitLong();
                for (int i = 0; i < n1; i++)
                {
                        //332
                        template.EntityHandles.Add(this.handleReference());
                }

                //DXF 95 subset count 2
                var n2 = this._objectReader.ReadBitLong();
                for (int i = 0; i < n2; i++)
                {
                        //333
                        template.ExpressionHandles.Add(this.handleReference());
                }

                return template;
        }
}

1	using ACadSharp.IO.Templates;
2	using ACadSharp.Objects;
3	using ACadSharp.Objects.Evaluations;
4
5	namespace ACadSharp.IO.DWG;
6
7	internal partial class DwgObjectReader : DwgSectionIO
8	{
9	private void readBlock1PtParameter(CadBlock1PtParameterTemplate template)
10	{	134✔
11	this.readBlockParameter(template);	134✔
12
13	//1010 1020 1030
14	template.Block1PtParameter.Location = this._mergedReaders.Read3BitDouble();	134✔
15	//170
16	template.Block1PtParameter.Value170 = this._mergedReaders.ReadBitShort();	134✔
17	//171
18	template.Block1PtParameter.Value171 = this._mergedReaders.ReadBitShort();	134✔
19	//93
20	template.Block1PtParameter.Value93 = this._mergedReaders.ReadBitLong();	134✔
21	}	134✔
22
23	private void readBlock2PtParameter(CadBlock2PtParameterTemplate template)
24	{	1✔
25	this.readBlockParameter(template);	1✔
26
27	//1010 1020 1030
28	template.Block2PtParameter.FirstPoint = this._mergedReaders.Read3BitDouble();	1✔
29	//1011 1021 1031
30	template.Block2PtParameter.SecondPoint = this._mergedReaders.Read3BitDouble();	1✔
31
32	//170 (always 4)
33	for (int i = 0; i < 4; i++)	10✔
34	{	4✔
35	//171 172 173 174
36	short n = this._mergedReaders.ReadBitShort();	4✔
37	for (int j = 0; j < n; j++)	12✔
38	{	2✔
39	//94 95 (I guess 96 97)
40	var d = this._mergedReaders.ReadBitLong();	2✔
41	//303 304
42	var e = this._mergedReaders.ReadVariableText();	2✔
43	}	2✔
44	}	4✔
45
46	for (int k = 0; k < 4; k++)	10✔
47	{	4✔
48	//91 values
49	var f = this._mergedReaders.ReadBitLong();	4✔
50	}	4✔
51
52	var value177 = this._mergedReaders.ReadBitShort();	1✔
53	}	1✔
54
55	private void readBlockAction(CadBlockActionTemplate template)
56	{	1✔
57	this.readBlockElement(template);	1✔
58
59	BlockAction blockAction = template.BlockAction;	1✔
60
61	// 1010, 1020, 1030
62	blockAction.ActionPoint = this._mergedReaders.Read3BitDouble();	1✔
63
64	//71
65	short entityCount = this._objectReader.ReadBitShort();	1✔
66	for (int i = 0; i < entityCount; i++)	4✔
67	{	1✔
68	ulong entityHandle = this.handleReference();	1✔
69	template.EntityHandles.Add(entityHandle);	1✔
70	}	1✔
71
72	// 70
73	blockAction.Value70 = this._mergedReaders.ReadBitShort();	1✔
74	}	1✔
75
76	private void readBlockActionBasePt(CadBlockActionBasePtTemplate template)
77	{	1✔
78	this.readBlockAction(template);	1✔
79
80	BlockActionBasePt blockActionBasePt = template.CadObject as BlockActionBasePt;	1✔
81
82	blockActionBasePt.Value1011 = this._mergedReaders.Read3BitDouble();	1✔
83
84	blockActionBasePt.Value92 = this._mergedReaders.ReadBitLong();	1✔
85	blockActionBasePt.Value301 = this._mergedReaders.ReadVariableText();	1✔
86	blockActionBasePt.Value93 = this._mergedReaders.ReadBitLong();	1✔
87	blockActionBasePt.Value302 = this._mergedReaders.ReadVariableText();	1✔
88
89	blockActionBasePt.Value280 = this._mergedReaders.ReadBit();	1✔
90	blockActionBasePt.Value1012 = this._mergedReaders.Read3BitDouble();	1✔
91	}	1✔
92
93	private void readBlockElement(CadBlockElementTemplate template)
94	{	271✔
95	this.readEvaluationExpression(template);	271✔
96
97	//300 name
98	template.BlockElement.ElementName = this._mergedReaders.ReadVariableText();	271✔
99	//98
100	template.BlockElement.Value98 = this._mergedReaders.ReadBitLong();	271✔
101	//99
102	template.BlockElement.Value99 = this._mergedReaders.ReadBitLong();	271✔
103	//1071
104	template.BlockElement.Value1071 = this._mergedReaders.ReadBitLong();	271✔
105	}	271✔
106
107	private void readBlockGrip(CadBlockGripTemplate template)
108	{	135✔
109	this.readBlockElement(template);	135✔
110
111	var blockGrip = template.CadObject as BlockGrip;	135✔
112
113	blockGrip.Value91 = this._mergedReaders.ReadBitLong();	135✔
114	blockGrip.Value92 = this._mergedReaders.ReadBitLong();	135✔
115	blockGrip.Location = this._mergedReaders.Read3BitDouble();	135✔
116	blockGrip.Value280 = this._mergedReaders.ReadBitAsShort();	135✔
117	blockGrip.Value93 = this._mergedReaders.ReadBitLong();	135✔
118	}	135✔
119
120	private CadTemplate readBlockGripLocationComponent()
121	{	804✔
122	BlockGripExpression gripExpression = new BlockGripExpression();	804✔
123	CadBlockGripExpressionTemplate template = new CadBlockGripExpressionTemplate(gripExpression);	804✔
124
125	this.readEvaluationExpression(template);	804✔
126
127	return template;	804✔
128	}	804✔
129
130	private void readBlockParameter(CadBlockParameterTemplate template)
131	{	135✔
132	this.readBlockElement(template);	135✔
133
134	//280
135	template.BlockParameter.Value280 = this._mergedReaders.ReadBit();	135✔
136	//281
137	template.BlockParameter.Value281 = this._mergedReaders.ReadBit();	135✔
138	}	135✔
139
140	private CadTemplate readBlockRepresentationData()
141	{	275✔
142	BlockRepresentationData representation = new BlockRepresentationData();	275✔
143	CadBlockRepresentationDataTemplate template = new CadBlockRepresentationDataTemplate(representation);	275✔
144
145	this.readCommonNonEntityData(template);	275✔
146
147	representation.Value70 = this._mergedReaders.ReadBitShort();	275✔
148	template.BlockHandle = this.handleReference();	275✔
149
150	return template;	275✔
151	}	275✔
152
153	private CadTemplate readBlockRotateAction()
154	{	1✔
155	BlockRotationAction rotationAction = new();	1✔
156	CadBlockRotationActionTemplate template = new(rotationAction);	1✔
157
158	this.readBlockActionBasePt(template);	1✔
159
160	rotationAction.Value94 = this._mergedReaders.ReadBitLong();	1✔
161	rotationAction. Value303 = this._mergedReaders.ReadVariableText();	1✔
162
163	return template;	1✔
164	}	1✔
165
166	private CadTemplate readBlockRotationParameter()
167	{	1✔
168	BlockRotationParameter blockRotationParameter = new();	1✔
169	CadBlockRotationParameterTemplate template = new CadBlockRotationParameterTemplate(blockRotationParameter);	1✔
170
171	this.readBlock2PtParameter(template);	1✔
172
173	//1011 1021 1031
174	blockRotationParameter.Point = this._mergedReaders.Read3BitDouble();	1✔
175	//305
176	blockRotationParameter.Name = this._mergedReaders.ReadVariableText();	1✔
177	//306
178	blockRotationParameter.Description = this._mergedReaders.ReadVariableText();	1✔
179	//140
180	blockRotationParameter.NameOffset = this._mergedReaders.ReadBitDouble();	1✔
181
182	//307 missing text?
183
184	blockRotationParameter.Value96 = this._mergedReaders.ReadBitLong();	1✔
185	blockRotationParameter.Value141 = this._mergedReaders.ReadBitDouble();	1✔
186	blockRotationParameter.Value142 = this._mergedReaders.ReadBitDouble();	1✔
187	blockRotationParameter.Value143 = this._mergedReaders.ReadBitDouble();	1✔
188
189	blockRotationParameter.Value175 = this._mergedReaders.ReadBitLong();	1✔
190
191	return template;	1✔
192	}	1✔
193
194	private CadTemplate readBlockVisibilityParameter()
195	{	134✔
196	BlockVisibilityParameter blockVisibilityParameter = new BlockVisibilityParameter();	134✔
197	CadBlockVisibilityParameterTemplate template = new CadBlockVisibilityParameterTemplate(blockVisibilityParameter);	134✔
198
199	this.readBlock1PtParameter(template);	134✔
200
201	//281
202	blockVisibilityParameter.Value281 = this._mergedReaders.ReadBit();	134✔
203	//301
204	blockVisibilityParameter.Name = this._mergedReaders.ReadVariableText();	134✔
205	//302
206	blockVisibilityParameter.Description = this._mergedReaders.ReadVariableText();	134✔
207	//missing bit?? 91 should be an int
208	blockVisibilityParameter.Value91 = this._mergedReaders.ReadBit();	134✔
209
210	//DXF 93 Total entities count
211	var totalEntitiesCount = this._objectReader.ReadBitLong();	134✔
212	for (int i = 0; i < totalEntitiesCount; i++)	544✔
213	{	138✔
214	//331
215	template.EntityHandles.Add(this.handleReference());	138✔
216	}	138✔
217
218	//DXF 92 states count
219	var nstates = this._objectReader.ReadBitLong();	134✔
220	for (int j = 0; j < nstates; j++)	1,340✔
221	{	536✔
222	template.StateTemplates.Add(this.readState());	536✔
223	}	536✔
224
225	return template;	134✔
226	}	134✔
227
228	private void readEvaluationExpression(CadEvaluationExpressionTemplate template)
229	{	1,075✔
230	this.readCommonNonEntityData(template);	1,075✔
231
232	//AcDbEvalExpr
233	var unknown = this._objectReader.ReadBitLong();	1,075✔
234
235	//98
236	template.CadObject.Value98 = this._objectReader.ReadBitLong();	1,075✔
237	//99
238	template.CadObject.Value99 = this._objectReader.ReadBitLong();	1,075✔
239
240	//Code value
241	short code = this._mergedReaders.ReadBitShort();	1,075✔
242	if (code > 0)	1,075✔
243	{	804✔
244	var groupValue = GroupCodeValue.TransformValue(code);	804✔
245	switch (groupValue)	804!
246	{
247	case GroupCodeValueType.Double:
248	case GroupCodeValueType.ExtendedDataDouble:
249	this._mergedReaders.ReadBitDouble();	804✔
250	break;	804✔
251	default:
NEW 252	throw new System.NotImplementedException($"[EvaluationExpression] Code not implemented {groupValue}");	×
253	}
254	}	804✔
255
256	//90
257	template.CadObject.Id = this._objectReader.ReadBitLong();	1,075✔
258	}	1,075✔
259
260	private CadBlockVisibilityParameterTemplate.StateTemplate readState()
261	{	536✔
262	CadBlockVisibilityParameterTemplate.StateTemplate template = new CadBlockVisibilityParameterTemplate.StateTemplate();	536✔
263
264	template.State.Name = this._textReader.ReadVariableText();	536✔
265
266	//DXF 94 subset count 1
267	int n1 = this._objectReader.ReadBitLong();	536✔
268	for (int i = 0; i < n1; i++)	1,894✔
269	{	411✔
270	//332
271	template.EntityHandles.Add(this.handleReference());	411✔
272	}	411✔
273
274	//DXF 95 subset count 2
275	var n2 = this._objectReader.ReadBitLong();	536✔
276	for (int i = 0; i < n2; i++)	4,264✔
277	{	1,596✔
278	//333
279	template.ExpressionHandles.Add(this.handleReference());	1,596✔
280	}	1,596✔
281
282	return template;	536✔
283	}	536✔
284	}

DomCR / ACadSharp / 21668989262

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous