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

fixed logger profile load bug 

git-svn-id: http://svn.3splooges.com/romraider-arch/trunk@469 d2e2e1cd-ba16-0410-be16-b7c4453c7c2d
This commit is contained in:
kascade 2007-01-26 08:42:48 +00:00
parent f294437dd4
commit b9784df86a
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/enginuity/logger/EcuLogger.java
View File

@ -232,8 +232,8 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
dataLoader.loadFromXml(settings.getLoggerConfigFilePath(), settings.getLoggerProtocol(), settings.getFileLoggingControllerSwitchId(), ecuInit); dataLoader.loadFromXml(settings.getLoggerConfigFilePath(), settings.getLoggerProtocol(), settings.getFileLoggingControllerSwitchId(), ecuInit);
List<EcuParameter> ecuParams = dataLoader.getEcuParameters(); List<EcuParameter> ecuParams = dataLoader.getEcuParameters();
addConvertorUpdateListeners(ecuParams); addConvertorUpdateListeners(ecuParams);
loadEcuParams(ecuParams, null); loadEcuParams(ecuParams);
loadEcuSwitches(dataLoader.getEcuSwitches(), null); loadEcuSwitches(dataLoader.getEcuSwitches());
initFileLoggingController(dataLoader.getFileLoggingControllerSwitch()); initFileLoggingController(dataLoader.getFileLoggingControllerSwitch());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -287,6 +287,7 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
List<ParameterRow> rows = paramListTableModel.getParameterRows(); List<ParameterRow> rows = paramListTableModel.getParameterRows();
for (ParameterRow row : rows) { for (ParameterRow row : rows) {
EcuData ecuData = row.getEcuData(); EcuData ecuData = row.getEcuData();
setDefaultUnits(profile, ecuData);
paramListTableModel.selectParam(ecuData, isSelectedOnLiveDataTab(profile, ecuData)); paramListTableModel.selectParam(ecuData, isSelectedOnLiveDataTab(profile, ecuData));
} }
} }
@ -295,6 +296,7 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
List<ParameterRow> rows = paramListTableModel.getParameterRows(); List<ParameterRow> rows = paramListTableModel.getParameterRows();
for (ParameterRow row : rows) { for (ParameterRow row : rows) {
EcuData ecuData = row.getEcuData(); EcuData ecuData = row.getEcuData();
setDefaultUnits(profile, ecuData);
paramListTableModel.selectParam(ecuData, isSelectedOnGraphTab(profile, ecuData)); paramListTableModel.selectParam(ecuData, isSelectedOnGraphTab(profile, ecuData));
} }
} }
@ -303,6 +305,7 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
List<ParameterRow> rows = paramListTableModel.getParameterRows(); List<ParameterRow> rows = paramListTableModel.getParameterRows();
for (ParameterRow row : rows) { for (ParameterRow row : rows) {
EcuData ecuData = row.getEcuData(); EcuData ecuData = row.getEcuData();
setDefaultUnits(profile, ecuData);
paramListTableModel.selectParam(ecuData, isSelectedOnDashTab(profile, ecuData)); paramListTableModel.selectParam(ecuData, isSelectedOnDashTab(profile, ecuData));
} }
} }
@ -335,35 +338,30 @@ public final class EcuLogger extends JFrame implements WindowListener, PropertyC
dashboardTabSwitchListTableModel.clear(); dashboardTabSwitchListTableModel.clear();
} }
private void loadEcuParams(List<EcuParameter> ecuParams, UserProfile profile) { private void loadEcuParams(List<EcuParameter> ecuParams) {
clearParamTableModels(); clearParamTableModels();
sort(ecuParams, new EcuDataComparator()); sort(ecuParams, new EcuDataComparator());
for (EcuParameter ecuParam : ecuParams) { for (EcuParameter ecuParam : ecuParams) {
if (profile == null || profile.contains(ecuParam)) { dataTabParamListTableModel.addParam(ecuParam, false);
setDefaultUnits(profile, ecuParam); graphTabParamListTableModel.addParam(ecuParam, false);
dataTabParamListTableModel.addParam(ecuParam, isSelectedOnLiveDataTab(profile, ecuParam)); dashboardTabParamListTableModel.addParam(ecuParam, false);
graphTabParamListTableModel.addParam(ecuParam, isSelectedOnGraphTab(profile, ecuParam));
dashboardTabParamListTableModel.addParam(ecuParam, isSelectedOnDashTab(profile, ecuParam));
}
} }
} }
private void loadEcuSwitches(List<EcuSwitch> ecuSwitches, UserProfile profile) { private void loadEcuSwitches(List<EcuSwitch> ecuSwitches) {
clearSwitchTableModels(); clearSwitchTableModels();
sort(ecuSwitches, new EcuDataComparator()); sort(ecuSwitches, new EcuDataComparator());
for (EcuSwitch ecuSwitch : ecuSwitches) { for (EcuSwitch ecuSwitch : ecuSwitches) {
if (profile == null || profile.contains(ecuSwitch)) { dataTabSwitchListTableModel.addParam(ecuSwitch, false);
dataTabSwitchListTableModel.addParam(ecuSwitch, isSelectedOnLiveDataTab(profile, ecuSwitch)); graphTabSwitchListTableModel.addParam(ecuSwitch, false);
graphTabSwitchListTableModel.addParam(ecuSwitch, isSelectedOnGraphTab(profile, ecuSwitch)); dashboardTabSwitchListTableModel.addParam(ecuSwitch, false);
dashboardTabSwitchListTableModel.addParam(ecuSwitch, isSelectedOnDashTab(profile, ecuSwitch));
}
} }
} }
private void setDefaultUnits(UserProfile profile, EcuParameter ecuParam) { private void setDefaultUnits(UserProfile profile, EcuData ecuData) {
if (profile != null) { if (profile != null) {
try { try {
ecuParam.selectConvertor(profile.getSelectedConvertor(ecuParam)); ecuData.selectConvertor(profile.getSelectedConvertor(ecuData));
} catch (Exception e) { } catch (Exception e) {
reportError(e); reportError(e);
} }