deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bug fix: corrected sort with average numbers

Browse source
This commit is contained in:
nifi 2010-10-14 18:53:08 +00:00
parent b49db633f3
commit 5a94145f7e
2 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
examples/sky-shell/src/se/sics/contiki/collect/Node.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: Node.java,v 1.8 2010/10/10 22:39:09 nifi Exp $ * $Id: Node.java,v 1.9 2010/10/14 18:53:08 nifi Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
@ -34,8 +34,8 @@
* *
* Authors : Joakim Eriksson, Niclas Finne * Authors : Joakim Eriksson, Niclas Finne
* Created : 3 jul 2008 * Created : 3 jul 2008
* Updated : $Date: 2010/10/10 22:39:09 $ * Updated : $Date: 2010/10/14 18:53:08 $
* $Revision: 1.8 $ * $Revision: 1.9 $
*/ */
package se.sics.contiki.collect; package se.sics.contiki.collect;
@ -61,8 +61,12 @@ public class Node implements Comparable<Node> {
private long lastActive; private long lastActive;
public Node(String nodeID) { public Node(String nodeID) {
this(nodeID, nodeID);
}
public Node(String nodeID, String nodeName) {
this.id = nodeID; this.id = nodeID;
this.name = nodeID; this.name = nodeName;
sensorDataAggregator = new SensorDataAggregator(this); sensorDataAggregator = new SensorDataAggregator(this);
} }

29
examples/sky-shell/src/se/sics/contiki/collect/gui/NodeInfoPanel.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: NodeInfoPanel.java,v 1.13 2010/10/14 17:00:56 nifi Exp $ * $Id: NodeInfoPanel.java,v 1.14 2010/10/14 18:53:08 nifi Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
@ -34,8 +34,8 @@
* *
* Authors : Joakim Eriksson, Niclas Finne * Authors : Joakim Eriksson, Niclas Finne
* Created : 6 sep 2010 * Created : 6 sep 2010
* Updated : $Date: 2010/10/14 17:00:56 $ * Updated : $Date: 2010/10/14 18:53:08 $
* $Revision: 1.13 $ * $Revision: 1.14 $
*/ */
package se.sics.contiki.collect.gui; package se.sics.contiki.collect.gui;
@ -46,6 +46,7 @@ import java.awt.Font;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.util.Comparator;
import java.util.Properties; import java.util.Properties;
import javax.swing.AbstractAction; import javax.swing.AbstractAction;
@ -77,6 +78,16 @@ public class NodeInfoPanel extends JPanel implements Visualizer, Configurable {
private static final long serialVersionUID = -1060893468047793431L; private static final long serialVersionUID = -1060893468047793431L;
private static Comparator<Number> NUMBER_COMPARATOR = new Comparator<Number>() {
public int compare(Number o1, Number o2) {
double v1 = o1.doubleValue();
double v2 = o2.doubleValue();
return (v1 < v2 ? -1 : (v1 == v2 ? 0 : 1));
}
};
private final CollectServer server; private final CollectServer server;
private final String category; private final String category;
private final JTable table; private final JTable table;
@ -234,13 +245,19 @@ public class NodeInfoPanel extends JPanel implements Visualizer, Configurable {
}; };
// Do not sort column when clicking between the columns (resizing) // Do not sort column when clicking between the columns (resizing)
table.setRowSorter(new TableRowSorter<NodeModel>(nodeModel) { TableRowSorter<NodeModel> sorter = new TableRowSorter<NodeModel>(nodeModel) {
public void toggleSortOrder(int column) { public void toggleSortOrder(int column) {
if(table.getTableHeader().getCursor().getType() != Cursor.E_RESIZE_CURSOR) { if(table.getTableHeader().getCursor().getType() != Cursor.E_RESIZE_CURSOR) {
super.toggleSortOrder(column); super.toggleSortOrder(column);
} }
} }
}); };
for(int c = 0; c < columns.length; c++) {
if (columns[c].dataClass == Number.class) {
sorter.setComparator(c, NUMBER_COMPARATOR);
}
}
table.setRowSorter(sorter);
// Pack the column when double clicking between columns (resizing) // Pack the column when double clicking between columns (resizing)
table.getTableHeader().addMouseListener(new MouseAdapter() { table.getTableHeader().addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
@ -514,7 +531,7 @@ public class NodeInfoPanel extends JPanel implements Visualizer, Configurable {
public static abstract class TableData extends AbstractAction { public static abstract class TableData extends AbstractAction {
private static final long serialVersionUID = -3045755073722516926L; private static final long serialVersionUID = -3045755073722516926L;
private final static Node AVERAGE_NODE = new Node("Avg"); private final static Node AVERAGE_NODE = new Node("99999999.9", "Avg");
public final String name; public final String name;
public final Class<?> dataClass; public final Class<?> dataClass;