[Performous-commit] Tapio Vierros : Notegraph tweaks.

[Tapio V. <aa...@us...>]

Module: editor
Branch: master
Commit: 61caf8c4b385b9e06269b495fb6afc3f7d39e102

Author: Tapio Vierros <tap...@gm...>
Date:   Mon Jan 10 18:47:43 2011 +0200

Notegraph tweaks.

---

 notegraphwidget.cc |   27 +++++++++++++++++----------
 notelabel.hh       |    2 +-
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/notegraphwidget.cc b/notegraphwidget.cc
index 5f33ee8..cf9b190 100644
--- a/notegraphwidget.cc
+++ b/notegraphwidget.cc
@@ -48,24 +48,23 @@ void NoteGraphWidget::setLyrics(QString lyrics)
 	int x = gap, y = 2 * noteYStep;
 
 	clear();
+	NoteLabel *first = NULL, *last = NULL;
 	while (!ts.atEnd()) {
 		QString word;
 		ts >> word;
 		if (!word.isEmpty()) {
 			NoteLabel *wordLabel = new NoteLabel(word, this, QPoint(x, y));
 			x += wordLabel->width() + gap;
+			if (!first) first = wordLabel;
+			last = wordLabel;
 		}
 	}
 
-	rebuildNoteList();
-	/*
 	// Set first and last to non-floating
-	if (m_notes.size() > 0)
-		m_notes.front()->disableFloating();
-	if (m_notes.size() > 1)
-		m_notes.back()->disableFloating();
-	*/
+	if (first) first->disableFloating();
+	if (last) last->disableFloating();
 
+	rebuildNoteList();
 	m_requiredWidth = x + gap;
 	updateWidth();
 }
@@ -86,14 +85,17 @@ void NoteGraphWidget::updateNotes()
 	for (NoteLabels::iterator it = m_notes.begin(); it != m_notes.end(); ++it) {
 		NoteLabel *child = *it;
 		if (!child) continue;
+
 		if (child->isFloating()) {
 			// Add floating note to gap
 			gap.addNote(child);
+
 		} else {
 			// Fixed note encountered, handle the gap (divide notes evenly into it)
 			if (!gap.isEmpty()) {
 				gap.end = child->x();
 				int x = gap.begin;
+
 				if (gap.width() >= gap.notesWidth()) {
 					// Plenty of space - no resizing needed
 					int step = (gap.width() - gap.notesWidth()) / (gap.notes.size() + 1);
@@ -102,6 +104,7 @@ void NoteGraphWidget::updateNotes()
 						(*it2)->move(x, (*it2)->y());
 						x += step + (*it2)->width();
 					}
+
 				} else if (gap.width() <= gap.minWidth()) {
 					// We are at minimum width, enforce it
 					for (NoteLabels::iterator it2 = gap.notes.begin(); it2 != gap.notes.end(); ++it2) {
@@ -109,8 +112,9 @@ void NoteGraphWidget::updateNotes()
 						(*it2)->resize(NoteLabel::min_width, (*it2)->height());
 						x += NoteLabel::min_width;
 					}
-					// TODO: Doesn't work properly
-					child->move(gap.begin + gap.minWidth(), child->y());
+					// FIXME: Enforcing fixed note position doesn't work properly
+					//child->move(gap.begin + gap.minWidth(), child->y());
+
 				} else {
 					// Make the notes smaller so that they fit
 					float sf = gap.width() / float(gap.notesWidth());
@@ -121,6 +125,7 @@ void NoteGraphWidget::updateNotes()
 					}
 				}
 			}
+
 			// Start a new gap
 			gap = FloatingGap(child->x() + child->width());
 		}
@@ -133,7 +138,7 @@ void NoteGraphWidget::rebuildNoteList()
 	const QObjectList &childlist = children();
 	for (QObjectList::const_iterator it = childlist.begin(); it != childlist.end(); ++it) {
 		NoteLabel *child = dynamic_cast<NoteLabel*>(*it);
-		if (child && child->isVisible()) m_notes.push_back(child);
+		if (child) m_notes.push_back(child);
 	}
 	m_notes.sort(cmpNoteLabelPtr);
 }
@@ -214,6 +219,8 @@ void NoteGraphWidget::wheelEvent(QWheelEvent *event)
 	int neww = child->size().width() + event->delta() * 0.1;
 	child->resize(neww, child->size().height());
 
+	updateNotes();
+
 	event->accept();
 }
 
diff --git a/notelabel.hh b/notelabel.hh
index 1ea91bd..98ae85a 100644
--- a/notelabel.hh
+++ b/notelabel.hh
@@ -18,7 +18,7 @@ public:
 	void setSelected(bool state = true) { m_selected = state; createPixmap(size()); }
 
 	bool isFloating() const { return m_floating; }
-	void disableFloating() { m_floating = false; }
+	void disableFloating() { m_floating = false; createPixmap(size()); }
 
 	void startResizing(int dir);
 	void startDragging(const QPoint& point);