*** empty log message ***

[moosique.git] / MooTrackView.java

diff --git a/MooTrackView.java b/MooTrackView.java
index c058cc5e01ec881e0922a5b67c951dcc47967683..96b55f0967c9996bc59f3cb14c3a15f7958fcb22 100644 (file)
--- a/MooTrackView.java
+++ b/MooTrackView.java
@@ -15,6 +15,13 @@ public class MooTrackView extends JPanel {
 
        private Track track;
        private Rectangle box;
+<<<<<<< MooTrackView.java
+       //private Rectangle box2;
+       /** 
+        * Creates 
+        */
+       public MooTrackView () {
+=======
        private JPopupMenu popup;
        private JMenuItem menuItem;
        private ArrayList rects;
@@ -24,6 +31,33 @@ public class MooTrackView extends JPanel {
        public MooTrackView (Track track) {
                super(true);
                this.track = track;
+<<<<<<< MooTrackView.java
+>>>>>>> 1.45
+               setLayout(new BorderLayout());
+<<<<<<< MooTrackView.java
+               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.setBorder(BorderFactory.createLineBorder(Color.black));
+               return title;
+       }
+
+       private JPanel noteView () {
+               notes = new NoteArea(); 
+               notes.setBackground(Color.white);
+               notes.setBorder(BorderFactory.createLineBorder(Color.black));   
+               return notes;           
+=======
+
+               notes = new NoteArea(track);    
+               notes.setBackground(Color.white);
+               notes.setBorder(BorderFactory.createLineBorder(Color.black));
+=======
 
                // Configures panel
                setBackground(Color.white);
@@ -63,6 +97,7 @@ public class MooTrackView extends JPanel {
                        setPreferredSize(new Dimension(VIEW_WIDTH, viewLength + extraHeight));
                }
                validate();
+>>>>>>> 1.46
 
                // Creates pop-up menu.
                popup = new JPopupMenu();
@@ -77,6 +112,82 @@ public class MooTrackView extends JPanel {
                return track;
        }
 
+
+       /** 
+        * Updates the track view.
+        */
+       public void update(long tickPosition) {
+               repaint();
+>>>>>>> 1.45
+       }
+
+<<<<<<< MooTrackView.java
+       class NoteArea extends JPanel {
+               public static final int NOTE_HEIGHT = 10, NOTE_WIDTH = 40, VIEW_WIDTH = 200;
+               private ArrayList rects;
+
+               public NoteArea(Track track) {
+                       // Configuring panel
+                       super(true);
+                       setLayout(null);
+                       setPreferredSize(new Dimension(VIEW_WIDTH, 140 * NOTE_HEIGHT));
+
+                       // Creating temporary variables
+                       MidiEvent note;
+                       MooNoteElement elem;
+                       int x, y, height;
+                       int beatsPerSixteenth = Moosique.getSequence().getResolution() / 4;
+                       rects = new ArrayList(track.size() / 2);
+
+                       // Placing note elements
+                       Insets insets = getInsets();
+                       for (int i = 0; i < track.size(); i++) {
+                               note = track.get(i);
+                               if (note instanceof MooNote) {
+                                       // Adds the note element to the note area.
+                                       MooNote mn = (MooNote)note;
+                                       elem = new MooNoteElement(mn);
+                                       add(elem);
+
+                                       // Moves the note element to the appropriate place.
+                                       x = insets.left;
+                                       y = insets.top + (int)(mn.getTick() / beatsPerSixteenth) * NOTE_HEIGHT;
+                                       height = (mn.getDuration() / beatsPerSixteenth) * NOTE_HEIGHT;
+                                       if (height == 0) height = NOTE_HEIGHT;
+                                       Rectangle r = new Rectangle(x, y, NOTE_WIDTH, height);
+                                       while(isOccupied(r)) r.translate(NOTE_WIDTH, 0);
+                                       elem.setBounds(r);
+                                       rects.add(r);
+                                       if (viewLength < (y + height)) viewLength = y + height;
+                               }
+                               setPreferredSize(new Dimension(VIEW_WIDTH, viewLength));
+                       }
+                       validate();
+               }
+               
+               private boolean isOccupied(Rectangle r) {
+                       Iterator it = rects.iterator();
+                       while (it.hasNext()) {
+                               if(r.intersects((Rectangle)it.next())) return true;
+                       }
+                       return false;
+               }
+
+               public void paintComponent(Graphics g) {
+                       super.paintComponent(g);
+                       Graphics2D g2 = (Graphics2D)g;
+<<<<<<< MooTrackView.java
+                       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);
+                                       g2.setColor(Color.gray);
+                                       g2.draw(box);
+                               }
+                       }
+               }
+       }
+=======
        private boolean isOccupied(Rectangle r) {
                Iterator it = rects.iterator();
                while (it.hasNext()) {
@@ -101,12 +212,21 @@ public class MooTrackView extends JPanel {
                        }
                }
        }
+>>>>>>> 1.46
 
-       /** 
-        * Updates the track view.
-        */
-       public void update(long tickPosition) {
-               repaint();
+       private static final int PANEL_WIDTH = 65;
+       private static final int TITLE_HEIGHT = 40;
+       private static final int NOTEVIEW_HEIGHT = 200;
+}
+=======
+                       for (int c = 0; c < viewLength || c < getHeight(); c += NOTE_HEIGHT) {
+                               for (int r = 0; r < (10 * NOTE_WIDTH); r += NOTE_WIDTH) {
+                                       box = new Rectangle(r, c, NOTE_WIDTH, NOTE_HEIGHT);
+                                       g2.setColor(Color.gray);
+                                       g2.draw(box);
+                               }
+                       }
+               }
        }
 
        class PopupListener extends MouseAdapter {
@@ -116,4 +236,8 @@ public class MooTrackView extends JPanel {
                        }
                }
        }
-}
\ No newline at end of file
+<<<<<<< MooTrackView.java
+}
+>>>>>>> 1.45
+=======
+}>>>>>>> 1.46