Skip to content

Commit 9d00f64

Browse files
madhephaestusmadhephaestus
committed
connection dialog now repacks when changes to the connections are made
1 parent 1b1b565 commit 9d00f64

File tree

8 files changed

+54
-29
lines changed

8 files changed

+54
-29
lines changed

‎javasdk/NRSDK/addons/com/neuronrobotics/sdk/javaxusb/UsbCDCSerialConnection.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,11 @@ private static void dumpDevice(final UsbDevice device,
235235
ArrayList<UsbDevice> addrs) throws UnsupportedEncodingException,
236236
UsbDisconnectedException, UsbException {
237237
try {
238-
if (device.getUsbDeviceDescriptor().idVendor() == 0x04d8) {// Neuron
238+
if (device.getUsbDeviceDescriptor().idVendor() == 0x04d8 &&
239+
( device.getUsbDeviceDescriptor().idProduct() == 0x0001||
240+
device.getUsbDeviceDescriptor().idProduct() == 0x3742
241+
)
242+
) {// Neuron
239243
// robotics
240244
// devices
241245
// Dump information about the device itself
@@ -632,11 +636,9 @@ public BowlerDatagram loadPacketFromPhy(ByteList bytesToPacketBuffer)
632636
}
633637
if (got > 0) {
634638
bytesToPacketBuffer.add(Arrays.copyOfRange(data, 0, got));
635-
return BowlerDatagramFactory
636-
.build(bytesToPacketBuffer);
637639
}
638-
639-
return null;
640+
return BowlerDatagramFactory
641+
.build(bytesToPacketBuffer);
640642
}
641643

642644
// /* (non-Javadoc)

‎javasdk/NRSDK/addons/com/neuronrobotics/sdk/ui/AbstractConnectionPanel.java‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,24 @@ public abstract class AbstractConnectionPanel extends JPanel {
2626
private static final long serialVersionUID = 1L;
2727
private String title;
2828
private ImageIcon icon;
29+
private ConnectionDialog connectionDialog;
2930

3031
public abstract BowlerAbstractConnection getConnection();
3132
public abstract void refresh();
3233

33-
public AbstractConnectionPanel(String title, ImageIcon icon) {
34+
35+
36+
public AbstractConnectionPanel(String title, ImageIcon icon,ConnectionDialog connectionDialog) {
3437
setTitle(title);
3538

3639
setIcon(icon);
40+
this.setConnectionDialog(connectionDialog);
3741
}
3842

39-
public AbstractConnectionPanel(String title) {
43+
public AbstractConnectionPanel(String title,ConnectionDialog connectionDialog) {
4044
setTitle(title);
4145
setIcon(ConnectionImageIconFactory.getIcon("images/connection-icon.png"));
46+
this.setConnectionDialog(connectionDialog);
4247
}
4348

4449
public void setTitle(String title) {
@@ -59,4 +64,11 @@ public ImageIcon getIcon(){
5964
return new ImageIcon();
6065
return icon;
6166
}
67+
68+
public ConnectionDialog getConnectionDialog() {
69+
return connectionDialog;
70+
}
71+
public void setConnectionDialog(ConnectionDialog connectionDialog) {
72+
this.connectionDialog = connectionDialog;
73+
}
6274
}

‎javasdk/NRSDK/addons/com/neuronrobotics/sdk/ui/BluetoothConnectionPanel.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,11 @@ public class BluetoothConnectionPanel extends AbstractConnectionPanel {
5050
private JLabel message = new JLabel();
5151

5252
/**
53+
* @param connectionDialog
5354
*
5455
*/
55-
public BluetoothConnectionPanel() {
56-
super("Bluetooth", ConnectionImageIconFactory.getIcon("images/bluetooth-icon.png"));
56+
public BluetoothConnectionPanel(ConnectionDialog connectionDialog) {
57+
super("Bluetooth", ConnectionImageIconFactory.getIcon("images/bluetooth-icon.png"),connectionDialog);
5758

5859
if(displayWarning) {
5960
return;
@@ -82,6 +83,8 @@ public void actionPerformed(ActionEvent arg0) {
8283
}
8384

8485

86+
87+
8588
public BluetoothSerialConnection getConnection() {
8689
try {
8790
String port = connectionCbo.getSelectedItem().toString();
@@ -127,6 +130,7 @@ public void onComplete() {
127130
});
128131
pm.start();
129132
bsp.start();
133+
getConnectionDialog().pack();
130134
}
131135

132136
private class BluetoothSearchProcess extends Thread implements IMonitorable {

‎javasdk/NRSDK/addons/com/neuronrobotics/sdk/ui/ConnectionDialog.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ public void actionPerformed(ActionEvent arg0) {
8989
panel.add(cancelBtn, "cell 0 2 2 2");
9090

9191
add(panel);
92-
setResizable(false);
92+
//setResizable(false);
9393
setTitle("Connection Information");
94-
pack();
94+
//pack();
9595

9696
if (connection != null) {
9797
connection.disconnect();
@@ -104,24 +104,25 @@ public void windowGainedFocus(WindowEvent e) {
104104
}
105105
});
106106
pack();
107+
107108
}
108109

109110
private void loadDefaultConnections() {
110111
try{
111112
try{
112-
addConnectionPanel(new UsbConnectionPanel());
113-
addConnectionPanel(new BluetoothConnectionPanel());
114-
addConnectionPanel(new SerialConnectionPanel());
113+
addConnectionPanel(new UsbConnectionPanel(this));
114+
addConnectionPanel(new BluetoothConnectionPanel(this));
115+
addConnectionPanel(new SerialConnectionPanel(this));
115116
}catch(Exception ex){
116-
addConnectionPanel(new SerialConnectionPanel());
117-
addConnectionPanel(new BluetoothConnectionPanel());
117+
addConnectionPanel(new SerialConnectionPanel(this));
118+
addConnectionPanel(new BluetoothConnectionPanel(this));
118119
}
119120
}catch(Error e){
120121
e.printStackTrace();
121122
Log.error("This is not a java 8 compliant system, removing the serial, bluetooth and usb connections");
122123
}
123-
addConnectionPanel(new UDPConnectionPanel());
124-
addConnectionPanel(new TCPConnectionPanel());
124+
addConnectionPanel(new UDPConnectionPanel(this));
125+
addConnectionPanel(new TCPConnectionPanel(this));
125126

126127
}
127128

‎javasdk/NRSDK/addons/com/neuronrobotics/sdk/ui/SerialConnectionPanel.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,11 @@ public class SerialConnectionPanel extends AbstractConnectionPanel {
4545
private SerialConnection connection = null;
4646

4747
/**
48+
* @param connectionDialog
4849
*
4950
*/
50-
public SerialConnectionPanel() {
51-
super("Serial", ConnectionImageIconFactory.getIcon("images/usb-icon.png"));
51+
public SerialConnectionPanel(ConnectionDialog connectionDialog) {
52+
super("Serial", ConnectionImageIconFactory.getIcon("images/usb-icon.png"),connectionDialog);
5253

5354
baudrateTxt.setText("115200");
5455

@@ -138,5 +139,6 @@ public void refresh() {
138139
JOptionPane.showMessageDialog(this, m,"NRSDK not installed properly", JOptionPane.ERROR_MESSAGE);
139140
throw new MissingNativeLibraryException(m);
140141
}
142+
getConnectionDialog().pack();
141143
}
142144
}

‎javasdk/NRSDK/addons/com/neuronrobotics/sdk/ui/TCPConnectionPanel.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@ public class TCPConnectionPanel extends AbstractConnectionPanel {
4040

4141

4242
/**
43+
* @param connectionDialog
4344
*
4445
*/
45-
public TCPConnectionPanel() {
46-
super("TCP", ConnectionImageIconFactory.getIcon("images/ethernet-icon.png"));
46+
public TCPConnectionPanel(ConnectionDialog connectionDialog) {
47+
super("TCP", ConnectionImageIconFactory.getIcon("images/ethernet-icon.png"),connectionDialog);
4748

4849

4950
port.setText(new Integer(defaultPortNum).toString());
@@ -113,6 +114,6 @@ public BowlerAbstractConnection getConnection() {
113114

114115
@Override
115116
public void refresh() {
116-
117+
getConnectionDialog().pack();
117118
}
118119
}

‎javasdk/NRSDK/addons/com/neuronrobotics/sdk/ui/UDPConnectionPanel.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,11 @@ public class UDPConnectionPanel extends AbstractConnectionPanel {
4747

4848

4949
/**
50+
* @param connectionDialog
5051
*
5152
*/
52-
public UDPConnectionPanel() {
53-
super("UDP",ConnectionImageIconFactory.getIcon("images/ethernet-icon.png"));
53+
public UDPConnectionPanel(ConnectionDialog connectionDialog) {
54+
super("UDP",ConnectionImageIconFactory.getIcon("images/ethernet-icon.png"),connectionDialog);
5455

5556

5657
port.setText(new Integer(defaultPortNum).toString());
@@ -131,7 +132,8 @@ public void onComplete() {
131132
});
132133

133134
pm.start();
134-
nsp.start();
135+
nsp.start();
136+
getConnectionDialog().pack();
135137
}
136138

137139
private class NetworkSearchProcess extends Thread implements IMonitorable {

‎javasdk/NRSDK/addons/com/neuronrobotics/sdk/ui/UsbConnectionPanel.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,11 @@ public class UsbConnectionPanel extends AbstractConnectionPanel implements IUsbD
5858
private UsbCDCSerialConnection connection = null;
5959

6060
/**
61+
* @param connectionDialog
6162
*
6263
*/
63-
public UsbConnectionPanel() {
64-
super("USB", ConnectionImageIconFactory.getIcon("images/usb-icon.png"));
64+
public UsbConnectionPanel(ConnectionDialog connectionDialog) {
65+
super("USB", ConnectionImageIconFactory.getIcon("images/usb-icon.png"),connectionDialog);
6566

6667

6768
connectionCbo = new JComboBox();
@@ -129,7 +130,7 @@ public void refresh() {
129130
}
130131
}
131132

132-
133+
getConnectionDialog().pack();
133134
}
134135

135136
@Override

0 commit comments

Comments
 (0)