Mercurial > hg > svgui

changeset 546:24d1d1528717

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Add start frame get/set to EditableDenseThreeDimensionalModel and use it when importing grids from CSV with timings attached
author Chris Cannam
date Fri, 11 Sep 2009 15:42:32 +0000
parents be5c35d3f409
children 0ce7566717b2
files widgets/CSVFormatDialog.cpp
diffstat 1 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- 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: