pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] incompatibility between dhtmlx.Scheduler and dhtmlx.Chart, bug in dhtmlx.Chart when first data serties contains the value 0 in some places, race condition in graph addon

Browse Source 
bzr revid: xmo@openerp.com-20110620170922-9443v3gtqza3vu2z
This commit is contained in:
Xavier Morel
2011-06-20 19:09:22 +02:00
parent d44a542efb ec186dfb7d
commit 9853c3a23f
10 changed files with 414 additions and 3081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart.js
Regular → Executable
+128 -2708
View File
File diff suppressed because it is too large Load Diff
addons/base_graph/static/lib/dhtmlxGraph/codebase/dhtmlxchart_debug.js
+182 -182
View File
@@ -3,15 +3,15 @@ Copyright DHTMLX LTD. http://www.dhtmlx.com
You allowed to use this component or parts of it under GPL terms
To use it on other terms or get Professional edition of the component please contact us at sales@dhtmlx.com
*/
/*
2010 September 30
*/
/* DHX DEPEND FROM FILE 'assert.js'*/
/*
2010 September 30
*/
/* DHX DEPEND FROM FILE 'assert.js'*/
if (!window.dhtmlx)
dhtmlx={};
@@ -250,12 +250,12 @@ if (dhtmlx.assert_enabled()){
return t;
};
}
/* DHX DEPEND FROM FILE 'dhtmlx.js'*/
}
/* DHX DEPEND FROM FILE 'dhtmlx.js'*/
/*DHX:Depend assert.js*/
/*
@@ -760,12 +760,12 @@ dhtmlx.html={
}
})();
dhtmlx.ui={};
/* DHX DEPEND FROM FILE 'destructor.js'*/
dhtmlx.ui={};
/* DHX DEPEND FROM FILE 'destructor.js'*/
/*
Behavior:Destruction
@@ -820,12 +820,12 @@ dhtmlx.event(window,"unload",function(){
ev[0].detachEvent("on"+ev[1],ev[2]);
delete dhtmlx._events[a];
}
});
/* DHX DEPEND FROM FILE 'math.js'*/
});
/* DHX DEPEND FROM FILE 'math.js'*/
dhtmlx.math = {};
dhtmlx.math._toHex=["0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F"];
dhtmlx.math.toHex = function(number, length){
@@ -841,12 +841,12 @@ dhtmlx.math.toHex = function(number, length){
};
/* DHX DEPEND FROM FILE 'map.js'*/
/* DHX DEPEND FROM FILE 'map.js'*/
/*DHX:Depend dhtmlx.js*/
dhtmlx.ui.Map = function(key){
@@ -894,19 +894,19 @@ dhtmlx.ui.Map.prototype = {
this._map = [];
}
};
/* DHX DEPEND FROM FILE 'ext/chart/chart_base.js'*/
};
/* DHX DEPEND FROM FILE 'ext/chart/chart_base.js'*/
/*DHX:Depend map.js*/
dhtmlx.chart = {};
/* DHX DEPEND FROM FILE 'ext/chart/chart_area.js'*/
dhtmlx.chart = {};
/* DHX DEPEND FROM FILE 'ext/chart/chart_area.js'*/
/*DHX:Depend ext/chart/chart_base.js*/
dhtmlx.chart.area = {
/**
@@ -984,7 +984,7 @@ dhtmlx.chart.stackedArea ={
ctx.globalAlpha = this._settings.alpha.call(this,data[0]);
ctx.fillStyle = this._settings.color.call(this,data[0]);
/*for the 2nd, 3rd, etc. series*/
var y01 = (sIndex?data[0].$startY:point1.y);
@@ -1037,12 +1037,12 @@ dhtmlx.chart.stackedArea ={
}
}
};
/* DHX DEPEND FROM FILE 'ext/chart/chart_spline.js'*/
/* DHX DEPEND FROM FILE 'ext/chart/chart_spline.js'*/
/*DHX:Depend ext/chart/chart_base.js*/
dhtmlx.chart.spline = {
/**
@@ -1129,12 +1129,12 @@ dhtmlx.chart.spline = {
_getSplineYPoint:function(x,xi,i,a,b,c,d){
return a[i] + (x - xi)*(b[i] + (x-xi)*(c[i]+(x-xi)*d[i]));
}
};
/* DHX DEPEND FROM FILE 'ext/chart/chart_barh.js'*/
};
/* DHX DEPEND FROM FILE 'ext/chart/chart_barh.js'*/
/*DHX:Depend ext/chart/chart_base.js*/
dhtmlx.chart.barH = {
/**
@@ -1388,12 +1388,12 @@ dhtmlx.chart.barH = {
}
};
/* DHX DEPEND FROM FILE 'ext/chart/chart_stackedbarh.js'*/
/* DHX DEPEND FROM FILE 'ext/chart/chart_stackedbarh.js'*/
/*DHX:Depend ext/chart/chart_base.js*/
/*DHX:Depend ext/chart/chart_barh.js*/
@@ -1487,7 +1487,7 @@ dhtmlx.chart.stackedBarH = {
/*for the 2nd, 3rd, etc. series*/
if(sIndex)
x0 = data[i].$startX;
x0 = data[i].$startX || x0;
if(value<0||(this._settings.yAxis&&value===0)){
this.renderTextAt(true, true, x0+Math.floor(barWidth/2),y0,this._settings.label(data[i]));
@@ -1538,12 +1538,12 @@ dhtmlx.chart.stackedBarH = {
data[i].$startX = points[0];
}
}
}
/* DHX DEPEND FROM FILE 'ext/chart/chart_stackedbar.js'*/
}
/* DHX DEPEND FROM FILE 'ext/chart/chart_stackedbar.js'*/
/*DHX:Depend ext/chart/chart_base.js*/
dhtmlx.chart.stackedBar = {
/**
@@ -1622,8 +1622,8 @@ dhtmlx.chart.stackedBar = {
/*for the 2nd, 3rd, etc. series*/
if(sIndex)
y0 = data[i].$startY;
y0 = data[i].$startY || y0;
/*the max height limit*/
if(y0 < (point0.y+1)) continue;
@@ -1711,12 +1711,12 @@ dhtmlx.chart.stackedBar = {
return [x5,y3-2*offset];
}
};
/* DHX DEPEND FROM FILE 'ext/chart/chart_line.js'*/
/* DHX DEPEND FROM FILE 'ext/chart/chart_line.js'*/
/*DHX:Depend ext/chart/chart_base.js*/
dhtmlx.chart.line = {
@@ -1865,12 +1865,12 @@ dhtmlx.chart.line = {
return params;
}
};
/* DHX DEPEND FROM FILE 'ext/chart/chart_bar.js'*/
/* DHX DEPEND FROM FILE 'ext/chart/chart_bar.js'*/
/*DHX:Depend ext/chart/chart_base.js*/
dhtmlx.chart.bar = {
/**
@@ -2099,12 +2099,12 @@ dhtmlx.chart.bar = {
// ctx.lineTo(x0,0); //IE fix!
return [x5,y3];
}
};
/* DHX DEPEND FROM FILE 'ext/chart/chart_pie.js'*/
};
/* DHX DEPEND FROM FILE 'ext/chart/chart_pie.js'*/
/*DHX:Depend ext/chart/chart_base.js*/
dhtmlx.chart.pie = {
pvt_render_pie:function(ctx,data,x,y,sIndex,map){
@@ -2395,12 +2395,12 @@ dhtmlx.chart.pie3D = {
pvt_render_pie3D:function(ctx,data,x,y,sIndex,map){
this._renderPie(ctx,data,x,y,this._settings.cant,map);
}
}
/* DHX DEPEND FROM FILE 'template.js'*/
}
/* DHX DEPEND FROM FILE 'template.js'*/
/*
Template - handles html templates
*/
@@ -2509,12 +2509,12 @@ dhtmlx.Type={
}
}
};
/* DHX DEPEND FROM FILE 'single_render.js'*/
/* DHX DEPEND FROM FILE 'single_render.js'*/
/*
REnders single item.
Can be used for elements without datastore, or with complex custom rendering logic
@@ -2544,12 +2544,12 @@ dhtmlx.SingleRender={
if (this.callEvent) this.callEvent("onAfterRender",[]);
}
}
};
/* DHX DEPEND FROM FILE 'tooltip.js'*/
};
/* DHX DEPEND FROM FILE 'tooltip.js'*/
/*
UI: Tooltip
@@ -2617,12 +2617,12 @@ dhtmlx.ui.Tooltip.prototype = {
template_item_start:dhtmlx.Template.empty,
template_item_end:dhtmlx.Template.empty
};
/* DHX DEPEND FROM FILE 'autotooltip.js'*/
/* DHX DEPEND FROM FILE 'autotooltip.js'*/
/*
Behavior: AutoTooltip - links tooltip to data driven item
*/
@@ -2643,12 +2643,12 @@ dhtmlx.AutoTooltip = {
});
return t;
}
};
/* DHX DEPEND FROM FILE 'datastore.js'*/
};
/* DHX DEPEND FROM FILE 'datastore.js'*/
/*DHX:Depend dhtmlx.js*/
/*
@@ -3057,12 +3057,12 @@ dhtmlx.sort = {
return method(a,b)*-1;
};
}
};
/* DHX DEPEND FROM FILE 'group.js'*/
};
/* DHX DEPEND FROM FILE 'group.js'*/
/*DHX:Depend datastore.js*/
/*DHX:Depend dhtmlx.js*/
@@ -3187,12 +3187,12 @@ dhtmlx.Group = {
});
return config;
}
};
/* DHX DEPEND FROM FILE 'key.js'*/
};
/* DHX DEPEND FROM FILE 'key.js'*/
/*
Behavior:KeyEvents - hears keyboard
*/
@@ -3207,12 +3207,12 @@ dhtmlx.KeyEvents = {
var code = e.which||e.keyCode; //FIXME better solution is required
this.callEvent((this._edit_id?"onEditKeyPress":"onKeyPress"),[code,e.ctrlKey,e.shiftKey,e]);
}
};
/* DHX DEPEND FROM FILE 'mouse.js'*/
};
/* DHX DEPEND FROM FILE 'mouse.js'*/
/*
Behavior:MouseEvents - provides inner evnets for mouse actions
*/
@@ -3306,12 +3306,12 @@ dhtmlx.MouseEvents={
}
return found; //returns true if item was located and event was triggered
}
};
/* DHX DEPEND FROM FILE 'config.js'*/
};
/* DHX DEPEND FROM FILE 'config.js'*/
/*
Behavior:Settings
@@ -3431,12 +3431,12 @@ dhtmlx.Settings={
this._obj.className += " "+value;
return value;
}
};
/* DHX DEPEND FROM FILE 'compatibility.js'*/
};
/* DHX DEPEND FROM FILE 'compatibility.js'*/
/*
Collection of compatibility hacks
*/
@@ -3512,12 +3512,12 @@ dhtmlx.compat=function(name, obj){
};
}
})();
/* DHX DEPEND FROM FILE 'compatibility_layout.js'*/
})();
/* DHX DEPEND FROM FILE 'compatibility_layout.js'*/
/*DHX:Depend dhtmlx.js*/
/*DHX:Depend compatibility.js*/
@@ -3558,12 +3558,12 @@ dhtmlx.attaches.attachChart = function(conf){
};
dhtmlx.compat.layout = function(){};
/* DHX DEPEND FROM FILE 'load.js'*/
/* DHX DEPEND FROM FILE 'load.js'*/
/*
ajax operations
@@ -3965,12 +3965,12 @@ dhtmlx.DataDriver.xml={
}
};
/* DHX DEPEND FROM FILE 'compatibility_grid.js'*/
/* DHX DEPEND FROM FILE 'compatibility_grid.js'*/
/*
Compatibility hack for loading data from the grid.
Provides new type of datasource - dhtmlxgrid
@@ -4001,12 +4001,12 @@ dhtmlx.DataDriver.dhtmlxgrid={
_from:0
};
}
};
/* DHX DEPEND FROM FILE 'canvas.js'*/
};
/* DHX DEPEND FROM FILE 'canvas.js'*/
/*DHX:Depend thirdparty\excanvas*/
/*DHX:Depend dhtmlx.js*/
@@ -4080,12 +4080,12 @@ dhtmlx.Canvas = {
//FF breaks, when we are using clear canvas and call clearRect without parameters
this.getCanvas().clearRect(0,0,this._canvas.offsetWidth, this._canvas.offsetHeight);
}
};
/* DHX INITIAL FILE 'D:\dev\xampp\htdocs\temp\chart\dhtmlxCore/sources//chart.js'*/
};
/* DHX INITIAL FILE 'D:\dev\xampp\htdocs\temp\chart\dhtmlxCore/sources//chart.js'*/
/*DHX:Depend chart.css*/
/*DHX:Depend canvas.js*/
/*DHX:Depend load.js*/
@@ -4734,4 +4734,4 @@ dhtmlXChart.prototype={
}
};
dhtmlx.compat("layout");
dhtmlx.compat("layout");