diff layer/RegionLayer.h @ 1428:c9fa16e41664 single-point

Update RegionLayer to updated RegionModel
author Chris Cannam
date Fri, 15 Mar 2019 14:24:22 +0000
parents a18e78b9c78b
children 31499c3520ee
line wrap: on
line diff
--- a/layer/RegionLayer.h	Fri Mar 15 11:09:17 2019 +0000
+++ b/layer/RegionLayer.h	Fri Mar 15 14:24:22 2019 +0000
@@ -141,9 +141,9 @@
 
     int getDefaultColourHint(bool dark, bool &impose) override;
 
-    RegionModel::PointList getLocalPoints(LayerGeometryProvider *v, int x) const;
+    EventVector getLocalPoints(LayerGeometryProvider *v, int x) const;
 
-    bool getPointToDrag(LayerGeometryProvider *v, int x, int y, RegionModel::Point &) const;
+    bool getPointToDrag(LayerGeometryProvider *v, int x, int y, Event &) const;
 
     RegionModel *m_model;
     bool m_editing;
@@ -151,9 +151,9 @@
     int m_dragPointY;
     int m_dragStartX;
     int m_dragStartY;
-    RegionModel::Point m_originalPoint;
-    RegionModel::Point m_editingPoint;
-    RegionModel::EditCommand *m_editingCommand;
+    Event m_originalPoint;
+    Event m_editingPoint;
+    ChangeEventsCommand *m_editingCommand;
     VerticalScale m_verticalScale;
     int m_colourMap;
     bool m_colourInverted;
@@ -170,7 +170,7 @@
     int spacingIndexToY(LayerGeometryProvider *v, int i) const;
     double yToSpacingIndex(LayerGeometryProvider *v, int y) const;
 
-    void finish(RegionModel::EditCommand *command) {
+    void finish(ChangeEventsCommand *command) {
         Command *c = command->finish();
         if (c) CommandHistory::getInstance()->addCommand(c, false);
     }