rusefi
/
RomRaider
mirror of https://github.com/rusefi/RomRaider.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Internationalize NCSLearningTableValues Class

This commit is contained in:
Dale Schultz 2019-03-28 22:35:38 -04:00
parent be37370c35
commit 49cc3cfbc8
3 changed files with 54 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
i18n/com/romraider/logger/ecu/comms/learning/NCSLearningTableValues.properties Normal file
View File

@ -0,0 +1,11 @@
DEFNOTFOUND = ECU definition file not found or undefined. Learning\nTable Values cannot be properly retrieved until an ECU\ndefinition is defined in the Editor's Definition Manager.
DEFMISSING = ECU Definition Missing
GETLTFTVALUES = Retrieving vehicle info & LTFT values ...
GETCOLRANGES = Retrieving LTFT column ranges ...
GETROWRANGES = Retrieving LTFT row ranges ...
GETTABLELTFT = Retrieving Table {0} LTFT row {1} values ...
ERRTABLELTFT = Error retrieving LTFT data values, missing LTFT reference
LTFTSUCCESS = Learning Table Values retrieved successfully.
ERRLTFT = Unable to retrieve current ECU learning values
ERRCONNECT = {0}\nError performing Learning Table Values read.\nCheck the following:\n* Logger has successfully connected to the ECU\n* Correct COM port is selected (if not Openport 2)\n* Cable is connected properly\n* Ignition is ON
LTV = Learning Table Values

11
i18n/com/romraider/logger/ecu/comms/learning/NCSLearningTableValues_fr_CA.properties Normal file
View File

@ -0,0 +1,11 @@
DEFNOTFOUND = Fichier de définition de l'ECU non trouvé ou non défini.\nLes valeurs nTable d'apprentissage ne peuvent pas être\nrécupérées correctement tant qu'une définition d'écus n'est\npas définie dans le gestionnaire de définitions de l'éditeur.
DEFMISSING = Définition de l'ECU manquante
GETLTFTVALUES = Récupération des informations du véhicule et des valeurs LTFT ...
GETCOLRANGES = Récupération des plages de colonnes LTFT ...
GETROWRANGES = Récupération des plages de lignes LTFT ...
GETTABLELTFT = Récupération des valeurs de la ligne {1} de la table {0} de LTFT ...
ERRTABLELTFT = Erreur lors de l'extraction des valeurs de données LTFT, référence LTFT manquante
LTFTSUCCESS = Apprentissage des valeurs de la table récupérées avec succès.
ERRLTFT = Impossible de récupérer les valeurs d'apprentissage actuelles du calculateur
ERRCONNECT = {0}\nErreur lors de la lecture des valeurs de la table d''apprentissage.\nVérifiez les éléments suivants:\n* L''enregistreur s''est connecté avec succès à l''ECU\n* Le port COM correct est sélectionné (si ce n''est pas Openport 2)\n* Le câble est connecté correctement\n* Le contact est activé
LTV = Apprentissage des valeurs de la table

64
src/main/java/com/romraider/logger/ecu/comms/learning/NCSLearningTableValues.java
View File

