comparison data/model/ModelDataTableModel.cpp @ 689:573d45e9487b

Merge from debug-output branch
author Chris Cannam
date Tue, 14 Jun 2011 14:47:59 +0100
parents 06f13a3b9e9e
children 1424aa29ae95
comparison
equal deleted inserted replaced
688:be43b2fe68e8 689:573d45e9487b
193 } 193 }
194 194
195 void 195 void
196 ModelDataTableModel::sort(int column, Qt::SortOrder sortOrder) 196 ModelDataTableModel::sort(int column, Qt::SortOrder sortOrder)
197 { 197 {
198 // std::cerr << "ModelDataTableModel::sort(" << column << ", " << sortOrder 198 // DEBUG << "ModelDataTableModel::sort(" << column << ", " << sortOrder
199 // << ")" << std::endl; 199 // << ")" << endl;
200 int prevCurrent = getCurrentRow(); 200 int prevCurrent = getCurrentRow();
201 if (m_sortColumn != column) { 201 if (m_sortColumn != column) {
202 clearSort(); 202 clearSort();
203 } 203 }
204 m_sortColumn = column; 204 m_sortColumn = column;
360 m_model->getData(i, m_sortColumn, TabularModel::SortRole); 360 m_model->getData(i, m_sortColumn, TabularModel::SortRole);
361 rowMap.insert(MapType::value_type(value.toString(), i)); 361 rowMap.insert(MapType::value_type(value.toString(), i));
362 } 362 }
363 363
364 for (MapType::iterator i = rowMap.begin(); i != rowMap.end(); ++i) { 364 for (MapType::iterator i = rowMap.begin(); i != rowMap.end(); ++i) {
365 // std::cerr << "resortAlphabetical: " << i->second << ": " << i->first.toStdString() << std::endl; 365 // std::cerr << "resortAlphabetical: " << i->second << ": " << i->first << std::endl;
366 m_rsort.push_back(i->second); 366 m_rsort.push_back(i->second);
367 } 367 }
368 368
369 // rsort now maps from sorted row number to original row number 369 // rsort now maps from sorted row number to original row number
370 } 370 }