From c126f318f5c6718b3911f7596616c69cdeb37926 Mon Sep 17 00:00:00 2001 From: Tgui Date: Mon, 28 Aug 2006 05:32:22 +0000 Subject: [PATCH] Cell selection fixed. git-svn-id: http://svn.3splooges.com/romraider-arch/trunk@266 d2e2e1cd-ba16-0410-be16-b7c4453c7c2d --- src/enginuity/swing/TableToolBar.java | 41 ++++++++++++--------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/src/enginuity/swing/TableToolBar.java b/src/enginuity/swing/TableToolBar.java index c879d236..fa00b4aa 100644 --- a/src/enginuity/swing/TableToolBar.java +++ b/src/enginuity/swing/TableToolBar.java @@ -41,10 +41,10 @@ import javax.swing.border.LineBorder; import com.ecm.graphics.Graph3dJPanel; import com.ecm.graphics.Graph3dManager; -import com.ecm.graphics.listeners.ModifiedDataListener; -import com.ecm.graphics.listeners.TableData; +import com.ecm.graphics.data.GraphData; +import com.ecm.graphics.data.GraphDataListener; -public class TableToolBar extends JToolBar implements MouseListener, ItemListener, ModifiedDataListener { +public class TableToolBar extends JToolBar implements MouseListener, ItemListener, GraphDataListener { private JButton incrementFine = new JButton(new ImageIcon("./graphics/icon-incfine.png")); private JButton decrementFine = new JButton(new ImageIcon("./graphics/icon-decfine.png")); @@ -305,7 +305,7 @@ public class TableToolBar extends JToolBar implements MouseListener, ItemListene //TODO Remove this when above is working Graph3dManager.openGraph3dFrame(graphValues, xValues, yValues,xLabel, yLabel, zLabel, table.getName()); - Graph3dManager.addListener(this); + GraphData.addGraphDataListener(this); } } @@ -360,26 +360,21 @@ public class TableToolBar extends JToolBar implements MouseListener, ItemListene // ****************************************** // Code for listening to graph3d data changes // ****************************************** - public void newGraphData(Vector data) { - Iterator modDataListenerIterator = data.iterator(); - while(modDataListenerIterator.hasNext()){ - TableData td = (TableData)modDataListenerIterator.next(); - + public void newGraphData(int x, int z, float value) { + Table3D table3d = (Table3D)table; + table3d.selectCellAt(x, table3d.getSizeY() - z - 1); + + //Set the value + table.setRealValue(value+""); + } + + public void selectStateChange(int x, int z, boolean value){ + if(value == true){ Table3D table3d = (Table3D)table; - table3d.selectCellAt(td.getX(), table3d.getSizeY() - td.getZ() - 1); - - //Set the value - table.setRealValue(td.getValue()+""); + table3d.selectCellAtWithoutClear(x, table3d.getSizeY() - z - 1); + }else{ + Table3D table3d = (Table3D)table; + table3d.deSelectCellAt(x, table3d.getSizeY() - z - 1); } } - - public void cellSelected(int x, int z){ - Table3D table3d = (Table3D)table; - table3d.selectCellAtWithoutClear(x, table3d.getSizeY() - z - 1); - } - - public void cellDeSelected(int x, int z){ - Table3D table3d = (Table3D)table; - table3d.deSelectCellAt(x, table3d.getSizeY() - z - 1); - } } \ No newline at end of file