Mercurial > hg > svgui
comparison widgets/CSVFormatDialog.cpp @ 706:97ea68f62c1f imaf_enc
Merge from default branch
author | Chris Cannam |
---|---|
date | Thu, 05 Dec 2013 09:47:02 +0000 |
parents | 1a0dfcbffaf1 |
children | cdafb1a438e8 |
comparison
equal
deleted
inserted
replaced
678:26c5f7fd4807 | 706:97ea68f62c1f |
---|---|
28 #include <QComboBox> | 28 #include <QComboBox> |
29 #include <QLabel> | 29 #include <QLabel> |
30 #include <QDialogButtonBox> | 30 #include <QDialogButtonBox> |
31 | 31 |
32 #include <iostream> | 32 #include <iostream> |
33 | |
34 #include "base/Debug.h" | |
33 | 35 |
34 CSVFormatDialog::CSVFormatDialog(QWidget *parent, CSVFormat format, | 36 CSVFormatDialog::CSVFormatDialog(QWidget *parent, CSVFormat format, |
35 int maxDisplayCols) : | 37 int maxDisplayCols) : |
36 QDialog(parent), | 38 QDialog(parent), |
37 m_format(format), | 39 m_format(format), |
288 | 290 |
289 bool thisChanged = (cb == m_columnPurposeCombos[i]); | 291 bool thisChanged = (cb == m_columnPurposeCombos[i]); |
290 | 292 |
291 if (thisChanged) { | 293 if (thisChanged) { |
292 | 294 |
293 std::cerr << "i == " << i << ", fuzzy == " << m_fuzzyColumn | 295 cerr << "i == " << i << ", fuzzy == " << m_fuzzyColumn |
294 << ", p == " << p << std::endl; | 296 << ", p == " << p << endl; |
295 | 297 |
296 if (i == m_fuzzyColumn) { | 298 if (i == m_fuzzyColumn) { |
297 for (int j = i; j < m_format.getColumnCount(); ++j) { | 299 for (int j = i; j < m_format.getColumnCount(); ++j) { |
298 if (p == 0) { // Ignore | 300 if (p == 0) { // Ignore |
299 m_format.setColumnPurpose(j, CSVFormat::ColumnUnknown); | 301 m_format.setColumnPurpose(j, CSVFormat::ColumnUnknown); |