comparison layer/TextLayer.cpp @ 586:1ae54a29e59e

Merge from debug-output branch

     if (m_model == model) return;
     m_model = model;
 
     connectSignals(m_model);
 
-//    std::cerr << "TextLayer::setModel(" << model << ")" << std::endl;
+//    DEBUG << "TextLayer::setModel(" << model << ")" << endl;
 
     emit modelReplaced();
 }
 
 Layer::PropertyList

     brushColour.setHsv(h, s, 255, 100);
 
     QColor penColour;
     penColour = v->getForeground();
 
-//    std::cerr << "TextLayer::paint: resolution is "
-//	      << m_model->getResolution() << " frames" << std::endl;
+//    DEBUG << "TextLayer::paint: resolution is "
+//	      << m_model->getResolution() << " frames" << endl;
 
     QPoint localPos;
     TextModel::Point illuminatePoint(0);
     bool shouldIlluminate;
 

 }
 
 void
 TextLayer::drawStart(View *v, QMouseEvent *e)
 {
-//    std::cerr << "TextLayer::drawStart(" << e->x() << "," << e->y() << ")" << std::endl;
+//    DEBUG << "TextLayer::drawStart(" << e->x() << "," << e->y() << ")" << endl;
 
     if (!m_model) {
-	std::cerr << "TextLayer::drawStart: no model" << std::endl;
+	DEBUG << "TextLayer::drawStart: no model" << endl;
 	return;
     }
 
     long frame = v->getFrameForX(e->x());
     if (frame < 0) frame = 0;

 }
 
 void
 TextLayer::drawDrag(View *v, QMouseEvent *e)
 {
-//    std::cerr << "TextLayer::drawDrag(" << e->x() << "," << e->y() << ")" << std::endl;
+//    DEBUG << "TextLayer::drawDrag(" << e->x() << "," << e->y() << ")" << endl;
 
     if (!m_model || !m_editing) return;
 
     long frame = v->getFrameForX(e->x());
     if (frame < 0) frame = 0;

 }
 
 void
 TextLayer::drawEnd(View *v, QMouseEvent *)
 {
-//    std::cerr << "TextLayer::drawEnd(" << e->x() << "," << e->y() << ")" << std::endl;
+//    DEBUG << "TextLayer::drawEnd(" << e->x() << "," << e->y() << ")" << endl;
     if (!m_model || !m_editing) return;
 
     bool ok = false;
     QString label = QInputDialog::getText(v, tr("Enter label"),
 					  tr("Please enter a new label:"),

 }
 
 void
 TextLayer::editStart(View *v, QMouseEvent *e)
 {
-//    std::cerr << "TextLayer::editStart(" << e->x() << "," << e->y() << ")" << std::endl;
+//    DEBUG << "TextLayer::editStart(" << e->x() << "," << e->y() << ")" << endl;
 
     if (!m_model) return;
 
     if (!getPointToDrag(v, e->x(), e->y(), m_editingPoint)) {
         return;

 }
 
 void
 TextLayer::editEnd(View *, QMouseEvent *)
 {
-//    std::cerr << "TextLayer::editEnd(" << e->x() << "," << e->y() << ")" << std::endl;
+//    DEBUG << "TextLayer::editEnd(" << e->x() << "," << e->y() << ")" << endl;
     if (!m_model || !m_editing) return;
 
     if (m_editingCommand) {
 
 	QString newName = m_editingCommand->getName();