rik/jlibwiiuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing for classic controller

Browse Source 
git-svn-id: http://wiiusej.googlecode.com/svn/trunk@189 ae48ae66-6a45-0410-b38e-211266189506
This commit is contained in:
guilhem.duche
2008-07-14 12:51:59 +00:00
parent 290a357df6
commit 5b2e5b41c8
5 changed files with 604 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
WiiUseJ/WiiUseJ.dll
View File

Binary file not shown.

BIN
WiiUseJ/src/img/classiccontroller.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 51 KiB

18
WiiUseJ/src/wiiusej/test/ClassicControllerGuiTest.java
View File

@@ -161,15 +161,15 @@ public class ClassicControllerGuiTest extends javax.swing.JFrame implements Wiim
// nothing to do // nothing to do
} }
// public static void main(String[] args) { public static void main(String[] args) {
// Wiimote[] wiimotes = WiiUseApiManager.getWiimotes(1, true); Wiimote[] wiimotes = WiiUseApiManager.getWiimotes(1, true);
// ClassicControllerGuiTest gui = null; ClassicControllerGuiTest gui = null;
// if (wiimotes.length > 0) { if (wiimotes.length > 0) {
// gui = new ClassicControllerGuiTest(wiimotes[0]); gui = new ClassicControllerGuiTest(wiimotes[0]);
// } }
// gui.setDefaultCloseOperation(WiiuseJGuiTest.EXIT_ON_CLOSE); gui.setDefaultCloseOperation(WiiuseJGuiTest.EXIT_ON_CLOSE);
// gui.setVisible(true); gui.setVisible(true);
// } }
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JPanel classicControllerPanel; private javax.swing.JPanel classicControllerPanel;
private javax.swing.JProgressBar leftShoulderBar; private javax.swing.JProgressBar leftShoulderBar;

293
WiiUseJ/src/wiiusej/test/WiiuseJGuiTest.java
View File

