#21 Group move

Author: SeungpilPark

src/main/webapp/examples/develope.html

@@ -352,7 +352,7 @@
 
             var dataTable = new OG.DataTable();
             var data = [];
-            for (var i = 0; i < 20; i++) {
+            for (var i = 0; i < 2; i++) {
                 data.push({
                     activity: '견적 TFT / EM' + i,
                     '90_': [
@@ -389,15 +389,15 @@
                 })
             }
 
-//            var start = new Date();
-//            dataTable.MOVABLE = false;
-//            canvas.drawShape([100, 100], dataTable, [100, 100], {});
-//            dataTable.setData(data);
-//            dataTable.draw();
-//            var end = new Date();
-//            var number = end.getTime() - start.getTime();
+            var start = new Date();
+            dataTable.MOVABLE = false;
+            canvas.drawShape([100, 100], dataTable, [100, 100], {});
+            dataTable.setData(data);
+            dataTable.draw();
+            var end = new Date();
+            var number = end.getTime() - start.getTime();
 
-            canvas.drawShape([100, 100], new OG.RectangleShape(), [100, 100], {});
+//            canvas.drawShape([100, 100], new OG.RectangleShape(), [100, 100], {});
 
         });
 

src/main/webapp/opengraph/OpenGraph-0.1.2-SNAPSHOT-All.js

@@ -881,7 +881,7 @@ OG.handler.EventHandler.prototype = {
                             if (!parentNode) {
                                 parentNode = ele.parentNode;
                             }
-                            if (parentNode.id !== root.id) {
+                            if (parentNode && parentNode.id !== root.id) {
                                 addToGroupArray.push(ele);
                             }
                         });
@@ -4899,6 +4899,9 @@ OG.handler.EventHandler.prototype = {
             if (renderer.isEdge(ele)) {
                 return;
             }
+            if(ele.shape && !ele.shape.MOVABLE){
+                return;
+            }
             connectCheckShapes.push(ele);
             if (renderer.isGroup(ele)) {
                 $.each(renderer.getInnerShapesOfGroup(ele), function (idx, innerShape) {
@@ -4928,10 +4931,11 @@ OG.handler.EventHandler.prototype = {
             renderer.remove(item.box);
 
             // 이동
-            renderer.move(ele, [dx, dy], excludeEdgeId);
+            if(ele.shape && ele.shape.MOVABLE){
+                renderer.move(ele, [dx, dy], excludeEdgeId);
+                eleArray.push(ele);
+            }
             renderer.drawGuide(ele);
-
-            eleArray.push(ele);
         });
 
         return eleArray;

src/main/webapp/opengraph/OpenGraph-0.1.2-SNAPSHOT-min.js

@@ -3942,10 +3942,10 @@ OG.renderer.RaphaelRenderer.prototype.ungroup = function (groupElements) {
 OG.renderer.RaphaelRenderer.prototype.addToGroup = function (groupElement, elements) {
     for (var i = 0, leni = elements.length; i < leni; i++) {
         groupElement.appendChild(elements[i]);
-        if (groupElement.shape && groupElement.shape.onAddToGroup) {
-            groupElement.shape.onAddToGroup(groupElement, elements[i]);
-        }
-        elements[i].shape.onAddToGroup(groupElement, elements[i]);
+        elements[i].shape.onAddedToGroup(groupElement, elements[i]);
+    }
+    if (groupElement.shape && groupElement.shape.onAddToGroup) {
+        groupElement.shape.onAddToGroup(groupElement, elements);
     }
 };
 
@@ -4999,8 +4999,11 @@ OG.renderer.RaphaelRenderer.prototype.drawConnectGuide = function (element) {
  */
 OG.renderer.RaphaelRenderer.prototype.removeConnectGuide = function (element) {
     var me = this;
-    var rElement = me._getREleById(OG.Util.isElement(element) ? element.id : element),
-        bBox = me._getREleById(rElement.id + OG.Constants.CONNECT_GUIDE_SUFFIX.BBOX);
+    var rElement = me._getREleById(OG.Util.isElement(element) ? element.id : element);
+    if (!rElement) {
+        return;
+    }
+    var bBox = me._getREleById(rElement.id + OG.Constants.CONNECT_GUIDE_SUFFIX.BBOX);
     $(me.getSpots(element)).each(function (index, spot) {
         me._remove(me._getREleById(spot.id));
     })

src/main/webapp/opengraph/OpenGraph-0.1.2-SNAPSHOT.js

@@ -267,7 +267,20 @@ OG.shape.IShape.prototype = {
     onPasteShape: function (copied, pasted) {
 
     },
-    onAddToGroup: function (groupElement, element) {
+    /**
+     * 자신에게 도형들이 그룹으로 들어왔을때의 이벤트
+     * @param groupElement
+     * @param elements
+     */
+    onAddToGroup: function (groupElement, elements) {
+
+    },
+    /**
+     * 자신이 그룹속으로 들어갔을 때의 이벤트
+     * @param groupElement
+     * @param element
+     */
+    onAddedToGroup: function(groupElement, element){
 
     },
     onSelectShape: function () {