Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions model/CSVDialog.cc
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,14 @@ void CSVDialog::loadFileFromName(const std::string& fname)
initialLines.clear();
for (size_t i=0; i<numInitialLines && is; ++i)
{
initialLines.emplace_back();
getline(is, initialLines.back());
// chomp any final '\r' character (DOS files)
if (!initialLines.back().empty() && initialLines.back().back()=='\r')
initialLines.back().erase(initialLines.back().end()-1);
string buf;
if (getline(is, buf))
{
initialLines.emplace_back(std::move(buf));
// chomp any final '\r' character (DOS files)
if (!initialLines.back().empty() && initialLines.back().back()=='\r')
initialLines.back().erase(initialLines.back().end()-1);
}
}
// Ensure dimensions.size() is the same as nColAxes() upon first load of a CSV file. For ticket 974.
if (spec.dimensions.size()<spec.nColAxes()) spec.setDataArea(spec.nRowAxes(),spec.nColAxes());
Expand Down
Loading
Loading