@design-core/core 0.0.6 → 50.1.0

package/core/properties/propertyManager.js

@@ -28,79 +28,81 @@ export class PropertyManager {
   }
 
   /**
-   * Set item properties
+   * Set entity properties
    * @param {string} property
    * @param {any} newPropertyValue
-   * @param {string} itemType
+   * @param {string} entityType
    */
-  setItemProperties(property, newPropertyValue, itemType='All') {
+  setEntityProperties(property, newPropertyValue, entityType='All') {
     const stateChanges = [];
     for (let i = 0; i < DesignCore.Scene.selectionManager.selectionSet.selectionSet.length; i++) {
       const index = DesignCore.Scene.selectionManager.selectionSet.selectionSet[i];
 
-      const item = DesignCore.Scene.entities.get(index);
+      const entity = DesignCore.Scene.entities.get(index);
 
-      // check if the item is of the selected type
-      if (itemType !== 'All' && item.type !== itemType) {
+      // check if the entity is of the selected type
+      if (entityType !== 'All' && entity.type !== entityType) {
         continue;
       }
 
-      // check if the item has the selected property
-      if (!item.hasOwnProperty(property)) {
+      // check if the entity has the selected property
+      if (!entity.properties?.has(property)) {
         continue;
       }
 
-      if (typeof (item[property]) !== typeof (newPropertyValue)) {
+      const currentValue = entity.getProperty(property);
+
+      if (typeof (currentValue) !== typeof (newPropertyValue)) {
         DesignCore.Core.notify(Strings.Error.INPUT);
       } else {
-        // update the item property
+        // update the entity property
         const update = {};
         update[property] = newPropertyValue;
-        const stateChange = new UpdateState(item, update);
+        const stateChange = new UpdateState(entity, update);
         stateChanges.push(stateChange);
       }
     }
     DesignCore.Scene.commit(stateChanges);
-    DesignCore.Scene.selectionManager.reloadSelectedItems();
+    DesignCore.Scene.selectionManager.reloadSelectedEntities();
   }
 
   /**
    * Get the types of items selected
    * @return {Array}
    */
-  getItemTypes() {
-    // Loop through the items and get a list of item types.
-    const itemTypes = [];
+  getEntityTypes() {
+    // Loop through the items and get a list of entity types.
+    const entityTypes = [];
 
     if (DesignCore.Scene.selectionManager.selectionSet.selectionSet.length > 0) {
       for (let i = 0; i < DesignCore.Scene.selectionManager.selectionSet.selectionSet.length; i++) {
-        const item = DesignCore.Scene.entities.get(DesignCore.Scene.selectionManager.selectionSet.selectionSet[i]);
-        const itemType = item.type;
+        const entity = DesignCore.Scene.entities.get(DesignCore.Scene.selectionManager.selectionSet.selectionSet[i]);
+        const entityType = entity.type;
 
-        if (itemTypes.indexOf(itemType, 0) === -1) {
-          itemTypes.push(itemType);
+        if (entityTypes.indexOf(entityType, 0) === -1) {
+          entityTypes.push(entityType);
         }
       }
 
       // if there is more that one type add an option for all
-      if (itemTypes.length > 1) {
-        itemTypes.unshift('All');
+      if (entityTypes.length > 1) {
+        entityTypes.unshift('All');
       }
     }
 
-    return itemTypes;
+    return entityTypes;
   }
 
   /**
-   * Get a list of common propertie
-   * @param {string} itemType
+   * Get a list of common properties
+   * @param {string} entityType
    * @return {Array}
    */
-  getItemProperties(itemType) {
+  getEntityProperties(entityType) {
     // Loop through the items and get a list of common properties.
 
-    // check for valid itemType and selectionSet
-    if (itemType === undefined || itemType === null || DesignCore.Scene.selectionManager.selectionSet.selectionSet.length <= 0) {
+    // check for valid entityType and selectionSet
+    if (entityType === undefined || entityType === null || DesignCore.Scene.selectionManager.selectionSet.selectionSet.length <= 0) {
       return;
     }
 
@@ -112,48 +114,62 @@ export class PropertyManager {
     });
 
     // get a subset of the selectionSet
-    if (itemType !== 'All') {
-      subset = subset.filter((el) => el.type === itemType);
+    if (entityType !== 'All') {
+      subset = subset.filter((el) => el.type === entityType);
     }
 
     const propertiesList = [];
 
     subset.forEach((el) => {
-      // get list of keys
-      Object.keys(el).forEach((key) => {
-        // check if the key is already in the propertiesList
-        if (propertiesList.includes(key) === false) {
-          // check if all subset items contain the key and the key is enumberable
-          if (subset.every((el) => el.hasOwnProperty(key) && Object.getOwnPropertyDescriptor(el, key).enumerable)) {
-            propertiesList.push(key);
+      if (el.properties) {
+        el.properties.list().forEach((key) => {
+          if (propertiesList.includes(key) === false) {
+            if (subset.every((sub) => sub.properties?.has(key))) {
+              propertiesList.push(key);
+            }
           }
-        }
-      });
+        });
+      }
     });
 
     return propertiesList;
   }
 
 
+  /**
+   * Get the Property descriptor for a named property from a representative selected entity.
+   * @param {string} entityType
+   * @param {string} property
+   * @return {Property|undefined}
+   */
+  getEntityPropertyDefinition(entityType, property) {
+    const index = DesignCore.Scene.selectionManager.selectionSet.selectionSet.find((i) => {
+      const entity = DesignCore.Scene.entities.get(i);
+      return (entityType === 'All' || entity.type === entityType) && entity.properties?.has(property);
+    });
+    if (index === undefined) return undefined;
+    return DesignCore.Scene.entities.get(index).properties.definition(property);
+  }
+
   /**
    * Get a list the property values
-   * @param {string} itemType
+   * @param {string} entityType
    * @param {string} property
    * @return {Array}
    */
-  getItemPropertyValue(itemType, property) {
+  getEntityPropertyValue(entityType, property) {
     // Loop through the items and get a list the property values
     const propertiesValueList = [];
     if (DesignCore.Scene.selectionManager.selectionSet.selectionSet.length > 0) {
       for (let i = 0; i < DesignCore.Scene.selectionManager.selectionSet.selectionSet.length; i++) {
-        if (DesignCore.Scene.entities.get(DesignCore.Scene.selectionManager.selectionSet.selectionSet[i]).type === itemType || itemType === 'All') {
-          const prop = DesignCore.Scene.entities.get(DesignCore.Scene.selectionManager.selectionSet.selectionSet[i])[property];
-          propertiesValueList.push(prop);
+        if (DesignCore.Scene.entities.get(DesignCore.Scene.selectionManager.selectionSet.selectionSet[i]).type === entityType || entityType === 'All') {
+          const entity = DesignCore.Scene.entities.get(DesignCore.Scene.selectionManager.selectionSet.selectionSet[i]);
+          propertiesValueList.push(entity.getProperty(property));
         }
       }
     }
 
-    // Check if every item in the selection set has the same value for the property
+    // Check if every entity in the selection set has the same value for the property
     if (propertiesValueList.every((prop) => {
       return prop === propertiesValueList[0];
     })) {

package/core/tables/block.js

@@ -8,9 +8,11 @@ import { Input, PromptOptions } from '../lib/inputManager.js';
 import { Flags } from '../properties/flags.js';
 import { Property } from '../properties/property.js';
 import { AddState, RemoveState } from '../lib/stateManager.js';
+import { Logging } from '../lib/logging.js';
+import { Utils } from '../lib/utils.js';
 
 import { DesignCore } from '../designCore.js';
-import { Utils } from '../lib/utils.js';
+
 
 /**
  * Block Entity Class
@@ -36,7 +38,7 @@ export class Block extends Entity {
       writable: true,
     });
 
-    Object.defineProperty(this, 'items', {
+    Object.defineProperty(this, 'entities', {
       value: [],
       writable: true,
     });
@@ -47,8 +49,8 @@ export class Block extends Entity {
         this.name = data.name || data[2];
       }
 
-      if (data.hasOwnProperty('items')) {
-        this.items = data.items;
+      if (data.hasOwnProperty('entities')) {
+        this.entities = data.entities;
       }
 
       if (data.hasOwnProperty('flags') || data.hasOwnProperty('70')) {
@@ -114,19 +116,21 @@ export class Block extends Entity {
       // array to hold state changes
       const stateChanges = [];
 
-      // move selected items from scene to block
+      // move selected entities from scene to block
       selections.forEach((index) => {
-        const item = DesignCore.Scene.entities.get(index);
-        // remove item from scene
-        const copyofitem = Utils.cloneObject(item);
-        // adjust the items points to reflect the insert point
+        const entity = DesignCore.Scene.entities.get(index);
+        // remove entity from scene
+        const copyOfEntity = Utils.cloneObject(entity);
+        // assign a fresh handle — the block entity is a new entity distinct from the scene entity
+        copyOfEntity.setProperty('handle', DesignCore.HandleManager.next());
+        // adjust the entity's points to reflect the insert point
         const delta = new Point(-insertPoint.x, -insertPoint.y);
-        if (item.hasOwnProperty('points')) {
-          const points = copyofitem.points.map((p) => new Point(p.x, p.y, p.bulge, p.sequence).add(delta));
-          copyofitem.setProperty('points', points);
+        if (copyOfEntity.points?.length) {
+          const points = copyOfEntity.points.map((p) => new Point(p.x, p.y, p.bulge, p.sequence).add(delta));
+          copyOfEntity.setProperty('points', points);
         }
-        block.items.push(copyofitem);
-        const stateChangeRemove = new RemoveState(item);
+        block.entities.push(copyOfEntity);
+        const stateChangeRemove = new RemoveState(entity);
         stateChanges.push(stateChangeRemove);
       });
 
@@ -161,9 +165,9 @@ export class Block extends Entity {
    */
   dxf(file) {
     file.writeGroupCode('0', 'BLOCK');
-    file.writeGroupCode('5', this.handle, DXFFile.Version.R2000); // Handle
+    file.writeGroupCode('5', this.getProperty('handle'), DXFFile.Version.R2000); // Handle
     file.writeGroupCode('100', 'AcDbEntity', DXFFile.Version.R2000);
-    file.writeGroupCode('8', this.layer);
+    file.writeGroupCode('8', this.getProperty('layer'));
     file.writeGroupCode('100', 'AcDbBlockBegin', DXFFile.Version.R2000);
     file.writeGroupCode('2', this.name);
     file.writeGroupCode('70', this.flags.getFlagValue());
@@ -173,8 +177,8 @@ export class Block extends Entity {
     file.writeGroupCode('3', this.name); // Name again
     file.writeGroupCode('1', '');
 
-    for (let i = 0; i < this.items.length; i++) {
-      this.items[i].dxf(file);
+    for (let i = 0; i < this.entities.length; i++) {
+      this.entities[i].dxf(file);
     }
 
     const endblk = new EndBlock({ handle: this.endblkHandle });
@@ -182,53 +186,18 @@ export class Block extends Entity {
   }
 
   /**
-   * Clear items from the block
-   */
-  clearItems() {
-    this.items = [];
-  }
-
-  /**
-   * Add an item to the block
-   * @param {Object} item
+   * Clear entities from the block
    */
-  addItem(item) {
-    this.items.push(item);
+  clearEntities() {
+    this.entities = [];
   }
 
   /**
-   * Draw the entity
-   * @param {Object} ctx - context
-   * @param {number} scale
-   * @param {Object} insert - insert entity
+   * Add an entity to the block
+   * @param {Object} entity
    */
-  draw(ctx, scale, insert = undefined) {
-    if (!this.items.length) {
-      // nothing to draw
-      return;
-    }
-
-    this.items.forEach((item) => {
-      ctx.save();
-      // Use the current item and block insert to set the context
-      // insert required for colour ByBlock
-      DesignCore.Canvas.setContext(item, ctx, insert);
-
-      item.draw(ctx, scale);
-      ctx.restore();
-    });
-
-    /*
-        //////////////////////////////////////////
-        // draw test point for location
-        ctx.strokeStyle = Colours.rgbToString(colour);
-        ctx.lineWidth = 1 / scale;
-        ctx.beginPath()
-        ctx.moveTo(this.points[0].x, this.points[0].y);
-        ctx.arc(this.points[0].x, this.points[0].y, 5 / scale, radians2degrees(0), radians2degrees(360), false);
-        ctx.stroke();
-        //////////////////////////////////////////
-        */
+  addEntity(entity) {
+    this.entities.push(entity);
   }
 
   /**
@@ -240,15 +209,15 @@ export class Block extends Entity {
   snaps(mousePoint, delta) {
     const snaps = [];
 
-    if (!this.items.length) {
+    if (!this.entities.length) {
       // nothing to draw
       return snaps;
     }
 
-    for (let item = 0; item < this.items.length; item++) {
-      // collect the child item snaps
-      const itemSnaps = this.items[item].snaps(mousePoint, delta);
-      snaps.push(...itemSnaps);
+    for (let entity = 0; entity < this.entities.length; entity++) {
+      // collect the child entity snaps
+      const entitySnaps = this.entities[entity].snaps(mousePoint, delta);
+      snaps.push(...entitySnaps);
     }
 
     return snaps;
@@ -263,19 +232,19 @@ export class Block extends Entity {
     let distance = Infinity;
     let minPnt = P;
 
-    if (!this.items.length) {
+    if (!this.entities.length) {
       // nothing to draw
       return [minPnt, distance];
     }
 
-    for (let idx = 0; idx < this.items.length; idx++) {
-      const itemClosestPoint = this.items[idx].closestPoint(P);
-      const itemPnt = itemClosestPoint[0];
-      const itemDist = itemClosestPoint[1];
+    for (let idx = 0; idx < this.entities.length; idx++) {
+      const entityClosestPoint = this.entities[idx].closestPoint(P);
+      const entityPnt = entityClosestPoint[0];
+      const entityDist = entityClosestPoint[1];
 
-      if (itemDist < distance) {
-        distance = itemDist;
-        minPnt = itemPnt;
+      if (entityDist < distance) {
+        distance = entityDist;
+        minPnt = entityPnt;
       }
     }
 
@@ -292,13 +261,13 @@ export class Block extends Entity {
     let ymin = Infinity;
     let ymax = -Infinity;
 
-    for (let idx = 0; idx < this.items.length; idx++) {
-      const itemBoundingBox = this.items[idx].boundingBox();
+    for (let idx = 0; idx < this.entities.length; idx++) {
+      const entityBoundingBox = this.entities[idx].boundingBox();
 
-      xmin = Math.min(xmin, itemBoundingBox.xMin);
-      xmax = Math.max(xmax, itemBoundingBox.xMax);
-      ymin = Math.min(ymin, itemBoundingBox.yMin);
-      ymax = Math.max(ymax, itemBoundingBox.yMax);
+      xmin = Math.min(xmin, entityBoundingBox.xMin);
+      xmax = Math.max(xmax, entityBoundingBox.xMax);
+      ymin = Math.min(ymin, entityBoundingBox.yMin);
+      ymax = Math.max(ymax, entityBoundingBox.yMax);
     }
 
     const topLeft = new Point(xmin, ymax);
@@ -313,8 +282,8 @@ export class Block extends Entity {
    * @return {boolean} true if touched
    */
   touched(selection) {
-    for (let idx = 0; idx < this.items.length; idx++) {
-      const touched = this.items[idx].touched(selection);
+    for (let idx = 0; idx < this.entities.length; idx++) {
+      const touched = this.entities[idx].touched(selection);
       if (touched) {
         return true;
       }

package/core/tables/dimStyle.js

@@ -321,11 +321,11 @@ export class DimStyle {
     this.DIMTMOVE = Property.loadValue([data.DIMTMOVE, data[279]], 0);
 
     // DXF Groupcode 280 - Horizontal dimension text position:
-    // 0 = Above dimension line and center-justified between extension lines
+    // 0 = Above dimension line and centre-justified between extension lines
     // 1 = Above dimension line and next to first extension line
     // 2 = Above dimension line and next to second extension line
-    // 3 = Above and center-justified to first extension line
-    // 4 = Above and center-justified to second extension line
+    // 3 = Above and centre-justified to first extension line
+    // 4 = Above and centre-justified to second extension line
     this.DIMJUST = Property.loadValue([data.DIMJUST, data[280]], 0);
 
     // DXF Groupcode 281 - Suppression of first extension line:
@@ -506,7 +506,7 @@ export class DimStyle {
   }
 
   /**
-   * get the DIMCEN property for the center mark size
+   * get the DIMCEN property for the centre mark size
    * @return {Number} DIMCEN value
    * This uses two internal values to define the DIMCEN property
    * DIMCENSTYL & DIMCENVALUE
@@ -604,7 +604,7 @@ export class DimStyle {
     file.writeGroupCode('275', this.DIMAUNIT, DXFFile.Version.R13);
     file.writeGroupCode('276', this.DIMFRAC, DXFFile.Version.R2000);
     file.writeGroupCode('277', this.DIMLUNIT, DXFFile.Version.R2000);
-    // file.writeGroupCode('278', this.DIMDSEP, DXFFile.Version.R14)); - TODO: AutoCAD uses a numberical description
+    // file.writeGroupCode('278', this.DIMDSEP, DXFFile.Version.R14)); - TODO: AutoCAD uses a numerical description
     file.writeGroupCode('279', this.DIMTMOVE, DXFFile.Version.R2000);
     file.writeGroupCode('280', this.DIMJUST, DXFFile.Version.R13);
     file.writeGroupCode('281', this.DIMSD1 ? 1 : 0, DXFFile.Version.R13); // convert bool to int

package/core/tables/endblk.js

@@ -20,7 +20,7 @@ export class EndBlock extends Entity {
    */
   dxf(file) {
     file.writeGroupCode('0', 'ENDBLK');
-    file.writeGroupCode('5', this.handle, DXFFile.Version.R2000); // Handle
+    file.writeGroupCode('5', this.getProperty('handle'), DXFFile.Version.R2000); // Handle
     file.writeGroupCode('100', 'AcDbEntity', DXFFile.Version.R2000);
     // file.writeGroupCode('8', this.layer);
     file.writeGroupCode('100', 'AcDbBlockEnd', DXFFile.Version.R2000);

package/core/tables/layer.js

@@ -166,6 +166,14 @@ export class Layer {
     return false;
   }
 
+  /**
+   * Determine if layer is plottable (visible and plotting flag set)
+   * @return {boolean}
+   */
+  get isPlottable() {
+    return this.isVisible && this.plotting;
+  }
+
   /**
    * Determine if layer is selectable
    * @return {boolean}

package/core/tables/ltypeManager.js

@@ -48,7 +48,7 @@ export class LTypeManager extends StyleManagerBase {
    */
   dxf(file) {
     // Create table data for ltype styles
-    // The LTYPE Table must preceed the LAYER table
+    // The LTYPE Table must precede the LAYER table
     file.writeGroupCode('0', 'TABLE');
     file.writeGroupCode('2', 'LTYPE');
     file.writeGroupCode('5', this.handle, DXFFile.Version.R2000);

package/core/tables/styleManagerBase.js

@@ -40,7 +40,7 @@ export class StyleManagerBase extends TableManagerBase {
     const selectionSet = [];
 
     for (let i = 0; i < DesignCore.Scene.entities.count(); i++) {
-      if (DesignCore.Scene.entities.get(i)[this.itemProperty] === style) {
+      if ((DesignCore.Scene.entities.get(i).getProperty?.(this.itemProperty) ?? DesignCore.Scene.entities.get(i)[this.itemProperty]) === style) {
         selectionSet.push(i);
       }
     }
@@ -79,7 +79,8 @@ export class StyleManagerBase extends TableManagerBase {
     this.addStandardItems();
 
     for (let i = 0; i < DesignCore.Scene.entities.count(); i++) {
-      const style = (DesignCore.Scene.entities.get(i)[this.itemProperty]);
+      const entity = DesignCore.Scene.entities.get(i);
+      const style = entity.getProperty?.(this.itemProperty) ?? entity[this.itemProperty];
       this.addItem({
         'name': style,
       });

package/core/tables/tableManagerBase.js

@@ -122,10 +122,15 @@ export class TableManagerBase {
       return this.getItemByName(newItemName);
     }
 
-    if (newItem.handle === undefined) {
-      newItem.handle = DesignCore.HandleManager.next();
+    const existingHandle = newItem.getProperty?.('handle') ?? newItem.handle;
+    if (existingHandle === undefined) {
+      if (newItem.setProperty) {
+        newItem.setProperty('handle', DesignCore.HandleManager.next());
+      } else {
+        newItem.handle = DesignCore.HandleManager.next();
+      }
     } else {
-      DesignCore.HandleManager.checkHandle(newItem.handle);
+      DesignCore.HandleManager.checkHandle(existingHandle);
     }
 
     if (!exists) {

package/core/tables/vport.js

@@ -12,9 +12,9 @@ export class VPort {
     this.handle = Property.loadValue([data?.handle, data?.[5]]);
     // DXF Groupcode 2 - Name
     this.name = Property.loadValue([data?.name, data?.[2]], '*ACTIVE');
-    // DXF Groupcode 12 - View center X
+    // DXF Groupcode 12 - View centre X
     this.viewCenterX = Property.loadValue([data?.viewCenterX, data?.[12]], 0);
-    // DXF Groupcode 22 - View center Y
+    // DXF Groupcode 22 - View centre Y
     this.viewCenterY = Property.loadValue([data?.viewCenterY, data?.[22]], 0);
     // DXF Groupcode 40 - VPort height
     this.height = Property.loadValue([data?.height, data?.[40]], 0);