Changeset 14343
- Timestamp:
- 10/20/16 17:28:48 (8 years ago)
- Location:
- trunk/sources
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisImportTypeDialog.cs
r14285 r14343 82 82 NumberFormatInfo = (NumberFormatInfo)DecimalSeparatorComboBox.SelectedValue, 83 83 DateTimeFormatInfo = (DateTimeFormatInfo)DateTimeFormatComboBox.SelectedValue, 84 VariableNamesAvailable = CheckboxColumnNames.Checked 84 VariableNamesAvailable = CheckboxColumnNames.Checked, 85 Encoding = (Encoding) EncodingComboBox.SelectedValue 85 86 }; 86 87 } -
trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/DataAnalysisCSVFormat.cs
r14185 r14343 21 21 22 22 using System.Globalization; 23 using System.Text; 23 24 24 25 namespace HeuristicLab.Problems.Instances.DataAnalysis { … … 28 29 public DateTimeFormatInfo DateTimeFormatInfo { get; set; } 29 30 public bool VariableNamesAvailable { get; set; } 31 public Encoding Encoding { get; set; } 30 32 } 31 33 } -
trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/DataAnalysisInstanceProvider.cs
r14185 r14343 40 40 public TData ImportData(string path, ImportType type, DataAnalysisCSVFormat csvFormat) { 41 41 TableFileParser csvFileParser = new TableFileParser(); 42 csvFileParser.Encoding = csvFormat.Encoding; 42 43 long fileSize = new FileInfo(path).Length; 43 44 csvFileParser.ProgressChanged += (sender, e) => {
Note: See TracChangeset
for help on using the changeset viewer.