comparison layer/TimeInstantLayer.cpp @ 22:179bf7b5ddea

* Update some copyright notice dates
* Add commands for basic editing operations in time-instants and time-value layers

 TimeInstantLayer::TimeInstantLayer(View *w) :
     Layer(w),
     m_model(0),
     m_editing(false),
     m_editingPoint(0, tr("New Point")),
+    m_editingCommand(0),
     m_colour(QColor(200, 50, 255))
 {
     m_view->addLayer(this);
 }
 

     if (!m_model) return;
 
     long frame = getFrameForX(e->x());
     if (frame < 0) frame = 0;
     frame = frame / m_model->getResolution() * m_model->getResolution();
+
     m_editingPoint = SparseOneDimensionalModel::Point(frame, tr("New Point"));
-    m_model->addPoint(m_editingPoint);
+
+    if (m_editingCommand) m_editingCommand->finish();
+    m_editingCommand = new SparseOneDimensionalModel::EditCommand(m_model,
+								  tr("Draw Point"));
+    m_editingCommand->addPoint(m_editingPoint);
+
     m_editing = true;
 }
 
 void
 TimeInstantLayer::drawDrag(QMouseEvent *e)

     if (!m_model || !m_editing) return;
 
     long frame = getFrameForX(e->x());
     if (frame < 0) frame = 0;
     frame = frame / m_model->getResolution() * m_model->getResolution();
-    m_model->deletePoint(m_editingPoint);
+    m_editingCommand->deletePoint(m_editingPoint);
     m_editingPoint.frame = frame;
-    m_model->addPoint(m_editingPoint);
+    m_editingCommand->addPoint(m_editingPoint);
 }
 
 void
 TimeInstantLayer::drawEnd(QMouseEvent *e)
 {
     std::cerr << "TimeInstantLayer::drawEnd(" << e->x() << ")" << std::endl;
     if (!m_model || !m_editing) return;
+    m_editingCommand->finish();
+    m_editingCommand = 0;
     m_editing = false;
 }
 
 void
 TimeInstantLayer::editStart(QMouseEvent *e)

 
     SparseOneDimensionalModel::PointList points = getLocalPoints(e->x());
     if (points.empty()) return;
 
     m_editingPoint = *points.begin();
+
+    if (m_editingCommand) {
+	m_editingCommand->finish();
+	m_editingCommand = 0;
+    }
+
     m_editing = true;
 }
 
 void
 TimeInstantLayer::editDrag(QMouseEvent *e)

     if (!m_model || !m_editing) return;
 
     long frame = getFrameForX(e->x());
     if (frame < 0) frame = 0;
     frame = frame / m_model->getResolution() * m_model->getResolution();
-    m_model->deletePoint(m_editingPoint);
+
+    if (!m_editingCommand) {
+	m_editingCommand = new SparseOneDimensionalModel::EditCommand(m_model,
+								      tr("Drag Point"));
+    }
+
+    m_editingCommand->deletePoint(m_editingPoint);
     m_editingPoint.frame = frame;
-    m_model->addPoint(m_editingPoint);
+    m_editingCommand->addPoint(m_editingPoint);
 }
 
 void
 TimeInstantLayer::editEnd(QMouseEvent *e)
 {
     std::cerr << "TimeInstantLayer::editEnd(" << e->x() << ")" << std::endl;
     if (!m_model || !m_editing) return;
+    if (m_editingCommand) m_editingCommand->finish();
+    m_editingCommand = 0;
     m_editing = false;
 }
 
 QString
 TimeInstantLayer::toXmlString(QString indent, QString extraAttributes) const