Index: Core/Common/src/Core.Common.Controls.Swf/Charting/ChartView.cs
===================================================================
diff -u -rf43e90a16e94b36691e0ebb8e9ffa5989678b093 -r23981d00366f6ee42b7b3c2b776a687c1dc70d07
--- Core/Common/src/Core.Common.Controls.Swf/Charting/ChartView.cs (.../ChartView.cs) (revision f43e90a16e94b36691e0ebb8e9ffa5989678b093)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/ChartView.cs (.../ChartView.cs) (revision 23981d00366f6ee42b7b3c2b776a687c1dc70d07)
@@ -9,7 +9,6 @@
using Core.Common.Utils;
using Core.Common.Utils.Collections;
using Core.Common.Utils.Collections.Generic;
-using Core.Common.Utils.Globalization;
using Steema.TeeChart;
using Steema.TeeChart.Drawing;
using Steema.TeeChart.Tools;
@@ -76,12 +75,10 @@
teeChart.KeyUp += (s, e) => OnKeyUp(e); //bubble the keyup events from the chart..otherwise it does not work..
DateTimeLabelFormatProvider = new TimeNavigatableLabelFormatProvider();
- RegionalSettingsManager.FormatChanged += RegionalSettingsManagerFormatChanged;
InitializeWheelZoom();
teeChart.Legend.Alignment = LegendAlignments.Bottom;
- teeChart.Axes.Left.Labels.ValueFormat = RegionalSettingsManager.RealNumberFormat; //actual format is applied in OnGetAxisLabel
teeChart.Chart.Header.Color = Color.Black; // To avoid blue titles everywhere
Tools.Add(new ExportChartAsImageChartTool(this)
@@ -303,8 +300,6 @@
/// true if managed resources should be disposed; otherwise, false.
protected override void Dispose(bool disposing)
{
- RegionalSettingsManager.FormatChanged -= RegionalSettingsManagerFormatChanged;
-
if (disposing && (components != null))
{
components.Dispose();
@@ -462,7 +457,7 @@
if (Double.TryParse(e.LabelText, out labelValue))
{
labelValue = Math.Round(labelValue, 13); //do some rounding to prevent TeeChart problem (TOOLS-4310)
- e.LabelText = labelValue.ToString(RegionalSettingsManager.RealNumberFormat);
+ e.LabelText = labelValue.ToString();
}
}
}
@@ -621,13 +616,6 @@
afterResize = false;
}
- private void RegionalSettingsManagerFormatChanged()
- {
- teeChart.Refresh();
- teeChart.PerformLayout();
- Invalidate(true);
- }
-
private void AddLegendScrollBarTool()
{
legendScrollBarTool = new LegendScrollBar(teeChart.Chart)
Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs
===================================================================
diff -u -r7ca30c36a4c796c39a1137d7f504884d766c6e70 -r23981d00366f6ee42b7b3c2b776a687c1dc70d07
--- Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs (.../TableView.cs) (revision 7ca30c36a4c796c39a1137d7f504884d766c6e70)
+++ Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs (.../TableView.cs) (revision 23981d00366f6ee42b7b3c2b776a687c1dc70d07)
@@ -14,7 +14,6 @@
using Core.Common.Utils;
using Core.Common.Utils.Collections;
using Core.Common.Utils.Collections.Generic;
-using Core.Common.Utils.Globalization;
using Core.Common.Utils.Reflection;
using DevExpress.Data;
using DevExpress.Utils;
@@ -1648,8 +1647,7 @@
sb.Append("\t");
}
- sb.Append(RegionalSettingsManager.ConvertToString(
- dxGridView.GetRowCellValue(cell.RowHandle, cell.Column), false));
+ sb.Append(dxGridView.GetRowCellValue(cell.RowHandle, cell.Column));
}
if (rowIndex != -1)
Index: Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj
===================================================================
diff -u -r3f1a2b8718a744b49b160c89df46dee6b7fb5fdd -r23981d00366f6ee42b7b3c2b776a687c1dc70d07
--- Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj (.../Core.Common.Utils.csproj) (revision 3f1a2b8718a744b49b160c89df46dee6b7fb5fdd)
+++ Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj (.../Core.Common.Utils.csproj) (revision 23981d00366f6ee42b7b3c2b776a687c1dc70d07)
@@ -1,4 +1,4 @@
-
+
@@ -94,7 +94,6 @@
-
Fisheye: Tag 23981d00366f6ee42b7b3c2b776a687c1dc70d07 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Globalization/RegionalSettingsManager.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewTest.cs
===================================================================
diff -u -re29972e3a754b192d4f792639e599eb193e6ea8d -r23981d00366f6ee42b7b3c2b776a687c1dc70d07
--- Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewTest.cs (.../TableViewTest.cs) (revision e29972e3a754b192d4f792639e599eb193e6ea8d)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewTest.cs (.../TableViewTest.cs) (revision 23981d00366f6ee42b7b3c2b776a687c1dc70d07)
@@ -13,7 +13,6 @@
using Core.Common.Controls.Swf.Test.Table.TestClasses;
using Core.Common.TestUtils;
using Core.Common.Utils.Collections.Generic;
-using Core.Common.Utils.Globalization;
using Core.Common.Utils.Reflection;
using DevExpress.XtraEditors.Repository;
using DevExpress.XtraGrid.Columns;
@@ -389,14 +388,12 @@
row["B"] = double6;
table.Rows.Add(row);
- RegionalSettingsManager.RealNumberFormat = "N2";
-
var tableView = new TableView
{
Data = table
};
- Assert.AreEqual(double1.ToString("N2"), tableView.GetCellDisplayText(0, 0));
+ Assert.AreEqual(double1.ToString(), tableView.GetCellDisplayText(0, 0));
tableView.SelectCells(1, 0, 2, 1);
@@ -406,11 +403,11 @@
var clipBoardText = Clipboard.GetText();
- Assert.AreEqual(RegionalSettingsManager.ConvertToString(double3, false) +
- "\t" + RegionalSettingsManager.ConvertToString(double4, false) +
- "\r\n" + RegionalSettingsManager.ConvertToString(double5, false) +
- "\t" + RegionalSettingsManager.ConvertToString(double6, false) + "\r\n",
- clipBoardText);
+ Assert.AreEqual(double3
+ + "\t" + double4
+ + "\r\n" + double5
+ + "\t" + double6
+ + "\r\n", clipBoardText);
}
[Test]
@@ -442,16 +439,14 @@
row["B"] = double6;
table.Rows.Add(row);
- RegionalSettingsManager.RealNumberFormat = "N2";
-
var tableView = new TableView
{
Data = table
};
tableView.Columns[1].SortOrder = SortOrder.Descending;
- Assert.AreEqual(double5.ToString("N2"), tableView.GetCellDisplayText(0, 0));
+ Assert.AreEqual(double5.ToString(), tableView.GetCellDisplayText(0, 0));
tableView.SelectCells(1, 0, 2, 1);
@@ -461,11 +456,11 @@
var clipBoardText = Clipboard.GetText();
- Assert.AreEqual(RegionalSettingsManager.ConvertToString(double3, false) +
- "\t" + RegionalSettingsManager.ConvertToString(double4, false) +
- "\r\n" + RegionalSettingsManager.ConvertToString(double1, false) +
- "\t" + RegionalSettingsManager.ConvertToString(double2, false) + "\r\n",
- clipBoardText);
+ Assert.AreEqual(double3
+ + "\t" + double4 +
+ "\r\n" + double1 +
+ "\t" + double2
+ + "\r\n", clipBoardText);
}
[Test]
@@ -497,15 +492,13 @@
row["B"] = double6;
table.Rows.Add(row);
- RegionalSettingsManager.RealNumberFormat = "N2";
-
var tableView = new TableView
{
Data = table
};
tableView.IncludeHeadersOnCopy = true;
- Assert.AreEqual(double1.ToString("N2"), tableView.GetCellDisplayText(0, 0));
+ Assert.AreEqual(double1.ToString(), tableView.GetCellDisplayText(0, 0));
tableView.SelectCells(0, 0, 2, 1);
@@ -514,13 +507,13 @@
tableView.CopySelectionToClipboard();
var clipBoardText = Clipboard.GetText();
- Assert.AreEqual("A\tB\r\n" + RegionalSettingsManager.ConvertToString(double1, false) +
- "\t" + RegionalSettingsManager.ConvertToString(double2, false) +
- "\r\n" + RegionalSettingsManager.ConvertToString(double3, false) +
- "\t" + RegionalSettingsManager.ConvertToString(double4, false) +
- "\r\n" + RegionalSettingsManager.ConvertToString(double5, false) +
- "\t" + RegionalSettingsManager.ConvertToString(double6, false) + "\r\n",
- clipBoardText);
+ Assert.AreEqual("A\tB\r\n" + double1 +
+ "\t" + +double2 +
+ "\r\n" + double3 +
+ "\t" + double4 +
+ "\r\n" + double5 +
+ "\t" + double6 +
+ "\r\n", clipBoardText);
}
[Test]
Index: Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj
===================================================================
diff -u -r5dc6b11ada2c7d2e4ca14413b1ddca577ba34d08 -r23981d00366f6ee42b7b3c2b776a687c1dc70d07
--- Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj (.../Core.Common.Utils.Test.csproj) (revision 5dc6b11ada2c7d2e4ca14413b1ddca577ba34d08)
+++ Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj (.../Core.Common.Utils.Test.csproj) (revision 23981d00366f6ee42b7b3c2b776a687c1dc70d07)
@@ -96,7 +96,6 @@
-
Fisheye: Tag 23981d00366f6ee42b7b3c2b776a687c1dc70d07 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Utils.Test/Globalization/RegionalSettingsManagerTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?