Commit: 4fb0e1380c86357d4695c0e0749c3cb4bfad58e5 - MIDIChordHelperGO (git)

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

Commit MetaInfo

• Révision: 4fb0e1380c86357d4695c0e0749c3cb4bfad58e5 (tree)
• l'heure: 2022-10-07 02:21:10
• Auteur: k-hatano <kent.ruffle.mgj626@gmai...>
• Commiter: k-hatano

Message de Log

ガイドを7とM7 6で分離、ハーモニックテーブルノートレイアウトを細かく

Change Summary

• modified: src/camidion/chordhelper/chordmatrix/ChordGuide.java
• modified: src/camidion/chordhelper/chordmatrix/ChordMatrix.java
• modified: src/camidion/chordhelper/pitchspace/CircularPitchSpace.java
• modified: src/camidion/chordhelper/pitchspace/HarmonicTableLayout.java

Modification

--- a/src/camidion/chordhelper/chordmatrix/ChordGuide.java
+++ b/src/camidion/chordhelper/chordmatrix/ChordGuide.java
@@ -15,7 +15,8 @@ import javax.swing.JPopupMenu;
  */
 public class ChordGuide extends JPanel {
 	public static enum Guide {
-		GUIDE_76(76),
+		GUIDE_7(7),
+		GUIDE_6(6),
 		GUIDE_5(5),
 		GUIDE_9(9);
 
@@ -73,11 +74,19 @@ public class ChordGuide extends JPanel {
 
 	}
 
-	private ChordGuideLabel guide76, guide5, guide9;
+	private ChordGuideLabel guide7, guide6, guide5, guide9;
 
 	public ChordGuide(ChordMatrix cm) {
 		setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
-		add(guide76 = new ChordGuideLabel(" 6  7  M7 ", cm) {
+		add(guide7 = new ChordGuideLabel(" 7 ", cm) {
+			{
+				setToolTipText("How to add 7th, major 7th, 6th");
+				addMenu(new JMenuItem("7        = <RightClick>"));
+				addMenu(new JMenuItem("M7(maj7) = [Shift] <RightClick>"));
+				addMenu(new JMenuItem("6        = [Shift]"));
+			}
+		});
+		add(guide6 = new ChordGuideLabel(" M7 6 ", cm) {
 			{
 				setToolTipText("How to add 7th, major 7th, 6th");
 				addMenu(new JMenuItem("7        = <RightClick>"));
@@ -114,15 +123,19 @@ public class ChordGuide extends JPanel {
 
 	public void setDarkMode(boolean is_dark) {
 		setBackground(is_dark ? Color.black : null);
-		guide76.setDarkMode(is_dark);
+		guide7.setDarkMode(is_dark);
+		guide6.setDarkMode(is_dark);
 		guide5.setDarkMode(is_dark);
 		guide9.setDarkMode(is_dark);
 	}
 
 	public void changeActive(Guide which, boolean is_active) {
 		switch (which) {
-			case GUIDE_76:
-				guide76.setActive(is_active);
+			case GUIDE_7:
+				guide7.setActive(is_active);
+				break;
+			case GUIDE_6:
+				guide6.setActive(is_active);
 				break;
 			case GUIDE_5:
 				guide5.setActive(is_active);
@@ -136,7 +149,8 @@ public class ChordGuide extends JPanel {
 	}
 
 	public void deactivateAll() {
-		guide76.setActive(false);
+		guide7.setActive(false);
+		guide6.setActive(false);
 		guide5.setActive(false);
 		guide9.setActive(false);
 	}

--- a/src/camidion/chordhelper/chordmatrix/ChordMatrix.java
+++ b/src/camidion/chordhelper/chordmatrix/ChordMatrix.java
@@ -807,7 +807,7 @@ public class ChordMatrix extends JPanel
 		int keyCo5 = key.toCo5();
 
 		if (keyCode == KeyEvent.VK_SHIFT) {
-			chordGuide.changeActive(ChordGuide.Guide.GUIDE_76, true);
+			chordGuide.changeActive(ChordGuide.Guide.GUIDE_6, true);
 			return;
 		}
 		if (keyCode == KeyEvent.VK_ALT) {
@@ -917,7 +917,7 @@ public class ChordMatrix extends JPanel
 	public void keyReleased(KeyEvent e) {
 		int keyCode = e.getKeyCode();
 		if (keyCode == KeyEvent.VK_SHIFT) {
-			chordGuide.changeActive(ChordGuide.Guide.GUIDE_76, false);
+			chordGuide.changeActive(ChordGuide.Guide.GUIDE_6, false);
 			return;
 		}
 		if (keyCode == KeyEvent.VK_ALT) {

--- a/src/camidion/chordhelper/pitchspace/CircularPitchSpace.java
+++ b/src/camidion/chordhelper/pitchspace/CircularPitchSpace.java
@@ -165,10 +165,10 @@ public class CircularPitchSpace extends JPanel {
                 g.fillRect(0, 0, this.getWidth(), this.getHeight());
             }
 
-            Color[] lineColors = { new Color(0x20, 0xD0, 0xD0),
-                new Color(0xD0, 0xD0, 0x00),
-                new Color(0xF0, 0x20, 0xF0),
-                new Color(0xC0, 0xC0, 0xC0)
+            Color[] lineColors = { new Color(0x00, 0x00, 0xC0),
+                new Color(0xC0, 0xC0, 0x00),
+                new Color(0xC0, 0x00, 0x00),
+                new Color(0x80, 0x80, 0x80)
             };
 
             for (int i = 0; i < 12; i++) {

--- a/src/camidion/chordhelper/pitchspace/HarmonicTableLayout.java
+++ b/src/camidion/chordhelper/pitchspace/HarmonicTableLayout.java
@@ -13,7 +13,7 @@ import javax.swing.JComponent;
 import javax.swing.JPanel;
 
 public class HarmonicTableLayout extends JPanel {
-    final int OVAL_WIDTH = 24;
+    final int OVAL_WIDTH = 20;
 
     private HarmonicTableLayoutComponent component;
     ArrayList<JComponent> views = new ArrayList<JComponent>();
@@ -83,8 +83,8 @@ public class HarmonicTableLayout extends JPanel {
 
             int offset = 120;
 
-            for (int iy = -2; iy < 12; iy++) {
-            	for (int ix = -2; ix < 6; ix++) {
+            for (int iy = -2; iy < 14; iy++) {
+            	for (int ix = -2; ix < 7; ix++) {
             		if ((ix + iy) % 2 != 0) {
             			continue;
             		}
@@ -151,8 +151,8 @@ public class HarmonicTableLayout extends JPanel {
                 new Color(0xFF, 0xFF, 0xA0)
             };
 
-            for (int iy = -2; iy < 12; iy++) {
-            	for (int ix = -2; ix < 6; ix++) {
+            for (int iy = -2; iy < 14; iy++) {
+            	for (int ix = -2; ix < 7; ix++) {
             		if ((ix + iy) % 2 != 0) {
             			continue;
             		}
@@ -232,8 +232,8 @@ public class HarmonicTableLayout extends JPanel {
                 }
             }
 
-            for (int iy = -2; iy < 12; iy++) {
-            	for (int ix = -2; ix < 6; ix++) {
+            for (int iy = -2; iy < 14; iy++) {
+            	for (int ix = -2; ix < 7; ix++) {
             		if ((ix + iy) % 2 != 0) {
             			continue;
             		}
@@ -251,7 +251,7 @@ public class HarmonicTableLayout extends JPanel {
                             g.setColor(Color.black);
                             g.drawOval(x - OVAL_WIDTH / 2, y - OVAL_WIDTH / 2, OVAL_WIDTH, OVAL_WIDTH);
                             g.setColor(Color.black);
-                            g.drawString(ix <= 1 ? notesLabelsWithFlat[noteIndex] : notesLabelsWithSharp[noteIndex],
+                            g.drawString(ix <= 2 ? notesLabelsWithFlat[noteIndex] : notesLabelsWithSharp[noteIndex],
                                     x - 4, y + 6);
                         } else {
                             g.setColor(Color.black);
@@ -259,7 +259,7 @@ public class HarmonicTableLayout extends JPanel {
                             g.setColor(Color.black);
                             g.drawOval(x - OVAL_WIDTH / 2, y - OVAL_WIDTH / 2, OVAL_WIDTH, OVAL_WIDTH);
                             g.setColor(Color.white);
-                            g.drawString(ix <= 1 ? notesLabelsWithFlat[noteIndex] : notesLabelsWithSharp[noteIndex],
+                            g.drawString(ix <= 2 ? notesLabelsWithFlat[noteIndex] : notesLabelsWithSharp[noteIndex],
                                     x - 4, y + 6);
                         }
                     } else {
@@ -267,13 +267,13 @@ public class HarmonicTableLayout extends JPanel {
                             g.setColor(new Color(214, 214, 214));
                             g.fillOval(x - OVAL_WIDTH / 2, y - OVAL_WIDTH / 2, OVAL_WIDTH, OVAL_WIDTH);
                             g.setColor(new Color(254, 254, 254));
-                            g.drawString(ix <= 1 ? notesLabelsWithFlat[noteIndex] : notesLabelsWithSharp[noteIndex],
+                            g.drawString(ix <= 2 ? notesLabelsWithFlat[noteIndex] : notesLabelsWithSharp[noteIndex],
                                     x - 4, y + 6);
                         } else {
                             g.setColor(new Color(190, 190, 190));
                             g.fillOval(x - OVAL_WIDTH / 2, y - OVAL_WIDTH / 2, OVAL_WIDTH, OVAL_WIDTH);
                             g.setColor(new Color(230, 230, 230));
-                            g.drawString(ix <= 1 ? notesLabelsWithFlat[noteIndex] : notesLabelsWithSharp[noteIndex],
+                            g.drawString(ix <= 2 ? notesLabelsWithFlat[noteIndex] : notesLabelsWithSharp[noteIndex],
                                     x - 4, y + 6);
                         }
                     }