Index: src/Common/DelftTools.Controls.Swf/Charting/Tools/RectangleTool.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r841d3efd31f92b5fb792bbd99c153dfeb0627458 --- src/Common/DelftTools.Controls.Swf/Charting/Tools/RectangleTool.cs (.../RectangleTool.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ src/Common/DelftTools.Controls.Swf/Charting/Tools/RectangleTool.cs (.../RectangleTool.cs) (revision 841d3efd31f92b5fb792bbd99c153dfeb0627458) @@ -82,21 +82,23 @@ { if (e is BeforeDrawEventArgs) { - if (Shape.Left < Chart.ChartRect.Left) + // Local copy to prevent compiler warning CS1690 (https://msdn.microsoft.com/en-us/library/x524dkh4.aspx) + var chartRect = Chart.ChartRect; + if (Shape.Left < chartRect.Left) { - Shape.Left = Chart.ChartRect.Left; + Shape.Left = chartRect.Left; } - if (Shape.Left + Shape.Width > Chart.ChartRect.Right) + if (Shape.Left + Shape.Width > chartRect.Right) { - Shape.Left = Chart.ChartRect.Right - Shape.Width; + Shape.Left = chartRect.Right - Shape.Width; } // Shape.Left = chart.ChartRect.Left; // Shape.Width = chart.ChartRect.Width; if (!AllowResizeHeight) { - Shape.Top = Chart.ChartRect.Top; - Shape.Height = Chart.ChartRect.Height; + Shape.Top = chartRect.Top; + Shape.Height = chartRect.Height; } } base.ChartEvent(e); @@ -229,14 +231,15 @@ { Shape.Left = X - P.X; Shape.Top = Y - P.Y; - - if (Shape.Left < Chart.ChartRect.Left) + // Local copy to prevent compiler warning CS1690 (https://msdn.microsoft.com/en-us/library/x524dkh4.aspx) + var chartRect = Chart.ChartRect; + if (Shape.Left < chartRect.Left) { - Shape.Left = Chart.ChartRect.Left; + Shape.Left = chartRect.Left; } - if (Shape.Left > Chart.ChartRect.Right - Shape.Width) + if (Shape.Left > chartRect.Right - Shape.Width) { - Shape.Left = Chart.ChartRect.Right - Shape.Width; + Shape.Left = chartRect.Right - Shape.Width; } OnDragging(EventArgs.Empty); @@ -304,7 +307,8 @@ int left, right, top, bottom; Rectangle tmpR = Rectangle.Empty; #endif - + // Local copy to prevent compiler warning CS1690 (https://msdn.microsoft.com/en-us/library/x524dkh4.aspx) + var chartRect = Chart.ChartRect; left = Shape.Left; right = Shape.Right; top = Shape.Top; @@ -314,9 +318,9 @@ case 0: ChangeLeft(ref left, X); - if (left < Chart.ChartRect.Left) + if (left < chartRect.Left) { - left = Chart.ChartRect.Left; + left = chartRect.Left; } break; case 1: @@ -325,9 +329,9 @@ case 2: ChangeRight(ref right, X); - if (right > Chart.ChartRect.Right) + if (right > chartRect.Right) { - right = Chart.ChartRect.Right; + right = chartRect.Right; } break; case 3: Index: src/Common/DelftTools.Controls.Swf/Charting/Tools/RulerTool.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r841d3efd31f92b5fb792bbd99c153dfeb0627458 --- src/Common/DelftTools.Controls.Swf/Charting/Tools/RulerTool.cs (.../RulerTool.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ src/Common/DelftTools.Controls.Swf/Charting/Tools/RulerTool.cs (.../RulerTool.cs) (revision 841d3efd31f92b5fb792bbd99c153dfeb0627458) @@ -65,15 +65,17 @@ measuringStartPoint = point; + var chartRect = teeChart.Chart.ChartRect; + horizontalValueStartPoint = GetAxesValue(bottomMinValue, bottomMaxValue, - teeChart.Chart.ChartRect.Left, - teeChart.Chart.ChartRect.Left + teeChart.Chart.ChartRect.Width, + chartRect.Left, + (chartRect.Left + chartRect.Width), point.X); verticalValueStartPoint = GetAxesValue(leftMinValue, leftMaxValue, - teeChart.Chart.ChartRect.Top + teeChart.Chart.ChartRect.Height, - teeChart.Chart.ChartRect.Top, + (chartRect.Top + chartRect.Height), + chartRect.Top, point.Y); horizontalValueEndPoint = double.NaN; verticalValueEndPoint = double.NaN; @@ -96,15 +98,17 @@ var leftMinValue = chartView.Chart.LeftAxis.Minimum; var leftMaxValue = chartView.Chart.LeftAxis.Maximum; + var chartRect = teeChart.Chart.ChartRect; + horizontalValueEndPoint = GetAxesValue(bottomMinValue, bottomMaxValue, - teeChart.Chart.ChartRect.Left, - teeChart.Chart.ChartRect.Left + teeChart.Chart.ChartRect.Width, + chartRect.Left, + (chartRect.Left + chartRect.Width), point.X); verticalValueEndPoint = GetAxesValue(leftMinValue, leftMaxValue, - teeChart.Chart.ChartRect.Top + teeChart.Chart.ChartRect.Height, - teeChart.Chart.ChartRect.Top, + (chartRect.Top + chartRect.Height), + chartRect.Top, point.Y); var dx = teeChart.Chart.Axes.Bottom.IsDateTime @@ -302,7 +306,9 @@ var currentPoint = new Point(e.X, e.Y); if (Active && measuring) { - if (teeChart.Chart.ChartRect.Contains(currentPoint)) + // Local copy to prevent compiler warning CS1690 (https://msdn.microsoft.com/en-us/library/x524dkh4.aspx) + var chartRect = teeChart.Chart.ChartRect; + if (chartRect.Contains(currentPoint)) { measuringEndPoint = currentPoint; } @@ -317,7 +323,9 @@ if (Active && Steema.TeeChart.Utils.GetMouseButton(e) == MouseButtons.Left) { var clickedPoint = new Point(e.X, e.Y); - if (teeChart.Chart.ChartRect.Contains(clickedPoint)) + // Local copy to prevent compiler warning CS1690 (https://msdn.microsoft.com/en-us/library/x524dkh4.aspx) + var chartRect = teeChart.Chart.ChartRect; + if (chartRect.Contains(clickedPoint)) { if (!measuring) { @@ -344,27 +352,29 @@ var leftMinValue = chartView.Chart.LeftAxis.Minimum; var leftMaxValue = chartView.Chart.LeftAxis.Maximum; + var chartRect = teeChart.Chart.ChartRect; + if (horizontalValueStartPoint != null && !double.IsNaN((double) horizontalValueStartPoint)) { var pixelValueStartX = GetPixelValue(bottomMinValue, bottomMaxValue, - teeChart.Chart.ChartRect.Left, - teeChart.Chart.ChartRect.Left + teeChart.Chart.ChartRect.Width, + chartRect.Left, + (chartRect.Left + chartRect.Width), (double) horizontalValueStartPoint); var pixelValueStartY = GetPixelValue(leftMinValue, leftMaxValue, - teeChart.Chart.ChartRect.Top + teeChart.Chart.ChartRect.Height, - teeChart.Chart.ChartRect.Top, + (chartRect.Top + chartRect.Height), + chartRect.Top, (double) verticalValueStartPoint); measuringStartPoint = new Point(pixelValueStartX, pixelValueStartY); } if (horizontalValueEndPoint != null && !double.IsNaN((double) horizontalValueEndPoint)) { var pixelValueEndX = GetPixelValue(bottomMinValue, bottomMaxValue, - teeChart.Chart.ChartRect.Left, - teeChart.Chart.ChartRect.Left + teeChart.Chart.ChartRect.Width, + chartRect.Left, + (chartRect.Left + chartRect.Width), (double) horizontalValueEndPoint); var pixelValueEndY = GetPixelValue(leftMinValue, leftMaxValue, - teeChart.Chart.ChartRect.Top + teeChart.Chart.ChartRect.Height, - teeChart.Chart.ChartRect.Top, + (chartRect.Top + chartRect.Height), + chartRect.Top, (double) verticalValueEndPoint); measuringEndPoint = new Point(pixelValueEndX, pixelValueEndY); } Index: src/Common/DelftTools.Controls.Swf/Charting/Tools/SelectPointTool.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r841d3efd31f92b5fb792bbd99c153dfeb0627458 --- src/Common/DelftTools.Controls.Swf/Charting/Tools/SelectPointTool.cs (.../SelectPointTool.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ src/Common/DelftTools.Controls.Swf/Charting/Tools/SelectPointTool.cs (.../SelectPointTool.cs) (revision 841d3efd31f92b5fb792bbd99c153dfeb0627458) @@ -365,7 +365,9 @@ int x = point.Series.CalcXPos(point.PointIndex); int y = point.Series.CalcYPos(point.PointIndex); - if (!Chart.ChartRect.Contains(x, y)) //outside chart area + // Local copy to prevent compiler warning CS1690 (https://msdn.microsoft.com/en-us/library/x524dkh4.aspx) + var chartRect = Chart.ChartRect; + if (! chartRect.Contains(x, y)) //outside chart area { continue; } Index: src/DeltaShell/DeltaShell.Gui/Forms/ProgressDialog/ProgressDialog.Designer.cs =================================================================== diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r841d3efd31f92b5fb792bbd99c153dfeb0627458 --- src/DeltaShell/DeltaShell.Gui/Forms/ProgressDialog/ProgressDialog.Designer.cs (.../ProgressDialog.Designer.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9) +++ src/DeltaShell/DeltaShell.Gui/Forms/ProgressDialog/ProgressDialog.Designer.cs (.../ProgressDialog.Designer.cs) (revision 841d3efd31f92b5fb792bbd99c153dfeb0627458) @@ -118,7 +118,6 @@ private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.Label lblTitle; - private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridView dgvActivities; private System.Windows.Forms.DataGridViewTextBoxColumn NameColumn; private System.Windows.Forms.DataGridViewTextBoxColumn Progress; Index: src/DeltaShell/DeltaShell.Gui/Forms/SelectViewDialog.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r841d3efd31f92b5fb792bbd99c153dfeb0627458 --- src/DeltaShell/DeltaShell.Gui/Forms/SelectViewDialog.cs (.../SelectViewDialog.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ src/DeltaShell/DeltaShell.Gui/Forms/SelectViewDialog.cs (.../SelectViewDialog.cs) (revision 841d3efd31f92b5fb792bbd99c153dfeb0627458) @@ -9,7 +9,6 @@ public partial class SelectViewDialog : Form { private IList items; - private string dataName; public SelectViewDialog() { Index: src/DeltaShell/DeltaShell.Gui/Forms/SplashScreen.xaml.cs =================================================================== diff -u -rda0e4ce0541bc755152f9948a66d9060f8496109 -r841d3efd31f92b5fb792bbd99c153dfeb0627458 --- src/DeltaShell/DeltaShell.Gui/Forms/SplashScreen.xaml.cs (.../SplashScreen.xaml.cs) (revision da0e4ce0541bc755152f9948a66d9060f8496109) +++ src/DeltaShell/DeltaShell.Gui/Forms/SplashScreen.xaml.cs (.../SplashScreen.xaml.cs) (revision 841d3efd31f92b5fb792bbd99c153dfeb0627458) @@ -24,7 +24,6 @@ private IApplication app; private DateTime lastUpdateTime; private string logoImageFilePath; - private MessageWindowData messageWindowData; private volatile ProgressInfo progressInfo; private bool scheduleUpdate;