mirror of https://github.com/rusefi/RomRaider.git
removed utec integration
git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@191 38686702-15cf-42e4-a595-3071df8bf5ea
This commit is contained in:
kascade
parent
186b1c7927
commit
aa1c5b3b92
|
|
@ -1,61 +0,0 @@
|
||||||
/*
|
|
||||||
* RomRaider Open-Source Tuning, Logging and Reflashing
|
|
||||||
* Copyright (C) 2006-2008 RomRaider.com
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along
|
|
||||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.romraider.logger.utec.gui.barGraph;
|
|
||||||
|
|
||||||
import javax.swing.JComponent;
|
|
||||||
import java.awt.Color;
|
|
||||||
import java.awt.Dimension;
|
|
||||||
import java.awt.GradientPaint;
|
|
||||||
import java.awt.Graphics;
|
|
||||||
import java.awt.Graphics2D;
|
|
||||||
import java.awt.geom.RoundRectangle2D;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author emorgan
|
|
||||||
* <p/>
|
|
||||||
*/
|
|
||||||
public class BarGraph extends JComponent {
|
|
||||||
|
|
||||||
public BarGraph() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Init() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public void paint(Graphics g) {
|
|
||||||
|
|
||||||
//Dimensions of bounding entity
|
|
||||||
Dimension theSize = this.getSize();
|
|
||||||
int width = theSize.width;
|
|
||||||
int height = theSize.height;
|
|
||||||
|
|
||||||
|
|
||||||
Graphics2D g2 = (Graphics2D) g;
|
|
||||||
GradientPaint gp = new GradientPaint((float) 0, (float) 0, Color.RED, (float) 0, (float) height - 10, Color.GREEN);
|
|
||||||
|
|
||||||
RoundRectangle2D rect1 = new RoundRectangle2D.Double(30, 5, 90, 390, 10, 10);
|
|
||||||
g2.setPaint(gp);
|
|
||||||
g2.fill(rect1);
|
|
||||||
g2.setPaint(Color.BLACK);
|
|
||||||
g2.draw(rect1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,219 +0,0 @@
|
||||||
/*
|
|
||||||
* RomRaider Open-Source Tuning, Logging and Reflashing
|
|
||||||
* Copyright (C) 2006-2008 RomRaider.com
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along
|
|
||||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.romraider.logger.utec.gui.bottomControl;
|
|
||||||
|
|
||||||
import com.romraider.logger.utec.commEvent.LoggerDataListener;
|
|
||||||
import com.romraider.logger.utec.commInterface.UtecInterface;
|
|
||||||
import com.romraider.logger.utec.gui.JutecGUI;
|
|
||||||
import javax.swing.JButton;
|
|
||||||
import javax.swing.JPanel;
|
|
||||||
import javax.swing.JScrollPane;
|
|
||||||
import javax.swing.JTextArea;
|
|
||||||
import java.awt.BorderLayout;
|
|
||||||
import java.awt.GridBagConstraints;
|
|
||||||
import java.awt.GridBagLayout;
|
|
||||||
import java.awt.event.ActionEvent;
|
|
||||||
import java.awt.event.ActionListener;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author emorgan
|
|
||||||
* <p/>
|
|
||||||
*/
|
|
||||||
public class BottomUtecControl extends JPanel implements ActionListener,
|
|
||||||
LoggerDataListener {
|
|
||||||
// Buttons to be used
|
|
||||||
private JButton openButton;
|
|
||||||
|
|
||||||
private JButton closeButton;
|
|
||||||
|
|
||||||
private JButton startButton;
|
|
||||||
|
|
||||||
private JButton stopButton;
|
|
||||||
|
|
||||||
// Text areas to be used
|
|
||||||
private JTextArea textFromUtec;
|
|
||||||
|
|
||||||
//public String totalLog = "";
|
|
||||||
|
|
||||||
public void setOpenPortEnabled(boolean choice) {
|
|
||||||
openButton.setEnabled(choice);
|
|
||||||
}
|
|
||||||
|
|
||||||
public BottomUtecControl() {
|
|
||||||
|
|
||||||
// Define UTEC output text Area
|
|
||||||
textFromUtec = new JTextArea();
|
|
||||||
textFromUtec.setCaretPosition(textFromUtec.getDocument().getLength());
|
|
||||||
textFromUtec.setText("--==< Live data feed from UTEC will start here. >==--\n");
|
|
||||||
JScrollPane utecOutTextScroll = new JScrollPane(textFromUtec);
|
|
||||||
|
|
||||||
// -------------------------
|
|
||||||
// Define buttons to be used
|
|
||||||
// -------------------------
|
|
||||||
// JButton button;
|
|
||||||
GridBagLayout gridbag = new GridBagLayout();
|
|
||||||
GridBagConstraints c = new GridBagConstraints();
|
|
||||||
//this.setLayout(gridbag);
|
|
||||||
this.setLayout(new BorderLayout());
|
|
||||||
c.fill = GridBagConstraints.BOTH;
|
|
||||||
c.gridwidth = 1;
|
|
||||||
|
|
||||||
// Button to open defined COM Port
|
|
||||||
openButton = new JButton("OPEN PORT");
|
|
||||||
openButton.addActionListener(this);
|
|
||||||
c.weightx = 0.5;
|
|
||||||
c.gridx = 0;
|
|
||||||
c.gridy = 0;
|
|
||||||
gridbag.setConstraints(openButton, c);
|
|
||||||
// openButton.setEnabled(false);
|
|
||||||
//this.add(openButton);
|
|
||||||
|
|
||||||
// Button to close defined COM port
|
|
||||||
closeButton = new JButton("CLOSE PORT");
|
|
||||||
closeButton.addActionListener(this);
|
|
||||||
closeButton.setEnabled(false);
|
|
||||||
c.gridx = 0;
|
|
||||||
c.gridy = 1;
|
|
||||||
gridbag.setConstraints(closeButton, c);
|
|
||||||
//this.add(closeButton);
|
|
||||||
|
|
||||||
// Button to start data capture from UTEC
|
|
||||||
startButton = new JButton("START CAPTURE");
|
|
||||||
startButton.addActionListener(this);
|
|
||||||
startButton.setEnabled(false);
|
|
||||||
c.gridx = 0;
|
|
||||||
c.gridy = 2;
|
|
||||||
gridbag.setConstraints(startButton, c);
|
|
||||||
//this.add(startButton);
|
|
||||||
|
|
||||||
// Button to stop data capture from UTEC
|
|
||||||
stopButton = new JButton("STOP CAPTURE");
|
|
||||||
stopButton.addActionListener(this);
|
|
||||||
stopButton.setEnabled(false);
|
|
||||||
c.gridx = 0;
|
|
||||||
c.gridy = 3;
|
|
||||||
gridbag.setConstraints(stopButton, c);
|
|
||||||
//this.add(stopButton);
|
|
||||||
|
|
||||||
// Text box that returns live text data from the UTEC
|
|
||||||
c.ipadx = 600;
|
|
||||||
c.gridheight = 5;
|
|
||||||
c.gridx = 1;
|
|
||||||
c.gridy = 0;
|
|
||||||
//gridbag.setConstraints(utecOutTextScroll, c);
|
|
||||||
this.add(utecOutTextScroll, BorderLayout.CENTER);
|
|
||||||
|
|
||||||
// Make this panel listen for comm events
|
|
||||||
//UtecInterface.addLoggerListener(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Implements actionPerformed
|
|
||||||
*/
|
|
||||||
public void actionPerformed(ActionEvent e) {
|
|
||||||
String cmd = e.getActionCommand();
|
|
||||||
|
|
||||||
// Open Port
|
|
||||||
if (cmd.equals("OPEN PORT")) {
|
|
||||||
System.out.println("Opening connection to defined port: "
|
|
||||||
+ UtecInterface.getPortChoiceUsed());
|
|
||||||
|
|
||||||
// Don't allow use after first press, and until after close port has
|
|
||||||
// been pressed
|
|
||||||
openButton.setEnabled(false);
|
|
||||||
closeButton.setEnabled(true);
|
|
||||||
startButton.setEnabled(true);
|
|
||||||
stopButton.setEnabled(false);
|
|
||||||
|
|
||||||
// Use interface to open connection
|
|
||||||
// UtecInterface.openConnection();
|
|
||||||
|
|
||||||
// VoiceThread vc = new VoiceThread("open port");
|
|
||||||
// vc.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close Port
|
|
||||||
if (cmd.equals("CLOSE PORT")) {
|
|
||||||
System.out.println("Closing connection to defined port");
|
|
||||||
|
|
||||||
// Use interface to close the connection to the Utec
|
|
||||||
UtecInterface.closeConnection();
|
|
||||||
|
|
||||||
// Set button states
|
|
||||||
openButton.setEnabled(true);
|
|
||||||
closeButton.setEnabled(false);
|
|
||||||
startButton.setEnabled(false);
|
|
||||||
stopButton.setEnabled(false);
|
|
||||||
|
|
||||||
// VoiceThread vc = new VoiceThread("close port.");
|
|
||||||
// vc.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Start Capture
|
|
||||||
if (cmd.equals("START CAPTURE")) {
|
|
||||||
System.out.println("Starting data capture from the UTEC");
|
|
||||||
|
|
||||||
// Use interface to pull logging data from the Utec
|
|
||||||
//UtecInterface.startDataLogFromUtec();
|
|
||||||
|
|
||||||
// Set button states
|
|
||||||
startButton.setEnabled(false);
|
|
||||||
stopButton.setEnabled(true);
|
|
||||||
openButton.setEnabled(false);
|
|
||||||
closeButton.setEnabled(false);
|
|
||||||
|
|
||||||
// Disable log save option
|
|
||||||
JutecGUI.getInstance().saveItem.setEnabled(false);
|
|
||||||
|
|
||||||
// VoiceThread vc = new VoiceThread("start capture");
|
|
||||||
// vc.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stop Capture
|
|
||||||
if (cmd.equals("STOP CAPTURE")) {
|
|
||||||
System.out.println("Stopping data capture from the UTEC");
|
|
||||||
|
|
||||||
// Use interface to reset the state of the Utec
|
|
||||||
UtecInterface.resetUtec();
|
|
||||||
|
|
||||||
// Set button states
|
|
||||||
startButton.setEnabled(true);
|
|
||||||
stopButton.setEnabled(false);
|
|
||||||
closeButton.setEnabled(true);
|
|
||||||
openButton.setEnabled(false);
|
|
||||||
|
|
||||||
// Enable log save option
|
|
||||||
JutecGUI.getInstance().saveItem.setEnabled(true);
|
|
||||||
|
|
||||||
// VoiceThread vc = new VoiceThread("stop capture");
|
|
||||||
// vc.start();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void getCommEvent(double[] doubleDarta) {
|
|
||||||
|
|
||||||
//String utecData = e.getUtecBuffer();
|
|
||||||
//totalLog += utecData;
|
|
||||||
//textFromUtec.append(utecData);
|
|
||||||
//textFromUtec.setCaretPosition(textFromUtec.getDocument().getLength());
|
|
||||||
|
|
||||||
// System.out.println("Adding data to the text AREA");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,457 +0,0 @@
|
||||||
/*
|
|
||||||
* RomRaider Open-Source Tuning, Logging and Reflashing
|
|
||||||
* Copyright (C) 2006-2008 RomRaider.com
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along
|
|
||||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package com.romraider.logger.utec.impl;
|
|
||||||
|
|
||||||
import com.romraider.NewGUI.data.ApplicationStateManager;
|
|
||||||
import com.romraider.NewGUI.interfaces.TuningEntity;
|
|
||||||
import com.romraider.NewGUI.interfaces.TuningEntityListener;
|
|
||||||
import com.romraider.logger.utec.commInterface.UtecInterface;
|
|
||||||
import com.romraider.logger.utec.gui.JutecToolBar;
|
|
||||||
import com.romraider.logger.utec.gui.mapTabs.UtecDataManager;
|
|
||||||
import com.romraider.logger.utec.mapData.UtecMapData;
|
|
||||||
import org.apache.log4j.Logger;
|
|
||||||
import javax.swing.JFileChooser;
|
|
||||||
import javax.swing.JMenu;
|
|
||||||
import javax.swing.JMenuItem;
|
|
||||||
import javax.swing.JOptionPane;
|
|
||||||
import javax.swing.JToolBar;
|
|
||||||
import java.awt.event.ActionEvent;
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileWriter;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.Vector;
|
|
||||||
|
|
||||||
public class UtecTuningEntityImpl implements TuningEntity {
|
|
||||||
private static final Logger LOGGER = Logger.getLogger(UtecTuningEntityImpl.class);
|
|
||||||
|
|
||||||
// Misc items
|
|
||||||
private String currentPort = null;
|
|
||||||
private int fileChosen;
|
|
||||||
private JFileChooser fileChooser = new JFileChooser();
|
|
||||||
|
|
||||||
|
|
||||||
private Vector<JMenu> jMenuItems = new Vector<JMenu>();
|
|
||||||
|
|
||||||
// Menu Items
|
|
||||||
public JMenuItem saveItem = new JMenuItem("Save Log");
|
|
||||||
public JMenuItem saveMapItem = new JMenuItem("Save Map To File");
|
|
||||||
public JMenuItem resetUtec = new JMenuItem("Force Utec Reset");
|
|
||||||
public JMenuItem startLogging = new JMenuItem("Start Logging");
|
|
||||||
public JMenuItem closePort = new JMenuItem("Close Port");
|
|
||||||
public JMenuItem loadMapOne = new JMenuItem("Load Map #1");
|
|
||||||
public JMenuItem loadMapTwo = new JMenuItem("Load Map #2");
|
|
||||||
public JMenuItem loadMapThree = new JMenuItem("Load Map #3");
|
|
||||||
public JMenuItem loadMapFour = new JMenuItem("Load Map #4");
|
|
||||||
public JMenuItem loadMapFive = new JMenuItem("Load Map #5");
|
|
||||||
|
|
||||||
public JMenuItem saveMapOne = new JMenuItem("Save To Map #1");
|
|
||||||
public JMenuItem saveMapTwo = new JMenuItem("Save To Map #2");
|
|
||||||
public JMenuItem saveMapThree = new JMenuItem("Save To Map #3");
|
|
||||||
public JMenuItem saveMapFour = new JMenuItem("Save To Map #4");
|
|
||||||
public JMenuItem saveMapFive = new JMenuItem("Save To Map #5");
|
|
||||||
|
|
||||||
private TuningEntityListener theTEL;
|
|
||||||
|
|
||||||
public UtecTuningEntityImpl() {
|
|
||||||
initJMenu();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void initJMenu() {
|
|
||||||
|
|
||||||
// *********************************************
|
|
||||||
// Add a menu item for basic application actions
|
|
||||||
// *********************************************
|
|
||||||
// Define the menu system
|
|
||||||
JMenu fileMenu = new JMenu("File");
|
|
||||||
saveItem.addActionListener(this);
|
|
||||||
saveMapItem.addActionListener(this);
|
|
||||||
fileMenu.add(saveItem);
|
|
||||||
fileMenu.add(saveMapItem);
|
|
||||||
jMenuItems.add(fileMenu);
|
|
||||||
|
|
||||||
// ******************************************
|
|
||||||
// Add menu item to coordinate Utec operation
|
|
||||||
// ******************************************
|
|
||||||
JMenu actionMenu = new JMenu("Actions");
|
|
||||||
this.resetUtec.addActionListener(this);
|
|
||||||
this.startLogging.addActionListener(this);
|
|
||||||
this.closePort.addActionListener(this);
|
|
||||||
actionMenu.add(this.resetUtec);
|
|
||||||
actionMenu.add(this.startLogging);
|
|
||||||
actionMenu.add(this.closePort);
|
|
||||||
jMenuItems.add(actionMenu);
|
|
||||||
|
|
||||||
// ****************************************
|
|
||||||
// Add menu item to pull maps from the utec
|
|
||||||
// ****************************************
|
|
||||||
JMenu getMapsMenu = new JMenu("Load Map");
|
|
||||||
loadMapOne.addActionListener(this);
|
|
||||||
loadMapTwo.addActionListener(this);
|
|
||||||
loadMapThree.addActionListener(this);
|
|
||||||
loadMapFour.addActionListener(this);
|
|
||||||
loadMapFive.addActionListener(this);
|
|
||||||
getMapsMenu.add(loadMapOne);
|
|
||||||
getMapsMenu.add(loadMapTwo);
|
|
||||||
getMapsMenu.add(loadMapThree);
|
|
||||||
getMapsMenu.add(loadMapFour);
|
|
||||||
getMapsMenu.add(loadMapFive);
|
|
||||||
jMenuItems.add(getMapsMenu);
|
|
||||||
|
|
||||||
// ****************************************
|
|
||||||
// Add menu item to save maps to the utec
|
|
||||||
// ****************************************
|
|
||||||
JMenu setMapsMenu = new JMenu("Save Map");
|
|
||||||
saveMapOne.addActionListener(this);
|
|
||||||
saveMapTwo.addActionListener(this);
|
|
||||||
saveMapThree.addActionListener(this);
|
|
||||||
saveMapFour.addActionListener(this);
|
|
||||||
saveMapFive.addActionListener(this);
|
|
||||||
setMapsMenu.add(saveMapOne);
|
|
||||||
setMapsMenu.add(saveMapTwo);
|
|
||||||
setMapsMenu.add(saveMapThree);
|
|
||||||
setMapsMenu.add(saveMapFour);
|
|
||||||
setMapsMenu.add(saveMapFive);
|
|
||||||
jMenuItems.add(setMapsMenu);
|
|
||||||
|
|
||||||
// ***************************************
|
|
||||||
// Add a menu item for comm port selection
|
|
||||||
// ***************************************
|
|
||||||
JMenu portsMenu = new JMenu("Select Port");
|
|
||||||
|
|
||||||
// Gather list of ports from interface
|
|
||||||
Vector portsVector = UtecInterface.getPortsVector();
|
|
||||||
|
|
||||||
Iterator portsIterator = portsVector.iterator();
|
|
||||||
int counter = 0;
|
|
||||||
while (portsIterator.hasNext()) {
|
|
||||||
counter++;
|
|
||||||
Object o = portsIterator.next();
|
|
||||||
String theName = (String) o;
|
|
||||||
JMenuItem item = new JMenuItem(theName);
|
|
||||||
item.setName(theName);
|
|
||||||
item.addActionListener(this);
|
|
||||||
portsMenu.add(item);
|
|
||||||
}
|
|
||||||
jMenuItems.add(portsMenu);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void removeTuningGroup(String tuningGroup) {
|
|
||||||
System.out.println("UTE removing tuning group:" + tuningGroup);
|
|
||||||
|
|
||||||
UtecDataManager.removeTuningGroup(tuningGroup);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Object[][] getTableData(String tableIdentifier) {
|
|
||||||
System.out.println("UTEC getTableData Impl tablename:" + tableIdentifier);
|
|
||||||
Object[][] data = null;
|
|
||||||
|
|
||||||
if (UtecDataManager.getAllMaps().size() == 0) {
|
|
||||||
System.out.println("UTEC Impl Current map data is null");
|
|
||||||
return new Double[0][0];
|
|
||||||
}
|
|
||||||
|
|
||||||
Iterator mapIterator = UtecDataManager.getAllMaps().iterator();
|
|
||||||
while (mapIterator.hasNext()) {
|
|
||||||
UtecMapData newMapData = (UtecMapData) mapIterator.next();
|
|
||||||
String mapName = newMapData.getMapName();
|
|
||||||
|
|
||||||
if (tableIdentifier.equals("Fuel:" + mapName)) {
|
|
||||||
System.out.println("UTE Fuel");
|
|
||||||
data = newMapData.getFuelMap();
|
|
||||||
return data;
|
|
||||||
} else if (tableIdentifier.equals("Timing:" + mapName)) {
|
|
||||||
System.out.println("UTE Timing");
|
|
||||||
data = newMapData.getTimingMap();
|
|
||||||
return data;
|
|
||||||
} else if (tableIdentifier.equals("Boost:" + mapName)) {
|
|
||||||
System.out.println("UTE Boost");
|
|
||||||
data = newMapData.getBoostMap();
|
|
||||||
return data;
|
|
||||||
} else if (tableIdentifier.equals("MapName:" + mapName)) {
|
|
||||||
System.out.println("UTE MapName");
|
|
||||||
data = new Object[1][1];
|
|
||||||
data[0][0] = newMapData.getMapName();
|
|
||||||
return data;
|
|
||||||
} else {
|
|
||||||
System.out.println("UTE returning empty data");
|
|
||||||
data = new Double[0][0];
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
return data;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void init(TuningEntityListener theTEL) {
|
|
||||||
this.theTEL = theTEL;
|
|
||||||
|
|
||||||
// Initialise tree
|
|
||||||
// ETreeNode root = new ETreeNode("UTEC: No map selected....", new TableMetaData(TableMetaData.CATEGORY,0.0,0.0,new Object[0], null, null, false,"","","", this));
|
|
||||||
|
|
||||||
// Inform main GUI of initial tree
|
|
||||||
//this.theTEL.addNewTuningGroup(root);
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getName() {
|
|
||||||
return "UTEC Tuning Entity";
|
|
||||||
}
|
|
||||||
|
|
||||||
public Vector<JMenu> getMenuItems() {
|
|
||||||
|
|
||||||
return jMenuItems;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Implements actionPerformed
|
|
||||||
* <p/>
|
|
||||||
* Action listeners for buttons/menus that throw them
|
|
||||||
*/
|
|
||||||
public void actionPerformed(ActionEvent e) {
|
|
||||||
String cmd = e.getActionCommand();
|
|
||||||
|
|
||||||
// Open Port
|
|
||||||
if (cmd.equals("New")) {
|
|
||||||
System.out.println("New action occuring");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close Port
|
|
||||||
else if (cmd.equals("Open")) {
|
|
||||||
System.out.println("Open action occuring");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Start Capture
|
|
||||||
else if (cmd.equals("Save Log")) {
|
|
||||||
String saveFileName = null;
|
|
||||||
System.out.println("Save action occuring");
|
|
||||||
fileChosen = fileChooser.showSaveDialog(null);
|
|
||||||
if (fileChosen == JFileChooser.APPROVE_OPTION) {
|
|
||||||
saveFileName = fileChooser.getSelectedFile().getPath();
|
|
||||||
// selectedFile = fileChooser.getSelectedFile();
|
|
||||||
try {
|
|
||||||
File file = new File(saveFileName);
|
|
||||||
FileWriter out = new FileWriter(file);
|
|
||||||
//out.write(bottomPanel.totalLog);
|
|
||||||
out.close();
|
|
||||||
//bottomPanel.totalLog = "";
|
|
||||||
} catch (IOException e2) {
|
|
||||||
System.out
|
|
||||||
.println("Couldn't save file " + saveFileName);
|
|
||||||
e2.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (cmd.equals("Save Map To File")) {
|
|
||||||
LOGGER.info("Saving map to file.");
|
|
||||||
|
|
||||||
if (UtecDataManager.getCurrentMapData() != null) {
|
|
||||||
|
|
||||||
String saveFileName = null;
|
|
||||||
LOGGER.info("Save map now.");
|
|
||||||
fileChosen = fileChooser.showSaveDialog(null);
|
|
||||||
if (fileChosen == JFileChooser.APPROVE_OPTION) {
|
|
||||||
saveFileName = fileChooser.getSelectedFile().getPath();
|
|
||||||
UtecDataManager.getCurrentMapData().writeMapToFile(saveFileName);
|
|
||||||
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
LOGGER.info("Map is null.");
|
|
||||||
}
|
|
||||||
} else if (cmd.equals("Load Map #1")) {
|
|
||||||
System.out.println("Starting to get map 1");
|
|
||||||
UtecInterface.pullMapData(1);
|
|
||||||
} else if (cmd.equals("Load Map #2")) {
|
|
||||||
System.out.println("Starting to get map 2");
|
|
||||||
UtecInterface.pullMapData(2);
|
|
||||||
} else if (cmd.equals("Load Map #3")) {
|
|
||||||
System.out.println("Starting to get map 3");
|
|
||||||
UtecInterface.pullMapData(3);
|
|
||||||
} else if (cmd.equals("Load Map #4")) {
|
|
||||||
System.out.println("Starting to get map 4");
|
|
||||||
UtecInterface.pullMapData(4);
|
|
||||||
} else if (cmd.equals("Load Map #5")) {
|
|
||||||
System.out.println("Starting to get map 5");
|
|
||||||
UtecInterface.pullMapData(5);
|
|
||||||
} else if (cmd.equals("Save To Map #1")) {
|
|
||||||
System.out.println("Starting to save map #1");
|
|
||||||
Iterator mapIterator = UtecDataManager.getAllMaps().iterator();
|
|
||||||
while (mapIterator.hasNext()) {
|
|
||||||
UtecMapData mapData = (UtecMapData) mapIterator.next();
|
|
||||||
if (mapData.getMapName().equals(ApplicationStateManager.getSelectedTuningGroup())) {
|
|
||||||
UtecInterface.sendMapData(1, mapData);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (cmd.equals("Save To Map #2")) {
|
|
||||||
System.out.println("Starting to save map #2");
|
|
||||||
Iterator mapIterator = UtecDataManager.getAllMaps().iterator();
|
|
||||||
while (mapIterator.hasNext()) {
|
|
||||||
UtecMapData mapData = (UtecMapData) mapIterator.next();
|
|
||||||
if (mapData.getMapName().equals(ApplicationStateManager.getSelectedTuningGroup())) {
|
|
||||||
UtecInterface.sendMapData(2, mapData);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (cmd.equals("Save To Map #3")) {
|
|
||||||
System.out.println("Starting to save map #3");
|
|
||||||
Iterator mapIterator = UtecDataManager.getAllMaps().iterator();
|
|
||||||
while (mapIterator.hasNext()) {
|
|
||||||
UtecMapData mapData = (UtecMapData) mapIterator.next();
|
|
||||||
if (mapData.getMapName().equals(ApplicationStateManager.getSelectedTuningGroup())) {
|
|
||||||
UtecInterface.sendMapData(3, mapData);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (cmd.equals("Save To Map #4")) {
|
|
||||||
System.out.println("Starting to save map #4");
|
|
||||||
Iterator mapIterator = UtecDataManager.getAllMaps().iterator();
|
|
||||||
while (mapIterator.hasNext()) {
|
|
||||||
UtecMapData mapData = (UtecMapData) mapIterator.next();
|
|
||||||
if (mapData.getMapName().equals(ApplicationStateManager.getSelectedTuningGroup())) {
|
|
||||||
UtecInterface.sendMapData(4, mapData);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (cmd.equals("Save To Map #5")) {
|
|
||||||
System.out.println("Starting to save map #5");
|
|
||||||
Iterator mapIterator = UtecDataManager.getAllMaps().iterator();
|
|
||||||
while (mapIterator.hasNext()) {
|
|
||||||
UtecMapData mapData = (UtecMapData) mapIterator.next();
|
|
||||||
if (mapData.getMapName().equals(ApplicationStateManager.getSelectedTuningGroup())) {
|
|
||||||
UtecInterface.sendMapData(5, mapData);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (cmd.equals("Force Utec Reset")) {
|
|
||||||
System.out.println("Resetting the Utec");
|
|
||||||
UtecInterface.resetUtec();
|
|
||||||
} else if (cmd.equals("Start Logging")) {
|
|
||||||
System.out.println("Kicking off the logging.");
|
|
||||||
UtecInterface.startLoggerDataFlow();
|
|
||||||
} else if (cmd.equals("Close Port")) {
|
|
||||||
System.out.println("Closing access to the currently opened port (if any).");
|
|
||||||
UtecInterface.closeConnection();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only non explicitly defined actions are those generated by ports.
|
|
||||||
// Since an arbitrary machine could have any number of serial ports
|
|
||||||
// its impossible to hard code choices based on menu items generated
|
|
||||||
// on the fly.
|
|
||||||
// Must pull the calling object and interrogate
|
|
||||||
else {
|
|
||||||
JMenuItem theItem = (JMenuItem) e.getSource();
|
|
||||||
String portChoice = theItem.getName();
|
|
||||||
System.out.println("Port chosen: " + portChoice);
|
|
||||||
currentPort = portChoice;
|
|
||||||
UtecInterface.setPortChoice(currentPort);
|
|
||||||
UtecInterface.openConnection();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public JToolBar getToolBar() {
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
return new JutecToolBar(this.theTEL, this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTableData(String tableIdentifier, Object[][] data) {
|
|
||||||
System.out.println("utec save data requested:" + tableIdentifier);
|
|
||||||
|
|
||||||
Iterator mapIterate = UtecDataManager.getAllMaps().iterator();
|
|
||||||
while (mapIterate.hasNext()) {
|
|
||||||
UtecMapData mapData = (UtecMapData) mapIterate.next();
|
|
||||||
String[] split = tableIdentifier.split(":");
|
|
||||||
String mapType = split[0];
|
|
||||||
String tableName = split[1];
|
|
||||||
if (mapData.getMapName().equals(tableName)) {
|
|
||||||
if (mapType.equals("Fuel")) {
|
|
||||||
System.out.println("UTE: Fuel Set");
|
|
||||||
mapData.setFuelMap(convertObjToDouble(data));
|
|
||||||
} else if (mapType.equals("Boost")) {
|
|
||||||
System.out.println("UTE: Boost Set");
|
|
||||||
mapData.setBoostMap(convertObjToDouble(data));
|
|
||||||
} else if (mapType.equals("Timing")) {
|
|
||||||
System.out.println("UTE: Timing Set");
|
|
||||||
mapData.setTimingMap(convertObjToDouble(data));
|
|
||||||
} else if (mapType.equals("MapName")) {
|
|
||||||
System.out.println("UTE: MapName Set");
|
|
||||||
mapData.setMapName((String) data[0][0]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Helper method for when dealing with fuel timing and boost tables
|
|
||||||
*
|
|
||||||
* @param objData
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
private Double[][] convertObjToDouble(Object[][] objData) {
|
|
||||||
int length = objData.length;
|
|
||||||
int width = objData[0].length;
|
|
||||||
|
|
||||||
Double[][] newData = new Double[length][width];
|
|
||||||
|
|
||||||
for (int i = 0; i < length; i++) {
|
|
||||||
for (int j = 0; j < width; j++) {
|
|
||||||
newData[i][j] = (Double) objData[i][j];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return newData;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void notifySystemExit() {
|
|
||||||
LOGGER.info("Saving map to file.");
|
|
||||||
|
|
||||||
String tuningGroup = ApplicationStateManager.getSelectedTuningGroup();
|
|
||||||
int mapChangeCount = this.theTEL.getMapChangeCount(ApplicationStateManager.getCurrentTuningEntity(), tuningGroup);
|
|
||||||
LOGGER.info("Number of maps changed: " + mapChangeCount);
|
|
||||||
int returnValue = 0;
|
|
||||||
if (mapChangeCount > 0) {
|
|
||||||
returnValue = JOptionPane.showConfirmDialog(null, "Tuning Group contains changes, save before continuing?", "Warning", JOptionPane.YES_NO_OPTION);
|
|
||||||
|
|
||||||
if (returnValue == 0) {
|
|
||||||
this.theTEL.saveMaps();
|
|
||||||
|
|
||||||
// Kick off the saving file to disk
|
|
||||||
String temp = ApplicationStateManager.getSelectedTuningGroup();
|
|
||||||
UtecMapData mapData = null;
|
|
||||||
Iterator mapIterate = UtecDataManager.getAllMaps().iterator();
|
|
||||||
while (mapIterate.hasNext()) {
|
|
||||||
mapData = (UtecMapData) mapIterate.next();
|
|
||||||
if (mapData.getMapName().equals(temp)) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
String saveFileName = null;
|
|
||||||
fileChosen = fileChooser.showSaveDialog(null);
|
|
||||||
if (fileChosen == JFileChooser.APPROVE_OPTION) {
|
|
||||||
saveFileName = fileChooser.getSelectedFile().getPath();
|
|
||||||
mapData.writeMapToFile(saveFileName);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.theTEL.removeTuningGroup(tuningGroup);
|
|
||||||
|
|
||||||
} else if (returnValue == 1) {
|
|
||||||
this.theTEL.removeTuningGroup(tuningGroup);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
UtecInterface.closeConnection();
|
|
||||||
this.theTEL.readyForExit();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue