Support trailing zeros control for dimension entities (part of DIMZIN)

zamtmn · Oct 26, 2022 · 3e26d50 · 3e26d50
1 parent 5565f75
commit 3e26d50
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/cad_source/zengine/core/entities/uzeentdimension.pas b/cad_source/zengine/core/entities/uzeentdimension.pas
@@ -493,14 +493,14 @@ function GDBObjDimension.LinearFloatToStr(l:Double;var drawing:TDrawingDef):TDXF
 var
    ff:TzeUnitsFormat;
 begin
-     ff:=drawing.GetUnitsFormat;
-     ff.RemoveTrailingZeros:=false;
-     ff.DeciminalSeparator:=PDimStyle.Units.DIMDSEP;
-     if PDimStyle.Units.DIMLUNIT<>DUSystem then
-                                               ff.uformat:=TLUnits(PDimStyle.Units.DIMLUNIT);
-     ff.umode:=UMWithSpaces;
-     ff.uprec:=TUPrec(PDimStyle.Units.DIMDEC);
-     result:=zeDimensionToUnicodeString(l,ff);
+  ff:=drawing.GetUnitsFormat;
+  ff.RemoveTrailingZeros:=(PDimStyle.Units.DIMZIN and 8)<>0;
+  ff.DeciminalSeparator:=PDimStyle.Units.DIMDSEP;
+  if PDimStyle.Units.DIMLUNIT<>DUSystem then
+    ff.uformat:=TLUnits(PDimStyle.Units.DIMLUNIT);
+  ff.umode:=UMWithSpaces;
+  ff.uprec:=TUPrec(PDimStyle.Units.DIMDEC);
+result:=zeDimensionToUnicodeString(l,ff);
 end;
 function GDBObjDimension.GetLinearDimStr(l:Double;var drawing:TDrawingDef):TDXFEntsInternalStringType;
 var

diff --git a/cad_source/zengine/styles/uzestylesdim.pas b/cad_source/zengine/styles/uzestylesdim.pas
@@ -94,6 +94,7 @@ TGDBDimUnitsProp=record
                        DIMRND:Double;//Rounding value for dimension distances//group45
                        DIMPOST:AnsiString; //Dimension prefix<>suffix //group3
                        DIMSCALE:Double;//DIMSCALE//group40
+                       DIMZIN:Integer;//Controls the suppression of zeros in the primary unit values//group78
                  end;
 PPGDBDimStyleObjInsp=^PGDBDimStyleObjInsp;
 PGDBDimStyleObjInsp=Pointer;
@@ -342,6 +343,8 @@ procedure GDBDimStyle.SetValueFromDxf(var mode:TDimStyleReadMode; group:Integer;
                           end;
                      end;
                 end;
+                78:
+                   Units.DIMZIN:=strtoint(value);
                 144:
                   begin
                                          Units.DIMLFAC:=strtofloat(value);
@@ -475,6 +478,7 @@ procedure GDBDimStyle.SetDefaultValues;
      Units.DIMRND:=0;
      Units.DIMDSEP:=DDSDot;
      Units.DIMPOST:='';
+     Units.DIMZIN:=12;
      Arrows.DIMASZ:=0.18;
      text.DIMTXT:=0.18;
      text.DIMTIH:=true;