comparison document/SVFileReader.cpp @ 51:5f9fdca0c7d8

* Some dull work to continue unifying the fft model and editable dense 3d model interfaces
author Chris Cannam
date Mon, 09 Oct 2006 10:49:46 +0000
parents 56e1d4242bb4
children ca1e3f5657d5
comparison
equal deleted inserted replaced
50:209cf46e2413 51:5f9fdca0c7d8
841 bool warned = false; 841 bool warned = false;
842 842
843 if (dtdm) { 843 if (dtdm) {
844 QStringList data = text.split(m_datasetSeparator); 844 QStringList data = text.split(m_datasetSeparator);
845 845
846 DenseThreeDimensionalModel::BinValueSet values; 846 DenseThreeDimensionalModel::Column values;
847 847
848 for (QStringList::iterator i = data.begin(); i != data.end(); ++i) { 848 for (QStringList::iterator i = data.begin(); i != data.end(); ++i) {
849 849
850 if (values.size() == dtdm->getYBinCount()) { 850 if (values.size() == dtdm->getHeight()) {
851 if (!warned) { 851 if (!warned) {
852 std::cerr << "WARNING: SV-XML: Too many y-bins in 3-D dataset row " 852 std::cerr << "WARNING: SV-XML: Too many y-bins in 3-D dataset row "
853 << m_rowNumber << std::endl; 853 << m_rowNumber << std::endl;
854 warned = true; 854 warned = true;
855 } 855 }
864 } else { 864 } else {
865 values.push_back(value); 865 values.push_back(value);
866 } 866 }
867 } 867 }
868 868
869 size_t windowStartFrame = m_rowNumber * dtdm->getResolution(); 869 dtdm->setColumn(m_rowNumber, values);
870
871 dtdm->setBinValues(windowStartFrame, values);
872 return true; 870 return true;
873 } 871 }
874 872
875 std::cerr << "WARNING: SV-XML: Row data found in non-row dataset" << std::endl; 873 std::cerr << "WARNING: SV-XML: Row data found in non-row dataset" << std::endl;
876 874