comparison layer/TimeValueLayer.cpp @ 376:e1a9e478b7f2

* juggle some files around in order to free audioio, base, and system libraries
  from dependency on QtGui

 
 #include "data/model/Model.h"
 #include "base/RealTime.h"
 #include "base/Profiler.h"
 #include "base/LogRange.h"
-#include "base/ColourDatabase.h"
+#include "ColourDatabase.h"
 #include "view/View.h"
 
 #include "data/model/SparseTimeValueModel.h"
 #include "data/model/Labeller.h"
 
 #include "widgets/ItemEditDialog.h"
 #include "widgets/ListInputDialog.h"
 
 #include "SpectrogramLayer.h" // for optional frequency alignment
-#include "base/ColourMapper.h"
+#include "ColourMapper.h"
 
 #include <QPainter>
 #include <QPainterPath>
 #include <QMouseEvent>
 #include <QRegExp>

             (frame, value, tr("New Point"));
     }
 
     m_originalPoint = m_editingPoint;
 
-    if (m_editingCommand) m_editingCommand->finish();
+    if (m_editingCommand) finish(m_editingCommand);
     m_editingCommand = new SparseTimeValueModel::EditCommand(m_model,
 							     tr("Draw Point"));
     if (!havePoint) {
         m_editingCommand->addPoint(m_editingPoint);
     }

 void
 TimeValueLayer::drawEnd(View *, QMouseEvent *)
 {
 //    std::cerr << "TimeValueLayer::drawEnd(" << e->x() << "," << e->y() << ")" << std::endl;
     if (!m_model || !m_editing) return;
-    m_editingCommand->finish();
+    finish(m_editingCommand);
     m_editingCommand = 0;
     m_editing = false;
 }
 
 void

     if (points.empty()) return;
 
     m_editingPoint = *points.begin();
 
     if (m_editingCommand) {
-	m_editingCommand->finish();
+	finish(m_editingCommand);
 	m_editingCommand = 0;
     }
 
     m_editing = true;
 }

     m_editingCommand = new SparseTimeValueModel::EditCommand
         (m_model, tr("Erase Point"));
 
     m_editingCommand->deletePoint(m_editingPoint);
 
-    m_editingCommand->finish();
+    finish(m_editingCommand);
     m_editingCommand = 0;
     m_editing = false;
 }
 
 void

 
     m_editingPoint = *points.begin();
     m_originalPoint = m_editingPoint;
 
     if (m_editingCommand) {
-	m_editingCommand->finish();
+	finish(m_editingCommand);
 	m_editingCommand = 0;
     }
 
     m_editing = true;
 }

 	} else {
 	    newName = tr("Change Point Value");
 	}
 
 	m_editingCommand->setName(newName);
-	m_editingCommand->finish();
+	finish(m_editingCommand);
     }
 
     m_editingCommand = 0;
     m_editing = false;
 }

         
         SparseTimeValueModel::EditCommand *command =
             new SparseTimeValueModel::EditCommand(m_model, tr("Edit Point"));
         command->deletePoint(point);
         command->addPoint(newPoint);
-        command->finish();
+        finish(command);
     }
 
     delete dialog;
     return true;
 }

 	    command->deletePoint(*i);
 	    command->addPoint(newPoint);
 	}
     }
 
-    command->finish();
+    finish(command);
 }
 
 void
 TimeValueLayer::resizeSelection(Selection s, Selection newSize)
 {

 	    command->deletePoint(*i);
 	    command->addPoint(newPoint);
 	}
     }
 
-    command->finish();
+    finish(command);
 }
 
 void
 TimeValueLayer::deleteSelection(Selection s)
 {

         if (s.contains(i->frame)) {
             command->deletePoint(*i);
         }
     }
 
-    command->finish();
+    finish(command);
 }    
 
 void
 TimeValueLayer::copy(View *v, Selection s, Clipboard &to)
 {

 
         prevPoint = newPoint;
         command->addPoint(newPoint);
     }
 
-    command->finish();
+    finish(command);
     return true;
 }
 
 void
 TimeValueLayer::toXml(QTextStream &stream,