@ -1,6 +1,6 @@
/* /*
* RomRaider Open-Source Tuning, Logging and Reflashing * RomRaider Open-Source Tuning, Logging and Reflashing
* Copyright (C) 2006-2018 RomRaider.com * Copyright (C) 2006-2019 RomRaider.com
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -27,6 +27,7 @@ import static javax.swing.JOptionPane.showMessageDialog;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.text.MessageFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -35,6 +36,7 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.ResourceBundle;
import javax.swing.SwingWorker; import javax.swing.SwingWorker;
@ -65,6 +67,7 @@ import com.romraider.logger.ecu.ui.paramlist.ParameterListTableModel;
import com.romraider.logger.ecu.ui.paramlist.ParameterRow; import com.romraider.logger.ecu.ui.paramlist.ParameterRow;
import com.romraider.logger.ecu.ui.swing.tools.NCSLearningTableValuesResultsPanel; import com.romraider.logger.ecu.ui.swing.tools.NCSLearningTableValuesResultsPanel;
import com.romraider.util.ParamChecker; import com.romraider.util.ParamChecker;
import com.romraider.util.ResourceUtil;
/** /**
@ -77,6 +80,8 @@ public final class NCSLearningTableValues extends SwingWorker<Void, Void>
private static final Logger LOGGER = private static final Logger LOGGER =
Logger.getLogger(NCSLearningTableValues.class); Logger.getLogger(NCSLearningTableValues.class);
private static final ResourceBundle rb = new ResourceUtil().getBundle(
NCSLearningTableValues.class.getName());
private static final List<String> AF_TABLE_NAMES = Arrays.asList( private static final List<String> AF_TABLE_NAMES = Arrays.asList(
"A/F Learning #1 Airflow Ranges", "A/F Learning #1 Airflow Ranges",
"A/F Learning #1 Airflow Ranges ", "A/F Learning #1 Airflow Ranges ",
@ -127,10 +132,8 @@ public final class NCSLearningTableValues extends SwingWorker<Void, Void>
Document document = null; Document document = null;
if (ecuDef.getEcuDefFile() == null) { if (ecuDef.getEcuDefFile() == null) {
showMessageDialog(logger, showMessageDialog(logger,
"ECU definition file not found or undefined. Learning\n" + rb.getString("DEFNOTFOUND"),
"Table Values cannot be properly retrieved until an ECU\n" + rb.getString("DEFMISSING"), WARNING_MESSAGE);
"defintion is defined in the Editor's Definition Manager.",
"ECU Defintion Missing", WARNING_MESSAGE);
return null; return null;
} }
else { else {
@ -147,7 +150,7 @@ public final class NCSLearningTableValues extends SwingWorker<Void, Void>
final boolean logging = logger.isLogging(); final boolean logging = logger.isLogging();
if (logging) logger.stopLogging(); if (logging) logger.stopLogging();
String message = "Retrieving vehicle info & LTFT values..."; String message = rb.getString("GETLTFTVALUES");
messageListener.reportMessage(message); messageListener.reportMessage(message);
buildVehicleInfoMap(ecuDef); buildVehicleInfoMap(ecuDef);
@ -176,7 +179,7 @@ public final class NCSLearningTableValues extends SwingWorker<Void, Void>
"Queries:%d, Set size:%d, Set 1 size:%d, Set 2 size:%d", "Queries:%d, Set size:%d, Set 1 size:%d, Set 2 size:%d",
queries.size(), setSize, querySet1.size(), querySet2.size())); queries.size(), setSize, querySet1.size(), querySet2.size()));
LOGGER.info(message); LOGGER.info("Retrieving vehicle info & LTFT values ...");
connection.sendAddressReads( connection.sendAddressReads(
querySet1, querySet1,
settings.getDestinationTarget(), settings.getDestinationTarget(),
@ -195,13 +198,13 @@ public final class NCSLearningTableValues extends SwingWorker<Void, Void>
//TODO: afRanges to be replaced with Knock tables once known how they operate //TODO: afRanges to be replaced with Knock tables once known how they operate
String[] afRanges = new String[0]; String[] afRanges = new String[0];
message = "Retrieving LTFT column ranges..."; message = rb.getString("GETCOLRANGES");
messageListener.reportMessage(message); messageListener.reportMessage(message);
String[] ltftCol = new String[0]; String[] ltftCol = new String[0];
queries.clear(); queries.clear();
queries = getTableAxisRanges(document, ecuDef, LTFT_TABLE_COLUMN_NAMES); queries = getTableAxisRanges(document, ecuDef, LTFT_TABLE_COLUMN_NAMES);
if (queries != null && !queries.isEmpty()) { if (queries != null && !queries.isEmpty()) {
LOGGER.info(message); LOGGER.info("Retrieving LTFT column ranges ...");
connection.sendAddressReads( connection.sendAddressReads(
queries, queries,
settings.getDestinationTarget(), settings.getDestinationTarget(),
@ -210,13 +213,13 @@ public final class NCSLearningTableValues extends SwingWorker<Void, Void>
ltftCol = formatRanges(queries, "%.2f"); ltftCol = formatRanges(queries, "%.2f");
} }
message = "Retrieving LTFT row ranges..."; message = rb.getString("GETROWRANGES");
messageListener.reportMessage(message); messageListener.reportMessage(message);
String[] ltftRow = new String[0]; String[] ltftRow = new String[0];
queries.clear(); queries.clear();
queries = getTableAxisRanges(document, ecuDef, LTFT_TABLE_ROW_NAMES); queries = getTableAxisRanges(document, ecuDef, LTFT_TABLE_ROW_NAMES);
if (queries != null && !queries.isEmpty()) { if (queries != null && !queries.isEmpty()) {
LOGGER.info(message); LOGGER.info("Retrieving LTFT row ranges ...");
connection.sendAddressReads( connection.sendAddressReads(
queries, queries,
settings.getDestinationTarget(), settings.getDestinationTarget(),
@ -243,11 +246,13 @@ public final class NCSLearningTableValues extends SwingWorker<Void, Void>
queries.add(ltftQueryGroups.get(i).get(j)); queries.add(ltftQueryGroups.get(i).get(j));
} }
} }
message = String.format( message = MessageFormat.format(
"Retrieving Table %d LTFT row %d values...", rb.getString("GETTABLELTFT"),
(k/128+1), i); (k/128+1), i);
messageListener.reportMessage(message); messageListener.reportMessage(message);
LOGGER.info(message); LOGGER.info(String.format(
"Retrieving Table %d LTFT row %d values ...",
(k/128+1), i));
setSize = queries.size() / 2; setSize = queries.size() / 2;
querySet1 = new ArrayList<EcuQuery>(); querySet1 = new ArrayList<EcuQuery>();
querySet2 = new ArrayList<EcuQuery>(); querySet2 = new ArrayList<EcuQuery>();
@ -266,7 +271,6 @@ public final class NCSLearningTableValues extends SwingWorker<Void, Void>
"Queries:%d, Set size:%d, Set 1 size:%d, Set 2 size:%d", "Queries:%d, Set size:%d, Set 1 size:%d, Set 2 size:%d",
queries.size(), setSize, querySet1.size(), querySet2.size())); queries.size(), setSize, querySet1.size(), querySet2.size()));
LOGGER.info(message);
connection.sendAddressReads( connection.sendAddressReads(
querySet1, querySet1,
settings.getDestinationTarget(), settings.getDestinationTarget(),
@ -283,10 +287,9 @@ public final class NCSLearningTableValues extends SwingWorker<Void, Void>
} }
} }
else { else {
message = String.format( message = rb.getString("ERRTABLELTFT");
"Error retrieving LTFT data values, missing LTFT reference");
messageListener.reportMessage(message); messageListener.reportMessage(message);
LOGGER.error(message); LOGGER.error("Error retrieving LTFT data values, missing LTFT reference");
} }
if (ltftCnt != null) { if (ltftCnt != null) {
for (int k = 0; k < 128; k += 64) { for (int k = 0; k < 128; k += 64) {
@ -304,10 +307,12 @@ public final class NCSLearningTableValues extends SwingWorker<Void, Void>
queries.add(ltftQueryGroups.get(i).get(j)); queries.add(ltftQueryGroups.get(i).get(j));
} }
} }
message = String.format("Retrieving Table %d LTFT row %d values...", message = MessageFormat.format(
rb.getString("GETTABLELTFT"),
(k/64+3), i); (k/64+3), i);
messageListener.reportMessage(message); messageListener.reportMessage(message);
LOGGER.info(message); LOGGER.info(String.format("Retrieving Table %d LTFT row %d values...",
(k/64+3), i));
setSize = queries.size() / 2; setSize = queries.size() / 2;
querySet1 = new ArrayList<EcuQuery>(); querySet1 = new ArrayList<EcuQuery>();
querySet2 = new ArrayList<EcuQuery>(); querySet2 = new ArrayList<EcuQuery>();
@ -325,7 +330,6 @@ public final class NCSLearningTableValues extends SwingWorker<Void, Void>
String.format("Queries:%d, Set size:%d, Set 1 size:%d, Set 2 size:%d", String.format("Queries:%d, Set size:%d, Set 1 size:%d, Set 2 size:%d",
queries.size(), setSize, querySet1.size(), querySet2.size())); queries.size(), setSize, querySet1.size(), querySet2.size()));
LOGGER.info(message);
connection.sendAddressReads( connection.sendAddressReads(
querySet1, querySet1,
settings.getDestinationTarget(), settings.getDestinationTarget(),
@ -341,13 +345,13 @@ public final class NCSLearningTableValues extends SwingWorker<Void, Void>
} }
} }
else { else {
message = String.format("Error retrieving LTFT data values, missing LTFT reference"); message = rb.getString("ERRTABLELTFT");
messageListener.reportMessage(message); messageListener.reportMessage(message);
LOGGER.error(message); LOGGER.error("Error retrieving LTFT data values, missing LTFT reference");
} }
messageListener.reportMessage( messageListener.reportMessage(
"Learning Table Values retrieved successfully."); rb.getString("LTFTSUCCESS"));
final NCSLearningTableValuesResultsPanel results = final NCSLearningTableValuesResultsPanel results =
new NCSLearningTableValuesResultsPanel( new NCSLearningTableValuesResultsPanel(
logger, vehicleInfo, logger, vehicleInfo,
@ -364,16 +368,12 @@ public final class NCSLearningTableValues extends SwingWorker<Void, Void>
} }
catch (Exception e) { catch (Exception e) {
messageListener.reportError( messageListener.reportError(
"Unable to retrieve current ECU learning values"); rb.getString("ERRLTFT"));
LOGGER.error(message + " Error retrieving values", e); LOGGER.error(message + " Error retrieving values", e);
showMessageDialog(logger, showMessageDialog(logger,
message + MessageFormat.format(
"\nError performing Learning Table Values read.\n" + rb.getString("ERRCONNECT"), message),
"Check the following:\n" + rb.getString("LTV"),
"* Logger has successfully conencted to the ECU\n" +
"* Correct COM port is selected (if not Openport 2)\n" +
"* Cable is connected properly\n* Ignition is ON\n",
"Learning Table Values",
ERROR_MESSAGE); ERROR_MESSAGE);
} }
return null; return null;