comparison layer/TextLayer.cpp @ 1051:c02c51ae5238 3.0-plus-imaf

Merge branches 3.0-integration and imaf_enc to 3.0-plus-imaf

     for (TextModel::PointList::iterator i = points.begin();
 	 i != points.end(); ++i) {
 
 	const TextModel::Point &p(*i);
 
-	int px = v->getXForFrame(p.frame);
-	int py = getYForHeight(v, p.height);
+    int px = v->getXForFrame(p.frame);
+    int py = getYForHeight(v, p.height);
 
 	QString label = p.label;
 	if (label == "") {
-	    label = tr("<no text>");
-	}
+        label = tr("<no text>");
+    }
 
 	QRect rect = metrics.boundingRect
 	    (QRect(0, 0, 150, 200),
 	     Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, label);
 

     RealTime rt = RealTime::frame2RealTime(useFrame, m_model->getSampleRate());
     
     QString text;
 
     if (points.begin()->label == "") {
-	text = QString(tr("Time:\t%1\nHeight:\t%2\nLabel:\t%3"))
+    text = QString(tr("Time:\t%1\nHeight:\t%2\nLabel:\t%3"))
 	    .arg(rt.toText(true).c_str())
 	    .arg(points.begin()->height)
 	    .arg(points.begin()->label);
     }
 

             paint.setPen(v->getBackground());
 	}
 
 	QString label = p.label;
 	if (label == "") {
-	    label = tr("<no text>");
+        label = tr("<no text>");
 	}
 
 	QRect boxRect = paint.fontMetrics().boundingRect
 	    (QRect(0, 0, boxMaxWidth, boxMaxHeight),
 	     Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, label);

 
     m_editingCommand->deletePoint(m_editingPoint);
     m_editingPoint.frame = frame;
     m_editingPoint.height = float(height);
     m_editingCommand->addPoint(m_editingPoint);
+
+
 }
 
 void
 TextLayer::drawEnd(LayerGeometryProvider *v, QMouseEvent *)
 {