Commit: da6b0481fe37a91c513d5ad893754301fd60d1b3 - MIDIChordHelperGO (git)

MIDI Chord Helper機能追加版（GOは五度圏や碁盤の「ご」。別に移動式じゃありません）

Commit MetaInfo

• Revision: da6b0481fe37a91c513d5ad893754301fd60d1b3 (tree)
• Time: 2022-03-20 01:41:26
• Author: k-hatano <kent.ruffle.mgj626@gmai...>
• Commiter: k-hatano

Log Message

五度圏ビュー追加、5ボタンマウス対応、sus2入力対応、他

Change Summary

• modified: Makefile
• modified: src/camidion/chordhelper/ButtonIcon.java
• modified: src/camidion/chordhelper/ChordHelperApplet.java
• modified: src/camidion/chordhelper/chorddiagram/ChordDiagram.java
• modified: src/camidion/chordhelper/chordmatrix/ChordMatrix.java
• modified: src/camidion/chordhelper/midieditor/MidiChannelButtonSelecter.java
• modified: src/camidion/chordhelper/music/Chord.java
• add: src/camidion/chordhelper/notecircle/NoteCircle.java
• modified: src/camidion/chordhelper/pianokeyboard/MidiKeyboardPanel.java

Incremental Difference

--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 $(eval SRCS := $(shell find src -name "*.java" | tr '\r' ' '))
 
 MidiChordHelper: $(SRCS)
-	javac -encoding utf8 -d bin $^
-	jar cvfm MidiChordHelper.jar mani.mf -C bin/ .
+	javac -encoding utf8 -d classes $^
+	jar cvfm MidiChordHelper.jar mani.mf -C classes/ .
 

--- a/src/camidion/chordhelper/ButtonIcon.java
+++ b/src/camidion/chordhelper/ButtonIcon.java
@@ -368,22 +368,21 @@ public class ButtonIcon implements Icon {
 
 		case RIGHT_PANEL_CONTENT_ICON:
 			if (is_selected) {
-				g2.drawOval(0, 0, width, HEIGHT);
-				for (int r = 0; r < 180; r += 30) {
-					g2.drawLine((int)(Math.cos(Math.PI * r / 180) * (width / 2) + (width / 2)),
-							(int)(Math.sin(Math.PI * r / 180) * (width / 2) + (width / 2)),
-							(int)(-1 * Math.cos(Math.PI * r / 180) * (width / 2) + (width / 2)),
-							(int)(-1 * Math.sin(Math.PI * r / 180) * (width / 2) + (width / 2)));
+				for (int r = 0; r < 360; r += 30) {
+					g2.fillOval((int)Math.round(Math.cos(Math.PI * r / 180) * (width / 2 - 2) + (width / 2) - 2),
+					(int)Math.round(Math.sin(Math.PI * r / 180) * (width / 2 - 2) + (width / 2) - 2),
+					3,
+					3);
 				}
 			} else {
-				g2.drawLine( 0, HEIGHT / 5 + 1, width, HEIGHT / 5 + 1 );
-				g2.drawLine( 0, HEIGHT * 2 / 5 + 1, width, HEIGHT * 2 / 5 + 1 );
-				g2.drawLine( 0, HEIGHT * 3 / 5 + 1, width, HEIGHT * 3 / 5 + 1 );
-				g2.drawLine( 0, HEIGHT * 4 / 5 + 1, width, HEIGHT * 4 / 5 + 1 );
+				g2.drawLine( 0, HEIGHT / 5, width, HEIGHT / 5 );
+				g2.drawLine( 0, HEIGHT * 2 / 5, width, HEIGHT * 2 / 5 );
+				g2.drawLine( 0, HEIGHT * 3 / 5, width, HEIGHT * 3 / 5 );
+				g2.drawLine( 0, HEIGHT * 4 / 5, width, HEIGHT * 4 / 5 );
 
-				g2.drawLine( width / 8, HEIGHT / 5 + 1, width / 8, HEIGHT * 4 / 5 + 1 );
-				g2.drawLine( width * 4 / 8, HEIGHT / 5 + 1, width * 4 / 8, HEIGHT * 4 / 5 + 1 );
-				g2.drawLine( width * 7 / 8, HEIGHT / 5 + 1, width * 7 / 8, HEIGHT * 4 / 5 + 1 );
+				g2.drawLine( width / 8, HEIGHT / 5, width / 8, HEIGHT * 4 / 5 );
+				g2.drawLine( width * 4 / 8, HEIGHT / 5, width * 4 / 8, HEIGHT * 4 / 5 );
+				g2.drawLine( width * 7 / 8, HEIGHT / 5, width * 7 / 8, HEIGHT * 4 / 5 );
 			}
 			break;
 		}

--- a/src/camidion/chordhelper/ChordHelperApplet.java
+++ b/src/camidion/chordhelper/ChordHelperApplet.java
@@ -349,6 +349,7 @@ public class ChordHelperApplet extends JApplet {
 				capoSelecter.valueSelecter.addActionListener(e->clearChord());
 			}
 		};
