# HG changeset patch # User Chris Cannam # Date 1252683752 0 # Node ID 24d1d152871735ab055d9125316a9aad5d920d6f # Parent be5c35d3f4098a1430d7a835d686860ba9d1a80b * Add start frame get/set to EditableDenseThreeDimensionalModel and use it when importing grids from CSV with timings attached diff -r be5c35d3f409 -r 24d1d1528717 widgets/CSVFormatDialog.cpp --- a/widgets/CSVFormatDialog.cpp Thu Sep 10 18:44:45 2009 +0000 +++ b/widgets/CSVFormatDialog.cpp Fri Sep 11 15:42:32 2009 +0000 @@ -192,12 +192,12 @@ { m_modelType = (CSVFormat::ModelType)type; - if (m_modelType == CSVFormat::ThreeDimensionalModel) { +// if (m_modelType == CSVFormat::ThreeDimensionalModel) { // We can't load 3d models with explicit timing, because the 3d // model is dense so we need a fixed sample increment - m_timingTypeCombo->setCurrentIndex(2); - timingTypeChanged(2); - } +// m_timingTypeCombo->setCurrentIndex(2); +// timingTypeChanged(2); +// } } void @@ -212,10 +212,10 @@ m_sampleRateLabel->setEnabled(false); m_windowSizeCombo->setEnabled(false); m_windowSizeLabel->setEnabled(false); - if (m_modelType == CSVFormat::ThreeDimensionalModel) { - m_modelTypeCombo->setCurrentIndex(1); - modelTypeChanged(1); - } +// if (m_modelType == CSVFormat::ThreeDimensionalModel) { +// m_modelTypeCombo->setCurrentIndex(1); +// modelTypeChanged(1); +// } break; case 1: @@ -225,10 +225,10 @@ m_sampleRateLabel->setEnabled(true); m_windowSizeCombo->setEnabled(false); m_windowSizeLabel->setEnabled(false); - if (m_modelType == CSVFormat::ThreeDimensionalModel) { - m_modelTypeCombo->setCurrentIndex(1); - modelTypeChanged(1); - } +// if (m_modelType == CSVFormat::ThreeDimensionalModel) { +// m_modelTypeCombo->setCurrentIndex(1); +// modelTypeChanged(1); +// } break; case 2: