+
+ /**
+ * 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);
+ }
+ }
+ }
+ }
+=======