viewport scale fix

nanoLogika · Dec 6, 2024 · 2dade95 · 2dade95
1 parent bb8e671
commit 2dade95
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/src/ACadSharp.Tests/IO/WriterSingleObjectTests.cs b/src/ACadSharp.Tests/IO/WriterSingleObjectTests.cs
@@ -25,6 +25,7 @@ public SingleCaseGenerator() { }
 			public SingleCaseGenerator(string name)
 			{
 				this.Name = name;
+				this.Document.Header.ShowModelSpace = true;
 			}
 
 			public override string ToString()

diff --git a/src/ACadSharp/Entities/Viewport.cs b/src/ACadSharp/Entities/Viewport.cs
@@ -335,19 +335,38 @@ public Scale Scale
 		{
 			get
 			{
-				return this._scale;
+				if (this.Document != null)
+				{
+					if (this.XDictionary != null && this.XDictionary.TryGetEntry(ASDK_XREC_ANNOTATION_SCALE_INFO, out XRecord record))
+					{
+						foreach (XRecord.Entry item in record.Entries)
+						{
+							if (item.Code == 340)
+							{
+								return item.Value as Scale;
+							}
+						}
+					}
+
+					return null;
+				}
+				else
+				{
+					return this._scale;
+				}
 			}
 			set
 			{
 				if (this.Document != null)
 				{
 					this._scale = this.updateCollection(value, this.Document.Scales);
-					this.updateScaleXRecord();
 				}
 				else
 				{
 					this._scale = value;
 				}
+
+				this.updateScaleXRecord();
 			}
 		}
 
@@ -433,7 +452,7 @@ internal override void AssignDocument(CadDocument doc)
 		{
 			base.AssignDocument(doc);
 
-			this._scale = this.updateCollection(this.Scale, doc.Scales);
+			this._scale = this.updateCollection(this._scale, doc.Scales);
 
 			this.Document.Scales.OnRemove += this.scalesOnRemove;
 		}
@@ -468,7 +487,7 @@ private void updateScaleXRecord()
 				{
 					if (item.Code == 340)
 					{
-						item.Value = this._scale.Handle;
+						item.Value = this._scale;
 					}
 				}
 			}
@@ -477,7 +496,7 @@ private void updateScaleXRecord()
 				record = new XRecord(ASDK_XREC_ANNOTATION_SCALE_INFO);
 				this.XDictionary.Add(record);
 
-				record.CreateEntry(340, _scale.Handle);
+				record.CreateEntry(340, _scale);
 			}
 		}
 	}