comparison layer/Layer.h @ 269:7b58c5e91f20

* save/reload measurements in session

      * inverse of the toXmlString method.
      */
     virtual void setProperties(const QXmlAttributes &) = 0;
 
     /**
+     * Produce an XML string containing the layer's ID and type.  This
+     * is used to refer to the layer in the display section of the SV
+     * session file, for a layer that has already been described in
+     * the data section.
+     */
+    virtual QString toBriefXmlString(QString indent = "",
+                                     QString extraAttributes = "") const;
+
+    /**
+     * Add a measurement rectangle from the given XML attributes
+     * (presumably taken from a measurement element).
+     * Does not use a command.
+     */
+    virtual void addMeasurementRect(const QXmlAttributes &);
+
+    /**
      * Indicate that a layer is not currently visible in the given
      * view and is not expected to become visible in the near future
      * (for example because the user has explicitly removed or hidden
      * it).  The layer may respond by (for example) freeing any cache
      * memory it is using, until next time its paint method is called,

         bool haveFrames;
         long startFrame; // only valid if haveFrames
         long endFrame;   // ditto
 
         bool operator<(const MeasureRect &mr) const;
+        QString toXmlString(QString indent) const;
     };
 
     class AddMeasurementRectCommand : public Command
     {
     public:

     private:
         Layer *m_layer;
         MeasureRect m_rect;
     };
 
-    void addMeasureRect(const MeasureRect &r) {
+    void addMeasureRectToSet(const MeasureRect &r) {
         m_measureRects.insert(r);
         emit layerMeasurementRectsChanged();
     }
 
-    void deleteMeasureRect(const MeasureRect &r) {
+    void deleteMeasureRectFromSet(const MeasureRect &r) {
         m_measureRects.erase(r); 
         emit layerMeasurementRectsChanged();
     }
 
     typedef std::set<MeasureRect> MeasureRectSet;
     MeasureRectSet m_measureRects;
     MeasureRect m_draggingRect;
     bool m_haveDraggingRect;
 
-    void paintMeasurementRect(View *v, QPainter &paint, MeasureRect &r);
+    void paintMeasurementRect(View *v, QPainter &paint,
+                              const MeasureRect &r) const;
 
 private:
     mutable QMutex m_dormancyMutex;
     mutable std::map<const void *, bool> m_dormancy;
 };