X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=MooTrackView.java;h=4e4f0027161da12374c71d308f5124438d1bcd3b;hb=c83e74facf762222fe4578f175408cc50d360518;hp=19888e877637a82fc39963ecc76520509419aca1;hpb=0b4a03f1de77a6c0681d84fba600151f30eb724a;p=moosique.git

diff --git a/MooTrackView.java b/MooTrackView.java
index 19888e8..4e4f002 100644
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -1,6 +1,6 @@
 import javax.swing.*;
-import java.awt.event.*;
 import java.awt.*;
+import java.awt.event.*;
 import javax.sound.midi.*;
 
 /**
@@ -9,94 +9,87 @@ import javax.sound.midi.*;
  * @author  Andersson , Andreen, Lanneskog, Pehrson
  * @version 1
  */
- 
+
 public class MooTrackView extends JPanel implements ActionListener {
 
+	private Track track;
 	private MooTrackTitle title;
 	private NoteArea notes;
 	private Rectangle box;
 	private JPopupMenu popup;
 	private JMenuItem menuItem;
-	private String newline = "\n";
-	
+
 	public MooTrackView (Track track) {
+		this.track = track;
+		setPreferredSize(new Dimension(200, 200));
 		setLayout(new BorderLayout());
 		this.setBorder(BorderFactory.createLineBorder(Color.black));
-		add(trackTitle(), BorderLayout.NORTH);
-		add(noteView(), BorderLayout.CENTER);
-	}
-	
-	private JPanel trackTitle () {
-		title = new MooTrackTitle();
-		title.setPreferredSize(new Dimension(PANEL_WIDTH, TITLE_HEIGHT));
+
+		title = new MooTrackTitle(track);
 		title.setBorder(BorderFactory.createLineBorder(Color.black));
-		return title;
-	}
+		add(title, BorderLayout.NORTH);
 
-	private JPanel noteView () {
-		notes = new NoteArea();	
+		notes = new NoteArea(track);	
 		notes.setBackground(Color.white);
 		notes.setBorder(BorderFactory.createLineBorder(Color.black));
-		
+
 		popup = new JPopupMenu();
-        menuItem = new JMenuItem("Add...");
-        menuItem.addActionListener(this);
-        popup.add(menuItem);
-        menuItem = new JMenuItem("Preferences...");
-        menuItem.addActionListener(this);
-        popup.add(menuItem);
-
-        MouseListener popupListener = new PopupListener();
-        notes.addMouseListener(popupListener);
-        	
-		return notes;		
+		menuItem = new JMenuItem("Add...");
+		menuItem.addActionListener(this);
+		popup.add(menuItem);
+		menuItem = new JMenuItem("Preferences...");
+		menuItem.addActionListener(this);
+		popup.add(menuItem);
+
+		notes.addMouseListener(new PopupListener());
+		add(notes, BorderLayout.CENTER);
+	}
+
+	public void actionPerformed(ActionEvent e) {}
+
+	public Track getTrack() {
+		return track;
 	}
-	
-	public void actionPerformed(ActionEvent e) {
-        JMenuItem source = (JMenuItem)(e.getSource());
-        String s = "Action event detected."
-                   + newline
-                   + "    Event source: " + source.getText();
-     }
-    
+
 	class NoteArea extends JPanel {
-		public void RectanglePanel() {
-			setPreferredSize(new Dimension(20, 20));
-			
+
+		public NoteArea(Track track) {
+			MidiEvent note;
+			for (int i = 0; i < track.size(); i++) {
+				note = track.get(i);
+				if (note instanceof MooNote) {
+					add(new MooNoteElement((MooNote)note));
+				}
+			}
+			validate();
 		}
-		
+
 		public void paintComponent(Graphics g) {
 			super.paintComponent(g);
 			Graphics2D g2 = (Graphics2D)g;
-			for (int c=0;c<1000;c=c+20) {
-				int r=0;
-				for (r=0;r<200;r=r+20) {
-					box = new Rectangle(r,c,20,20);
+			for (int c = 0; c < 1000; c += 20) {
+				for (int r = 0; r < 200; r += 20) {
+					box = new Rectangle(r, c, 20, 20);
 					g2.setColor(Color.gray);
 					g2.draw(box);
 				}
 			}
 		}
 	}
-	
+
 	class PopupListener extends MouseAdapter {
-        public void mousePressed(MouseEvent e) {
-            maybeShowPopup(e);
-        }
-
-        public void mouseReleased(MouseEvent e) {
-            maybeShowPopup(e);
-        }
-
-        private void maybeShowPopup(MouseEvent e) {
-            if (e.isPopupTrigger()) {
-                popup.show(e.getComponent(),
-                           e.getX(), e.getY());
-            }
-        }
-    }
-	
-	private static final int PANEL_WIDTH = 65;
-	private static final int TITLE_HEIGHT = 60;
-	private static final int NOTEVIEW_HEIGHT = 200;
-}
+		public void mousePressed(MouseEvent e) {
+			maybeShowPopup(e);
+		}
+
+		public void mouseReleased(MouseEvent e) {
+			maybeShowPopup(e);
+		}
+
+		private void maybeShowPopup(MouseEvent e) {
+			if (e.isPopupTrigger()) {
+				popup.show(e.getComponent(), e.getX(), e.getY());
+			}
+		}
+	}
+}
\ No newline at end of file