Stored the AutoCad color index in the layer data, updated tests to ex…

…pect additional data
liuwanfu · May 14, 2018 · c28177c · c28177c
1 parent dc14930
commit c28177c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/dist/dxf-parser.js b/dist/dxf-parser.js
@@ -988,7 +988,8 @@ DxfParser.prototype._parse = function(dxfString) {
 				case 62: // color, visibility
 					layer.visible = curr.value >= 0;
 					// TODO 0 and 256 are BYBLOCK and BYLAYER respectively. Need to handle these values for layers?.
-					layer.color = getAcadColor(Math.abs(curr.value));
+					layer.colorIndex = Math.abs(curr.value);
+					layer.color = getAcadColor(layer.colorIndex);
 					curr = scanner.next();
 					break;
 				case 70: // frozen layer

diff --git a/lib/DxfParser.js b/lib/DxfParser.js
@@ -575,7 +575,8 @@ DxfParser.prototype._parse = function(dxfString) {
 				case 62: // color, visibility
 					layer.visible = curr.value >= 0;
 					// TODO 0 and 256 are BYBLOCK and BYLAYER respectively. Need to handle these values for layers?.
-					layer.color = getAcadColor(Math.abs(curr.value));
+					layer.colorIndex = Math.abs(curr.value);
+					layer.color = getAcadColor(layer.colorIndex);
 					curr = scanner.next();
 					break;
 				case 70: // frozen layer

diff --git a/test/data/extendeddata.expected.json b/test/data/extendeddata.expected.json
@@ -986,6 +986,7 @@
           "name": "0",
           "frozen": false,
           "visible": true,
+          "colorIndex": 7,
           "color": 16777215
         }
       }

diff --git a/test/data/layer-table.expected.json b/test/data/layer-table.expected.json
@@ -6,12 +6,14 @@
       "frozen": false,
       "name": "0",
       "visible": true,
+      "colorIndex": 7,
       "color": 16777215
     },
     "Layer 1": {
       "frozen": true,
       "name": "Layer 1",
       "visible": true,
+      "colorIndex": 7,
       "color": 16777215
     }
   }