Ver código fonte

Update 'src/app/core/application/objects.js'

Fix ID numbering and read of GEO with 3 straight lines (not fineshed!)
Improvements in indentation
+ getByKonvaObject (konvaObject): additional lines to help in debug process
leo 2 anos atrás
pai
commit
8ea79955b4
1 arquivos alterados com 53 adições e 25 exclusões
  1. 53 25
      src/app/core/application/objects.js

+ 53 - 25
src/app/core/application/objects.js

@@ -1,37 +1,65 @@
-import { stageManager as StageManager } from "./stage-manager";
+ { stageManager as StageManager } from "./stage-manager";
 
 class Objects {
-  constructor() { }
-  add(aggregator) {
+
+  constructor () { }
+
+  add (aggregator) {
     StageManager.getCurrentLayer().addAggregator(aggregator);
-  }
-  get() {
+    }
+
+  get () {
     return StageManager.getCurrentLayer().getAggregators();
-  }
-  getByGenericObject(genericObject) {
+    }
+
+  getByGenericObject (genericObject) {
     return this.get().filter(e => e.genericObject.id == genericObject.id);
-  }
-  getByKonvaObject(konvaObject) {
-    return this.get().filter(
-      e =>
-        e.konvaObject._id == konvaObject._id ||
-        e.konvaObject.children.filter(x => x._id == konvaObject._id)[0] !=
-        undefined
-    );
-  }
-  getSelectedObjects() {
+    }
+
+  getByKonvaObject (konvaObject) {
+    var objKonva;
+    var listOfAggregators;
+    var aux = "[(", tam, ii;
+    try {
+      aux += "konvaObject._id=" + konvaObject._id + ", ";
+      listOfAggregators = this.get();
+      tam = listOfAggregators.length;
+      for (ii=0; ii<tam; ii++) aux += ii + "::" + listOfAggregators[ii].konvaObject._id + "; ";
+      aux += ")]";
+      console.log("objects.js!getByKonvaObject(konvaObject): " + aux);
+    } catch (error) { console.log("objects.js!getByKonvaObject(konvaObject): (1) error " + error); }
+    try {
+      //D objKonva = this.get().filter(
+      objKonva = listOfAggregators.filter(
+        e =>
+          e.konvaObject._id == konvaObject._id ||
+          e.konvaObject.children.filter(x => x._id == konvaObject._id)[0] != undefined
+        );
+    } catch (error) {
+      var aux1 = (e.konvaObject==undefined ? "<erro 1>" : e.konvaObject._id);
+      var aux2 = (konvaObject==undefined ? "<erro 2>" : konvaObject._id);
+      console.log("objects.js!getByKonvaObject(konvaObject): error " + error + ", with e.konvaObject._id=" + aux1 + ", konvaObject._id=" + aux2);
+      }
+    return objKonva;
+    }
+
+  getSelectedObjects () {
     return StageManager.getCurrentLayer().getSelectedAggregators();
-  }
-  setSelectedOject(aggregator) {
+    }
+
+  setSelectedOject (aggregator) {
     if (!aggregator.visible) return;
     return StageManager.getCurrentLayer().setSelectedAggregator(aggregator);
-  }
-  removeSelectedOject(aggregator) {
+    }
+
+  removeSelectedOject (aggregator) {
     return StageManager.getCurrentLayer().removeSelectedAggregator(aggregator);
-  }
-  removeAggregator(aggregator) {
+    }
 
+  removeAggregator (aggregator) {
     StageManager.getCurrentLayer().removeAggregator(aggregator);
+    }
+
   }
-}
-export const objects = new Objects();
+
+export const objects = new Objects();