Changeset 16165

Timestamp:

09/20/18 14:58:59 (6 years ago)

Author:

gkronber

Message:

#2932: merged r16054 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisImportDialog.cs (modified) (7 diffs)

stable/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisImportDialog.cs

@@ -33 +33 @@
   public partial class DataAnalysisImportDialog : Form {
 
-    private static readonly List<KeyValuePair<DateTimeFormatInfo, string>> dateTimeFormats =
+    private static readonly List<KeyValuePair<DateTimeFormatInfo, string>> POSSIBLE_DATETIME_FORMATS =
       new List<KeyValuePair<DateTimeFormatInfo, string>>{
         new KeyValuePair<DateTimeFormatInfo, string>(DateTimeFormatInfo.GetInstance(new CultureInfo("de-DE")), "dd/mm/yyyy hh:MM:ss" ),
@@ -42 +42 @@
 
     private static readonly List<KeyValuePair<char, string>> POSSIBLE_SEPARATORS =
-      new List<KeyValuePair<char, string>>{  
+      new List<KeyValuePair<char, string>>{
         new KeyValuePair<char, string>(';', "; (Semicolon)" ),
-        new KeyValuePair<char, string>(',', ", (Comma)" ),    
+        new KeyValuePair<char, string>(',', ", (Comma)" ),
         new KeyValuePair<char, string>('\t', "\\t (Tab)"),
         new KeyValuePair<char, string>((char)0, "all whitespaces (including tabs and spaces)")
@@ -52 +52 @@
       new List<KeyValuePair<NumberFormatInfo, string>>{
         new KeyValuePair<NumberFormatInfo, string>(NumberFormatInfo.GetInstance(new CultureInfo("de-DE")), ", (Comma)"),
-        new KeyValuePair<NumberFormatInfo, string>(NumberFormatInfo.InvariantInfo, ". (Period)" )    
+        new KeyValuePair<NumberFormatInfo, string>(NumberFormatInfo.InvariantInfo, ". (Period)" )
     };
 
@@ -59 +59 @@
         new KeyValuePair<Encoding, string>(Encoding.Default, "Default"),
         new KeyValuePair<Encoding, string>(Encoding.ASCII, "ASCII"),
-        new KeyValuePair<Encoding, string>(Encoding.Unicode, "Unicode"),    
-        new KeyValuePair<Encoding, string>(Encoding.UTF8, "UTF8")        
+        new KeyValuePair<Encoding, string>(Encoding.Unicode, "Unicode"),
+        new KeyValuePair<Encoding, string>(Encoding.UTF8, "UTF8")
       };
 
@@ -97 +97 @@
       DecimalSeparatorComboBox.ValueMember = "Key";
       DecimalSeparatorComboBox.DisplayMember = "Value";
-      DateTimeFormatComboBox.DataSource = dateTimeFormats;
+      DateTimeFormatComboBox.DataSource = POSSIBLE_DATETIME_FORMATS;
       DateTimeFormatComboBox.ValueMember = "Key";
       DateTimeFormatComboBox.DisplayMember = "Value";
@@ -104 +104 @@
       EncodingComboBox.DisplayMember = "Value";
 
+
+      // set default values based on the current culture
+      var separator = POSSIBLE_SEPARATORS.Where(n => n.Value.Substring(0, 1) == CultureInfo.CurrentCulture.TextInfo.ListSeparator);
+      if (separator.Any())
+        SeparatorComboBox.SelectedItem = separator.First();
+
+      var decimalSeparator = POSSIBLE_DECIMAL_SEPARATORS.Where(n => n.Value.Substring(0,1) == CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator);
+      if (decimalSeparator.Any())
+        DecimalSeparatorComboBox.SelectedItem = decimalSeparator.First();
     }
 
@@ -158 +167 @@
         OkButton.Enabled = true;
       }
-      catch (Exception ex) {
+       catch (Exception ex) {
         if (ex is IOException || ex is InvalidOperationException || ex is ArgumentException) {
           OkButton.Enabled = false;