warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions
Download patch file Download diff file Expand all files Collapse all files

1813
Scripts/Engines/Reports/Rendering/BarGraphRenderer.cs
View file

File diff suppressed because it is too large Load diff

89
Scripts/Engines/Reports/Rendering/ChartRenderer.cs
View file

@ -3,61 +3,54 @@ using System.Drawing;
namespace Server.Engines.Reports
{
//*********************************************************************
//
// Chart Class
//
// Base class implementation for BarChart and PieChart
//
//*********************************************************************
//*********************************************************************
//
// Chart Class
//
// Base class implementation for BarChart and PieChart
//
//*********************************************************************
public abstract class ChartRenderer
{
private const int _colorLimit = 9;
public abstract class ChartRenderer
{
private const int _colorLimit = 9;
private Color[] _color =
{
Color.Firebrick,
Color.SkyBlue,
Color.MediumSeaGreen,
Color.MediumOrchid,
Color.Chocolate,
Color.SlateBlue,
Color.LightPink,
Color.LightGreen,
Color.Khaki
};
private Color[] _color =
{
Color.Firebrick,
Color.SkyBlue,
Color.MediumSeaGreen,
Color.MediumOrchid,
Color.Chocolate,
Color.SlateBlue,
Color.LightPink,
Color.LightGreen,
Color.Khaki
};
// Represent collection of all data points for the chart
public ChartItemsCollection DataPoints{ get; set; } = new ChartItemsCollection();
// The implementation of this method is provided by derived classes
public abstract Bitmap Draw();
// Represent collection of all data points for the chart
public ChartItemsCollection DataPoints { get; set; } = new ChartItemsCollection();
// The implementation of this method is provided by derived classes
public abstract Bitmap Draw();
public void SetColor(int index, Color NewColor)
{
if (index < _colorLimit)
{
_color[index] = NewColor;
}
else
{
throw new Exception("Color Limit is " + _colorLimit);
}
}
public void SetColor(int index, Color NewColor)
{
if (index < _colorLimit)
_color[index] = NewColor;
else
throw new Exception("Color Limit is " + _colorLimit);
}
public Color GetColor(int index)
{
//return _color[index%_colorLimit];
public Color GetColor(int index)
{
//return _color[index%_colorLimit];
if (index < _colorLimit)
{
return _color[index];
}
if (index < _colorLimit) return _color[index];
return _color[(index+2)%_colorLimit];
//throw new Exception("Color Limit is " + _colorLimit);
}
}
return _color[(index + 2) % _colorLimit];
//throw new Exception("Color Limit is " + _colorLimit);
}
}
}

122
Scripts/Engines/Reports/Rendering/DataItem.cs
View file

@ -3,75 +3,77 @@ using System.Drawing;
namespace Server.Engines.Reports
{
// Modified from MS sample
// Modified from MS sample
//*********************************************************************
//
// ChartItem Class
//
// This class represents a data point in a chart
//
//*********************************************************************
//*********************************************************************
//
// ChartItem Class
//
// This class represents a data point in a chart
//
//*********************************************************************
public class DataItem
{
private DataItem() {}
public DataItem(string label, string desc, float data, float start, float sweep, Color clr)
{
Label = label;
Description = desc;
Value = data;
StartPos = start;
SweepSize = sweep;
ItemColor = clr;
}
public class DataItem
{
private DataItem()
{
}
public string Label { get; set; }
public DataItem(string label, string desc, float data, float start, float sweep, Color clr)
{
Label = label;
Description = desc;
Value = data;
StartPos = start;
SweepSize = sweep;
ItemColor = clr;
}
public string Description { get; set; }
public string Label{ get; set; }
public float Value { get; set; }
public string Description{ get; set; }
public Color ItemColor { get; set; }
public float Value{ get; set; }
public float StartPos { get; set; }
public Color ItemColor{ get; set; }
public float SweepSize { get; set; }
}
public float StartPos{ get; set; }
//*********************************************************************
//
// Custom Collection for ChartItems
//
//*********************************************************************
public float SweepSize{ get; set; }
}
public class ChartItemsCollection : CollectionBase
{
public DataItem this[int index]
{
get => (DataItem)(List[index]);
set => List[index] = value;
}
public int Add(DataItem value)
{
return List.Add(value);
}
public int IndexOf(DataItem value)
{
return List.IndexOf(value);
}
public bool Contains(DataItem value)
{
return List.Contains(value);
}
//*********************************************************************
//
// Custom Collection for ChartItems
//
//*********************************************************************
public void Remove(DataItem value)
{
List.Remove(value);
}
}
public class ChartItemsCollection : CollectionBase
{
public DataItem this[int index]
{
get => (DataItem)List[index];
set => List[index] = value;
}
public int Add(DataItem value)
{
return List.Add(value);
}
public int IndexOf(DataItem value)
{
return List.IndexOf(value);
}
public bool Contains(DataItem value)
{
return List.Contains(value);
}
public void Remove(DataItem value)
{
List.Remove(value);
}
}
}

