From: Einar Pehrson <einarp@itstud.chalmers.se>
Date: Mon, 12 May 2003 22:58:57 +0000 (+0000)
Subject: no message
X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=commitdiff_plain;h=9becc0105a709c62132cc6ff111ba1943ebb32de

no message
---

diff --git a/MooNoteElement.java b/MooNoteElement.java
index bcf5a7b..beb5702 100644
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -45,17 +45,12 @@ public class MooNoteElement extends JPanel {
 	{
 		super.paintComponent(g);
 
-		if (note == null)
-			return;
-
-		if (!(g instanceof Graphics2D))
-			return;
+		if (note == null || !(g instanceof Graphics2D)) return;
 		Graphics2D g2 = (Graphics2D)g;
 
 		String n = ""; 
 		int pitch = note.getPitch();
-		switch( pitch % 12)
-		{
+		switch (pitch % 12) {
 			case 0: n = "C"; break;
 			case 1: n = "C#"; break;
 			case 2: n = "D"; break;
@@ -72,8 +67,5 @@ public class MooNoteElement extends JPanel {
 		g2.setFont(new Font("Helvetica", Font.PLAIN, 8));
 		n = n +(pitch/12);
 		g2.drawString(n + " "+ note.getVelocity(), 1, 9);
-		
-
 	}
-
-}
+}
\ No newline at end of file
diff --git a/MooTrackView.java b/MooTrackView.java
index 16d396f..1b090ff 100644
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -67,13 +67,17 @@ public class MooTrackView extends JPanel implements ActionListener {
 		private int trackLength;
 
 		public NoteArea(Track track) {
+			// Configuring panel
 			setLayout(null);
 			trackLength = 140;
-			setPreferredSize(new Dimension(200,140*NOTE_HEIGHT));
+			setPreferredSize(new Dimension(200, 140 * NOTE_HEIGHT));
+
+			// Temporary variables
 			MidiEvent note;
 			MooNoteElement elem;
-			boolean isOccupied;
 			int x, y, height;
+
+			// Placing note elements
 			Insets insets = getInsets();
 			for (int i = 0; i < track.size(); i++) {
 				note = track.get(i);
@@ -83,15 +87,15 @@ public class MooTrackView extends JPanel implements ActionListener {
 					elem = new MooNoteElement(mn);
 					add(elem);
 
-					// Places the note element in the appropriate place.
+					// Moves the note element to the appropriate place.
 					x = insets.left;
 					y = insets.top + (int)(mn.getTick() / 24) * NOTE_HEIGHT;
-					height = NOTE_HEIGHT;
-					// height = (mn.getDuration() / 24) * NOTE_HEIGHT;
+					height = (mn.getDuration() / 24) * NOTE_HEIGHT;
+					if (height == 0) height = NOTE_HEIGHT;
 					while(findComponentAt(x, y) instanceof MooNoteElement ||
 					      findComponentAt(x, y + height - 1) instanceof MooNoteElement) x += NOTE_WIDTH;
 					elem.setBounds(x, y, NOTE_WIDTH, height);
-					if (viewLength < (y+height)) viewLength = y+height;
+					if (viewLength < (y + height)) viewLength = y + height;
 				}
 				setPreferredSize(new Dimension(200,viewLength));
 			}
@@ -101,7 +105,6 @@ public class MooTrackView extends JPanel implements ActionListener {
 		public void paintComponent(Graphics g) {
 			super.paintComponent(g);
 			Graphics2D g2 = (Graphics2D)g;
-//(trackLength*NOTE_HEIGHT)
 			for (int c = 0; c < viewLength ; c += NOTE_HEIGHT) {
 				for (int r = 0; r < (10*NOTE_WIDTH); r += NOTE_WIDTH) {
 					box = new Rectangle(r, c, NOTE_WIDTH, NOTE_HEIGHT);
@@ -127,4 +130,4 @@ public class MooTrackView extends JPanel implements ActionListener {
 			}
 		}
 	}
-}
+}
\ No newline at end of file