Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8478] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2013-09-02 22:30:14
|
Revision: 8478
http://sourceforge.net/p/fudaa/svn/8478
Author: deniger
Date: 2013-09-02 22:30:07 +0000 (Mon, 02 Sep 2013)
Log Message:
-----------
maj des dicos
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/VariableFCVariableNameComparator.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponent.java
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/config/ModellingGlobalConfiguration.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilderProcessor.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportAggregationCacheService.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportFormuleService.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepSliderPanel.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/VariableFCVariableNameComparator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/VariableFCVariableNameComparator.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/result/VariableFCVariableNameComparator.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -27,7 +27,7 @@
@Override
protected int compareSafe(String o1, String o2) {
- return compareComparable(getString(o1), getString(o1));
+ return compareComparable(getString(o1), getString(o2));
}
private String getString(String init) {
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponent.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponent.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -46,7 +46,7 @@
public static final String TOPCOMPONENT_ACTION_DISPLAYNAME = "#" + TOPCOMPONENT_ACTION;
JTextField jMethodInterpolation;
OutlineView outlineView;
- ExplorerManagerListenerHelper helper;
+ final ExplorerManagerListenerHelper helper;
private boolean editable;
public ModellingListCiniTopComponent() {
@@ -55,8 +55,8 @@
setName(NbBundle.getMessage(ModellingListCiniTopComponent.class, TOPCOMPONENT_ACTION));
setToolTipText(NbBundle.getMessage(ModellingListCiniTopComponent.class, "HINT_" + TOPCOMPONENT_ID));
ActionMap map = getActionMap();
+ helper = new ExplorerManagerListenerHelper(this);
associateLookup(ExplorerUtils.createLookup(getExplorerManager(), map));
- helper = new ExplorerManagerListenerHelper(this);
}
@Override
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/config/ModellingGlobalConfiguration.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/config/ModellingGlobalConfiguration.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/config/ModellingGlobalConfiguration.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -63,12 +63,12 @@
props.put(PROP_DEFAULT_LITMINEUR, initValue);
}
initValue = props.get(SEUIL_SIMPLIF_PROFIL_SECTION);
- if (initValue == null) {
+ if (initValue == null && ccm.getDefaultValue(CrueConfigMetierConstants.PROP_DEFAULT_SEUILSIMPLIFPROFILSECTION) != null) {
initValue = ccm.getDefaultValue(CrueConfigMetierConstants.PROP_DEFAULT_SEUILSIMPLIFPROFILSECTION).toString();
props.put(SEUIL_SIMPLIF_PROFIL_SECTION, initValue);
}
initValue = props.get(SEUIL_SIMPLIF_PROFIL_CASIER);
- if (initValue == null) {
+ if (initValue == null && ccm.getDefaultValue(CrueConfigMetierConstants.PROP_DEFAULT_SEUILSIMPLIFPROFILCASIER) != null) {
initValue = ccm.getDefaultValue(CrueConfigMetierConstants.PROP_DEFAULT_SEUILSIMPLIFPROFILCASIER).toString();
props.put(SEUIL_SIMPLIF_PROFIL_CASIER, initValue);
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -58,7 +58,7 @@
protected ReportResultProviderService reportResultProviderService = Lookup.getDefault().lookup(ReportResultProviderService.class);
protected U uiController;
protected ViewCourbeManager loiLabelsManager;
- protected ExternFileBuilder externFileBuilder = new ExternFileBuilder();
+ protected final ExternFileBuilder externFileBuilder = new ExternFileBuilder();
public ExternFileBuilder getExternFileBuilder() {
return externFileBuilder;
@@ -234,7 +234,7 @@
"CourbesBuilder.ProgressTitle"));
} else {
- return getInternCourbesAfterTimeChanged(content, null);
+ return getInternCourbes(content, null);
}
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilder.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilder.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -47,7 +47,7 @@
final String name = org.openide.util.NbBundle.getMessage(ExternFileBuilder.class, "ExternFile.Loading");
CtuluLogGroup logs = CrueProgressUtils.showProgressDialogAndRun(processor, name);
- if (logs.containsSomething()) {
+ if (logs != null && logs.containsSomething()) {
LogsDisplayer.displayError(logs, name);
}
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilderProcessor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilderProcessor.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/ExternFileBuilderProcessor.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -56,6 +56,9 @@
List<ReadCallable> filesToLoad = new ArrayList<ReadCallable>();
Map<String, ExternContent> newContentsByFilename = new HashMap<String, ExternContent>();
for (String externFile : externFiles) {
+ if (externFile == null) {
+ continue;
+ }
ExternContent content = builder.getContentsByFilename().get(externFile);
if (content != null) {
newContentsByFilename.put(externFile, content);
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -4,6 +4,7 @@
package org.fudaa.fudaa.crue.report.longitudinal;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -70,7 +71,6 @@
return content.courbeconfigs.values();
}
-
@Override
public List<EGCourbeSimple> getInternCourbes(ReportLongitudinalConfig content, ProgressHandle progress) {
ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content);
@@ -259,7 +259,7 @@
progress.setDisplayName(reportRunVariableKey.getDisplayName());
}
LoiConstanteCourbeModel model = limitBuilder.build(reportRunVariableKey, result.getCartouches());
- if (model != null) {
+ if (model != null && model.getKey() != null && content.courbeconfigs != null) {
EGCourbeSimple courbe = new EGCourbeSimple(axeZ, model);
AbstractReportGrapheBuilder.applyPersistConfig(content.courbeconfigs.get(model.getKey()), courbe);
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportAggregationCacheService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportAggregationCacheService.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportAggregationCacheService.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -24,7 +24,8 @@
@ServiceProvider(service = ReportAggregationCacheServiceContrat.class)})
public class ReportAggregationCacheService implements ReportAggregationCacheServiceContrat {
- private LRUMap map = new LRUMap(100);
+// private LRUMap map = new LRUMap(1000);
+ private LRUMap map = new LRUMap(10000);
private PostRunService postRunService = Lookup.getDefault().lookup(PostRunService.class);
ReportService reportService = Lookup.getDefault().lookup(ReportService.class);
private final Lookup.Result<EMHScenario> resultat;
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportFormuleService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportFormuleService.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportFormuleService.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -141,11 +141,15 @@
}
}
- DialogHelper.showError(NbBundle.getMessage(ReportFormuleService.class, "cycleDetected.Error"), "<li>" + StringUtils.join(cycliqueVar, "</li><li>") + "</li>");
+ DialogHelper.showError(NbBundle.getMessage(ReportFormuleService.class, "cycleDetected.Error"), "<li>" + StringUtils.join(cycliqueVar,
+ "</li><li>") + "</li>");
}
}
private FormuleServiceContent load() {
+ if (!reportService.isRunLoaded()) {
+ return new FormuleServiceContent();
+ }
FormuleSaver saver = new FormuleSaver();
final File targetFile = getTargetFile();
if (targetFile == null || !targetFile.exists()) {
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -124,7 +124,8 @@
addEMH();
}
};
- EbliActionSimple chooseVariables = new EbliActionSimple(NbBundle.getMessage(ReportTemporalTopComponent.class, "ChooseVariable.ButtonName"), null, "CHOOSE_VARIABLES") {
+ EbliActionSimple chooseVariables = new EbliActionSimple(NbBundle.getMessage(ReportTemporalTopComponent.class, "ChooseVariable.ButtonName"), null,
+ "CHOOSE_VARIABLES") {
@Override
public void actionPerformed(ActionEvent _e) {
chooseVariable();
@@ -136,10 +137,16 @@
protected void addEMH() {
List<String> emhs = content.emhs;
+ EnumCatEMH oldUsedCat = ChooseEMHByTypeHelper.getUsedCat(reportService, content.emhs);
List<String> selectedEMH = new ChooseEMHByTypeHelper().chooseEMH(emhs);
if (selectedEMH != null) {
content.emhs = selectedEMH;
Collections.sort(content.emhs);
+ EnumCatEMH usedCat = ChooseEMHByTypeHelper.getUsedCat(reportService, content.emhs);
+ if (usedCat != oldUsedCat) {
+ content.variables.clear();
+ content.temporalVariables.clear();
+ }
propagateChange();
}
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepSliderPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepSliderPanel.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/time/ReportTimeStepSliderPanel.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -21,6 +21,7 @@
import javax.swing.JPanel;
import javax.swing.JSlider;
import javax.swing.JToggleButton;
+import javax.swing.SwingConstants;
import javax.swing.Timer;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -348,8 +349,11 @@
lbMax.setFont(BuLib.deriveFont(lbMax.getFont(), -1));
JPanel pnMinMax = new JPanel(new BorderLayout());
pnMinMax.setBorder(BorderFactory.createEmptyBorder(0, 1, 0, 3));
- pnMinMax.add(lbMin, BorderLayout.WEST);
- pnMinMax.add(lbMax, BorderLayout.EAST);
+ pnMinMax.add(lbMin, BorderLayout.NORTH);
+ pnMinMax.add(lbMax, BorderLayout.SOUTH);
+ lbMin.setHorizontalTextPosition(SwingConstants.LEFT);
+ lbMax.setHorizontalTextPosition(SwingConstants.RIGHT);
+ lbMax.setHorizontalAlignment(SwingConstants.RIGHT);
return pnMinMax;
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java 2013-09-02 19:20:26 UTC (rev 8477)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportTransversalGrapheBuilder.java 2013-09-02 22:30:07 UTC (rev 8478)
@@ -39,7 +39,6 @@
import org.fudaa.fudaa.crue.report.data.ReportVariableKey;
import org.fudaa.fudaa.crue.report.data.ReportVariableTypeEnum;
import org.fudaa.fudaa.crue.report.helper.ReportProfilHelper;
-import org.fudaa.fudaa.crue.report.temporal.ReportTemporalConfig;
import org.netbeans.api.progress.ProgressHandle;
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
