Mercurial > hg > svapp
comparison framework/Align.cpp @ 425:5882462fa747 alignment_view
Seems more logical for the external alignment program to emit reference,other rather than other,reference
author | Chris Cannam |
---|---|
date | Thu, 20 Nov 2014 17:17:45 +0000 |
parents | d044682967ca |
children | b23db4cef02f |
comparison
equal
deleted
inserted
replaced
424:d044682967ca | 425:5882462fa747 |
---|---|
200 CSVFormat format; | 200 CSVFormat format; |
201 format.setModelType(CSVFormat::TwoDimensionalModel); | 201 format.setModelType(CSVFormat::TwoDimensionalModel); |
202 format.setTimingType(CSVFormat::ExplicitTiming); | 202 format.setTimingType(CSVFormat::ExplicitTiming); |
203 format.setTimeUnits(CSVFormat::TimeSeconds); | 203 format.setTimeUnits(CSVFormat::TimeSeconds); |
204 format.setColumnCount(2); | 204 format.setColumnCount(2); |
205 format.setColumnPurpose(0, CSVFormat::ColumnStartTime); | 205 // The output format has time in the reference file first, and |
206 format.setColumnPurpose(1, CSVFormat::ColumnValue); | 206 // time in the "other" file in the second column. This is a |
207 // more natural approach for a command-line alignment tool, | |
208 // but it's the opposite of what we expect for native | |
209 // alignment paths, which map from "other" file to | |
210 // reference. These column purpose settings reflect that. | |
211 format.setColumnPurpose(1, CSVFormat::ColumnStartTime); | |
212 format.setColumnPurpose(0, CSVFormat::ColumnValue); | |
207 format.setAllowQuoting(false); | 213 format.setAllowQuoting(false); |
208 format.setSeparator(','); | 214 format.setSeparator(','); |
209 | 215 |
210 CSVFileReader reader(process, format, alignmentModel->getSampleRate()); | 216 CSVFileReader reader(process, format, alignmentModel->getSampleRate()); |
211 if (!reader.isOK()) { | 217 if (!reader.isOK()) { |