comparison layer/Layer.h @ 283:86a112b5b319

* Make it possible to "measure" a feature on the spectrogram by double-
  clicking in measure mode
* Make shift-click-drag (for zoom to region) work in measure mode as well
  as navigate mode.  It would be nice to be able to shift-doubleclick to
  zoom on a feature directly using a combination of these last two features,
  but that isn't possible yet.
* Make Del delete the measurement under the mouse pointer.

-
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 
 /*
     Sonic Visualiser
     An audio file viewer and annotation editor.

     virtual void measureStart(View *, QMouseEvent *);
     virtual void measureDrag(View *, QMouseEvent *);
     virtual void measureEnd(View *, QMouseEvent *);
     virtual void measureDoubleClick(View *, QMouseEvent *);
 
+    virtual bool haveCurrentMeasureRect() const {
+        return m_haveCurrentMeasureRect;
+    }
+    virtual void deleteCurrentMeasureRect(); // using a command
+
     /**
      * Open an editor on the item under the mouse (e.g. on
      * double-click).  If there is no item or editing is not
      * supported, return false.
      */

     private:
         Layer *m_layer;
         MeasureRect m_rect;
     };
 
+    class DeleteMeasurementRectCommand : public Command
+    {
+    public:
+        DeleteMeasurementRectCommand(Layer *layer, MeasureRect rect) :
+            m_layer(layer), m_rect(rect) { }
+
+        virtual QString getName() const;
+        virtual void execute();
+        virtual void unexecute();
+
+    private:
+        Layer *m_layer;
+        MeasureRect m_rect;
+    };
+
     void addMeasureRectToSet(const MeasureRect &r) {
         m_measureRects.insert(r);
         emit layerMeasurementRectsChanged();
     }
 

 
     typedef std::set<MeasureRect> MeasureRectSet;
     MeasureRectSet m_measureRects;
     MeasureRect m_draggingRect;
     bool m_haveDraggingRect;
+    mutable bool m_haveCurrentMeasureRect;
+    mutable QPoint m_currentMeasureRectPoint;
    
     // Note that pixrects are only correct for a single view.
     // So we should update them at the start of the paint procedure
     // (painting is single threaded) and only use them after that.
     void updateMeasurePixrects(View *v) const;
 
     virtual void updateMeasureRectYCoords(View *v, const MeasureRect &r) const;
     virtual void setMeasureRectYCoord(View *v, MeasureRect &r, bool start, int y) const;
+    virtual void setMeasureRectFromPixrect(View *v, MeasureRect &r, QRect pixrect) const;
 
     // This assumes updateMeasurementPixrects has been called
     MeasureRectSet::const_iterator findFocusedMeasureRect(QPoint) const;
 
     void paintMeasurementRect(View *v, QPainter &paint,