946
Scripts/Engines/Reports/Rendering/HtmlRenderer.cs
View file

File diff suppressed because it is too large Load diff

422
Scripts/Engines/Reports/Rendering/PieChartRenderer.cs
View file

@ -5,244 +5,252 @@ using System.Drawing.Drawing2D;
namespace Server.Engines.Reports
{
// Modified from MS sample
// Modified from MS sample
//*********************************************************************
//
// PieChart Class
//
// This class uses GDI+ to render Pie Chart.
//
//*********************************************************************
//*********************************************************************
//
// PieChart Class
//
// This class uses GDI+ to render Pie Chart.
//
//*********************************************************************
public class PieChartRenderer : ChartRenderer
{
private const int _bufferSpace = 125;
private ArrayList _chartItems;
private int _perimeter;
private Color _backgroundColor;
private Color _borderColor;
private float _total;
private int _legendWidth;
private int _legendHeight;
private int _legendFontHeight;
private string _legendFontStyle;
private float _legendFontSize;
public class PieChartRenderer : ChartRenderer
{
private const int _bufferSpace = 125;
private Color _backgroundColor;
private Color _borderColor;
private ArrayList _chartItems;
private int _legendFontHeight;
private float _legendFontSize;
private string _legendFontStyle;
private int _legendHeight;
private int _legendWidth;
private int _perimeter;
private float _total;
public bool ShowPercents { get; set; }
public PieChartRenderer()
{
_chartItems = new ArrayList();
_perimeter = 250;
_backgroundColor = Color.White;
_borderColor = Color.FromArgb(63, 63, 63);
_legendFontSize = 8;
_legendFontStyle = "Verdana";
}
public PieChartRenderer()
{
_chartItems = new ArrayList();
_perimeter = 250;
_backgroundColor = Color.White;
_borderColor = Color.FromArgb(63,63,63);
_legendFontSize = 8;
_legendFontStyle = "Verdana";
}
public PieChartRenderer(Color bgColor)
{
_chartItems = new ArrayList();
_perimeter = 250;
_backgroundColor = bgColor;
_borderColor = Color.FromArgb(63, 63, 63);
_legendFontSize = 8;
_legendFontStyle = "Verdana";
}
public PieChartRenderer(Color bgColor)
{
_chartItems = new ArrayList();
_perimeter = 250;
_backgroundColor = bgColor;
_borderColor = Color.FromArgb(63,63,63);
_legendFontSize = 8;
_legendFontStyle = "Verdana";
}
public bool ShowPercents{ get; set; }
//*********************************************************************
//
// This method collects all data points and calculate all the necessary dimensions
// to draw the chart. It is the first method called before invoking the Draw() method.
//
//*********************************************************************
//*********************************************************************
//
// This method collects all data points and calculate all the necessary dimensions
// to draw the chart. It is the first method called before invoking the Draw() method.
//
//*********************************************************************
public void CollectDataPoints(string[] xValues, string[] yValues)
{
_total = 0.0f;
for (int i = 0;i < xValues.Length;i++)
{
float ftemp = Convert.ToSingle(yValues[i]);
_chartItems.Add(new DataItem(xValues[i], xValues.ToString(), ftemp, 0, 0, Color.AliceBlue));
_total += ftemp;
}
float nextStartPos = 0.0f;
int counter = 0;
foreach (DataItem item in _chartItems)
{
item.StartPos = nextStartPos;
item.SweepSize = item.Value / _total * 360;
nextStartPos = item.StartPos + item.SweepSize;
item.ItemColor = GetColor(counter++);
}
public void CollectDataPoints(string[] xValues, string[] yValues)
{
_total = 0.0f;
CalculateLegendWidthHeight();
}
for (int i = 0; i < xValues.Length; i++)
{
float ftemp = Convert.ToSingle(yValues[i]);
_chartItems.Add(new DataItem(xValues[i], xValues.ToString(), ftemp, 0, 0, Color.AliceBlue));
_total += ftemp;
}
//*********************************************************************
//
// This method returns a bitmap to the calling function. This is the method
// that actually draws the pie chart and the legend with it.
//
//*********************************************************************
float nextStartPos = 0.0f;
int counter = 0;
foreach (DataItem item in _chartItems)
{
item.StartPos = nextStartPos;
item.SweepSize = item.Value / _total * 360;
nextStartPos = item.StartPos + item.SweepSize;
item.ItemColor = GetColor(counter++);
}
public override Bitmap Draw()
{
int perimeter = _perimeter;
Rectangle pieRect = new Rectangle(0, 0, perimeter, perimeter-1);
Bitmap bmp = new Bitmap(perimeter + _legendWidth, perimeter);
Font fnt = null;
Pen pen = null;
Graphics grp = null;
StringFormat sf = null, sfp = null;
try
{
grp = Graphics.FromImage(bmp);
grp.CompositingQuality = CompositingQuality.HighQuality;
grp.SmoothingMode = SmoothingMode.AntiAlias;
sf = new StringFormat();
CalculateLegendWidthHeight();
}
//Paint Back ground
using ( SolidBrush brsh = new SolidBrush( _backgroundColor ) )
grp.FillRectangle(brsh, -1, -1, perimeter + _legendWidth+1, perimeter+1);
//*********************************************************************
//
// This method returns a bitmap to the calling function. This is the method
// that actually draws the pie chart and the legend with it.
//
//*********************************************************************
//Align text to the right
sf.Alignment = StringAlignment.Far;
//Draw all wedges and legends
for(int i=0; i<_chartItems.Count; i++)
{
DataItem item = (DataItem) _chartItems[i];
SolidBrush brs = null;
try
{
brs = new SolidBrush(item.ItemColor);
grp.FillPie(brs, pieRect, item.StartPos, item.SweepSize);
public override Bitmap Draw()
{
int perimeter = _perimeter;
Rectangle pieRect = new Rectangle(0, 0, perimeter, perimeter - 1);
Bitmap bmp = new Bitmap(perimeter + _legendWidth, perimeter);
Font fnt = null;
Pen pen = null;
Graphics grp = null;
StringFormat sf = null, sfp = null;
//grp.DrawPie(new Pen(_borderColor,1.2f),pieRect,item.StartPos,item.SweepSize);
try
{
grp = Graphics.FromImage(bmp);
grp.CompositingQuality = CompositingQuality.HighQuality;
grp.SmoothingMode = SmoothingMode.AntiAlias;
sf = new StringFormat();
if ( fnt == null )
fnt = new Font( _legendFontStyle, _legendFontSize );
//Paint Back ground
using (SolidBrush brsh = new SolidBrush(_backgroundColor))
{
grp.FillRectangle(brsh, -1, -1, perimeter + _legendWidth + 1, perimeter + 1);
}
if ( ShowPercents && item.SweepSize > 10 )
{
if ( sfp == null )
{
sfp = new StringFormat();
sfp.Alignment = StringAlignment.Center;
sfp.LineAlignment = StringAlignment.Center;
}
//Align text to the right
sf.Alignment = StringAlignment.Far;
float perc = (item.SweepSize * 100.0f) / 360.0f;
string percString = $"{perc:F0}%";
//Draw all wedges and legends
for (int i = 0; i < _chartItems.Count; i++)
{
DataItem item = (DataItem)_chartItems[i];
SolidBrush brs = null;
try
{
brs = new SolidBrush(item.ItemColor);
grp.FillPie(brs, pieRect, item.StartPos, item.SweepSize);
float px = pieRect.X+(pieRect.Width/2);
float py = pieRect.Y+(pieRect.Height/2);
//grp.DrawPie(new Pen(_borderColor,1.2f),pieRect,item.StartPos,item.SweepSize);
double angle = item.StartPos + (item.SweepSize/2);
double rads = (angle/180.0)*Math.PI;
if (fnt == null)
fnt = new Font(_legendFontStyle, _legendFontSize);
px += (float)(Math.Cos( rads ) * perimeter / 3);
py += (float)(Math.Sin( rads ) * perimeter / 3);
if (ShowPercents && item.SweepSize > 10)
{
if (sfp == null)
{
sfp = new StringFormat();
sfp.Alignment = StringAlignment.Center;
sfp.LineAlignment = StringAlignment.Center;
}
grp.DrawString( percString, fnt, Brushes.Gray,
new RectangleF( px - 30 - 1, py - 20, 60, 40 ), sfp );
float perc = item.SweepSize * 100.0f / 360.0f;
string percString = $"{perc:F0}%";
grp.DrawString( percString, fnt, Brushes.Gray,
new RectangleF( px - 30 + 1, py - 20, 60, 40 ), sfp );
float px = pieRect.X + pieRect.Width / 2;
float py = pieRect.Y + pieRect.Height / 2;
grp.DrawString( percString, fnt, Brushes.Gray,
new RectangleF( px - 30, py - 20 - 1, 60, 40 ), sfp );
double angle = item.StartPos + item.SweepSize / 2;
double rads = angle / 180.0 * Math.PI;
grp.DrawString( percString, fnt, Brushes.Gray,
new RectangleF( px - 30, py - 20 + 1, 60, 40 ), sfp );
px += (float)(Math.Cos(rads) * perimeter / 3);
py += (float)(Math.Sin(rads) * perimeter / 3);
grp.DrawString(percString, fnt, Brushes.Gray,
new RectangleF(px - 30 - 1, py - 20, 60, 40), sfp);
grp.DrawString(percString, fnt, Brushes.Gray,
new RectangleF(px - 30 + 1, py - 20, 60, 40), sfp);
grp.DrawString(percString, fnt, Brushes.Gray,
new RectangleF(px - 30, py - 20 - 1, 60, 40), sfp);
grp.DrawString(percString, fnt, Brushes.Gray,
new RectangleF(px - 30, py - 20 + 1, 60, 40), sfp);
grp.DrawString( percString, fnt, Brushes.White,
new RectangleF( px - 30, py - 20, 60, 40 ), sfp );
}
grp.DrawString(percString, fnt, Brushes.White,
new RectangleF(px - 30, py - 20, 60, 40), sfp);
}
if ( pen == null )
pen = new Pen( _borderColor, 0.5f );
if (pen == null)
pen = new Pen(_borderColor, 0.5f);
grp.FillRectangle(brs, perimeter + _bufferSpace, i * _legendFontHeight + 15, 10, 10);
grp.DrawRectangle(pen, perimeter + _bufferSpace, i * _legendFontHeight + 15, 10, 10);
grp.DrawString(item.Label, fnt,
Brushes.Black, perimeter + _bufferSpace + 20, i * _legendFontHeight + 13);
grp.FillRectangle(brs, perimeter + _bufferSpace, i * _legendFontHeight + 15, 10, 10);
grp.DrawRectangle(pen, perimeter + _bufferSpace, i * _legendFontHeight + 15, 10, 10);
grp.DrawString(item.Value.ToString("#,###.##"), fnt,
Brushes.Black, perimeter + _bufferSpace + 200, i * _legendFontHeight + 13,sf);
}
finally
{
brs?.Dispose();
}
}
grp.DrawString(item.Label, fnt,
Brushes.Black, perimeter + _bufferSpace + 20, i * _legendFontHeight + 13);
for(int i=0; i<_chartItems.Count; i++)
{
DataItem item = (DataItem) _chartItems[i];
SolidBrush brs = null;
try
{
grp.DrawPie(new Pen(_borderColor,0.5f),pieRect,item.StartPos,item.SweepSize);
}
finally
{
brs?.Dispose();
}
}
//draws the border around Pie
using ( Pen pen2 = new Pen( _borderColor, 2 ) )
grp.DrawEllipse(pen2, pieRect);
grp.DrawString(item.Value.ToString("#,###.##"), fnt,
Brushes.Black, perimeter + _bufferSpace + 200, i * _legendFontHeight + 13, sf);
}
finally
{
brs?.Dispose();
}
}
//draw border around legend
using ( Pen pen1 = new Pen( _borderColor, 1 ) )
grp.DrawRectangle(pen1, perimeter + _bufferSpace - 10, 10, 220, _chartItems.Count * _legendFontHeight + 25);
for (int i = 0; i < _chartItems.Count; i++)
{
DataItem item = (DataItem)_chartItems[i];
SolidBrush brs = null;
try
{
grp.DrawPie(new Pen(_borderColor, 0.5f), pieRect, item.StartPos, item.SweepSize);
}
finally
{
brs?.Dispose();
}
}
//Draw Total under legend
using ( Font fntb = new Font( _legendFontStyle, _legendFontSize, FontStyle.Bold ) )
{
grp.DrawString("Total", fntb,
Brushes.Black, perimeter + _bufferSpace + 30, (_chartItems.Count+1) * _legendFontHeight,sf);
grp.DrawString(_total.ToString("#,###.##"), fntb,
Brushes.Black, perimeter + _bufferSpace + 200, (_chartItems.Count+1) * _legendFontHeight,sf);
}
grp.SmoothingMode = SmoothingMode.AntiAlias;
}
finally
{
sf?.Dispose();
grp?.Dispose();
sfp?.Dispose();
fnt?.Dispose();
pen?.Dispose();
}
return bmp;
}
//draws the border around Pie
using (Pen pen2 = new Pen(_borderColor, 2))
{
grp.DrawEllipse(pen2, pieRect);
}
//*********************************************************************
//
// This method calculates the space required to draw the chart legend.
//
//*********************************************************************
private void CalculateLegendWidthHeight()
{
Font fontLegend = new Font(_legendFontStyle, _legendFontSize);
_legendFontHeight = fontLegend.Height+3;
_legendHeight = fontLegend.Height * (_chartItems.Count + 1);
if (_legendHeight > _perimeter) _perimeter = _legendHeight;
//draw border around legend
using (Pen pen1 = new Pen(_borderColor, 1))
{
grp.DrawRectangle(pen1, perimeter + _bufferSpace - 10, 10, 220,
_chartItems.Count * _legendFontHeight + 25);
}
_legendWidth = _perimeter + _bufferSpace;
fontLegend.Dispose();
}
}
//Draw Total under legend
using (Font fntb = new Font(_legendFontStyle, _legendFontSize, FontStyle.Bold))
{
grp.DrawString("Total", fntb,
Brushes.Black, perimeter + _bufferSpace + 30, (_chartItems.Count + 1) * _legendFontHeight, sf);
grp.DrawString(_total.ToString("#,###.##"), fntb,
Brushes.Black, perimeter + _bufferSpace + 200, (_chartItems.Count + 1) * _legendFontHeight, sf);
}
grp.SmoothingMode = SmoothingMode.AntiAlias;
}
finally
{
sf?.Dispose();
grp?.Dispose();
sfp?.Dispose();
fnt?.Dispose();
pen?.Dispose();
}
return bmp;
}
//*********************************************************************
//
// This method calculates the space required to draw the chart legend.
//
//*********************************************************************
private void CalculateLegendWidthHeight()
{
Font fontLegend = new Font(_legendFontStyle, _legendFontSize);
_legendFontHeight = fontLegend.Height + 3;
_legendHeight = fontLegend.Height * (_chartItems.Count + 1);
if (_legendHeight > _perimeter) _perimeter = _legendHeight;
_legendWidth = _perimeter + _bufferSpace;
fontLegend.Dispose();
}
}
}