瀏覽代碼

Update 'src/app/core/parser/parser-orchestrator.js'

Fixing midpoint object MiddlePoint: now constructing only one geometric object.
Indentation adjusts: inserted space in all function/method declaration (before open parenthesis) to distinguish it from its use.
Inserted one "console.log" to help in debug process.
leo 2 年之前
父節點
當前提交
56ef432764
共有 1 個文件被更改,包括 23 次插入21 次删除
  1. 23 21
      src/app/core/parser/parser-orchestrator.js

+ 23 - 21
src/app/core/parser/parser-orchestrator.js

@@ -1,5 +1,6 @@
 import { ELEMENTS_CLASS } from "../enums/elements-class-enum";
 import { PointModel } from "../../components/point-component/models/point-model";
+import { MiddlePointModel } from "../../components/middle-point/models/middle-point-model";
 import { CircumferenceModel } from "../../components/circumference-component/models/circumference-model";
 import { LineSegmentModel } from "../../components/line-segment-component/models/line-segment-model";
 import { IntersectionModel } from "../../components/intersection-component/models/intersection-model";
@@ -8,17 +9,20 @@ import { label as Label } from '../../component-registry/label';
 import { LineModel } from "../../components/line-component/models/line-model";
 export class ParserOrchestrator {
 
-  constructor(mapArr) {
+  constructor (mapArr) {
     this.mapArr = mapArr;
     this.list = new Array();
     this.drawersMap = new Map();
     this.tools = menu.tools;
-  }
-  orchestrate() {
-    for (const i in this.mapArr) this.do(this.mapArr[i]);
+    }
+  orchestrate () {
+var aux = "";
+var ii=0;
+    for (const i in this.mapArr) { this.do(this.mapArr[i]); aux += "(" + ii + "," + this.mapArr[i] + "); "; ii++; }
     for (const i in this.list) this.draw(this.list[i]);
-  }
-  do(map) {
+console.log("parser-orchestrator.js: orchestrate(): " + aux);
+    }
+  do (map) {
     let object;
     switch (map.get("type")) {
       case ELEMENTS_CLASS.CIRCUMFERENCE:
@@ -30,6 +34,9 @@ export class ParserOrchestrator {
       case ELEMENTS_CLASS.POINT:
         object = PointModel.do(map, this.list);
         break;
+      case ELEMENTS_CLASS.MIDDLE_POINT:
+        object = MiddlePointModel.do(map, this.list);
+        break;
       case ELEMENTS_CLASS.LINE_SEGMENT:
         object = LineSegmentModel.do(map, this.list);
         break;
@@ -38,8 +45,7 @@ export class ParserOrchestrator {
         break;
       default:
         break;
-
-    }
+      }
     if (object == undefined) return;
     switch (object.elementClass) {
       case ELEMENTS_CLASS.CIRCUMFERENCE:
@@ -48,11 +54,10 @@ export class ParserOrchestrator {
         Label.pushLower(object.label);
       default:
         Label.pushUpper(object.label);
-    }
+      }
     this.list.push(object);
-
-  }
-  draw(object) {
+    }
+  draw (object) {
     if (object == undefined) return;
     let drawer;
 
@@ -74,15 +79,12 @@ export class ParserOrchestrator {
         break;
       default:
         break;
-    }
-    drawer.draw({
-      attrs: {
-        genericObject: object
       }
-    });
-  }
+    drawer.draw ({ attrs: { genericObject: object } });
+    }
 
-  getDrawer(elementClass) {
+  getDrawer (elementClass) {
     return this.tools.find(x => x.drawer.elementClass === elementClass).drawer;
-  }
-}
+    }
+
+  }