+		chordMatrix.chordDiagram = chordDiagram;
 		keysigLabel = new KeySignatureLabel() {{
 			addMouseListener(new MouseAdapter() {
 				@Override
@@ -498,7 +499,15 @@ public class ChordHelperApplet extends JApplet {
 			add( Box.createHorizontalStrut(5) );
 			add( chordMatrix.capoSelecter );
 			add( Box.createHorizontalStrut(5) );
-			add( rightPanelContentToggleButton = new JToggleButton(new ButtonIcon(ButtonIcon.RIGHT_PANEL_CONTENT_ICON)));
+			add( rightPanelContentToggleButton = new JToggleButton(new ButtonIcon(ButtonIcon.RIGHT_PANEL_CONTENT_ICON)){{
+				addItemListener(event->{
+					if (((JToggleButton)event.getSource()).isSelected()) {
+						chordDiagram.switchContent(1);
+					} else {
+						chordDiagram.switchContent(0);
+					}
+				});
+			}});
 			add( Box.createHorizontalStrut(2) );
 		}};
 		keyboardSequencerPanel = new JPanel() {{

--- a/src/camidion/chordhelper/chorddiagram/ChordDiagram.java
+++ b/src/camidion/chordhelper/chorddiagram/ChordDiagram.java
@@ -1,4 +1,5 @@
 package camidion.chordhelper.chorddiagram;
+import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Insets;
 import java.util.Arrays;
@@ -17,11 +18,13 @@ import javax.swing.JRadioButton;
 import javax.swing.JScrollBar;
 import javax.swing.JToggleButton;
 import javax.swing.SwingConstants;
+import javax.swing.JComponent;
 
 import camidion.chordhelper.ButtonIcon;
 import camidion.chordhelper.ChordDisplayLabel;
 import camidion.chordhelper.music.Chord;
 import camidion.chordhelper.music.Note;
+import camidion.chordhelper.circleoffifth.NoteCircle;
 
 /**
  * ChordDiagram class for MIDI Chord Helper
@@ -31,6 +34,9 @@ import camidion.chordhelper.music.Note;
  *	http://www.yk.rim.or.jp/~kamide/music/chordhelper/
  */
 public class ChordDiagram extends JPanel {
+	private JPanel originalChordDiagram;
+	private NoteCircle circleOfFifth;
+
 	/** コードダイアグラムの対象楽器を示す値 */
 	public static enum Instrument {
 		Ukulele("A,E,C,G"),
@@ -68,9 +74,12 @@ public class ChordDiagram extends JPanel {
 	 * @param capoComboBoxModel カポ値選択コンボボックスのデータモデル
 	 */
 	public ChordDiagram(CapoComboBoxModel capoComboBoxModel) {
+		originalChordDiagram = new JPanel();
+
 		capoSelecterView.valueSelecter.setModel(capoComboBoxModel);
-		setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-		add(new JPanel() {
+
+		originalChordDiagram.setLayout(new BoxLayout(originalChordDiagram, BoxLayout.Y_AXIS));
+		originalChordDiagram.add(new JPanel() {
 			{
 				setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
 				setOpaque(false);
@@ -80,8 +89,8 @@ public class ChordDiagram extends JPanel {
 				add(capoSelecterView);
 			}
 		});
-		add(Box.createHorizontalStrut(5));
-		add(new JPanel() {
+		originalChordDiagram.add(Box.createHorizontalStrut(5));
+		originalChordDiagram.add(new JPanel() {
 			{
 				setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
 				setOpaque(false);
@@ -105,6 +114,12 @@ public class ChordDiagram extends JPanel {
 				add(variationScrollbar);
 			}
 		});
+		originalChordDiagram.setVisible(true);
+		add(originalChordDiagram);
+
+		circleOfFifth = new NoteCircle();
+		circleOfFifth.setVisible(false);
+		add(circleOfFifth);
 	}
 	/**
 	 * コードをテキストに記録するボタン
@@ -204,4 +219,25 @@ public class ChordDiagram extends JPanel {
 	public void setTargetInstrument(Instrument instrument) {
 		instButtons.get(Objects.requireNonNull(instrument)).doClick();
 	}
+
+	public final int CHORD_DIAGRAM = 0;
+	public final int CIRCLE_OF_FIFTH = 1;
+
+	public void switchContent(int which) {
+		switch (which) {
+			case CHORD_DIAGRAM:
+				originalChordDiagram.setVisible(true);
+				circleOfFifth.setVisible(false);
+				break;
+			case CIRCLE_OF_FIFTH:
+				originalChordDiagram.setVisible(false);
+				circleOfFifth.setVisible(true);
+				circleOfFifth.invalidate();
+				break;
+		}
+	}
+
+	public void note(boolean isNoteOn, int noteNumber) {
+        this.circleOfFifth.note(isNoteOn, noteNumber);
+    }
 }

--- a/src/camidion/chordhelper/chordmatrix/ChordMatrix.java
+++ b/src/camidion/chordhelper/chordmatrix/ChordMatrix.java
@@ -31,6 +31,7 @@ import javax.swing.JPanel;
 
 import camidion.chordhelper.ButtonIcon;
 import camidion.chordhelper.ChordDisplayLabel;
+import camidion.chordhelper.chorddiagram.ChordDiagram;
 import camidion.chordhelper.chorddiagram.CapoComboBoxModel;
 import camidion.chordhelper.chorddiagram.CapoSelecterView;
 import camidion.chordhelper.midieditor.SequenceTickIndex;
@@ -60,6 +61,8 @@ public class ChordMatrix extends JPanel
 	public ChordDisplayLabel chordDisplay = new ChordDisplayLabel("Chord Pad", null, this, null);
 
 	private NoteWeight noteWeightArray[] = new NoteWeight[Note.SEMITONES_PER_OCTAVE];
+
+	public ChordDiagram chordDiagram = null;
 	/**
 	 * 発音中のノート表示をクリアします。
 	 */
@@ -76,6 +79,8 @@ public class ChordMatrix extends JPanel
 		int diff = (isNoteOn ? 1 : -1);
 		NoteWeight w = noteWeightArray[Note.mod12(noteNumber)];
 		if( noteNumber < 49 ) w.addBass(diff); else w.add(diff);
+
+		chordDiagram.note(isNoteOn, noteNumber);
 	}
 
 	/**
@@ -543,14 +548,14 @@ public class ChordMatrix extends JPanel
 				else
 					intervals.add(Chord.Interval.SEVENTH);
 			}
-			else if( e.isShiftDown() )
+			else if( e.isShiftDown() || (e.getButton() == 4) )
 				intervals.add(Chord.Interval.SIXTH);
-			if( e.isControlDown() )
+			if( e.isControlDown() || (e.getButton() == 5) )
 				intervals.add(Chord.Interval.NINTH);
 			else
 				intervals.remove(Chord.Interval.NINTH);
 
-			if( e.isAltDown() ) {
+			if( e.isAltDown() || (e.getButton() == 2) ) {
 				if( cl.isSus4 ) {
 					intervals.add(Chord.Interval.MAJOR); // To cancel sus4
 					intervals.add(Chord.Interval.SHARP5);

--- a/src/camidion/chordhelper/midieditor/MidiChannelButtonSelecter.java
+++ b/src/camidion/chordhelper/midieditor/MidiChannelButtonSelecter.java
@@ -58,7 +58,8 @@ public class MidiChannelButtonSelecter extends JList<Integer>
 		public MyCellRenderer() {
 			setOpaque(true);
 			setHorizontalAlignment(CENTER);
-			setSelectionBackground(Color.yellow);
+			setForeground(Color.lightGray);
+			setSelectionForeground(Color.red);
 		}
 		@Override
 		public Component getListCellRendererComponent(
@@ -69,7 +70,10 @@ public class MidiChannelButtonSelecter extends JList<Integer>
 			this.cellHasFocus = cellHasFocus;
 			setText(value.toString());
 			if(isSelected) {
-				setBackground(list.getSelectionBackground());
+				setBackground(
+					keyboard != null && keyboard.countKeyOn(index) > 0 ?
+					Color.pink : list.getBackground()
+				);
 				setForeground(list.getSelectionForeground());
 			} else {
 				setBackground(

--- a/src/camidion/chordhelper/music/Chord.java
+++ b/src/camidion/chordhelper/music/Chord.java
@@ -202,6 +202,7 @@ public class Chord {
 			set(Interval.MINOR);
 		}
 		else if( outParen.matches(".*sus4.*") ) set(Interval.SUS4);
+		else if( outParen.matches(".*sus2.*") ) set(Interval.SUS2);
 		//
 		// extended
 		if( outParen.matches(".*9.*") ) {

--- /dev/null
+++ b/src/camidion/chordhelper/notecircle/NoteCircle.java
@@ -0,0 +1,144 @@
+package camidion.chordhelper.circleoffifth;
+import java.awt.Canvas;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.BorderLayout;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.stream.Collectors;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.BoxLayout;
+
+public class NoteCircle extends JPanel {
+    private NoteCircleComponent component;
+    int noteWeights[] = new int[12];
+
+    public NoteCircle() {
+        super();
+        setLayout(new BorderLayout());
+        setPreferredSize(new Dimension(140, 200));
+
+        component = new NoteCircleComponent();
+        component.setSize(128, 128);
+        add(component, BorderLayout.CENTER);
+
+        JPanel radioButtonsPanel = new JPanel();
+        radioButtonsPanel.setLayout(new BoxLayout(radioButtonsPanel, BoxLayout.Y_AXIS));
+
+        JPanel circleTypePanel = new JPanel();
+        ButtonGroup circleTypeGroup = new ButtonGroup();
+        circleTypePanel.setLayout(new BoxLayout(circleTypePanel, BoxLayout.X_AXIS));
+
+        JRadioButton fifthsButton = new JRadioButton("Fifths");
+        fifthsButton.setSelected(true);
+        fifthsButton.addActionListener(event -> {
+            component.setChromatic(false);
+        });
+        circleTypePanel.add(fifthsButton, BorderLayout.WEST);
+        circleTypeGroup.add(fifthsButton);
+
+        JRadioButton chromaticButton = new JRadioButton("Chromatic");
+        chromaticButton.addActionListener(event -> {
+            component.setChromatic(true);
+        });
+        circleTypePanel.add(chromaticButton, BorderLayout.EAST);
+        circleTypeGroup.add(chromaticButton);
+
+        radioButtonsPanel.add(circleTypePanel);
+
+        JPanel accidentalNotationPanel = new JPanel();
+        ButtonGroup accidentalNotationGroup = new ButtonGroup();
+        accidentalNotationPanel.setLayout(new BoxLayout(accidentalNotationPanel, BoxLayout.X_AXIS));
+
+        JRadioButton sharpButton = new JRadioButton("Sharp");
+        sharpButton.setSelected(true);
+        sharpButton.addActionListener(event -> {
+            component.setFlatten(false);
+        });
+        accidentalNotationPanel.add(sharpButton, BorderLayout.WEST);
+        accidentalNotationGroup.add(sharpButton);
+
+        JRadioButton flatButton = new JRadioButton("Flat");
+        flatButton.addActionListener(event -> {
+            component.setFlatten(true);
+        });
+        accidentalNotationPanel.add(flatButton, BorderLayout.EAST);
+        accidentalNotationGroup.add(flatButton);
+
+        radioButtonsPanel.add(accidentalNotationPanel);
+        add(radioButtonsPanel, BorderLayout.SOUTH);
+    }
+
+    public void note(boolean isNoteOn, int noteNumber) {
+        if (isNoteOn) {
+            noteWeights[noteNumber % 12]++;
+        } else {
+            noteWeights[noteNumber % 12]--;
+            if (noteWeights[noteNumber % 12] < 0) {
+                noteWeights[noteNumber % 12] = 0;
+            }
+        }
+        component.repaint();
+    }
+
+    class NoteCircleComponent extends JComponent {
+        private boolean isFlatten = false;
+        private boolean isChromatic = false;
+        private String notesLabelsWithSharp[] = {"C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"};
+        private String notesLabelsWithFlat[] = {"C", "Db", "D", "Eb", "E", "F", "Gb ", "G", "Ab", "A", "Bb", "B"};
+
+        public void setChromatic(boolean value) {
+            isChromatic = value;
+            repaint();
+        }
+
+        public void setFlatten(boolean value) {
+            isFlatten = value;
+            repaint();
+        }
+        
+        public void paintComponent(Graphics g) {
+            // g.clearRect(0, 0, this.getWidth(), this.getHeight());
+    
+            int unit = Math.min(this.getWidth(), this.getHeight()) - 28;
+    
+            for (int i = 0; i < 12; i++) {
+                int noteIndex;
+                if (isChromatic) {
+                    noteIndex = i;
+                } else {
+                    noteIndex = (i * 7) % 12;
+                }
+
+                int x = (int)((Math.sin(i / 12.0 * 2 * Math.PI) / 2) * (unit)) + this.getWidth() / 2;
+                int y = (int)((- Math.cos(i / 12.0 * 2 * Math.PI) / 2) * (unit)) + this.getHeight() / 2;
+    
+                if (noteWeights[noteIndex] > 0) {
+                    g.setColor(Color.black);
+                    g.fillOval(x - 11, y - 11, 22, 22);
+    
+                    g.setColor(Color.white);
+                    if (isFlatten) {
+                        g.drawString(notesLabelsWithFlat[noteIndex], x - 4, y + 6);
+                    } else {
+                        g.drawString(notesLabelsWithSharp[noteIndex], x - 4, y + 6);
+                    }
+                } else {
+                    g.setColor(Color.lightGray);
+                    g.drawOval(x - 11, y - 11, 22, 22);
+                    if (isFlatten) {
+                        g.drawString(notesLabelsWithFlat[noteIndex], x - 4, y + 6);
+                    } else {
+                        g.drawString(notesLabelsWithSharp[noteIndex], x - 4, y + 6);
+                    }
+                }
+            }
+        }
+    }
+}

--- a/src/camidion/chordhelper/pianokeyboard/MidiKeyboardPanel.java
+++ b/src/camidion/chordhelper/pianokeyboard/MidiKeyboardPanel.java
@@ -9,6 +9,7 @@ import javax.swing.AbstractAction;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
 import javax.swing.JPanel;
 
 import camidion.chordhelper.ChordDisplayLabel;
@@ -64,6 +65,9 @@ public class MidiKeyboardPanel extends JPanel {
 			add(midiChannelCombobox = new MidiChannelComboSelecter(
 				"MIDI Channel", keyboardCenterPanel.keyboard.midiChComboboxModel
 			));
+			add(new JCheckBox("Solo"){{
+				this.setEnabled(false);
+			}});
 			add(midiChannelButtons = new MidiChannelButtonSelecter(
 				keyboardCenterPanel.keyboard
 			));