@@ -86,14 +86,24 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
public void windowActivated(WindowEvent e) { public void windowActivated(WindowEvent e) {
showExpansionWiimoteButton.setEnabled(false); showExpansionWiimoteButton.setEnabled(false);
if (expansionFrame instanceof NunchukGuiTest){
showExpansionWiimoteButton.setText("Hide Nunchuk"); showExpansionWiimoteButton.setText("Hide Nunchuk");
//@TODO adapt to the connected Expansion }else if(expansionFrame instanceof GuitarHero3GuiTest){
showExpansionWiimoteButton.setText("Hide Guitar");
}else if(expansionFrame instanceof ClassicControllerGuiTest){
showExpansionWiimoteButton.setText("Hide Classic Controller");
}
} }
public void windowDeactivated(WindowEvent e) { public void windowDeactivated(WindowEvent e) {
showExpansionWiimoteButton.setEnabled(true); showExpansionWiimoteButton.setEnabled(true);
if (expansionFrame instanceof NunchukGuiTest){
showExpansionWiimoteButton.setText("Show Nunchuk"); showExpansionWiimoteButton.setText("Show Nunchuk");
//@TODO adapt to the connected Expansion }else if(expansionFrame instanceof GuitarHero3GuiTest){
showExpansionWiimoteButton.setText("Show Guitar");
}else if(expansionFrame instanceof ClassicControllerGuiTest){
showExpansionWiimoteButton.setText("Show Classic controller");
}
} }
}; };
@@ -375,7 +385,7 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
* regenerated by the Form Editor. * regenerated by the Form Editor.
*/ */
// <editor-fold defaultstate="collapsed" desc="Generated // <editor-fold defaultstate="collapsed" desc="Generated
// Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
leftPanel = new javax.swing.JPanel(); leftPanel = new javax.swing.JPanel();
@@ -437,6 +447,7 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
mouseIRControlButton = new javax.swing.JButton(); mouseIRControlButton = new javax.swing.JButton();
exPansionPanel = new javax.swing.JPanel(); exPansionPanel = new javax.swing.JPanel();
expansionText = new javax.swing.JLabel(); expansionText = new javax.swing.JLabel();
expansionButtonPanel = new javax.swing.JPanel();
showExpansionWiimoteButton = new javax.swing.JButton(); showExpansionWiimoteButton = new javax.swing.JButton();
showExpansionWiimoteButton.setEnabled(false); showExpansionWiimoteButton.setEnabled(false);
messagesPanel = new javax.swing.JPanel(); messagesPanel = new javax.swing.JPanel();
@@ -451,100 +462,80 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
leftPanel.setBorder(javax.swing.BorderFactory.createEtchedBorder()); leftPanel.setBorder(javax.swing.BorderFactory.createEtchedBorder());
irViewPanel.setBackground(new java.awt.Color(0, 0, 0)); irViewPanel.setBackground(new java.awt.Color(0, 0, 0));
irViewPanel.setBorder(javax.swing.BorderFactory.createTitledBorder( irViewPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(new javax.swing.border.LineBorder(new java.awt.Color(0, 153, 153), 2, true), "IR View", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 0, 11), new java.awt.Color(255, 0, 51)));
new javax.swing.border.LineBorder(new java.awt.Color(0, 153,
153), 2, true), "IR View",
javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
javax.swing.border.TitledBorder.DEFAULT_POSITION,
new java.awt.Font("Tahoma", 0, 11), new java.awt.Color(255, 0,
51)));
irViewPanel.setToolTipText("IREvent"); irViewPanel.setToolTipText("IREvent");
javax.swing.GroupLayout irViewPanelLayout = new javax.swing.GroupLayout( javax.swing.GroupLayout irViewPanelLayout = new javax.swing.GroupLayout(irViewPanel);
irViewPanel);
irViewPanel.setLayout(irViewPanelLayout); irViewPanel.setLayout(irViewPanelLayout);
irViewPanelLayout.setHorizontalGroup(irViewPanelLayout irViewPanelLayout.setHorizontalGroup(
.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) irViewPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 272, Short.MAX_VALUE)); .addGap(0, 272, Short.MAX_VALUE)
irViewPanelLayout.setVerticalGroup(irViewPanelLayout );
.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) irViewPanelLayout.setVerticalGroup(
.addGap(0, 299, Short.MAX_VALUE)); irViewPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 299, Short.MAX_VALUE)
);
accelerationPanel.setToolTipText("MotionSensingEvent"); accelerationPanel.setToolTipText("MotionSensingEvent");
javax.swing.GroupLayout accelerationPanelLayout = new javax.swing.GroupLayout( javax.swing.GroupLayout accelerationPanelLayout = new javax.swing.GroupLayout(accelerationPanel);
accelerationPanel);
accelerationPanel.setLayout(accelerationPanelLayout); accelerationPanel.setLayout(accelerationPanelLayout);
accelerationPanelLayout.setHorizontalGroup(accelerationPanelLayout accelerationPanelLayout.setHorizontalGroup(
.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) accelerationPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 279, Short.MAX_VALUE)); .addGap(0, 279, Short.MAX_VALUE)
accelerationPanelLayout.setVerticalGroup(accelerationPanelLayout );
.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) accelerationPanelLayout.setVerticalGroup(
.addGap(0, 213, Short.MAX_VALUE)); accelerationPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 213, Short.MAX_VALUE)
);
jTabbedPane1.addTab("Acceleration", accelerationPanel); jTabbedPane1.addTab("Acceleration", accelerationPanel);
javax.swing.GroupLayout motionSensingPanelLayout = new javax.swing.GroupLayout( javax.swing.GroupLayout motionSensingPanelLayout = new javax.swing.GroupLayout(motionSensingPanel);
motionSensingPanel);
motionSensingPanel.setLayout(motionSensingPanelLayout); motionSensingPanel.setLayout(motionSensingPanelLayout);
motionSensingPanelLayout.setHorizontalGroup(motionSensingPanelLayout motionSensingPanelLayout.setHorizontalGroup(
.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) motionSensingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 279, Short.MAX_VALUE)); .addGap(0, 279, Short.MAX_VALUE)
motionSensingPanelLayout.setVerticalGroup(motionSensingPanelLayout );
.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) motionSensingPanelLayout.setVerticalGroup(
.addGap(0, 213, Short.MAX_VALUE)); motionSensingPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 213, Short.MAX_VALUE)
);
jTabbedPane1.addTab("Orientation", motionSensingPanel); jTabbedPane1.addTab("Orientation", motionSensingPanel);
javax.swing.GroupLayout gForcePanelLayout = new javax.swing.GroupLayout( javax.swing.GroupLayout gForcePanelLayout = new javax.swing.GroupLayout(gForcePanel);
gForcePanel);
gForcePanel.setLayout(gForcePanelLayout); gForcePanel.setLayout(gForcePanelLayout);
gForcePanelLayout.setHorizontalGroup(gForcePanelLayout gForcePanelLayout.setHorizontalGroup(
.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) gForcePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 279, Short.MAX_VALUE)); .addGap(0, 279, Short.MAX_VALUE)
gForcePanelLayout.setVerticalGroup(gForcePanelLayout );
.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) gForcePanelLayout.setVerticalGroup(
.addGap(0, 213, Short.MAX_VALUE)); gForcePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 213, Short.MAX_VALUE)
);
jTabbedPane1.addTab("GForce", gForcePanel); jTabbedPane1.addTab("GForce", gForcePanel);
javax.swing.GroupLayout leftPanelLayout = new javax.swing.GroupLayout( javax.swing.GroupLayout leftPanelLayout = new javax.swing.GroupLayout(leftPanel);
leftPanel);
leftPanel.setLayout(leftPanelLayout); leftPanel.setLayout(leftPanelLayout);
leftPanelLayout.setHorizontalGroup(leftPanelLayout.createParallelGroup( leftPanelLayout.setHorizontalGroup(
javax.swing.GroupLayout.Alignment.LEADING).addComponent( leftPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
irViewPanel, javax.swing.GroupLayout.Alignment.TRAILING, .addComponent(irViewPanel, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
javax.swing.GroupLayout.DEFAULT_SIZE, .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 284, Short.MAX_VALUE)
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) );
.addComponent(jTabbedPane1, leftPanelLayout.setVerticalGroup(
javax.swing.GroupLayout.DEFAULT_SIZE, 284, leftPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
Short.MAX_VALUE)); .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, leftPanelLayout.createSequentialGroup()
leftPanelLayout .addComponent(jTabbedPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 238, javax.swing.GroupLayout.PREFERRED_SIZE)
.setVerticalGroup(leftPanelLayout .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.createParallelGroup( .addComponent(irViewPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
javax.swing.GroupLayout.Alignment.LEADING) );
.addGroup(
javax.swing.GroupLayout.Alignment.TRAILING,
leftPanelLayout
.createSequentialGroup()
.addComponent(
jTabbedPane1,
javax.swing.GroupLayout.PREFERRED_SIZE,
238,
javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(
javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(
irViewPanel,
javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE)));
jTabbedPane1.getAccessibleContext().setAccessibleName("Orientation"); jTabbedPane1.getAccessibleContext().setAccessibleName("Orientation");
rightPanel.setBorder(javax.swing.BorderFactory.createEtchedBorder()); rightPanel.setBorder(javax.swing.BorderFactory.createEtchedBorder());
rightPanel.setLayout(new javax.swing.BoxLayout(rightPanel, rightPanel.setLayout(new javax.swing.BoxLayout(rightPanel, javax.swing.BoxLayout.LINE_AXIS));
javax.swing.BoxLayout.LINE_AXIS));
fixedWiimotePanel.setMaximumSize(new java.awt.Dimension(120, 32767)); fixedWiimotePanel.setMaximumSize(new java.awt.Dimension(120, 32767));
fixedWiimotePanel.setMinimumSize(new java.awt.Dimension(120, 100)); fixedWiimotePanel.setMinimumSize(new java.awt.Dimension(120, 100));
@@ -557,15 +548,16 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
buttonsPanel.setOpaque(false); buttonsPanel.setOpaque(false);
buttonsPanel.setPreferredSize(new java.awt.Dimension(120, 484)); buttonsPanel.setPreferredSize(new java.awt.Dimension(120, 484));
javax.swing.GroupLayout buttonsPanelLayout = new javax.swing.GroupLayout( javax.swing.GroupLayout buttonsPanelLayout = new javax.swing.GroupLayout(buttonsPanel);
buttonsPanel);
buttonsPanel.setLayout(buttonsPanelLayout); buttonsPanel.setLayout(buttonsPanelLayout);
buttonsPanelLayout.setHorizontalGroup(buttonsPanelLayout buttonsPanelLayout.setHorizontalGroup(
.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) buttonsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 120, Short.MAX_VALUE)); .addGap(0, 120, Short.MAX_VALUE)
buttonsPanelLayout.setVerticalGroup(buttonsPanelLayout );
.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) buttonsPanelLayout.setVerticalGroup(
.addGap(0, 484, Short.MAX_VALUE)); buttonsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 484, Short.MAX_VALUE)
);
fixedWiimotePanel.add(buttonsPanel); fixedWiimotePanel.add(buttonsPanel);
buttonsPanel.setBounds(0, 0, 120, 484); buttonsPanel.setBounds(0, 0, 120, 484);
@@ -585,8 +577,7 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
activateRumbleIRPanel.add(toggleRumbleButton); activateRumbleIRPanel.add(toggleRumbleButton);
toggleIRTrackingButton.setText("Activate IR Tracking"); toggleIRTrackingButton.setText("Activate IR Tracking");
toggleIRTrackingButton toggleIRTrackingButton.addMouseListener(new java.awt.event.MouseAdapter() {
.addMouseListener(new java.awt.event.MouseAdapter() {
public void mousePressed(java.awt.event.MouseEvent evt) { public void mousePressed(java.awt.event.MouseEvent evt) {
toggleIRTrackingButtonMousePressed(evt); toggleIRTrackingButtonMousePressed(evt);
} }
@@ -595,10 +586,8 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
controlsPanel.add(activateRumbleIRPanel); controlsPanel.add(activateRumbleIRPanel);
toggleMotionSensingTrackingButton toggleMotionSensingTrackingButton.setText("Activate motion sensing Tracking");
.setText("Activate motion sensing Tracking"); toggleMotionSensingTrackingButton.addMouseListener(new java.awt.event.MouseAdapter() {
toggleMotionSensingTrackingButton
.addMouseListener(new java.awt.event.MouseAdapter() {
public void mousePressed(java.awt.event.MouseEvent evt) { public void mousePressed(java.awt.event.MouseEvent evt) {
toggleMotionSensingTrackingButtonMousePressed(evt); toggleMotionSensingTrackingButtonMousePressed(evt);
} }
@@ -608,8 +597,7 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
controlsPanel.add(activateMotionSensingPanel); controlsPanel.add(activateMotionSensingPanel);
toggleSmoothingButton.setText("Activate Smoothing"); toggleSmoothingButton.setText("Activate Smoothing");
toggleSmoothingButton toggleSmoothingButton.addMouseListener(new java.awt.event.MouseAdapter() {
.addMouseListener(new java.awt.event.MouseAdapter() {
public void mousePressed(java.awt.event.MouseEvent evt) { public void mousePressed(java.awt.event.MouseEvent evt) {
toggleSmoothingButtonMousePressed(evt); toggleSmoothingButtonMousePressed(evt);
} }
@@ -617,8 +605,7 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
activateSmoothingContinuousPanel.add(toggleSmoothingButton); activateSmoothingContinuousPanel.add(toggleSmoothingButton);
toggleContinuousButton.setText("Activate Continuous"); toggleContinuousButton.setText("Activate Continuous");
toggleContinuousButton toggleContinuousButton.addMouseListener(new java.awt.event.MouseAdapter() {
.addMouseListener(new java.awt.event.MouseAdapter() {
public void mousePressed(java.awt.event.MouseEvent evt) { public void mousePressed(java.awt.event.MouseEvent evt) {
toggleContinuousButtonMousePressed(evt); toggleContinuousButtonMousePressed(evt);
} }
@@ -670,13 +657,11 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
controlsPanel.add(setLedsPanel); controlsPanel.add(setLedsPanel);
alphaSmoothingTextField.setMinimumSize(new java.awt.Dimension(100, 20)); alphaSmoothingTextField.setMinimumSize(new java.awt.Dimension(100, 20));
alphaSmoothingTextField alphaSmoothingTextField.setPreferredSize(new java.awt.Dimension(100, 20));
.setPreferredSize(new java.awt.Dimension(100, 20));
setAlphaSmoothingPanel.add(alphaSmoothingTextField); setAlphaSmoothingPanel.add(alphaSmoothingTextField);
alphaSmoothingButton.setText("Set alpha smoothing"); alphaSmoothingButton.setText("Set alpha smoothing");
alphaSmoothingButton alphaSmoothingButton.addMouseListener(new java.awt.event.MouseAdapter() {
.addMouseListener(new java.awt.event.MouseAdapter() {
public void mousePressed(java.awt.event.MouseEvent evt) { public void mousePressed(java.awt.event.MouseEvent evt) {
alphaSmoothingButtonMousePressed(evt); alphaSmoothingButtonMousePressed(evt);
} }
@@ -685,15 +670,12 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
controlsPanel.add(setAlphaSmoothingPanel); controlsPanel.add(setAlphaSmoothingPanel);
orientationThresholdTextField.setMinimumSize(new java.awt.Dimension( orientationThresholdTextField.setMinimumSize(new java.awt.Dimension(100, 20));
100, 20)); orientationThresholdTextField.setPreferredSize(new java.awt.Dimension(100, 20));
orientationThresholdTextField.setPreferredSize(new java.awt.Dimension(
100, 20));
setOrientationThresholdPanel.add(orientationThresholdTextField); setOrientationThresholdPanel.add(orientationThresholdTextField);
orientationThresholdButton.setText("Set orientation threshold"); orientationThresholdButton.setText("Set orientation threshold");
orientationThresholdButton orientationThresholdButton.addMouseListener(new java.awt.event.MouseAdapter() {
.addMouseListener(new java.awt.event.MouseAdapter() {
public void mousePressed(java.awt.event.MouseEvent evt) { public void mousePressed(java.awt.event.MouseEvent evt) {
orientationThresholdButtonMousePressed(evt); orientationThresholdButtonMousePressed(evt);
} }
@@ -702,13 +684,11 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
controlsPanel.add(setOrientationThresholdPanel); controlsPanel.add(setOrientationThresholdPanel);
accelerationThresholdTextField.setPreferredSize(new java.awt.Dimension( accelerationThresholdTextField.setPreferredSize(new java.awt.Dimension(100, 20));
100, 20));
setAccelerationThresholdPanel.add(accelerationThresholdTextField); setAccelerationThresholdPanel.add(accelerationThresholdTextField);
accelerationThresholdButton.setText("Set acceleration threshold"); accelerationThresholdButton.setText("Set acceleration threshold");
accelerationThresholdButton accelerationThresholdButton.addMouseListener(new java.awt.event.MouseAdapter() {
.addMouseListener(new java.awt.event.MouseAdapter() {
public void mousePressed(java.awt.event.MouseEvent evt) { public void mousePressed(java.awt.event.MouseEvent evt) {
accelerationThresholdButtonMousePressed(evt); accelerationThresholdButtonMousePressed(evt);
} }
@@ -736,8 +716,7 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
controlsPanel.add(getStatusPanel); controlsPanel.add(getStatusPanel);
setIrSensitivySpinner.setPreferredSize(new java.awt.Dimension(50, 18)); setIrSensitivySpinner.setPreferredSize(new java.awt.Dimension(50, 18));
setIrSensitivySpinner setIrSensitivySpinner.addChangeListener(new javax.swing.event.ChangeListener() {
.addChangeListener(new javax.swing.event.ChangeListener() {
public void stateChanged(javax.swing.event.ChangeEvent evt) { public void stateChanged(javax.swing.event.ChangeEvent evt) {
setIrSensitivySpinnerStateChanged(evt); setIrSensitivySpinnerStateChanged(evt);
} }
@@ -745,8 +724,7 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
setIrSensitivyPanel.add(setIrSensitivySpinner); setIrSensitivyPanel.add(setIrSensitivySpinner);
setIrSensitivyButton.setText("SetIrSensivity"); setIrSensitivyButton.setText("SetIrSensivity");
setIrSensitivyButton setIrSensitivyButton.addMouseListener(new java.awt.event.MouseAdapter() {
.addMouseListener(new java.awt.event.MouseAdapter() {
public void mousePressed(java.awt.event.MouseEvent evt) { public void mousePressed(java.awt.event.MouseEvent evt) {
setIrSensitivyButtonMousePressed(evt); setIrSensitivyButtonMousePressed(evt);
} }
@@ -764,8 +742,7 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
controlsPanel.add(setIrSensitivyPanel); controlsPanel.add(setIrSensitivyPanel);
normalTimeoutSpinner.setPreferredSize(new java.awt.Dimension(40, 18)); normalTimeoutSpinner.setPreferredSize(new java.awt.Dimension(40, 18));
normalTimeoutSpinner normalTimeoutSpinner.addChangeListener(new javax.swing.event.ChangeListener() {
.addChangeListener(new javax.swing.event.ChangeListener() {
public void stateChanged(javax.swing.event.ChangeEvent evt) { public void stateChanged(javax.swing.event.ChangeEvent evt) {
normalTimeoutSpinnerStateChanged(evt); normalTimeoutSpinnerStateChanged(evt);
} }
@@ -775,10 +752,8 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
normalTimeoutText.setText("Normal timeout"); normalTimeoutText.setText("Normal timeout");
setTimeoutPanel.add(normalTimeoutText); setTimeoutPanel.add(normalTimeoutText);
expansionHandshakeTimeoutSpinner expansionHandshakeTimeoutSpinner.setPreferredSize(new java.awt.Dimension(40, 18));
.setPreferredSize(new java.awt.Dimension(40, 18)); expansionHandshakeTimeoutSpinner.addChangeListener(new javax.swing.event.ChangeListener() {
expansionHandshakeTimeoutSpinner
.addChangeListener(new javax.swing.event.ChangeListener() {
public void stateChanged(javax.swing.event.ChangeEvent evt) { public void stateChanged(javax.swing.event.ChangeEvent evt) {
expansionHandshakeTimeoutSpinnerStateChanged(evt); expansionHandshakeTimeoutSpinnerStateChanged(evt);
} }
@@ -791,8 +766,7 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
controlsPanel.add(setTimeoutPanel); controlsPanel.add(setTimeoutPanel);
toggleSensorBarPositionButton.setText("Set sensor bar above"); toggleSensorBarPositionButton.setText("Set sensor bar above");
toggleSensorBarPositionButton toggleSensorBarPositionButton.addMouseListener(new java.awt.event.MouseAdapter() {
.addMouseListener(new java.awt.event.MouseAdapter() {
public void mousePressed(java.awt.event.MouseEvent evt) { public void mousePressed(java.awt.event.MouseEvent evt) {
toggleSensorBarPositionButtonMousePressed(evt); toggleSensorBarPositionButtonMousePressed(evt);
} }
@@ -800,8 +774,7 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
setIRConfPanel.add(toggleSensorBarPositionButton); setIRConfPanel.add(toggleSensorBarPositionButton);
toggleScreenAspectRatioButton.setText("Set screen aspect ratio 4/3"); toggleScreenAspectRatioButton.setText("Set screen aspect ratio 4/3");
toggleScreenAspectRatioButton toggleScreenAspectRatioButton.addMouseListener(new java.awt.event.MouseAdapter() {
.addMouseListener(new java.awt.event.MouseAdapter() {
public void mousePressed(java.awt.event.MouseEvent evt) { public void mousePressed(java.awt.event.MouseEvent evt) {
toggleScreenAspectRatioButtonMousePressed(evt); toggleScreenAspectRatioButtonMousePressed(evt);
} }
@@ -826,8 +799,7 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
setVirtualResolutionPanel.add(yResolutionTextField); setVirtualResolutionPanel.add(yResolutionTextField);
setVirtualResolutionButton.setText("Set virtual resolution"); setVirtualResolutionButton.setText("Set virtual resolution");
setVirtualResolutionButton setVirtualResolutionButton.addMouseListener(new java.awt.event.MouseAdapter() {
.addMouseListener(new java.awt.event.MouseAdapter() {
public void mousePressed(java.awt.event.MouseEvent evt) { public void mousePressed(java.awt.event.MouseEvent evt) {
setVirtualResolutionButtonMousePressed(evt); setVirtualResolutionButtonMousePressed(evt);
} }
@@ -837,8 +809,7 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
controlsPanel.add(setVirtualResolutionPanel); controlsPanel.add(setVirtualResolutionPanel);
mouseIRControlButton.setText("Start infrared mouse control"); mouseIRControlButton.setText("Start infrared mouse control");
mouseIRControlButton mouseIRControlButton.addMouseListener(new java.awt.event.MouseAdapter() {
.addMouseListener(new java.awt.event.MouseAdapter() {
public void mousePressed(java.awt.event.MouseEvent evt) { public void mousePressed(java.awt.event.MouseEvent evt) {
mouseIRControlButtonMousePressed(evt); mouseIRControlButtonMousePressed(evt);
} }
@@ -850,20 +821,20 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
expansionText.setText("No expansion connected."); expansionText.setText("No expansion connected.");
exPansionPanel.add(expansionText); exPansionPanel.add(expansionText);
controlsPanel.add(exPansionPanel);
showExpansionWiimoteButton.setText("No expansion connected"); showExpansionWiimoteButton.setText("No expansion connected");
showExpansionWiimoteButton showExpansionWiimoteButton.addMouseListener(new java.awt.event.MouseAdapter() {
.addMouseListener(new java.awt.event.MouseAdapter() {
public void mousePressed(java.awt.event.MouseEvent evt) { public void mousePressed(java.awt.event.MouseEvent evt) {
showExpansionWiimoteButtonMousePressed(evt); showExpansionWiimoteButtonMousePressed(evt);
} }
}); });
exPansionPanel.add(showExpansionWiimoteButton); expansionButtonPanel.add(showExpansionWiimoteButton);
controlsPanel.add(exPansionPanel); controlsPanel.add(expansionButtonPanel);
reconnectWiimotesButton.setText("Reconnect wiimote"); reconnectWiimotesButton.setText("Reconnect wiimote");
reconnectWiimotesButton reconnectWiimotesButton.addMouseListener(new java.awt.event.MouseAdapter() {
.addMouseListener(new java.awt.event.MouseAdapter() {
public void mousePressed(java.awt.event.MouseEvent evt) { public void mousePressed(java.awt.event.MouseEvent evt) {
reconnectWiimotesButtonMousePressed(evt); reconnectWiimotesButtonMousePressed(evt);
} }
@@ -882,38 +853,23 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
rightPanel.add(controlsPanel); rightPanel.add(controlsPanel);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout( javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane());
getContentPane().setLayout(layout); getContentPane().setLayout(layout);
layout layout.setHorizontalGroup(
.setHorizontalGroup(layout layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.createParallelGroup( .addGroup(layout.createSequentialGroup()
javax.swing.GroupLayout.Alignment.LEADING) .addComponent(leftPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup( .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
layout .addComponent(rightPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 498, Short.MAX_VALUE))
.createSequentialGroup() );
.addComponent( layout.setVerticalGroup(
leftPanel, layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
javax.swing.GroupLayout.DEFAULT_SIZE, .addComponent(leftPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
javax.swing.GroupLayout.DEFAULT_SIZE, .addComponent(rightPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 573, Short.MAX_VALUE)
Short.MAX_VALUE) );
.addPreferredGap(
javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(
rightPanel,
javax.swing.GroupLayout.DEFAULT_SIZE,
498, Short.MAX_VALUE)));
layout.setVerticalGroup(layout.createParallelGroup(
javax.swing.GroupLayout.Alignment.LEADING).addComponent(
leftPanel, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(rightPanel, javax.swing.GroupLayout.DEFAULT_SIZE,
573, Short.MAX_VALUE));
java.awt.Dimension screenSize = java.awt.Toolkit.getDefaultToolkit() java.awt.Dimension screenSize = java.awt.Toolkit.getDefaultToolkit().getScreenSize();
.getScreenSize(); setBounds((screenSize.width-800)/2, (screenSize.height-600)/2, 800, 600);
setBounds((screenSize.width - 800) / 2, (screenSize.height - 600) / 2,
800, 600);
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
private void toggleRumbleButtonMousePressed(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_toggleRumbleButtonMousePressed private void toggleRumbleButtonMousePressed(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_toggleRumbleButtonMousePressed
@@ -1325,14 +1281,30 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
expansionFrame.setEnabled(true); expansionFrame.setEnabled(true);
expansionFrame.setVisible(true); expansionFrame.setVisible(true);
showExpansionWiimoteButton.setEnabled(false); showExpansionWiimoteButton.setEnabled(false);
if (expansionFrame instanceof NunchukGuiTest){
showExpansionWiimoteButton.setText("Hide Nunchuk"); showExpansionWiimoteButton.setText("Hide Nunchuk");
messageText.setText("Nunchuk displayed !"); messageText.setText("Nunchuk displayed !");
}else if(expansionFrame instanceof GuitarHero3GuiTest){
showExpansionWiimoteButton.setText("Hide Guitar");
messageText.setText("Guitar displayed !");
}else if(expansionFrame instanceof ClassicControllerGuiTest){
showExpansionWiimoteButton.setText("Hide Classic controller");
messageText.setText("Classic controller displayed !");
}
} else {// already being shown } else {// already being shown
expansionFrame.setEnabled(false); expansionFrame.setEnabled(false);
expansionFrame.setVisible(false); expansionFrame.setVisible(false);
showExpansionWiimoteButton.setEnabled(true); showExpansionWiimoteButton.setEnabled(true);
if (expansionFrame instanceof NunchukGuiTest){
showExpansionWiimoteButton.setText("Show Nunchuk"); showExpansionWiimoteButton.setText("Show Nunchuk");
messageText.setText("Nunchuk hidden !"); messageText.setText("Nunchuk hidden !");
}else if(expansionFrame instanceof GuitarHero3GuiTest){
showExpansionWiimoteButton.setText("Show Guitar");
messageText.setText("Guitar hidden !");
}else if(expansionFrame instanceof ClassicControllerGuiTest){
showExpansionWiimoteButton.setText("Show Classic controller");
messageText.setText("Classic controller hidden !");
}
} }
} }
}// GEN-LAST:event_showExpansionWiimoteButtonMousePressed }// GEN-LAST:event_showExpansionWiimoteButtonMousePressed
@@ -1351,6 +1323,7 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
private javax.swing.JPanel buttonsPanel; private javax.swing.JPanel buttonsPanel;
private javax.swing.JPanel controlsPanel; private javax.swing.JPanel controlsPanel;
private javax.swing.JPanel exPansionPanel; private javax.swing.JPanel exPansionPanel;
private javax.swing.JPanel expansionButtonPanel;
private javax.swing.JSpinner expansionHandshakeTimeoutSpinner; private javax.swing.JSpinner expansionHandshakeTimeoutSpinner;
private javax.swing.JLabel expansionHandshakeTimeoutText; private javax.swing.JLabel expansionHandshakeTimeoutText;
private javax.swing.JLabel expansionText; private javax.swing.JLabel expansionText;

12
WiiUseJ/src/wiiusej/utils/ClassicControllerButtonsEventPanel.java
View File

@@ -168,13 +168,13 @@ public class ClassicControllerButtonsEventPanel extends javax.swing.JPanel imple
/* button Down */ /* button Down */
if (buttons.isButtonDownJustPressed()) { if (buttons.isButtonDownJustPressed()) {
drawFunction(g2, pressedColor, 53, 353, shapeButton); drawFunction(g2, pressedColor, 60, 97, shapeButton);
} }
if (buttons.isButtonDownHeld()) { if (buttons.isButtonDownHeld()) {
drawFunction(g2, heldColor, 53, 353, shapeButton); drawFunction(g2, heldColor, 60, 97, shapeButton);
} }
if (buttons.isButtonDownJustReleased()) { if (buttons.isButtonDownJustReleased()) {
drawFunction(g2, releasedColor, 53, 353, shapeButton); drawFunction(g2, releasedColor, 60, 97, shapeButton);
} }
/* button FullLeft */ /* button FullLeft */
@@ -256,13 +256,13 @@ public class ClassicControllerButtonsEventPanel extends javax.swing.JPanel imple
/* button Up */ /* button Up */
if (buttons.isButtonUpJustPressed()) { if (buttons.isButtonUpJustPressed()) {
drawFunction(g2, pressedColor, 59, 50, shapeButton); drawFunction(g2, pressedColor, 60, 50, shapeButton);
} }
if (buttons.isButtonUpHeld()) { if (buttons.isButtonUpHeld()) {
drawFunction(g2, heldColor, 59, 50, shapeButton); drawFunction(g2, heldColor, 60, 50, shapeButton);
} }
if (buttons.isButtonUpJustReleased()) { if (buttons.isButtonUpJustReleased()) {
drawFunction(g2, releasedColor, 59, 50, shapeButton); drawFunction(g2, releasedColor, 60, 50, shapeButton);
} }
/* button X */ /* button X */