git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47720 954022d7-b5bf-4e40-9824-e11837661b57

Excel/model/DrawingObjects/DrawingObjectsController.js

@@ -172,7 +172,27 @@ DrawingObjectsController.prototype =
     },
 
     unGroup: function()
-    {},
+    {
+        var selected_objects = this.selectedObjects;
+        var ungrouped_objects = [];
+        for(var i = 0; i < selected_objects.length; ++i)
+        {
+            if(selected_objects[i].isGroup() && selected_objects[i].canUnGroup())
+            {
+                ungrouped_objects.push(selected_objects[i]);
+
+            }
+        }
+        for(i = 0; i < ungrouped_objects.length; ++i)
+        {
+            var ungrouped_sp_tree = ungrouped_objects[i].getUnGroupedSpTree();
+            for(var j = 0; j < ungrouped_sp_tree.length; ++j)
+            {
+                ungrouped_sp_tree[j].recalculateTransform();
+            }
+            this.drawingObjects.insertUngroupedObjects(ungrouped_objects[i].drawingBase.id, ungrouped_sp_tree);
+        }
+    },
 
     canGroup: function()
     {
@@ -181,7 +201,7 @@ DrawingObjectsController.prototype =
 
     canUnGroup: function()
     {
-        return false;
+        return true;
     },
 
     startTrackNewShape: function(presetGeom)

Excel/model/DrawingObjects/Format/GroupShape.js

@@ -566,6 +566,11 @@ CGroupShape.prototype =
         return true;//TODO
     },
 
+    canUnGroup: function()
+    {
+        return true;
+    },
+
     hitInBoundingRect: function(x, y)
     {
         var invert_transform = this.getInvertTransform();
@@ -666,6 +671,31 @@ CGroupShape.prototype =
         return this.invertTransform;
     } ,
 
+    getUnGroupedSpTree: function()
+    {
+        this.normalize();
+        this.recalculateTransform();
+        var sp_tree = this.spTree;
+        var ret = [];
+        for(var i = 0; i < sp_tree.length; ++i)
+        {
+            var sp = sp_tree[i];
+            var full_flip_h = sp.getFullFlipH();
+            var full_flip_v = sp.getFullFlipV();
+            var full_rotate = sp.getFullRotate();
+            var hc = sp.spPr.xfrm.extX*0.5;
+            var vc = sp.spPr.xfrm.extY*0.5;
+            var xc = sp.transform.TransformPointX(hc, vc);
+            var yc = sp.transform.TransformPointY(hc, vc);
+            sp.setGroup(null);
+            sp.setPosition(xc - hc, yc - vc);
+            sp.setFlips(full_flip_h, full_flip_v);
+            sp.setRotate(normalizeRotate(sp.getFullRotate()));
+            ret.push(sp);
+        }
+        return ret;
+    },
+
     select: function(drawingObjectsController)
     {
         this.selected = true;
@@ -784,4 +814,18 @@ CGroupShape.prototype =
     {
         return new ResizeTrackGroup(this, cardDirection);
     }
-};
\ No newline at end of file
+};
+
+function normalizeRotate(rot)
+{
+    var new_rot = rot;
+    if(isRealNumber(new_rot))
+    {
+        while(new_rot >= 2*Math.PI)
+            new_rot -= Math.PI;
+        while(new_rot < 0)
+            new_rot += Math.PI;
+        return new_rot;
+    }
+    return new_rot;
+}
\ No newline at end of file

Excel/model/DrawingObjects/Format/Image.js

@@ -116,6 +116,7 @@ CImage.prototype =
     setPresetGeometry: function(preset)
     {
         this.spPr.geometry = CreateGeometry(preset);
+        this.spPr.geometry.Init(5, 5);
     },
 
     setPosition: function(x, y)
@@ -141,6 +142,15 @@ CImage.prototype =
         this.spPr.xfrm.rot = rot;
     },
 
+    setRecalculateAll: function()
+    {
+        this.recalcInfo =
+        {
+            recalculateTransform: true,
+            recalculateGeometry: true,
+            recalculateBrush: true
+        };
+    },
     updateDrawingBaseCoordinates: function()
     {
         if(isRealObject(this.drawingBase))

Excel/model/DrawingObjects/Format/Shape.js

@@ -139,6 +139,16 @@ CShape.prototype =
         this.spPr.geometry.Init(5, 5);
     },
 
+    setRecalculateAll: function()
+    {
+        this.recalcInfo =
+        {
+            recalculateTransform: true,
+            recalculateBrush: true,
+            recalculatePen: true
+        };
+    },
+
     setStyle: function(style)
     {
         this.style = style;