From 9dcc4a5025cb582cb2eaa16909fc50110d854105 Mon Sep 17 00:00:00 2001 From: Tgui Date: Wed, 21 Feb 2007 05:57:21 +0000 Subject: [PATCH] Map changes added datamanager now. git-svn-id: http://svn.3splooges.com/romraider-arch/trunk@537 d2e2e1cd-ba16-0410-be16-b7c4453c7c2d --- .../logger/utec/gui/mapTabs/DataManager.java | 24 ++++++++++++++----- .../utec/gui/mapTabs/UtecTableModel.java | 15 ++++++++++++ .../logger/utec/mapData/UtecMapData.java | 12 ++++++++++ 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/src/enginuity/logger/utec/gui/mapTabs/DataManager.java b/src/enginuity/logger/utec/gui/mapTabs/DataManager.java index 61518621..0b68c668 100644 --- a/src/enginuity/logger/utec/gui/mapTabs/DataManager.java +++ b/src/enginuity/logger/utec/gui/mapTabs/DataManager.java @@ -3,7 +3,7 @@ package enginuity.logger.utec.gui.mapTabs; import enginuity.logger.utec.mapData.UtecMapData; public class DataManager { - private static UtecMapData currentData = null; + private static UtecMapData currentMapData = null; private static UtecTableModel fuelListener = null; @@ -12,10 +12,12 @@ public class DataManager { public static void setCurrentMap(UtecMapData newUtecMap){ - currentData = newUtecMap; - fuelListener.replaceData(currentData.getFuelMap()); - boostListener.replaceData(currentData.getBoostMap()); - timingListener.replaceData(currentData.getTimingMap()); + currentMapData = newUtecMap; + + // Call listeners + fuelListener.replaceData(currentMapData.getFuelMap()); + boostListener.replaceData(currentMapData.getBoostMap()); + timingListener.replaceData(currentMapData.getTimingMap()); } @@ -33,5 +35,15 @@ public class DataManager { DataManager.timingListener = timingListener; } - + public static void setFuelMapValue(int row, int col, double value){ + currentMapData.setFuelMapValue(row, col, value); + } + + public static void setBoostMapValue(int row, int col, double value){ + currentMapData.setBoostMapValue(row, col, value); + } + + public static void setTimingMapValue(int row, int col, double value){ + currentMapData.setTimingMapValue(row, col, value); + } } diff --git a/src/enginuity/logger/utec/gui/mapTabs/UtecTableModel.java b/src/enginuity/logger/utec/gui/mapTabs/UtecTableModel.java index 7513bb54..be3d39ac 100644 --- a/src/enginuity/logger/utec/gui/mapTabs/UtecTableModel.java +++ b/src/enginuity/logger/utec/gui/mapTabs/UtecTableModel.java @@ -10,7 +10,10 @@ public class UtecTableModel extends AbstractTableModel { String test = ""; + private int identifier = 0; + public UtecTableModel(int identifier, double[][] initialData) { + this.identifier = identifier; this.data = initialData; @@ -51,6 +54,18 @@ public class UtecTableModel extends AbstractTableModel { System.out.println("Not a valid number entered."); } data[col][row] = temp; + + // Update current map in scope + if(this.identifier == MapJPanel.FUELMAP){ + DataManager.setFuelMapValue(row, col, temp); + } + else if(this.identifier == MapJPanel.TIMINGMAP){ + DataManager.setTimingMapValue(row, col, temp); + } + else if(this.identifier == MapJPanel.BOOSTMAP){ + DataManager.setBoostMapValue(row, col, temp); + } + this.fireTableDataChanged(); } diff --git a/src/enginuity/logger/utec/mapData/UtecMapData.java b/src/enginuity/logger/utec/mapData/UtecMapData.java index 4290e6ea..489e3161 100644 --- a/src/enginuity/logger/utec/mapData/UtecMapData.java +++ b/src/enginuity/logger/utec/mapData/UtecMapData.java @@ -471,4 +471,16 @@ public class UtecMapData { public String getMapName() { return mapName; } + + public void setFuelMapValue(int row, int col, double value){ + this.fuelMap[col][row] = value; + } + + public void setBoostMapValue(int row, int col, double value){ + this.boostMap[col][row] = value; + } + + public void setTimingMapValue(int row, int col, double value){ + this.timingMap[col][row] = value; + } } \ No newline at end of file