Changeset 15186 for stable

Timestamp:

07/10/17 19:04:35 (7 years ago)

Author:

gkronber

Message:

#2688: merged r14343 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisImportTypeDialog.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/DataAnalysisCSVFormat.cs (modified) (2 diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/DataAnalysisInstanceProvider.cs (modified) (1 diff)

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

@@ -82 +82 @@
           NumberFormatInfo = (NumberFormatInfo)DecimalSeparatorComboBox.SelectedValue,
           DateTimeFormatInfo = (DateTimeFormatInfo)DateTimeFormatComboBox.SelectedValue,
-          VariableNamesAvailable = CheckboxColumnNames.Checked
+          VariableNamesAvailable = CheckboxColumnNames.Checked,
+          Encoding = (Encoding) EncodingComboBox.SelectedValue
         };
       }

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/DataAnalysisCSVFormat.cs

@@ -21 +21 @@
 
 using System.Globalization;
+using System.Text;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
@@ -28 +29 @@
     public DateTimeFormatInfo DateTimeFormatInfo { get; set; }
     public bool VariableNamesAvailable { get; set; }
+    public Encoding Encoding { get; set; }
   }
 }

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/DataAnalysisInstanceProvider.cs

@@ -40 +40 @@
     public TData ImportData(string path, ImportType type, DataAnalysisCSVFormat csvFormat) {
       TableFileParser csvFileParser = new TableFileParser();
+      csvFileParser.Encoding = csvFormat.Encoding;
       long fileSize = new FileInfo(path).Length;
       csvFileParser.ProgressChanged += (sender, e) => {