comparison document/SVFileReader.cpp @ 154:f6ce5febc07f

* save/reload measurements in session

     m_currentDerivedModel(0),
     m_currentDerivedModelId(-1),
     m_currentPlayParameters(0),
     m_datasetSeparator(" "),
     m_inRow(false),
+    m_inLayer(false),
+    m_inView(false),
     m_rowNumber(0),
     m_ok(false)
 {
 }
 

 	ok = true;
 
     } else if (name == "selection") {
 
 	ok = readSelection(attributes);
+
+    } else if (name == "measurement") {
+
+        ok = readMeasurement(attributes);
+
+    } else {
+        std::cerr << "WARNING: SV-XML: Unexpected element \""
+                  << name.toLocal8Bit().data() << "\"" << std::endl;
     }
 
     if (!ok) {
 	std::cerr << "WARNING: SV-XML: Failed to completely process element \""
 		  << name.toLocal8Bit().data() << "\"" << std::endl;

         m_currentTransform = "";
         m_currentTransformConfiguration = "";
 
     } else if (name == "row") {
 	m_inRow = false;
+    } else if (name == "layer") {
+        m_inLayer = false;
     } else if (name == "view") {
 	m_inView = false;
     } else if (name == "selections") {
 	m_inSelections = false;
     } else if (name == "playparameters") {

 	m_document->addLayerToView(m_currentPane, layer);
 
         layer->setLayerDormant(m_currentPane, dormant);
     }
 
+    m_currentLayer = layer;
+    m_inLayer = true;
+
     return true;
 }
 
 bool
 SVFileReader::readDatasetStart(const QXmlAttributes &attributes)

     m_paneCallback.addSelection(start, end);
 
     return true;
 }
 
+bool
+SVFileReader::readMeasurement(const QXmlAttributes &attributes)
+{
+    std::cerr << "SVFileReader::readMeasurement: inLayer "
+              << m_inLayer << ", layer " << m_currentLayer << std::endl;
+
+    if (!m_inLayer) {
+        std::cerr << "WARNING: SV-XML: Measurement found outside layer" << std::endl;
+        return false;
+    }
+
+    m_currentLayer->addMeasurementRect(attributes);
+    return true;
+}
+
 SVFileReaderPaneCallback::~SVFileReaderPaneCallback()
 {
 }