Mercurial > hg > svcore
view data/model/ModelDataTableModel.cpp @ 1196:c7b9c902642f spectrogram-minor-refactor
Fix threshold in spectrogram -- it wasn't working in the last release.
There is a new protocol for this. Formerly the threshold parameter had a
range from -50dB to 0 with the default at -50, and -50 treated internally
as "no threshold". However, there was a hardcoded, hidden internal threshold
for spectrogram colour mapping at -80dB with anything below this being rounded
to zero. Now the threshold parameter has range -81 to -1 with the default
at -80, -81 is treated internally as "no threshold", and there is no hidden
internal threshold. So the default behaviour is the same as before, an
effective -80dB threshold, but it is now possible to change this in both
directions. Sessions reloaded from prior versions may look slightly different
because, if the session says there should be no threshold, there will now
actually be no threshold instead of having the hidden internal one.
Still need to do something in the UI to make it apparent that the -81dB
setting removes the threshold entirely. This is at least no worse than the
previous, also obscured, magic -50dB setting.
author | Chris Cannam |
---|---|
date | Mon, 01 Aug 2016 16:21:01 +0100 |
parents | 2f49be7d4264 |
children | cbdd534f517a |
line wrap: on
line source
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ /* Sonic Visualiser An audio file viewer and annotation editor. Centre for Digital Music, Queen Mary, University of London. This file copyright 2008 QMUL. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. See the file COPYING included with this distribution for more information. */ #include "ModelDataTableModel.h" #include "TabularModel.h" #include "Model.h" #include <map> #include <algorithm> #include <iostream> ModelDataTableModel::ModelDataTableModel(TabularModel *m) : m_model(m), m_sortColumn(0), m_sortOrdering(Qt::AscendingOrder), m_currentRow(0) { Model *baseModel = dynamic_cast<Model *>(m); connect(baseModel, SIGNAL(modelChanged()), this, SLOT(modelChanged())); connect(baseModel, SIGNAL(modelChangedWithin(sv_frame_t, sv_frame_t)), this, SLOT(modelChangedWithin(sv_frame_t, sv_frame_t))); connect(baseModel, SIGNAL(aboutToBeDeleted()), this, SLOT(modelAboutToBeDeleted())); } ModelDataTableModel::~ModelDataTableModel() { } QVariant ModelDataTableModel::data(const QModelIndex &index, int role) const { if (!m_model) return QVariant(); if (role != Qt::EditRole && role != Qt::DisplayRole) return QVariant(); if (!index.isValid()) return QVariant(); return m_model->getData(getUnsorted(index.row()), index.column(), role); } bool ModelDataTableModel::setData(const QModelIndex &index, const QVariant &value, int role) { if (!m_model) return false; if (!index.isValid()) return false; Command *command = m_model->getSetDataCommand(getUnsorted(index.row()), index.column(), value, role); if (command) { emit addCommand(command); return true; } else { return false; } } bool ModelDataTableModel::insertRow(int row, const QModelIndex &parent) { if (!m_model) return false; if (parent.isValid()) return false; emit beginInsertRows(parent, row, row); Command *command = m_model->getInsertRowCommand(getUnsorted(row)); if (command) { emit addCommand(command); } emit endInsertRows(); return (command ? true : false); } bool ModelDataTableModel::removeRow(int row, const QModelIndex &parent) { if (!m_model) return false; if (parent.isValid()) return false; emit beginRemoveRows(parent, row, row); Command *command = m_model->getRemoveRowCommand(getUnsorted(row)); if (command) { emit addCommand(command); } emit endRemoveRows(); return (command ? true : false); } Qt::ItemFlags ModelDataTableModel::flags(const QModelIndex &) const { Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | Qt::ItemIsSelectable; return flags; } QVariant ModelDataTableModel::headerData(int section, Qt::Orientation orientation, int role) const { if (!m_model) return QVariant(); if (orientation == Qt::Vertical && role == Qt::DisplayRole) { return section + 1; } if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { return m_model->getHeading(section); } return QVariant(); } QModelIndex ModelDataTableModel::index(int row, int column, const QModelIndex &) const { return createIndex(row, column, (void *)0); } QModelIndex ModelDataTableModel::parent(const QModelIndex &) const { return QModelIndex(); } int ModelDataTableModel::rowCount(const QModelIndex &parent) const { if (!m_model) return 0; if (parent.isValid()) return 0; return m_model->getRowCount(); } int ModelDataTableModel::columnCount(const QModelIndex &parent) const { if (!m_model) return 0; if (parent.isValid()) return 0; return m_model->getColumnCount(); } QModelIndex ModelDataTableModel::getModelIndexForFrame(sv_frame_t frame) const { if (!m_model) return createIndex(0, 0); int row = m_model->getRowForFrame(frame); return createIndex(getSorted(row), 0, (void *)0); } sv_frame_t ModelDataTableModel::getFrameForModelIndex(const QModelIndex &index) const { if (!m_model) return 0; return m_model->getFrameForRow(getUnsorted(index.row())); } QModelIndex ModelDataTableModel::findText(QString text) const { if (text == "") return QModelIndex(); int rows = rowCount(); int cols = columnCount(); int current = getCurrentRow(); for (int row = 1; row <= rows; ++row) { int wrapped = (row + current) % rows; for (int col = 0; col < cols; ++col) { if (m_model->getSortType(col) != TabularModel::SortAlphabetical) { continue; } QString cell = m_model->getData(getUnsorted(wrapped), col, Qt::DisplayRole).toString(); if (cell.contains(text, Qt::CaseInsensitive)) { return createIndex(wrapped, col); } } } return QModelIndex(); } void ModelDataTableModel::sort(int column, Qt::SortOrder sortOrder) { // SVDEBUG << "ModelDataTableModel::sort(" << column << ", " << sortOrder // << ")" << endl; int prevCurrent = getCurrentRow(); if (m_sortColumn != column) { clearSort(); } m_sortColumn = column; m_sortOrdering = sortOrder; int current = getCurrentRow(); if (current != prevCurrent) { // cerr << "Current row changed from " << prevCurrent << " to " << current << " for underlying row " << m_currentRow << endl; emit currentChanged(createIndex(current, 0, (void *)0)); } emit layoutChanged(); } void ModelDataTableModel::modelChanged() { clearSort(); emit layoutChanged(); } void ModelDataTableModel::modelChangedWithin(sv_frame_t, sv_frame_t) { //!!! inefficient clearSort(); emit layoutChanged(); } void ModelDataTableModel::modelAboutToBeDeleted() { m_model = 0; emit modelRemoved(); } int ModelDataTableModel::getSorted(int row) const { if (!m_model) return row; if (m_model->isColumnTimeValue(m_sortColumn)) { if (m_sortOrdering == Qt::AscendingOrder) { return row; } else { return rowCount() - row - 1; } } if (m_sort.empty()) { resort(); } int result = 0; if (row >= 0 && row < (int)m_sort.size()) { result = m_sort[row]; } if (m_sortOrdering == Qt::DescendingOrder) { result = rowCount() - result - 1; } return result; } int ModelDataTableModel::getUnsorted(int row) const { if (!m_model) return row; if (m_model->isColumnTimeValue(m_sortColumn)) { if (m_sortOrdering == Qt::AscendingOrder) { return row; } else { return rowCount() - row - 1; } } if (m_sort.empty()) { resort(); } int result = 0; if (row >= 0 && row < (int)m_sort.size()) { if (m_sortOrdering == Qt::AscendingOrder) { result = m_rsort[row]; } else { result = m_rsort[rowCount() - row - 1]; } } return result; } void ModelDataTableModel::resort() const { if (!m_model) return; bool numeric = (m_model->getSortType(m_sortColumn) == TabularModel::SortNumeric); // cerr << "resort: numeric == " << numeric << endl; m_sort.clear(); m_rsort.clear(); if (numeric) resortNumeric(); else resortAlphabetical(); std::map<int, int> tmp; // rsort maps from sorted row number to original row number for (int i = 0; i < (int)m_rsort.size(); ++i) { tmp[m_rsort[i]] = i; } // tmp now maps from original row number to sorted row number for (std::map<int, int>::const_iterator i = tmp.begin(); i != tmp.end(); ++i) { m_sort.push_back(i->second); } // and sort now maps from original row number to sorted row number } void ModelDataTableModel::resortNumeric() const { if (!m_model) return; typedef std::multimap<double, int> MapType; MapType rowMap; int rows = m_model->getRowCount(); for (int i = 0; i < rows; ++i) { QVariant value = m_model->getData(i, m_sortColumn, TabularModel::SortRole); rowMap.insert(MapType::value_type(value.toDouble(), i)); } for (MapType::iterator i = rowMap.begin(); i != rowMap.end(); ++i) { // cerr << "resortNumeric: " << i->second << ": " << i->first << endl; m_rsort.push_back(i->second); } // rsort now maps from sorted row number to original row number } void ModelDataTableModel::resortAlphabetical() const { if (!m_model) return; typedef std::multimap<QString, int> MapType; MapType rowMap; int rows = m_model->getRowCount(); for (int i = 0; i < rows; ++i) { QVariant value = m_model->getData(i, m_sortColumn, TabularModel::SortRole); rowMap.insert(MapType::value_type(value.toString(), i)); } for (MapType::iterator i = rowMap.begin(); i != rowMap.end(); ++i) { // cerr << "resortAlphabetical: " << i->second << ": " << i->first << endl; m_rsort.push_back(i->second); } // rsort now maps from sorted row number to original row number } int ModelDataTableModel::getCurrentRow() const { return getSorted(m_currentRow); } void ModelDataTableModel::setCurrentRow(int row) { m_currentRow = getUnsorted(row); } void ModelDataTableModel::clearSort() { // int prevCurrent = getCurrentRow(); m_sort.clear(); // int current = getCurrentRow(); //!!! no -- not until the sort criteria have changed // if (current != prevCurrent) { // cerr << "Current row changed from " << prevCurrent << " to " << current << " for underlying row " << m_currentRow << endl; // emit currentRowChanged(createIndex(current, 0, 0)); // } }