From: Einar Pehrson <einarp@itstud.chalmers.se>
Date: Mon, 12 May 2003 16:34:49 +0000 (+0000)
Subject: .
X-Git-Url: https://ruin.nu/git/?p=moosique.git;a=commitdiff_plain;h=c2644cb200b06d71a3e6c4548c37272228130c3d

.
---

diff --git a/MooNoteElement.java b/MooNoteElement.java
index e854a44..ca1d5c2 100644
--- a/MooNoteElement.java
+++ b/MooNoteElement.java
@@ -20,28 +20,6 @@ public class MooNoteElement extends JPanel {
 	 */
 	public MooNoteElement (MooNote mn) {
 		note = mn;
-		setPreferredSize(new Dimension(20,20));
-		setFont(new Font("Helvetica", Font.PLAIN, 10));
-
-		class MouseList implements MouseListener{
-			public void mouseClicked(MouseEvent event){
-				//Bring upp dialog to edit note.
-			}
-
-			public void mouseEntered(MouseEvent event){
-				//Show note props in statusbar?
-			}
-
-			public void mouseExited(MouseEvent event){
-				//Reset statusbar?
-			}
-
-			public void mousePressed(MouseEvent event){	}
-
-			public void mouseReleased(MouseEvent event){}
-		};
-		MouseListener listener = new MouseList();
-		addMouseListener(listener);
 	}
 
 	/** 
@@ -91,8 +69,10 @@ public class MooNoteElement extends JPanel {
 			case 10: n = "A#"; break;
 			case 11: n = "B"; break;
 		}
-
-		g2.drawString(n +" "+(pitch/12), 2, 2);
+		g2.setFont(new Font("Helvetica", Font.PLAIN, 10));
+		n = n +(pitch/12);
+		g2.drawString(n, 1, 11);
+		g2.drawString(""+note.getVelocity(),1,23);
 
 	}
 
diff --git a/MooTrackView.java b/MooTrackView.java
index dd348fd..0bc564c 100644
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -18,6 +18,7 @@ public class MooTrackView extends JPanel implements ActionListener {
 	private Rectangle box;
 	private JPopupMenu popup;
 	private JMenuItem menuItem;
+	
 
 	public MooTrackView (Track track) {
 		this.track = track;
@@ -60,11 +61,12 @@ public class MooTrackView extends JPanel implements ActionListener {
 	}
 
 	class NoteArea extends JPanel {
-
-		public static final int NOTE_SIZE = 20;
+		public static final int NOTE_SIZE = 25;
+		private int trackLength;
 
 		public NoteArea(Track track) {
 			setLayout(null);
+			trackLength = 60;
 			MidiEvent note;
 			MooNoteElement elem;
 			boolean isOccupied;
@@ -81,9 +83,12 @@ public class MooTrackView extends JPanel implements ActionListener {
 					// Places the note element in the appropriate place.
 					x = insets.left;
 					y = insets.top + (int)(mn.getTick() / 24) * NOTE_SIZE;
-					height = (mn.getDuration() / 24) * NOTE_SIZE;
-					//System.out.println(findComponentAt(x, y) != this);
-					elem.setBounds(x, y, NOTE_SIZE, 20);
+					height = NOTE_SIZE;
+					// height = (mn.getDuration() / 24) * NOTE_SIZE;
+					System.out.println("Comp at: " + x + ", " + y + " is: " + findComponentAt(x + 10, y + 10));
+					while(findComponentAt(x, y) instanceof MooNoteElement ||
+					      findComponentAt(x, y + height - 1) instanceof MooNoteElement) x += NOTE_SIZE;
+					elem.setBounds(x, y, NOTE_SIZE, height);
 				}
 			}
 		}
@@ -91,9 +96,9 @@ public class MooTrackView extends JPanel implements ActionListener {
 		public void paintComponent(Graphics g) {
 			super.paintComponent(g);
 			Graphics2D g2 = (Graphics2D)g;
-			for (int c = 0; c < 1000; c += 20) {
-				for (int r = 0; r < 200; r += 20) {
-					box = new Rectangle(r, c, 20, 20);
+			for (int c = 0; c < (trackLength*NOTE_SIZE); c += NOTE_SIZE) {
+				for (int r = 0; r < (10*NOTE_SIZE); r += NOTE_SIZE) {
+					box = new Rectangle(r, c, NOTE_SIZE, NOTE_SIZE);
 					g2.setColor(Color.gray);
 					g2.draw(box);
 				}
diff --git a/Moosique.java b/Moosique.java
index c5f31e2..c7ea53f 100644
--- a/Moosique.java
+++ b/Moosique.java
@@ -50,7 +50,7 @@ public class Moosique {
 			setActiveChannel(0);
 		} catch (MidiUnavailableException e) {
 			System.out.println("Failed, quitting.");
-			quit();
+			System.exit(1);
 		}
 		System.out.println("Done");