@design-core/core 0.0.6 → 50.1.0

package/core/dimensions/{baseLinearDimension.js → linearDimensionBase.js}

@@ -3,17 +3,19 @@ import { Line } from '../entities/line.js';
 import { Text } from '../entities/text.js';
 import { Input, PromptOptions } from '../lib/inputManager.js';
 import { Logging } from '../lib/logging.js';
-import { BaseDimension } from './baseDimension.js';
+import { DimensionBase } from './dimensionBase.js';
 import { Point } from '../entities/point.js';
 
 import { DesignCore } from '../designCore.js';
+import { Property } from '../properties/property.js';
 import { Utils } from '../lib/utils.js';
+import { RubberBand } from '../lib/auxiliary/rubberBand.js';
 
 /**
  * Aligned Dimension Entity Class
- * @extends BaseDimension
+ * @extends DimensionBase
  */
-export class BaseLinearDimension extends BaseDimension {
+export class LinearDimensionBase extends DimensionBase {
   /**
    * Create an Aligned Dimension
    * @param {Array} data
@@ -29,7 +31,7 @@ export class BaseLinearDimension extends BaseDimension {
   async execute() {
     try {
       DesignCore.Scene.selectionManager.reset();
-      this.dimensionStyle = DesignCore.DimStyleManager.getCstyle();
+      this.setProperty(Property.Names.DIMENSIONSTYLE, DesignCore.DimStyleManager.getCstyle());
       this.dimType.setDimType(0); // Rotated dimension
 
       const op = new PromptOptions(Strings.Input.START, [Input.Type.POINT]);
@@ -60,10 +62,9 @@ export class BaseLinearDimension extends BaseDimension {
    * Preview the entity during creation
    */
   preview() {
-    if (this.points.length == 1) {
+    if (this.points.length === 1) {
       const mousePoint = DesignCore.Mouse.pointOnScene();
-      const points = [this.points.at(0), mousePoint];
-      DesignCore.Scene.tempEntities.create('Line', { points: points });
+      DesignCore.Scene.auxiliaryEntities.add(new RubberBand([this.points.at(0), mousePoint]));
     }
 
     if (this.points.length > 1) {
@@ -71,7 +72,7 @@ export class BaseLinearDimension extends BaseDimension {
       pt11.sequence = 11;
       const tempLine = new Line({ points: [...this.points] });
       const points = this.constructor.getPointsFromSelection([tempLine], pt11);
-      DesignCore.Scene.tempEntities.create(this.type, { points: points, dimensionStyle: this.dimensionStyle });
+      DesignCore.Scene.previewEntities.create(this.type, { points: points, dimensionStyle: this.getProperty(Property.Names.DIMENSIONSTYLE) });
     }
   }
 
@@ -155,7 +156,7 @@ export class BaseLinearDimension extends BaseDimension {
     const midPoint = Pt13e.midPoint(Pt14e);
 
     // set the dimension line angle. This is required for rotated dimension dxf definition
-    this.linearDimAngle = Utils.radians2degrees(dimLineAngle);
+    this.setProperty(Property.Names.LINEARDIMANGLE, Utils.radians2degrees(dimLineAngle));
 
     // Approximate text width based on height using the formatted dimension value i.e with units, precision and symbols
     const approxTextWidth = Text.getApproximateWidth(this.getDimensionValue(dimension), DIMTXT);
@@ -189,7 +190,7 @@ export class BaseLinearDimension extends BaseDimension {
     const outsideOffsetDirection = Pt11.distance(Pt13e) < Pt11.distance(Pt14e) ? reverseDimLineAngle : dimLineAngle;
 
     switch (DIMJUST) {
-      case 0: // 0 = Center-justified between extension lines
+      case 0: // 0 = Centre-justified between extension lines
         if (textOutSide) {
           textPosition = midPoint.project(outsideOffsetDirection, outsideOffsetDistance);
         }
@@ -236,7 +237,7 @@ export class BaseLinearDimension extends BaseDimension {
 
     // DIMTAD - Text vertical position
     switch (DIMTAD) {
-      case 0: // 0 = Centers the dimension text between the extension lines.
+      case 0: // 0 = Centres the dimension text between the extension lines.
         break;
       case 1: // 1 = Places the dimension text above the dimension line except when the dimension line is not horizontal and text inside the extension lines is forced horizontal ( DIMTIH = 1).
         textPosition = textPosition.project(textAboveDirection, textAboveDistance);
@@ -300,8 +301,8 @@ export class BaseLinearDimension extends BaseDimension {
         dimLineTwoEnd = Pt14e;
       }
       // get the distance to extend the dimension line
-      // when text is vertically centered trim the dimension line back from the text position
-      // when text is not vertically centered extend the dimension line beyond the text position by half the text width
+      // when text is vertically centred trim the dimension line back from the text position
+      // when text is not vertically centred extend the dimension line beyond the text position by half the text width
       const dimlineExtendDistance = textDimlineIntersection.isSame(textPosition) ? approxTextHalfWidth + DIMGAP : -approxTextHalfWidth;
 
       if (Pt11.distance(Pt13e) < Pt11.distance(Pt14e)) {
@@ -313,7 +314,7 @@ export class BaseLinearDimension extends BaseDimension {
       }
     }
 
-    // split the dimension line when the text is centered vertically
+    // split the dimension line when the text is centred vertically
     if (textIsOnInternalDimLine) {
       dimLineOneEnd = dimLineOneEnd.project(reverseDimLineAngle, approxTextWidth * 0.6);
       dimLineTwoEnd = dimLineTwoEnd.project(dimLineAngle, approxTextWidth * 0.6);

package/core/dimensions/radialDimension.js

@@ -1,12 +1,13 @@
 
 import { DXFFile } from '../lib/dxf/dxfFile.js';
-import { BaseCircularDimension } from './baseCircularDimension.js';
+import { CircularDimensionBase } from './circularDimensionBase.js';
+import { Property } from '../properties/property.js';
 
 /**
  * Radial Dimension Entity Class
- * @extends BaseCircularDimension
+ * @extends CircularDimensionBase
  */
-export class RadialDimension extends BaseCircularDimension {
+export class RadialDimension extends CircularDimensionBase {
   /**
    * Create a Radial Dimension
    * @param {Array} data
@@ -30,17 +31,17 @@ export class RadialDimension extends BaseCircularDimension {
 
   /**
    * Get sequenced points from user selection
-   * @param {any} items
+   * @param {any} entities
    * @param {Point} textPos
    * @return {Array} array of points
    */
-  static getPointsFromSelection(items, textPos) {
-    const item = items[0];
+  static getPointsFromSelection(entities, textPos) {
+    const entity = entities[0];
     const Pt11 = textPos;
     Pt11.sequence = 11;
-    const Pt10 = item.points[0]; // Centre
+    const Pt10 = entity.points[0]; // Centre
     Pt10.sequence = 10;
-    const Pt15 = Pt10.project(Pt10.angle(Pt11), item.getRadius());// Radius
+    const Pt15 = Pt10.project(Pt10.angle(Pt11), entity.getRadius());// Radius
     Pt15.sequence = 15;
 
     const points = [Pt10, Pt15, Pt11];
@@ -57,10 +58,10 @@ export class RadialDimension extends BaseCircularDimension {
     const Pt15 = this.getPointBySequence(this.points, 15);
 
     file.writeGroupCode('0', 'DIMENSION');
-    file.writeGroupCode('5', this.handle, DXFFile.Version.R2000); // Handle
+    file.writeGroupCode('5', this.getProperty(Property.Names.HANDLE), DXFFile.Version.R2000); // Handle
     file.writeGroupCode('100', 'AcDbEntity', DXFFile.Version.R2000);
     file.writeGroupCode('100', 'AcDbDimension', DXFFile.Version.R2000);
-    file.writeGroupCode('8', this.layer);
+    file.writeGroupCode('8', this.getProperty(Property.Names.LAYER));
     // file.writeGroupCode('2', this.blockName); // Block not required
     file.writeGroupCode('10', Pt10.x); // X - Start of Dimension Line
     file.writeGroupCode('20', Pt10.y); // Y
@@ -69,7 +70,7 @@ export class RadialDimension extends BaseCircularDimension {
     file.writeGroupCode('21', Pt11.y); // Y
     file.writeGroupCode('31', '0.0'); // Z
     file.writeGroupCode('70', this.dimType.getDimType()); // DIMENSION TYPE
-    file.writeGroupCode('3', this.dimensionStyle); // DIMENSION STYLE
+    file.writeGroupCode('3', this.getProperty(Property.Names.DIMENSIONSTYLE)); // DIMENSION STYLE
     file.writeGroupCode('100', 'AcDbRadialDimension', DXFFile.Version.R2000);
     file.writeGroupCode('15', Pt15.x); // X - End of Dimension Line
     file.writeGroupCode('25', Pt15.y); // Y

package/core/dimensions/rotatedDimension.js

@@ -4,16 +4,18 @@ import { Input, PromptOptions } from '../lib/inputManager.js';
 import { Logging } from '../lib/logging.js';
 import { DXFFile } from '../lib/dxf/dxfFile.js';
 import { Point } from '../entities/point.js';
-import { BaseLinearDimension } from './baseLinearDimension.js';
+import { LinearDimensionBase } from './linearDimensionBase.js';
 
 import { DesignCore } from '../designCore.js';
+import { Property } from '../properties/property.js';
+import { RubberBand } from '../lib/auxiliary/rubberBand.js';
 
 
 /**
  * Rotated Dimension Entity Class
- * @extends BaseLinearDimension
+ * @extends LinearDimensionBase
  */
-export class RotatedDimension extends BaseLinearDimension {
+export class RotatedDimension extends LinearDimensionBase {
   /**
    * Create an Rotated Dimension
    * @param {Array} data
@@ -42,12 +44,12 @@ export class RotatedDimension extends BaseLinearDimension {
   async execute() {
     try {
       DesignCore.Scene.selectionManager.reset();
-      this.dimensionStyle = DesignCore.DimStyleManager.getCstyle();
+      this.setProperty(Property.Names.DIMENSIONSTYLE, DesignCore.DimStyleManager.getCstyle());
       this.dimType.setDimType(0); // Rotated dimension
 
       const opAngle = new PromptOptions(Strings.Input.ROTATION, [Input.Type.NUMBER]);
       const angleValue = await DesignCore.Scene.inputManager.requestInput(opAngle);
-      this.linearDimAngle = Number(angleValue) || 0;
+      this.setProperty(Property.Names.LINEARDIMANGLE, Number(angleValue) || 0);
 
       const op = new PromptOptions(Strings.Input.START, [Input.Type.POINT]);
       const pt13 = await DesignCore.Scene.inputManager.requestInput(op);
@@ -65,7 +67,7 @@ export class RotatedDimension extends BaseLinearDimension {
       this.points.push(pt11);
 
       const tempLine = new Line({ points: [pt13, pt14] });
-      this.points = RotatedDimension.getPointsFromSelection([tempLine], pt11, this.linearDimAngle);
+      this.points = RotatedDimension.getPointsFromSelection([tempLine], pt11, this.getProperty(Property.Names.LINEARDIMANGLE));
 
       DesignCore.Scene.inputManager.executeCommand(this);
     } catch (err) {
@@ -75,20 +77,20 @@ export class RotatedDimension extends BaseLinearDimension {
 
   /**
      * Get sequenced points from user selection
-     * @param {any} items
+     * @param {any} entities
      * @param {Point} textPos
      * @param {number} angle - rotation angle in degrees (default 0 = horizontal)
      * @return {Array} array of points
      */
-  static getPointsFromSelection(items, textPos, angle = 0) {
+  static getPointsFromSelection(entities, textPos, angle = 0) {
     const points = [];
-    const item = items[0];
+    const entity = entities[0];
 
-    const Pt13 = item.points[0];
+    const Pt13 = entity.points[0];
     Pt13.sequence = 13;
     points.push(Pt13);
 
-    const Pt14 = item.points[1];
+    const Pt14 = entity.points[1];
     Pt14.sequence = 14;
     points.push(Pt14);
 
@@ -117,16 +119,15 @@ export class RotatedDimension extends BaseLinearDimension {
   preview() {
     if (this.points.length === 1) {
       const mousePoint = DesignCore.Mouse.pointOnScene();
-      const points = [this.points.at(0), mousePoint];
-      DesignCore.Scene.tempEntities.create('Line', { points: points });
+      DesignCore.Scene.auxiliaryEntities.add(new RubberBand([this.points.at(0), mousePoint]));
     }
 
     if (this.points.length > 1) {
       const pt11 = DesignCore.Mouse.pointOnScene();
       pt11.sequence = 11;
       const tempLine = new Line({ points: [this.points[0], this.points[1]] });
-      const points = RotatedDimension.getPointsFromSelection([tempLine], pt11, this.linearDimAngle);
-      DesignCore.Scene.tempEntities.create(this.type, { points: points, dimensionStyle: this.dimensionStyle });
+      const points = RotatedDimension.getPointsFromSelection([tempLine], pt11, this.getProperty(Property.Names.LINEARDIMANGLE));
+      DesignCore.Scene.previewEntities.create(this.type, { points: points, dimensionStyle: this.getProperty(Property.Names.DIMENSIONSTYLE) });
     }
   }
 
@@ -141,10 +142,10 @@ export class RotatedDimension extends BaseLinearDimension {
     const Pt14 = this.getPointBySequence(this.points, 14);
 
     file.writeGroupCode('0', 'DIMENSION');
-    file.writeGroupCode('5', this.handle, DXFFile.Version.R2000); // Handle
+    file.writeGroupCode('5', this.getProperty(Property.Names.HANDLE), DXFFile.Version.R2000); // Handle
     file.writeGroupCode('100', 'AcDbEntity', DXFFile.Version.R2000);
     file.writeGroupCode('100', 'AcDbDimension', DXFFile.Version.R2000);
-    file.writeGroupCode('8', this.layer);
+    file.writeGroupCode('8', this.getProperty(Property.Names.LAYER));
     // file.writeGroupCode('2', this.blockName);  // Block not required
     file.writeGroupCode('10', Pt10.x); // X - definition / arrow point
     file.writeGroupCode('20', Pt10.y); // Y
@@ -153,7 +154,7 @@ export class RotatedDimension extends BaseLinearDimension {
     file.writeGroupCode('21', Pt11.y); // Y
     file.writeGroupCode('31', '0.0'); // Z
     file.writeGroupCode('70', this.dimType.getDimType()); // DIMENSION TYPE
-    file.writeGroupCode('3', this.dimensionStyle); // DIMENSION STYLE
+    file.writeGroupCode('3', this.getProperty(Property.Names.DIMENSIONSTYLE)); // DIMENSION STYLE
     file.writeGroupCode('100', 'AcDbAlignedDimension', DXFFile.Version.R2000);
     file.writeGroupCode('13', Pt13.x); // X - start point of first extension line
     file.writeGroupCode('23', Pt13.y); // Y
@@ -161,7 +162,7 @@ export class RotatedDimension extends BaseLinearDimension {
     file.writeGroupCode('14', Pt14.x); // X - start point of second extension line
     file.writeGroupCode('24', Pt14.y); // Y
     file.writeGroupCode('34', '0.0'); // Z
-    file.writeGroupCode('50', this.linearDimAngle); // Utils.radians2degrees(Pt13.angle(Pt14))); // Rotation angle
+    file.writeGroupCode('50', this.getProperty(Property.Names.LINEARDIMANGLE)); // Utils.radians2degrees(Pt13.angle(Pt14))); // Rotation angle
     file.writeGroupCode('100', 'AcDbRotatedDimension', DXFFile.Version.R2000);
   }
 }