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

Common/Drawings/CommonController.js

@@ -467,6 +467,15 @@ DrawingObjectsController.prototype =
     {
         if(this.handleEventMode === HANDLE_EVENT_MODE_HANDLE)
         {
+            if(e.CtrlKey)
+            {
+                var target_content = this.getTargetDocContent();
+                if(!target_content)
+                {
+                    return this.handleMoveHit(object, e, x, y, group, false, pageIndex, bWord);
+                }
+
+            }
             this.resetSelection();
             (group ? group : this).selectObject(object,pageIndex);
             object.selectionSetStart(e, x, y, pageIndex);
@@ -2345,6 +2354,11 @@ DrawingObjectsController.prototype =
                     plot_area.addChart(new_chart_type, 0);
                     plot_area.removeCharts(1, plot_area.charts.length - 1);
                     new_chart_type.setFromOtherChart(chart_type);
+                    for(var j = 0; j < new_chart_type.series.length; ++j)
+                    {
+                        new_chart_type.series[j].setMarker(null);
+                    }
+                    new_chart_type.setScatterStyle(SCATTER_STYLE_MARKER);
                     axis_obj = CreateScatterAxis(); //cat - 0, val - 1
                     new_chart_type.addAxId(axis_obj.catAx);
                     new_chart_type.addAxId(axis_obj.valAx);

Common/Drawings/Format/ChartSpace.js

@@ -5231,6 +5231,8 @@ CChartSpace.prototype =
             var max_width = 0, cur_width, max_font_size = 0, cur_font_size, ser, b_line_series;
             var max_word_width = 0;
             this.chart.legend.chart = this;
+            var b_scatter_no_line = false;/*(this.chart.plotArea.chart.getObjectType() === historyitem_type_ScatterChart &&
+                (this.chart.plotArea.chart.scatterStyle === SCATTER_STYLE_MARKER || this.chart.plotArea.chart.scatterStyle === SCATTER_STYLE_NONE));  */
             if( !this.chart.plotArea.chart.varyColors || (this.chart.plotArea.chart.getObjectType() !== historyitem_type_PieChart && this.chart.plotArea.chart.getObjectType() !== historyitem_type_DoughnutChart) && series.length !== 1)
             {
                 for(i = 0; i < series.length; ++i)
@@ -5254,6 +5256,7 @@ CChartSpace.prototype =
 
                     calc_entry.calcMarkerUnion = new CUnionMarker();
                     union_marker = calc_entry.calcMarkerUnion;
+                    var pts = getPtsFromSeries(ser);
                     switch(ser.getObjectType())
                     {
                         case historyitem_type_BarSeries:
@@ -5273,15 +5276,17 @@ CChartSpace.prototype =
                             if(ser.compiledSeriesMarker)
                             {
                                 union_marker.marker = CreateMarkerGeometryByType(ser.compiledSeriesMarker.symbol, null);
-                                if(ser.compiledSeriesPen)
-                                    union_marker.marker.brush = ser.compiledSeriesPen.Fill;
+                                if(pts[0] && pts[0].compiledMarker)
+                                    union_marker.marker.brush = pts[0].compiledMarker.brush;
                             }
-                            if(ser.compiledSeriesPen)
+
+                            if(ser.compiledSeriesPen && !b_scatter_no_line)
                             {
                                 union_marker.lineMarker = CreateMarkerGeometryByType(SYMBOL_DASH, null);
                                 union_marker.lineMarker.pen = ser.compiledSeriesPen.createDuplicate(); //Копируем, так как потом возможно придется изменять толщину линии;
                             }
-                            b_line_series = true;
+                            if(!b_scatter_no_line)
+                                b_line_series = true;
                             break;
                         }
                     }
@@ -5336,7 +5341,8 @@ CChartSpace.prototype =
                             union_marker.lineMarker = CreateMarkerGeometryByType(SYMBOL_DASH, null);
                             union_marker.lineMarker.pen = pt.pen;
                         }
-                        b_line_series = true;
+                        if(!b_scatter_no_line)
+                            b_line_series = true;
                     }
                     else
                     {

Common/Drawings/States.js

@@ -271,9 +271,9 @@ RotateState.prototype =
             {
                 var i, copy;
                 this.drawingObjects.resetSelection();
+                History.Create_NewPoint();
                 for(i = 0; i < tracks.length; ++i)
                 {
-                    History.Create_NewPoint();
                     copy = tracks[i].originalObject.copy();
                     copy.setWorksheet(this.drawingObjects.drawingObjects.getWorksheetModel());
                     copy.addToDrawingObjects();