[Tinyos-contrib-commits]
CVS: tinyos-1.x/contrib/eyes/tools/java/de/tub/eyes/components
NetworkViewComponent.java, 1.7, 1.8
Till Wimmer
twimmer at users.sourceforge.net
Thu May 18 09:38:36 PDT 2006
Update of /cvsroot/tinyos/tinyos-1.x/contrib/eyes/tools/java/de/tub/eyes/components
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11565
Modified Files:
NetworkViewComponent.java
Log Message:
added revalidate() on zoom/map changes; put NodeListViewer JScrollPane; better note positioning
Index: NetworkViewComponent.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/eyes/tools/java/de/tub/eyes/components/NetworkViewComponent.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** NetworkViewComponent.java 24 Apr 2006 14:56:43 -0000 1.7
--- NetworkViewComponent.java 18 May 2006 16:38:34 -0000 1.8
***************
*** 68,72 ****
private PanelBuilder cpanelBuilder;
private JToggleButton button;
- private JButton addToGraph, removeFromGraph;
private JButton toggleLinksButton, toggleRenderButton, toggleBgButton;
private JComboBox mapCB, zoomCB;
--- 68,71 ----
***************
*** 80,83 ****
--- 79,83 ----
private GIS gis;
private int mapNo = -1;
+ private int zoomFactor = 1;
/**
***************
*** 249,254 ****
int map = mapCB.getSelectedIndex();
if (map > -1) {
- viewer.setMap(map-1);
mapNo = map-1;
setPositionAll();
}
--- 249,257 ----
int map = mapCB.getSelectedIndex();
if (map > -1) {
mapNo = map-1;
+ viewer.setMap(mapNo);
+ viewer.setZoom(1);
+ zoomCB.setSelectedIndex(1);
+ builder.getPanel().revalidate();
setPositionAll();
}
***************
*** 256,260 ****
if (viewer != null && e.getSource() == zoomCB) {
! viewer.setZoom(zoomCB.getSelectedIndex());
}
}
--- 259,266 ----
if (viewer != null && e.getSource() == zoomCB) {
! zoomFactor = zoomCB.getSelectedIndex();
! viewer.setZoom(zoomFactor);
! builder.getPanel().revalidate();
! setPositionAll();
}
}
***************
*** 312,322 ****
button = new JToggleButton("<html>Network<br>View");
button.setHorizontalAlignment(JButton.LEFT);
! button.setActionCommand("networkview");
! addToGraph = new JButton("add selected Node to Graph");
! addToGraph.setActionCommand("add");
! addToGraph.addActionListener(this);
! removeFromGraph = new JButton("remove selected Node from Graph");
! removeFromGraph.setActionCommand("remove");
! removeFromGraph.addActionListener(this);
toggleLinksButton = new JButton("Links on/off");
toggleLinksButton.setActionCommand("togglelinks");
--- 318,322 ----
button = new JToggleButton("<html>Network<br>View");
button.setHorizontalAlignment(JButton.LEFT);
!
toggleLinksButton = new JButton("Links on/off");
toggleLinksButton.setActionCommand("togglelinks");
***************
*** 329,334 ****
toggleBgButton.addActionListener(this);
! //layout = new FormLayout("f:p:g,10dlu,l:p", "f:p,10dlu,t:1dlu:g,4dlu,t:p:g,6dlu,p");
! layout = new FormLayout("f:d,10dlu,l:p", "f:p,10dlu,t:1dlu:g,4dlu,t:p:g,6dlu,p");
builder = new PanelBuilder(layout);
--- 329,334 ----
toggleBgButton.addActionListener(this);
!
! layout = new FormLayout("f:d,10dlu,p", "f:p,10dlu,t:1dlu:g,6dlu,f:p");
builder = new PanelBuilder(layout);
***************
*** 357,367 ****
JScrollPane scrViewer = new JScrollPane(viewer);
viewer.setScrollPane(scrViewer);
! builder.add(scrViewer, cc.xywh(1, 1, 1, 5, CellConstraints.FILL, CellConstraints.FILL));
! builder.add(nodePropertyViewer, cc.xy(3, 1, CellConstraints.DEFAULT, CellConstraints.TOP));
! builder.add(nodeListViewer.buildUI(), cc.xy(3,3, CellConstraints.DEFAULT, CellConstraints.TOP)); //added by Chen
! builder.add(cpanelBuilder.getPanel(), cc.xyw(1,7,3));
! // builder.add(addToGraph, cc.xy(3, 4));
! // builder.add(removeFromGraph, cc.xy(3, 5));
!
}
--- 357,366 ----
JScrollPane scrViewer = new JScrollPane(viewer);
viewer.setScrollPane(scrViewer);
! builder.add(scrViewer, cc.xywh(1, 1, 1, 3, CellConstraints.FILL, CellConstraints.FILL));
! builder.add(nodePropertyViewer, cc.xy(3, 1, CellConstraints.RIGHT, CellConstraints.TOP));
! JScrollPane scrListViewer = new JScrollPane(nodeListViewer.buildUI());
!
! builder.add(scrListViewer, cc.xy(3,3));
! builder.add(cpanelBuilder.getPanel(), cc.xyw(1,5,3));
}
***************
*** 417,434 ****
return;
}
int uart = Integer.parseInt(Demonstrator.getProps().getProperty("uartAddr", "-1"));
int [] mapXY;
int id = n.getId();
! if (uart != -1 && id != uart)
! id -= 1000;
! if ((mapXY = gis.getFloorXY(id)) == null || mapXY[0] != mapNo ) {
! n.setVisible(false);
return;
- }
int offX = Maps.getOffsetX(mapNo);
! int offY = Maps.getOffsetY(mapNo);
! n.setPosition(mapXY[1]+offX, viewer.getHeight() - (mapXY[2]+offY));
n.setVisible(true);
--- 416,438 ----
return;
}
+ else
+ n.setVisible(false);
+
int uart = Integer.parseInt(Demonstrator.getProps().getProperty("uartAddr", "-1"));
int [] mapXY;
int id = n.getId();
! //if (uart != -1 && id != uart)
! // id -= 1000;
!
! if ((mapXY = gis.getFloorXY(id, mapNo)) == null )
return;
int offX = Maps.getOffsetX(mapNo);
! int offY = Maps.getOffsetY(mapNo);
! //System.out.println("Viewer Height = " + viewer.getPreferredSize().height);
! float x = (mapXY[0]+offX) * viewer.zoomFactor[zoomFactor];
! float y = (mapXY[1]+offY) * viewer.zoomFactor[zoomFactor];
! n.setPosition((int)x, viewer.getPreferredSize().height - (int)y);
n.setVisible(true);
***************
*** 440,443 ****
--- 444,448 ----
setPosition((Node)it.next());
}
+ viewer.repaint();
}
More information about the Tinyos-contrib-commits
mailing list