Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2012-10-31 17:55:15
|
Revision: 7840
http://fudaa.svn.sourceforge.net/fudaa/?rev=7840&view=rev
Author: deniger
Date: 2012-10-31 17:55:03 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
CRUE-332
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportVisuPanelService.java
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java 2012-10-31 17:25:53 UTC (rev 7839)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java 2012-10-31 17:55:03 UTC (rev 7840)
@@ -69,6 +69,9 @@
createFindActions();
getVueCalque().setCheckTtranslation(false);
}
+
+
+
public PlanimetryVisuPanelConfigurer getConfigurer() {
return configurer;
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java 2012-10-31 17:25:53 UTC (rev 7839)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java 2012-10-31 17:55:03 UTC (rev 7840)
@@ -14,12 +14,14 @@
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.BCalqueInteraction;
+import org.fudaa.ebli.calque.BCalqueLegendeCustomizer;
import org.fudaa.ebli.calque.ZCalqueSelectionInteractionSimple;
import org.fudaa.ebli.calque.ZEbliCalquesPanel;
import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.ebli.commun.EbliActionPaletteAbstract;
import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.geometrie.GrBoite;
+import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.fudaa.crue.common.action.ExportImageAction;
import org.fudaa.fudaa.crue.common.action.ExportImageToClipboardAction;
import org.fudaa.fudaa.crue.planimetry.ConfigureUIAction;
@@ -94,13 +96,6 @@
return deleteCascadeAction;
}
-// @Override
-// protected EbliActionInterface createRepereAction() {
-// final EbliActionPaletteAbstract plAction = new FSigGrillePalette(getGrille(), getVisuPanel());
-// plAction.putValue(Action.SHORT_DESCRIPTION, EbliResource.EBLI.getString("Transformations du repère"));
-// return plAction;
-// }
-
@Override
public void restaurer() {
final BCalqueInteraction cq = unsetCurrentInteractifCalque();
@@ -149,6 +144,23 @@
@Override
protected void buildButtonGroupStandard() {
+ PlanimetryVisuPanel panel = (PlanimetryVisuPanel) getPn();
+ if (standardActionGroup_ != null || panel.getCqLegend() == null) {
+ return;
+ }
+ final ArrayList l = new ArrayList(6);
+ EbliActionPaletteAbstract ebliActionPaletteAbstract = new EbliActionPaletteAbstract(EbliLib.getS("Légende"),
+ EbliResource.EBLI.getToolIcon("legend"),
+ "EDIT_LEGEND", true) {
+ @Override
+ public JComponent buildContentPane() {
+ return new BCalqueLegendeCustomizer(getView().getCqLegend());
+ }
+ };
+ ebliActionPaletteAbstract.setParent(pn_);
+ l.add(ebliActionPaletteAbstract);
+ standardActionGroup_ = new EbliActionInterface[l.size()];
+ l.toArray(standardActionGroup_);
}
@Override
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java 2012-10-31 17:25:53 UTC (rev 7839)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java 2012-10-31 17:55:03 UTC (rev 7840)
@@ -38,6 +38,7 @@
import org.fudaa.fudaa.crue.report.node.ReportNodeEMH;
import org.fudaa.fudaa.crue.report.node.ReportNodeEMHFactory;
import org.fudaa.fudaa.crue.report.persist.ReportPlanimetryConfig;
+import org.fudaa.fudaa.crue.report.planimetry.ReportPlanimetryConfigUI;
import org.fudaa.fudaa.crue.report.planimetry.ReportPlanimetryConfigurer;
import org.fudaa.fudaa.crue.report.service.ReportViewServiceContrat;
import org.fudaa.fudaa.crue.report.service.ReportVisuPanelService;
@@ -155,7 +156,9 @@
planimetryController.getCqNoeud().modeleDonnees().setNodeConfigurationExtra(reportPlanimetryConfigurer.getNodeConfigurationExtra());
planimetryController.getCqSection().modeleDonnees().setSectionConfigurationExtra(reportPlanimetryConfigurer.getSectionConfigurationExtra());
planimetryController.getCqTrace().modeleDonnees().setTraceConfigurationExtra(reportPlanimetryConfigurer.getTraceConfigurationExtra());
+ //mettre a jour les legenede
}
+ new ReportPlanimetryConfigUI(planimetryController).updatePalettes();
panel.getVueCalque().repaint(0);
}
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java 2012-10-31 17:25:53 UTC (rev 7839)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/planimetry/ReportPlanimetryConfigUI.java 2012-10-31 17:55:03 UTC (rev 7840)
@@ -12,14 +12,12 @@
import com.jidesoft.swing.JideTabbedPane;
import java.util.ArrayList;
import java.util.List;
-import org.fudaa.ctulu.CtuluRange;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
import org.fudaa.dodico.crue.metier.result.OrdResExtractor;
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryController;
-import org.fudaa.fudaa.crue.report.data.ReportRunVariableKey;
import org.fudaa.fudaa.crue.report.data.ReportVariableKey;
import org.fudaa.fudaa.crue.report.data.ReportVariableTypeEnum;
import org.fudaa.fudaa.crue.report.planimetry.ReportPlanimetryConfigDataUI.ExtraEditor;
@@ -88,12 +86,24 @@
data.setUsePalette(traceData.isUsePalette());
data.setPaletteVariable(traceData.getPaletteVariable());
traceConfigurationExtra.setData(traceData);
+ updatePalettes();
planimetryController.getState().setStudyConfigModified();
}
return ok;
}
+ public void updatePalettes() {
+ final ReportPlanimetryBrancheConfig brancheConfigurationExtra = (ReportPlanimetryBrancheConfig) planimetryController.getCqBranche().modeleDonnees().getBrancheConfigurationExtra();
+ final ReportPlanimetryCasierConfig casierConfigurationExtra = (ReportPlanimetryCasierConfig) planimetryController.getCqCasier().modeleDonnees().getCasierConfigurationExtra();
+ final ReportPlanimetryNodeConfig nodeConfigurationExtra = (ReportPlanimetryNodeConfig) planimetryController.getCqNoeud().modeleDonnees().getNodeConfigurationExtra();
+ final ReportPlanimetrySectionConfig sectionConfigurationExtra = (ReportPlanimetrySectionConfig) planimetryController.getCqSection().modeleDonnees().getSectionConfigurationExtra();
+ planimetryController.getCqBranche().setPaletteCouleurPlages(brancheConfigurationExtra.getData().getPalette());
+ planimetryController.getCqCasier().setPaletteCouleurPlages(casierConfigurationExtra.getData().getPalette());
+ planimetryController.getCqNoeud().setPaletteCouleurPlages(nodeConfigurationExtra.getData().getPalette());
+ planimetryController.getCqSection().setPaletteCouleurPlages(sectionConfigurationExtra.getData().getPalette());
+ }
+
private ReportPlanimetryConfigDataUI create(EnumCatEMH catEMH) {
EMHScenario scenario = reportService.getRunCourant().getScenario();
OrdResExtractor extractor = new OrdResExtractor(scenario.getOrdResScenario());
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportVisuPanelService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportVisuPanelService.java 2012-10-31 17:25:53 UTC (rev 7839)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportVisuPanelService.java 2012-10-31 17:55:03 UTC (rev 7840)
@@ -7,6 +7,7 @@
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
+import org.fudaa.ebli.calque.BCalqueLegende;
import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.fudaa.crue.common.helper.CtuluUIForNetbeans;
import org.fudaa.fudaa.crue.options.services.ConfigurationManagerService;
@@ -125,6 +126,12 @@
panel.getPlanimetryController().getCqCasier().setActions(actions);
panel.getPlanimetryController().getCqSection().setActions(actions);
panel.getPlanimetryController().getCqTrace().setActions(actions);
+ panel.addCalqueLegend();
+ final BCalqueLegende cqLegend = panel.getCqLegend();
+ panel.getPlanimetryController().getCqBranche().setLegende(cqLegend);
+ panel.getPlanimetryController().getCqNoeud().setLegende(cqLegend);
+ panel.getPlanimetryController().getCqCasier().setLegende(cqLegend);
+ panel.getPlanimetryController().getCqSection().setLegende(cqLegend);
if (CollectionUtils.isNotEmpty(result.additionnalLayer)) {
panel.getPlanimetryController().addAdditionnalLayer(result.additionnalLayer);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-11-01 08:24:39
|
Revision: 7842
http://fudaa.svn.sourceforge.net/fudaa/?rev=7842&view=rev
Author: deniger
Date: 2012-11-01 08:24:32 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
correction tests unitaires
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaver.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/persist/ReportPlanimetryConfig.java
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/ReportConfigSaverPlanimetryTest.java
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaver.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaver.java 2012-11-01 08:09:43 UTC (rev 7841)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaver.java 2012-11-01 08:24:32 UTC (rev 7842)
@@ -29,6 +29,9 @@
public LinkedHashMap<String, Property> getProperties(VisuConfiguration in, LayerVisibility visibility) {
LinkedHashMap<String, Property> res = new LinkedHashMap<String, Property>();
+ if (in == null) {
+ return res;
+ }
Sheet.Set generalConfig = VisuConfigurationInfo.createSet(in);
ConfigSaverHelper.addProperties(res, generalConfig);
List<Sheet.Set> sectionConfig = SectionConfigurationInfo.createSet(in.getSectionConfiguration());
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/persist/ReportPlanimetryConfig.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/persist/ReportPlanimetryConfig.java 2012-11-01 08:09:43 UTC (rev 7841)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/persist/ReportPlanimetryConfig.java 2012-11-01 08:24:32 UTC (rev 7842)
@@ -4,7 +4,6 @@
package org.fudaa.fudaa.crue.report.persist;
import com.rits.cloning.Cloner;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
import java.awt.Color;
import java.awt.Font;
import org.fudaa.fudaa.crue.planimetry.configuration.LayerVisibility;
Modified: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/ReportConfigSaverPlanimetryTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/ReportConfigSaverPlanimetryTest.java 2012-11-01 08:09:43 UTC (rev 7841)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/view/persist/ReportConfigSaverPlanimetryTest.java 2012-11-01 08:24:32 UTC (rev 7842)
@@ -3,15 +3,21 @@
*/
package org.fudaa.fudaa.crue.report.view.persist;
+import java.awt.Color;
import java.io.File;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.fudaa.ctulu.converter.ColorToStringTransformer;
import org.fudaa.dodico.crue.io.AbstractIOTestCase;
import org.fudaa.dodico.crue.io.common.CrueIOResu;
-import org.fudaa.dodico.crue.metier.emh.EnumBrancheType;
+import org.fudaa.dodico.crue.io.conf.Option;
import org.fudaa.ebli.converter.TraceToStringConverter;
import org.fudaa.fudaa.crue.report.persist.ReportConfigContrat;
import org.fudaa.fudaa.crue.report.data.ReportRunKey;
import org.fudaa.fudaa.crue.report.persist.ReportPlanimetryConfig;
+import org.fudaa.fudaa.crue.report.persist.ReportPlanimetryConfigPersist;
import org.fudaa.fudaa.crue.report.view.transformer.KeysToStringConverter;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -32,22 +38,23 @@
File file = AbstractIOTestCase.getFile("/org/fudaa/fudaa/crue/report/view/persist/planimetry.xml");
ReportConfigContrat metier = read(file);
assertNotNull(metier);
- assertEquals(ReportPlanimetryConfig.class, metier.getClass());
+ assertEquals(ReportPlanimetryConfigPersist.class, metier.getClass());
file.delete();
- ReportPlanimetryConfig config = (ReportPlanimetryConfig) metier;
+ ReportPlanimetryConfigPersist config = (ReportPlanimetryConfigPersist) metier;
testContent(config);
}
@Test
public void testWriteTransversal() throws IOException {
File file = AbstractIOTestCase.getFile("/org/fudaa/fudaa/crue/report/view/persist/planimetry.xml");
- ReportConfigContrat metier = read(file);
+ ReportPlanimetryConfigPersist metier = (ReportPlanimetryConfigPersist) read(file);
+ ReportPlanimetryConfig config = metier.createConfig();
file.delete();
File out = File.createTempFile("planimetry", ".xml");
- createSaver().save(out, metier, "test");
- metier = read(out);
+ createSaver().save(out, config, "test");
+ metier = (ReportPlanimetryConfigPersist) read(out);
out.delete();
- testContent((ReportPlanimetryConfig) metier);
+ testContent(metier);
}
private ReportConfigContrat read(File file) {
@@ -58,8 +65,17 @@
return metier;
}
- private void testContent(ReportPlanimetryConfig config) {
- config.getVisuConfiguration().getBrancheConfiguration().getColor(EnumBrancheType.EMHBrancheSaintVenant);
+ private void testContent(ReportPlanimetryConfigPersist config) {
+ List<Option> visuConfiguration = config.getVisuConfiguration();
+ Map<String, Option> options = new HashMap<String, Option>();
+ for (Option option : visuConfiguration) {
+ options.put(option.getNom(), option);
+ }
+ Option colorOption = options.get("branches.colors.EMHBrancheSaintVenant");
+ String valeur = colorOption.getValeur();
+ Color color = new ColorToStringTransformer().fromString(valeur);
+ assertEquals(new Color(204, 0, 51), color);
+
}
@Test
@@ -71,12 +87,11 @@
CrueIOResu<ReportConfigContrat> read = saver.read(target);
ReportConfigContrat metier = read.getMetier();
assertNotNull(metier);
- assertEquals(ReportPlanimetryConfig.class, metier.getClass());
+ assertEquals(ReportPlanimetryConfigPersist.class, metier.getClass());
target.delete();
- ReportPlanimetryConfig readConfig = (ReportPlanimetryConfig) metier;
+ ReportPlanimetryConfigPersist readConfig = (ReportPlanimetryConfigPersist) metier;
assertNotNull(readConfig.getReportPlanimetryExtraContainer());
assertNotNull(readConfig.getVisuConfiguration());
- assertNotNull(readConfig.getVisibility());
}
private ReportConfigSaver createSaver() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-11-14 08:38:53
|
Revision: 7880
http://fudaa.svn.sourceforge.net/fudaa/?rev=7880&view=rev
Author: deniger
Date: 2012-11-14 08:38:46 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/SeveriteManager.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDC.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java
trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueOPTRFile.java
trunk/soft/fudaa-crue/crue-server/src/test/resources/CrueConfigMetierForTestsFalse.xml
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/SeveriteManager.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/SeveriteManager.java 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/config/SeveriteManager.java 2012-11-14 08:38:46 UTC (rev 7880)
@@ -16,6 +16,7 @@
public static final String VERBOSITE_ID = "Ten_Severite";
public static final String INFO = "INFO";
+ public static final String DEFAULT_DEBUG_LEVEL_FOR_CRUE9 = "DEBUG2";
public static final String DEBUG3 = "DEBUG3";
private final List<ItemEnum> levels;
private final Map<String, ItemEnum> verbosite;
@@ -51,8 +52,8 @@
if (!mng.isManaged(INFO)) {
log.addSevereError("config.verbositeRequiredLevelNotFound", INFO);
}
- if (!mng.isManaged(DEBUG3)) {
- log.addSevereError("config.verbositeRequiredLevelNotFound", DEBUG3);
+ if (!mng.isManaged(DEFAULT_DEBUG_LEVEL_FOR_CRUE9)) {
+ log.addSevereError("config.verbositeRequiredLevelNotFound", DEFAULT_DEBUG_LEVEL_FOR_CRUE9);
}
return mng;
}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2012-11-14 08:38:46 UTC (rev 7880)
@@ -2294,9 +2294,9 @@
metier.getOrCreateOPTG();
metier.getOrCreateOPTI();
if (!"0".equals(isorti)) {
- metier.getOrCreateOPTR().getSorties().modifyVerbositeForAll(SeveriteManager.DEBUG3);
- metier.getOrCreateOPTG().getSorties().modifyVerbositeForAll(SeveriteManager.DEBUG3);
- metier.getOrCreateOPTI().getSorties().modifyVerbositeForAll(SeveriteManager.DEBUG3);
+ metier.getOrCreateOPTR().getSorties().modifyVerbositeForAll(SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9);
+ metier.getOrCreateOPTG().getSorties().modifyVerbositeForAll(SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9);
+ metier.getOrCreateOPTI().getSorties().modifyVerbositeForAll(SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9);
}
if (metier.getPNUM().getParamNumCalcTrans() == null) {
metier.getPNUM().setParamNumCalcTrans(new ParamNumCalcTrans(metier.getCrueConfigMetier()));
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/io/neuf/DHReader.java 2012-11-14 08:38:46 UTC (rev 7880)
@@ -1294,7 +1294,7 @@
}
if (ilecam == 1) {
- // LOI FONCTION DU TEMPS FOURNIE, AVEC DEBUG3 PAS DE TEMPS CONSTANT
+ // LOI FONCTION DU TEMPS FOURNIE, AVEC DEFAULT_DEBUG_LEVEL_FOR_CRUE9 PAS DE TEMPS CONSTANT
final Duration pasDeTempsDefLoi = readDuration(reader);
final Duration decal = readDuration(reader, 4);
@@ -1650,7 +1650,7 @@
// // Enregistrement de isorti dans PCAL
crueData.getOrCreateOCAL().getSorties().modifyVerbositeForAll(isorti == 0
? SeveriteManager.INFO
- : SeveriteManager.DEBUG3);
+ : SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9);
// pour cree un PCAL par defaut.
crueData.getOrCreatePCAL();
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDC.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDC.java 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDC.java 2012-11-14 08:38:46 UTC (rev 7880)
@@ -194,8 +194,8 @@
assertTrue(sorties.getAvancement().getSortieFichier());
assertTrue(sorties.getTrace().getSortieEcran());
assertTrue(sorties.getTrace().getSortieFichier());
- assertEquals(SeveriteManager.DEBUG3, sorties.getTrace().getVerbositeEcran());
- assertEquals(SeveriteManager.DEBUG3, sorties.getTrace().getVerbositeFichier());
+ assertEquals(SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9, sorties.getTrace().getVerbositeEcran());
+ assertEquals(SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9, sorties.getTrace().getVerbositeFichier());
}
private void testBatiCasier(final CrueData data) {
@@ -468,7 +468,7 @@
final CtuluLog analyzer = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
final CrueData data = readModeleCrue9(analyzer, FICHIER_TEST_MODELE3_1_DC_ISORTI_0);
assertFalse(analyzer.containsSevereError());
- data.getOPTG().getSorties().getTrace().setVerbositeEcran(SeveriteManager.DEBUG3);
+ data.getOPTG().getSorties().getTrace().setVerbositeEcran(SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9);
File f = createTempFile();
writeModeleCrue9(analyzer, f, data);
try {
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueDH.java 2012-11-14 08:38:46 UTC (rev 7880)
@@ -119,7 +119,7 @@
testAnalyser(analyzer);
//le dh active OCAL
TestCrueDC.assertSortieTrueAndInfo(data.getMetier().getOCAL().getSorties());
- data.getMetier().getOCAL().getSorties().getTrace().setVerbositeFichier(SeveriteManager.DEBUG3);
+ data.getMetier().getOCAL().getSorties().getTrace().setVerbositeFichier(SeveriteManager.DEFAULT_DEBUG_LEVEL_FOR_CRUE9);
File f = createTempFile();
Crue9FileFormatFactory.getDHFileFormat().writeMetier(data, f, analyzer);
testAnalyser(analyzer);
Modified: trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueOPTRFile.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueOPTRFile.java 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/crue-server/src/test/java/org/fudaa/dodico/crue/io/TestCrueOPTRFile.java 2012-11-14 08:38:46 UTC (rev 7880)
@@ -20,13 +20,13 @@
public class TestCrueOPTRFile extends AbstractIOTestCase {
/**
- *
+ *
*/
protected static final String FICHIER_TEST_OPTR_XML = "/v1_2/M3-0_c10.optr.xml";
protected static final String FICHIER_TEST_OPTR_XML_FALSE = "/v1_2/M3-0_c10-false.optr.xml";
/**
- *
+ *
*/
public TestCrueOPTRFile() {
super(Crue10FileFormatFactory.getVersion(CrueFileType.OPTR, TestCoeurConfig.INSTANCE), FICHIER_TEST_OPTR_XML);
@@ -34,7 +34,7 @@
public void testLecture() {
- final OrdPrtReseau data = readModele(FICHIER_TEST_OPTR_XML,TestCoeurConfig.INSTANCE);
+ final OrdPrtReseau data = readModele(FICHIER_TEST_OPTR_XML, TestCoeurConfig.INSTANCE);
testData(data);
}
@@ -111,9 +111,8 @@
public OrdPrtReseau readModele(String file, CoeurConfigContrat version) {
final CtuluLog analyzer = new CtuluLog();
final OrdPrtReseau data = (OrdPrtReseau) Crue10FileFormatFactory.getVersion(CrueFileType.OPTR, version).read(file, analyzer, createDefault())
- .getMetier();
+ .getMetier();
testAnalyser(analyzer);
return data;
}
-
}
Modified: trunk/soft/fudaa-crue/crue-server/src/test/resources/CrueConfigMetierForTestsFalse.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/test/resources/CrueConfigMetierForTestsFalse.xml 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/crue-server/src/test/resources/CrueConfigMetierForTestsFalse.xml 2012-11-14 08:38:46 UTC (rev 7880)
@@ -39,7 +39,7 @@
<ItemEnum Id="4">Lt_StoG</ItemEnum>
</ItemTypeEnum>
<ItemTypeEnum Nom="Ten_Severite">
- <ItemEnum Id="0">DEBUG3</ItemEnum>
+ <ItemEnum Id="0">DEBUG2</ItemEnum>
<ItemEnum Id="2">FATAL</ItemEnum>
</ItemTypeEnum>
</TypeEnums>
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java 2012-11-14 08:31:59 UTC (rev 7879)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/AbstractPerspectiveService.java 2012-11-14 08:38:46 UTC (rev 7880)
@@ -201,7 +201,6 @@
@Override
public void setState(PerspectiveState state) {
if (PerspectiveState.MODE_READ_ONLY_ALWAYS.equals(this.state)) {
- setState(this.state);
return;
}
doSetState(state);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-11-20 00:04:26
|
Revision: 7902
http://fudaa.svn.sourceforge.net/fudaa/?rev=7902&view=rev
Author: deniger
Date: 2012-11-20 00:04:20 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/netbeans/
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/export/
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/longitudinal/
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/multivar/
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/rptg/
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/temporal/
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/time/
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/transversal/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-11-20 07:25:04
|
Revision: 7904
http://fudaa.svn.sourceforge.net/fudaa/?rev=7904&view=rev
Author: deniger
Date: 2012-11-20 07:24:57 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/pom.xml
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-server/
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2012-11-20 00:19:54 UTC (rev 7903)
+++ trunk/soft/fudaa-crue/pom.xml 2012-11-20 07:24:57 UTC (rev 7904)
@@ -28,7 +28,14 @@
</properties>
<modules>
<module>crue-test</module>
- <module>crue-server</module>
+ <module>crue-core</module>
+ <module>crue-config</module>
+ <module>crue-emh</module>
+ <module>crue-io</module>
+ <module>crue-compare</module>
+ <module>crue-otfa</module>
+ <module>crue-project</module>
+ <module>crue-validation</module>
<module>crue-sysdoc</module>
<module>ui-common</module>
<module>ui-branding</module>
@@ -47,6 +54,7 @@
<module>ui-loi</module>
<module>ui-report</module>
<module>ui-sysdoc</module>
+
</modules>
<dependencyManagement>
<dependencies>
@@ -91,38 +99,87 @@
<artifactId>utils</artifactId>
<version>1.07.00</version>
</dependency>
- <!-- <dependency>
- <groupId>net.java.dev.glazedlists</groupId>
- <artifactId>glazedlists_java15</artifactId>
- <version>1.8.0</version>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-io</artifactId>
+ <version>${project.version}</version>
</dependency>
- -->
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>crue-server</artifactId>
+ <artifactId>crue-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-emh</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-validation</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-config</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>crue-sysdoc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>crue-server</artifactId>
+ <artifactId>crue-otfa</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-compare</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-project</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-io</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <artifactId>crue-test</artifactId>
+ <artifactId>crue-emh</artifactId>
+ <type>test-jar</type>
<version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-project</artifactId>
<type>test-jar</type>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-core</artifactId>
+ <type>test-jar</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-config</artifactId>
+ <type>test-jar</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>crue-test</artifactId>
<version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
@@ -240,6 +297,12 @@
<version>1.6</version>
</dependency>
<dependency>
+ <groupId>uk.com.robust-it</groupId>
+ <artifactId>cloning</artifactId>
+ <version>1.7.9</version>
+ </dependency>
+
+ <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.2</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-11-20 13:24:37
|
Revision: 7919
http://fudaa.svn.sourceforge.net/fudaa/?rev=7919&view=rev
Author: deniger
Date: 2012-11-20 13:24:26 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-compare/
trunk/soft/fudaa-crue/crue-compare/pom.xml
trunk/soft/fudaa-crue/crue-compare/src/
trunk/soft/fudaa-crue/crue-compare/src/main/
trunk/soft/fudaa-crue/crue-compare/src/main/java/
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/
Property changes on: trunk/soft/fudaa-crue/crue-compare
___________________________________________________________________
Added: svn:ignore
+ target
Added: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml (rev 0)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml 2012-11-20 13:24:26 UTC (rev 7919)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>fudaa-crue</artifactId>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <version>0.62-SNAPSHOT</version>
+ </parent>
+ <artifactId>crue-compare</artifactId>
+ <name>Crue Compare</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <parallel>classes</parallel>
+ <threadCount>5</threadCount>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-test</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-emh</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-crue</groupId>
+ <artifactId>crue-config</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ </dependency>
+ </dependencies>
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-11-20 16:23:00
|
Revision: 8002
http://fudaa.svn.sourceforge.net/fudaa/?rev=8002&view=rev
Author: deniger
Date: 2012-11-20 16:22:53 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-io/src/test/resources/projet/Etu3-0_1.1.2.zip
trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestEMHPropertiesValidator.java
Modified: trunk/soft/fudaa-crue/crue-io/src/test/resources/projet/Etu3-0_1.1.2.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestEMHPropertiesValidator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestEMHPropertiesValidator.java 2012-11-20 16:10:26 UTC (rev 8001)
+++ trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestEMHPropertiesValidator.java 2012-11-20 16:22:53 UTC (rev 8002)
@@ -7,8 +7,6 @@
import java.util.List;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.io.ReadHelper;
-import org.fudaa.dodico.crue.io.CrueDCTest;
-import org.fudaa.dodico.crue.io.CrueDHTest;
import org.fudaa.dodico.crue.common.io.CrueIOResu;
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
@@ -27,7 +25,7 @@
public void testValidationModele3() {
final CtuluLog analyze = new CtuluLog();
final CrueIOResu<CrueData> res = ReadHelper.readModele(analyze, FilesForTest.FICHIER_TEST_MODELE3_DC,
- FilesForTest.DH_M_30);
+ FilesForTest.DH_M_30);
testAnalyser(analyze);
final List<EMH> allEMH = res.getMetier().getAllSimpleEMH();
allEMH.add(res.getMetier().getScenarioData());
@@ -35,8 +33,9 @@
allEMH.add(res.getMetier().getSousModele());
final CrueData data = res.getMetier();
final List<CtuluLog> validate = ValidatorForValuesAndContents.validateValues(data.getScenarioData(),
- data.getCrueConfigMetier());
-
+ data.getCrueConfigMetier());
+ assertEquals(3, validate.size());
+
}
/**
@@ -50,7 +49,7 @@
allEMH.add(scenario);
allEMH.add(scenario.getModeles().get(0));
List<CtuluLog> validate = ValidatorForValuesAndContents.validateValues(scenario,
- TestCoeurConfig.INSTANCE.getCrueConfigMetier());
+ TestCoeurConfig.INSTANCE.getCrueConfigMetier());
for (final CtuluLog ctuluAnalyze : validate) {
if (ctuluAnalyze.containsErrorOrSevereError()) {
ctuluAnalyze.printResume();
@@ -58,6 +57,6 @@
// ores not read
assertFalse(ctuluAnalyze.containsErrorOrSevereError());
}
-
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-11-20 23:40:27
|
Revision: 8033
http://fudaa.svn.sourceforge.net/fudaa/?rev=8033&view=rev
Author: deniger
Date: 2012-11-20 23:40:20 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/LoaderService.java
trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/ScenarioLoaderServiceAbstract.java
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2012-11-20 23:39:16 UTC (rev 8032)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2012-11-20 23:40:20 UTC (rev 8033)
@@ -31,7 +31,7 @@
import org.fudaa.dodico.crue.projet.EMHProjetController;
import org.fudaa.dodico.crue.projet.EMHScenarioContainer;
import org.fudaa.dodico.crue.projet.ScenarioLoader;
-import org.fudaa.dodico.crue.projet.ScenarioLoaderResult;
+import org.fudaa.dodico.crue.projet.ScenarioLoaderOperation;
import org.fudaa.dodico.crue.projet.calcul.CalculCrueContrat;
import org.fudaa.dodico.crue.projet.calcul.CalculCrueRunnerManager;
import org.fudaa.dodico.crue.projet.calcul.ExecInputDefault;
@@ -285,7 +285,7 @@
}
ScenarioLoader loader = new ScenarioLoader(managerScenario, projet, projet.getCoeurConfig());
- ScenarioLoaderResult load = loader.load(managerScenario.getRunCourant());//on charge le run courant:
+ ScenarioLoaderOperation load = loader.load(managerScenario.getRunCourant());//on charge le run courant:
logs.addGroup(load.getLogs().createCleanGroup());
EMHScenario emhScenario = null;
Modified: trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/LoaderService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/LoaderService.java 2012-11-20 23:39:16 UTC (rev 8032)
+++ trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/LoaderService.java 2012-11-20 23:40:20 UTC (rev 8033)
@@ -13,7 +13,7 @@
import org.fudaa.dodico.crue.metier.etude.EMHRun;
import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
import org.fudaa.dodico.crue.projet.ScenarioLoader;
-import org.fudaa.dodico.crue.projet.ScenarioLoaderResult;
+import org.fudaa.dodico.crue.projet.ScenarioLoaderOperation;
import org.fudaa.dodico.crue.config.coeur.CoeurConfigContrat;
import org.fudaa.fudaa.crue.common.CommonMessage;
import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
@@ -49,7 +49,7 @@
public EMHScenario load(final EMHProjet projet, final ManagerEMHScenario scenario, EMHRun run, boolean displayOnlyIfError) {
ScenarioLoader loader = new ScenarioLoader(scenario, projet, projet.getCoeurConfig());
- final ScenarioLoaderResult load = loader.load(run);
+ final ScenarioLoaderOperation load = loader.load(run);
final boolean isLoadedWithoutFatalError = load.getResult() != null && !load.getLogs().containsFatalError();
if (displayOnlyIfError) {
if (load.getLogs().containsError() || load.getLogs().containsFatalError()) {
Modified: trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/ScenarioLoaderServiceAbstract.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/ScenarioLoaderServiceAbstract.java 2012-11-20 23:39:16 UTC (rev 8032)
+++ trunk/soft/fudaa-crue/ui-loader/src/main/java/org/fudaa/fudaa/crue/loader/ScenarioLoaderServiceAbstract.java 2012-11-20 23:40:20 UTC (rev 8033)
@@ -9,7 +9,7 @@
import org.fudaa.dodico.crue.metier.etude.EMHRun;
import org.fudaa.dodico.crue.metier.etude.ManagerEMHScenario;
import org.fudaa.dodico.crue.projet.ScenarioLoader;
-import org.fudaa.dodico.crue.projet.ScenarioLoaderResult;
+import org.fudaa.dodico.crue.projet.ScenarioLoaderOperation;
import org.fudaa.fudaa.crue.common.CommonMessage;
import org.fudaa.fudaa.crue.common.PerspectiveEnum;
import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
@@ -99,7 +99,7 @@
protected boolean loadScenario(final EMHProjet projet, final ManagerEMHScenario scenario, final EMHRun run) {
ScenarioLoader loader = new ScenarioLoader(scenario, projet, projet.getCoeurConfig());
- final ScenarioLoaderResult load = loader.load(run);
+ final ScenarioLoaderOperation load = loader.load(run);
EventQueue.invokeLater(new Runnable() {
@Override
public void run() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-11-21 08:23:40
|
Revision: 8049
http://fudaa.svn.sourceforge.net/fudaa/?rev=8049&view=rev
Author: deniger
Date: 2012-11-21 08:23:28 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsEnum.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagne.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLineResult.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneResult.java
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml 2012-11-21 07:25:22 UTC (rev 8048)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml 2012-11-21 08:23:28 UTC (rev 8049)
@@ -2,20 +2,20 @@
<Comparaisons xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue
http://www.fudaa.fr/xsd/crue/comparaison-1.0.0.xsd">
<!--
- Dans toutes les requetes, on part de EMHScenario. On a ajouté des
- methodes pour faciliter les requetes
+ Dans toutes les requetes, on part de EMHScenario. On a ajouté des
+ methodes pour faciliter les requetes
-->
<Comparaison>
- <Id>DRSO1</Id>
+ <Id>DRSO1.1</Id>
<Nom>Quelle EMH, présente (et active) dans A, est absente (ou inactive) dans B</Nom>
<Selection>
<!--
- allSimpleEMH donne la liste des tous les EMH simple (non conteneur)
- contenu par les sous-modeles du scenario
+ allSimpleEMH donne la liste des tous les EMH simple (non conteneur)
+ contenu par les sous-modeles du scenario
-->
<!--
- [active='true'] signifie que l'on ne recupere que les EMH qui sont
- actives
+ allSimpleEMH[actuallyActive='true'] signifie que l'on ne recupere que les EMH qui sont
+ actives
-->
<Requete Description="EMH active">
allSimpleEMH[actuallyActive='true']
@@ -29,12 +29,22 @@
<Compare-Liste Bidirect="true" Attribut="id" />
</Comparaison>
<Comparaison>
+ <Id>DRSO1.2</Id>
+ <Nom>Quelle EMH, présente et inactive dans A, est absente ou active dans B</Nom>
+ <Selection>
+ <Requete Description="EMH active">
+ allSimpleEMH[actuallyActive='false']
+ </Requete>
+ </Selection>
+ <Compare-Liste Bidirect="true" Attribut="id" />
+ </Comparaison>
+ <Comparaison>
<Id>DRSO2</Id>
<Nom>Quelle EMH, présente dans A et B, a un type différent</Nom>
<Selection>
<!--
- Merge signifie que l'on va "merger" le contenu de la requete "allSimpleEMH" et faire concorder les EMH qui ont le même Id Attribut="Id" La comparaison portera sur toutes les
- EMH qui ont même id
+ Merge signifie que l'on va "merger" le contenu de la requete "allSimpleEMH" et faire concorder les EMH qui ont le même Id Attribut="Id" La comparaison portera sur toutes les
+ EMH qui ont même id
-->
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
<Requete Description="Toutes les EMH">allSimpleEMH[actuallyActive='true']
@@ -193,28 +203,28 @@
</Comparaison>
<!-- DPTG -->
<Comparaison>
- <Id>DPTG01</Id>
+ <Id>DPTG1.1</Id>
<Nom>Quelle EMH, présente dans A et B, possède des listes de DonPrtGeo* différentes</Nom>
<Selection>
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
- <Requete Description="Toutes les EMH">allSimpleEMH[actuallyActive='true']
+ <Requete Description="Toutes les EMH">allSimpleEMH
</Requete>
</Merge>
<!--
- les EMH ont une methode getDPTG qui liste toutes les DonPrtGeo qui
- sont nommées: soit DonPrtGeoBatiCasier,
- DonPrtGeoProfilCasier,DonPrtGeoProfilSection
+ les EMH ont une methode getDPTG qui liste toutes les DonPrtGeo qui
+ sont nommées: soit DonPrtGeoBatiCasier,
+ DonPrtGeoProfilCasier,DonPrtGeoProfilSection
-->
<Requete Description="Les dptg nommés">DPTGNommes</Requete>
</Selection>
<Compare-Liste Bidirect="true" Attribut="id" />
</Comparaison>
<Comparaison>
- <Id>DPTG01.1</Id>
+ <Id>DPTG1.2</Id>
<Nom>Quelle EMH, présente dans A et B, a des différences sur ses DonPrtGeo* de même nom (attributs premier niveau)</Nom>
<Selection>
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
- <Requete Description="Toutes les EMH">allSimpleEMH[actuallyActive='true']
+ <Requete Description="Toutes les EMH">allSimpleEMH
</Requete>
</Merge>
<Merge Attribut="id" Description="dptg de même nom">
@@ -231,11 +241,11 @@
</Compare-Objet>
</Comparaison>
<Comparaison>
- <Id>DPTG01.2</Id>
+ <Id>DPTG1.3</Id>
<Nom>Quelle EMHBrancheSaintVenant, présente dans A et B, a des différences sur ses DonPrtGeo* (attributs premier niveau)</Nom>
<Selection>
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
- <Requete Description="Toutes les branches de Saint-Venant">branchesSaintVenant[actuallyActive='true']
+ <Requete Description="Toutes les branches de Saint-Venant">branchesSaintVenant
</Requete>
</Merge>
<!-- les EMH ont une methode getDPTG qui liste toutes les DonPrtGeo-->
@@ -246,12 +256,11 @@
<Compare-Objet />
</Comparaison>
<Comparaison>
- <Id>DPTG01.3</Id>
+ <Id>DPTG1.4</Id>
<Nom>Quelle EMHSectionIdem, présente dans A et B, a des différences sur ses DonPrtGeo* (attributs premier niveau)</Nom>
<Selection>
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
- <Requete Description="Toutes les EMHSectionIdem">sections[type="EMHSectionIdem" and
- actuallyActive='true']
+ <Requete Description="Toutes les EMHSectionIdem">sections[type="EMHSectionIdem"]
</Requete>
</Merge>
<!-- les EMH ont une methode getDPTG qui liste toutes les DonPrtGeo-->
@@ -261,14 +270,31 @@
</Selection>
<Compare-Objet />
</Comparaison>
+ <Comparaison>
+ <Id>DPTG2</Id>
+ <Nom>Quel ProfilSection, présent dans A et B, n'a pas les mêmes LitNommés</Nom>
+ <Selection>
+ <Merge Attribut="id">
+ <Requete Description="Les DonPrtGeoProfilSection de même id">
+ allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
+ </Requete>
+ </Merge>
+ <Requete Description="les litNommes">
+ litNommes
+ </Requete>
+ </Selection>
+ <Compare-Objet>
+ <Attribut>nom</Attribut>
+ </Compare-Objet>
+ </Comparaison>
<Comparaison>
- <Id>DPTG03</Id>
- <Nom>Quel ProfilSection, présent dans A et B, n'a pas le même nombre de LitNumerote</Nom>
+ <Id>DPTG3</Id>
+ <Nom>Quel ProfilSection de SectionProfil, présent dans A et B, n'a pas le même nombre de LitNumerote</Nom>
<Selection>
<Merge Attribut="id">
<Requete Description="Les DonPrtGeoProfilSection de même id">
- allSimpleEMH[actuallyActive='true']/DPTGNommes[type="DonPrtGeoProfilSection"]
+ allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
</Requete>
</Merge>
</Selection>
@@ -276,13 +302,14 @@
<Attribut>nombreLitNumerote</Attribut>
</Compare-Objet>
</Comparaison>
+
<Comparaison>
- <Id>DPTG04</Id>
+ <Id>DPTG4</Id>
<Nom>Quel ProfilSection, présent dans A et B, ayant le même nombre de LitNumerote, a des LitNumerote de caractéristiques différentes : IsLitActif, IsLitMineur</Nom>
<Selection>
<Merge Attribut="id,litNumerote.size">
<Requete Description="Les DonPrtGeoProfilSection de même id et ayant le même nombre de lit">
- allSimpleEMH[actuallyActive='true']/DPTGNommes[type="DonPrtGeoProfilSection"]
+ allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
</Requete>
</Merge>
<Requete Description="Les LitNumerote">litNumerote</Requete>
@@ -293,12 +320,12 @@
</Compare-Objet>
</Comparaison>
<Comparaison>
- <Id>DPTG05</Id>
+ <Id>DPTG5</Id>
<Nom>Quel ProfilSection, présent dans A et B, ayant le même nombre de LitNumerote, a des limites de lits différentes (Xt ou Z) pour certains lits</Nom>
<Selection>
<Merge Attribut="id,litNumerote.size">
<Requete Description="Les DonPrtGeoProfilSection de même id et ayant le même nombre de lit">
- allSimpleEMH[actuallyActive='true']/DPTGNommes[type="DonPrtGeoProfilSection"]
+ allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
</Requete>
</Merge>
<Requete Description="Les LitNumerote">litNumerote</Requete>
@@ -309,12 +336,12 @@
</Compare-Objet>
</Comparaison>
<Comparaison>
- <Id>DPTG06</Id>
+ <Id>DPTG6</Id>
<Nom>Quel ProfilSection, présent dans A et B, ayant le même nombre de LitNumerote, a des DonFrt de noms différents pour certains lits</Nom>
<Selection>
<Merge Attribut="id,litNumerote.size">
<Requete Description="Les DonPrtGeoProfilSection de même id et ayant le même nombre de lit">
- allSimpleEMH[actuallyActive='true']/DPTGNommes[type="DonPrtGeoProfilSection"]
+ allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
</Requete>
</Merge>
<Requete Description="Les LitNumerote">litNumerote</Requete>
@@ -327,19 +354,19 @@
<Compare-Objet Deep="-1">
<Attribut>frotId</Attribut>
<Option>
- <Nom>Commentaire</Nom>
- <Valeur>Ignore</Valeur>
+ <Nom>IgnoreCommentaire</Nom>
+ <Valeur>True</Valeur>
</Option>
</Compare-Objet>
</Comparaison>
<Comparaison>
- <Id>DPTG07</Id>
+ <Id>DPTG7</Id>
<Nom>Quel ProfilSection, présent dans A et B, n'a pas le même nombre de PtProfil</Nom>
<Selection>
<Merge Attribut="id">
<Requete Description="Les DonPrtGeoProfilSection de même id">
- allSimpleEMH[actuallyActive='true']/DPTGNommes[type="DonPrtGeoProfilSection"]
+ allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
</Requete>
</Merge>
</Selection>
@@ -348,12 +375,12 @@
</Compare-Objet>
</Comparaison>
<Comparaison>
- <Id>DPTG08</Id>
+ <Id>DPTG8</Id>
<Nom>Quel ProfilSection, présent dans A et B, n'a pas les mêmes PtProfil (Xt ou Z)</Nom>
<Selection>
<Merge Attribut="id">
<Requete Description="Les DonPrtGeoProfilSection de même id">
- allSimpleEMH[actuallyActive='true']/DPTGNommes[type="DonPrtGeoProfilSection"]
+ allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]
</Requete>
</Merge>
</Selection>
@@ -367,7 +394,7 @@
<Selection>
<Merge Attribut="id">
<Requete Description="Les DonPrtGeoProfilCasier de même id">
- allSimpleEMH[actuallyActive='true']/DPTGNommes[type="DonPrtGeoProfilCasier"]
+ allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilCasier"]
</Requete>
</Merge>
</Selection>
@@ -381,7 +408,7 @@
<Selection>
<Merge Attribut="id">
<Requete Description="Les DonPrtGeoProfilCasier de même id">
- allSimpleEMH[actuallyActive='true']/DPTGNommes[type="DonPrtGeoProfilCasier"]
+ allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilCasier"]
</Requete>
</Merge>
</Selection>
@@ -390,12 +417,12 @@
</Compare-Objet>
</Comparaison>
<Comparaison>
- <Id>DPTG12</Id>
+ <Id>DPTG12.1</Id>
<Nom>Quel ProfilCasier, présent dans A et B, n'a pas les mêmes PtProfil (Xt ou Z)</Nom>
<Selection>
<Merge Attribut="id">
<Requete Description="Les DonPrtGeoProfilCasier de même id">
- allSimpleEMH[actuallyActive='true']/DPTGNommes[type="DonPrtGeoProfilCasier"]
+ allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilCasier"]
</Requete>
</Merge>
</Selection>
@@ -404,12 +431,12 @@
</Compare-Objet>
</Comparaison>
<Comparaison>
- <Id>DPTG12.1</Id>
+ <Id>DPTG12.2</Id>
<Nom>Quel ProfilCasier, présent dans A et B, n'a pas le même commentaire</Nom>
<Selection>
<Merge Attribut="id">
<Requete Description="Les DonPrtGeoProfilCasier de même id">
- allSimpleEMH[actuallyActive='true']/DPTGNommes[type="DonPrtGeoProfilCasier"]
+ allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilCasier"]
</Requete>
</Merge>
</Selection>
@@ -422,7 +449,7 @@
<Nom>Quel LitNomme, présent dans A, est absent dans B</Nom>
<Selection>
<Requete Description="Les lit nommmes">
- allSimpleEMH[actuallyActive='true']/DPTGNommes[type="DonPrtGeoProfilSection"]/litNumerote/nomLit
+ allSimpleEMH/DPTGNommes[type="DonPrtGeoProfilSection"]/litNumerote/nomLit
</Requete>
</Selection>
<Compare-Liste Attribut="id" Bidirect="true" />
@@ -464,8 +491,8 @@
<Compare-Objet>
<Attribut>loi</Attribut>
<Option>
- <Nom>Commentaire</Nom>
- <Valeur>Ignore</Valeur>
+ <Nom>IgnoreCommentaire</Nom>
+ <Valeur>True</Valeur>
</Option>
</Compare-Objet>
</Comparaison>
@@ -579,8 +606,8 @@
<Nom>Quel calcul, présent (et utilisé) dans A, est absent (ou inutilisé) dans B</Nom>
<Selection>
<!--
- un calcul est utilise s'il appartient a un Ordre de calcul du
- scenario?
+ un calcul est utilise s'il appartient a un Ordre de calcul du
+ scenario?
-->
<Requete Description="tous les calculs utilisés">
ordCalcScenario/ordCalc/calc
@@ -621,8 +648,8 @@
</Selection>
<Compare-Objet Deep="2">
<Option>
- <Nom>Commentaire</Nom>
- <Valeur>Ignore</Valeur>
+ <Nom>IgnoreCommentaire</Nom>
+ <Valeur>True</Valeur>
</Option>
<!-- on ne reteste pas le calcul parent qui est le meme -->
<AttributToIgnore>calculParent</AttributToIgnore>
@@ -645,30 +672,11 @@
</Compare-Objet>
</Comparaison>
<Comparaison>
- <Id>DCLM5</Id>
- <Nom>Quel calcul, ayant les mêmes CLM dans A et dans B, les ordonne dans un ordre différent</Nom>
- <Selection>
- <Merge Attribut="id,type" Description="Les calcul de même id et meme type">
- <Requete Description="tous les calculs">
- donCLimMScenario/calc
- </Requete>
- </Merge>
- <Requete Description="La liste des dclm utilisant le calcul">listeDCLM</Requete>
- </Selection>
- la comparaison se fera uniquement si les 2 listes comportent les même id
- <Compare-Liste-Order Attribut="typeAndEMH" OnlyIfSameList="true" />
- </Comparaison>
- <Comparaison>
<Id>DLHY1</Id>
<Nom>Quelle loi, présente (et utilisée) dans A, est absente (ou inutilisée) dans B</Nom>
<Selection>
- <!--
- loiConteneur/lois donne la liste des lois contenu par le scenario
- -->
- <!--
- [used='true'] signifie que l'on ne recupere que les lois qui sont
- utilisées
- -->
+ <!--loiConteneur/lois donne la liste des lois contenu par le scenario-->
+ <!--[used='true'] signifie que l'on ne recupere que les lois qui sont utilisées-->
<Requete Description="Lois utilisées">
loiConteneur/lois[used='true']
</Requete>
@@ -693,8 +701,8 @@
<!-- on compare le type -->
<Compare-Objet>
<Option>
- <Nom>Commentaire</Nom>
- <Valeur>Ignore</Valeur>
+ <Nom>IgnoreCommentaire</Nom>
+ <Valeur>True</Valeur>
</Option>
<Attribut>type</Attribut>
</Compare-Objet>
@@ -858,8 +866,8 @@
</Compare-Objet>
</Comparaison>
<!--
- Attention, pour que cette comparaison fonctionne, il faut qu'il y le
- meme nombre de modele
+ Attention, pour que cette comparaison fonctionne, il faut qu'il y le
+ meme nombre de modele
-->
<Comparaison>
<Id>OPTG2</Id>
@@ -977,7 +985,7 @@
<Attribut>active</Attribut>
</Compare-Objet>
</Comparaison>
- <Comparaison>
+ <Comparaison>
<Id>OPTI5</Id>
<Nom>Quel modèle, présent dans A et B, a des paramétrages différents sur les règles de même type</Nom>
<Selection>
@@ -1097,8 +1105,8 @@
<Compare-Liste-Order Attribut="id" OnlyIfSameList="true" />
</Comparaison>
<Comparaison>
- <Id>RPTG1</Id>
- <Nom>Quelle section, présente dans A et dans B, comporte des différences sur les résultats de prétraitement géométriques, et sur quelles courbes</Nom>
+ <Id>RPTG1.1</Id>
+ <Nom>Quelle section, présente dans A et dans B, comporte des différences sur les résultats de prétraitement géométriques LoiZ*(Zfond), et sur quelles courbes (Epsilon absolu)</Nom>
<Selection>
<Merge Attribut="id" Description="Les sections de même id">
<Requete Description="Les sections">
@@ -1108,60 +1116,164 @@
<Requete Description="Les resultat de pré-traitement">resPrtGeo</Requete>
</Selection>
<!--pour tester les lois-->
- <Compare-Objet Deep="2"/>
+ <Compare-Objet Deep="2">
+ <Option>
+ <!--on ne compare que les loiZ et le premier point seulement-->
+ <Nom>CompareLoiZFirstPointOnly</Nom>
+ <Valeur>True</Valeur>
+ </Option>
+ </Compare-Objet>
</Comparaison>
<Comparaison>
- <Id>RPTG2</Id>
- <Nom>Quel casier, présent dans A et dans B, comporte des différences sur les résultats de prétraitement géométriques, et sur quelles courbes</Nom>
+ <Id>RPTG1.2</Id>
+ <Nom>Quelle section, présente dans A et dans B, comporte des différences sur les résultats de prétraitement géométriques LoiZ*(Zfond), et sur quelles courbes (Epsilon absolu et relatif)</Nom>
<Selection>
<Merge Attribut="id" Description="Les sections de même id">
<Requete Description="Les sections">
- casiers[actuallyActive='true']
+ sections[actuallyActive='true']
</Requete>
</Merge>
<Requete Description="Les resultat de pré-traitement">resPrtGeo</Requete>
</Selection>
<!--pour tester les lois-->
- <Compare-Objet Deep="2"/>
+ <Compare-Objet Deep="2">
+ <Option>
+ <Nom>CompareLoiZFirstPointOnly</Nom>
+ <Valeur>True</Valeur>
+ </Option>
+ <Option>
+ <Nom>CompareDoubleRelativeMethod</Nom>
+ <Valeur>True</Valeur>
+ </Option>
+ </Compare-Objet>
</Comparaison>
<Comparaison>
- <Id>RPTG3</Id>
- <Nom>Quel casier, présent dans A et dans B, comporte des différences sur les listes des résultats de prétraitement géométriques des sections
- </Nom>
+ <Id>RPTG1.3</Id>
+ <Nom>Quelle section, présente dans A et dans B, comporte des différences sur les résultats de prétraitement géométriques, et sur quelles courbes (LoiZ*(Zfond) ignoré, Epsilon absolu)</Nom>
<Selection>
<Merge Attribut="id" Description="Les sections de même id">
<Requete Description="Les sections">
- casiers[actuallyActive='true']
+ sections[actuallyActive='true']
</Requete>
</Merge>
- <Requete Description="Les résultats de section ">
- resPrtGeoSection
- </Requete>
-
+ <Requete Description="Les resultat de pré-traitement">resPrtGeo</Requete>
</Selection>
- <Compare-Liste Attribut="id" Bidirect="true" />
+ <!--pour tester les lois-->
+ <Compare-Objet Deep="2">
+ <Option>
+ <Nom>LoiZDontCompareFirstPoint</Nom>
+ <Valeur>True</Valeur>
+ </Option>
+ </Compare-Objet>
</Comparaison>
<Comparaison>
- <Id>RPTG4</Id>
- <Nom>Quel casier, présent dans A et dans B, comporte des différences dans les resultats de prétraitement géométriques de sections de même id
- </Nom>
+ <Id>RPTG1.4</Id>
+ <Nom>Quelle section, présente dans A et dans B, comporte des différences sur les résultats de prétraitement géométriques, et sur quelles courbes (LoiZ*(Zfond) ignoré, Epsilon absolu et relatif)</Nom>
<Selection>
<Merge Attribut="id" Description="Les sections de même id">
<Requete Description="Les sections">
+ sections[actuallyActive='true']
+ </Requete>
+ </Merge>
+ <Requete Description="Les resultat de pré-traitement">resPrtGeo</Requete>
+ </Selection>
+ <!--pour tester les lois-->
+ <Compare-Objet Deep="2">
+ <Option>
+ <Nom>LoiZDontCompareFirstPoint</Nom>
+ <Valeur>True</Valeur>
+ </Option>
+ <Option>
+ <Nom>CompareDoubleRelativeMethod</Nom>
+ <Valeur>True</Valeur>
+ </Option>
+ </Compare-Objet>
+ </Comparaison>
+ <Comparaison>
+ <Id>RPTG2.1</Id>
+ <Nom>Quel casier, présent dans A et dans B, comporte des différences sur les résultats de prétraitement géométriques LoiZ*(Zfond), et sur quelles courbes (Epsilon absolu)</Nom>
+ <Selection>
+ <Merge Attribut="id" Description="Les sections de même id">
+ <Requete Description="Les sections">
casiers[actuallyActive='true']
</Requete>
</Merge>
+ <Requete Description="Les resultat de pré-traitement">resPrtGeo</Requete>
+ </Selection>
+ <Compare-Objet Deep="2">
+ <Option>
+ <Nom>CompareLoiZFirstPointOnly</Nom>
+ <Valeur>True</Valeur>
+ </Option>
+ </Compare-Objet>
+ </Comparaison>
+ <Comparaison>
+ <Id>RPTG2.2</Id>
+ <Nom>Quel casier, présent dans A et dans B, comporte des différences sur les résultats de prétraitement géométriques LoiZ*(Zfond), et sur quelles courbes (Epsilon absolu et relatif)</Nom>
+ <Selection>
+ <Merge Attribut="id" Description="Les casiers de même id">
+ <Requete Description="Les sections">
+ casiers[actuallyActive='true']
+ </Requete>
+ </Merge>
+ <Requete Description="Les resultat de pré-traitement">resPrtGeo</Requete>
+ </Selection>
+ <!--pour tester les lois-->
+ <Compare-Objet Deep="2">
+ <Option>
+ <Nom>CompareLoiZFirstPointOnly</Nom>
+ <Valeur>True</Valeur>
+ </Option>
+ <Option>
+ <Nom>CompareDoubleRelativeMethod</Nom>
+ <Valeur>True</Valeur>
+ </Option>
+ </Compare-Objet>
+ </Comparaison>
+ <Comparaison>
+ <Id>RPTG2.3</Id>
+ <Nom>Quel casier, présent dans A et dans B, comporte des différences sur les résultats de prétraitement géométriques, et sur quelles courbes (LoiZ*(Zfond) ignoré, Epsilon absolu)</Nom>
+ <Selection>
+ <Merge Attribut="id" Description="Les casiers de même id">
+ <Requete Description="Les sections">
+ casiers[actuallyActive='true']
+ </Requete>
+ </Merge>
+ <Requete Description="Les resultat de pré-traitement">resPrtGeo</Requete>
+ </Selection>
+ <Compare-Objet Deep="2">
+ <Option>
+ <Nom>LoiZDontCompareFirstPoint</Nom>
+ <Valeur>True</Valeur>
+ </Option>
+ </Compare-Objet>
+ </Comparaison>
+ <Comparaison>
+ <Id>RPTG2.4</Id>
+ <Nom>Quel casier, présent dans A et dans B, comporte des différences sur les résultats de prétraitement géométriques, et sur quelles courbes (LoiZ*(Zfond) ignoré, Epsilon absolu et relatif)</Nom>
+ <Selection>
<Merge Attribut="id" Description="Les sections de même id">
<Requete Description="Les sections">
- resPrtGeoSection
+ casiers[actuallyActive='true']
</Requete>
</Merge>
+ <Requete Description="Les resultat de pré-traitement">resPrtGeo</Requete>
</Selection>
- <Compare-Liste Attribut="id" Bidirect="true" />
+ <!--pour tester les lois-->
+ <Compare-Objet Deep="2">
+ <Option>
+ <Nom>LoiZDontCompareFirstPoint</Nom>
+ <Valeur>True</Valeur>
+ </Option>
+ <Option>
+ <Nom>CompareDoubleRelativeMethod</Nom>
+ <Valeur>True</Valeur>
+ </Option>
+ </Compare-Objet>
</Comparaison>
<Comparaison>
- <Id>RPTI1</Id>
- <Nom>Quel casier, présent dans A et dans B, comporte des différences sur les résultats de prétraitement des conditions initiales</Nom>
+ <Id>RPTI1.1</Id>
+ <Nom>Quel casier, présent dans A et dans B, comporte des différences sur les résultats de prétraitement des conditions initiales (Epsilon absolu)</Nom>
<Selection>
<Merge Attribut="id" Description="Les casiers de même id">
<Requete Description="Les casiers">
@@ -1173,9 +1285,27 @@
<Compare-Objet />
</Comparaison>
<Comparaison>
- <Id>RPTI2</Id>
- <Nom>Quelle section, présente dans A et dans B, comporte des différences sur les résultats de prétraitement des conditions initiales</Nom>
+ <Id>RPTI1.2</Id>
+ <Nom>Quel casier, présent dans A et dans B, comporte des différences sur les résultats de prétraitement des conditions initiales (Epsilon absolu + relatif)</Nom>
<Selection>
+ <Merge Attribut="id" Description="Les casiers de même id">
+ <Requete Description="Les casiers">
+ casiers[actuallyActive='true']
+ </Requete>
+ </Merge>
+ <Requete Description="Les conditions initiales">resPrtCIniCasier</Requete>
+ </Selection>
+ <Compare-Objet>
+ <Option>
+ <Nom>CompareDoubleRelativeMethod</Nom>
+ <Valeur>True</Valeur>
+ </Option>
+ </Compare-Objet>
+ </Comparaison>
+ <Comparaison>
+ <Id>RPTI2.1</Id>
+ <Nom>Quelle section, présente dans A et dans B, comporte des différences sur les résultats de prétraitement des conditions initiales (Epsilon absolu)</Nom>
+ <Selection>
<Merge Attribut="id" Description="Les sections de même id">
<Requete Description="Les sections">
sections[actuallyActive='true']
@@ -1186,6 +1316,24 @@
<Compare-Objet />
</Comparaison>
<Comparaison>
+ <Id>RPTI2.2</Id>
+ <Nom>Quelle section, présente dans A et dans B, comporte des différences sur les résultats de prétraitement des conditions initiales (Epsilon absolu + relatif) </Nom>
+ <Selection>
+ <Merge Attribut="id" Description="Les sections de même id">
+ <Requete Description="Les sections">
+ sections[actuallyActive='true']
+ </Requete>
+ </Merge>
+ <Requete Description="Les conditions initiales">resPrtCIniSection</Requete>
+ </Selection>
+ <Compare-Objet>
+ <Option>
+ <Nom>CompareDoubleRelativeMethod</Nom>
+ <Valeur>True</Valeur>
+ </Option>
+ </Compare-Objet>
+ </Comparaison>
+ <Comparaison>
<Id>RCAL1</Id>
<Nom>Quel calcul contient des résultats dans A et pas dans B ( et inversement)</Nom>
<Selection>
@@ -1216,8 +1364,8 @@
<Compare-Objet />
</Comparaison>
<Comparaison>
- <Id>RCAL4</Id>
- <Nom>Quelle EMH, présente dans A et dans B, comporte des résultat différents</Nom>
+ <Id>RCAL4.1</Id>
+ <Nom>Quelle EMH, présente dans A et dans B, comporte des résultat différents (Epsilon absolu)</Nom>
<Selection>
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
<Requete Description="Toutes les EMH">allSimpleEMH[actuallyActive='true']
@@ -1227,11 +1375,28 @@
</Selection>
<Compare-Objet />
</Comparaison>
+ <Comparaison>
+ <Id>RCAL4.2</Id>
+ <Nom>Quelle EMH, présente dans A et dans B, comporte des résultat différents (Epsilon absolu + relatif)</Nom>
+ <Selection>
+ <Merge Attribut="id" Description="EMH présente dans A et B de même Id">
+ <Requete Description="Toutes les EMH">allSimpleEMH[actuallyActive='true']
+ </Requete>
+ </Merge>
+ <Requete Description="Les résultats">resultatCalcul</Requete>
+ </Selection>
+ <Compare-Objet>
+ <Option>
+ <Nom>CompareDoubleRelativeMethod</Nom>
+ <Valeur>True</Valeur>
+ </Option>
+ </Compare-Objet>
+ </Comparaison>
<Comparaison>
<Id>CPTR</Id>
- <Nom>Quel compte-rendu CPTR, présent dans A et dans B, comporte des données différentes</Nom>
+ <Nom>Quel compte-rendu CPTR, présent dans A et dans B, comporte des différences</Nom>
<Selection>
<Requete Description="compte-rendu">
modeles/compteRenduPTR
@@ -1242,7 +1407,7 @@
<Comparaison>
<Id>CPTG</Id>
- <Nom>Quel compte-rendu CPTG, présent dans A et dans B, comporte des données différentes</Nom>
+ <Nom>Quel compte-rendu CPTG, présent dans A et dans B, comporte des différences</Nom>
<Selection>
<Requete Description="compte-rendu">
modeles/compteRenduPTG
@@ -1254,7 +1419,7 @@
<Comparaison>
<Id>CPTI</Id>
- <Nom>Quel compte-rendu CPTI, présent dans A et dans B, comporte des données différentes</Nom>
+ <Nom>Quel compte-rendu CPTI, présent dans A et dans B, comporte des différences</Nom>
<Selection>
<Requete Description="compte-rendu">
modeles/compteRenduPTI
@@ -1265,7 +1430,7 @@
<Comparaison>
<Id>CCAL</Id>
- <Nom>Quel compte-rendu CCAL, présent dans A et dans B, comporte des données différentes</Nom>
+ <Nom>Quel compte-rendu CCAL, présent dans A et dans B, comporte des différences</Nom>
<Selection>
<Requete Description="compte-rendu">
modeles/compteRenduCAL
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsEnum.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsEnum.java 2012-11-21 07:25:22 UTC (rev 8048)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsEnum.java 2012-11-21 08:23:28 UTC (rev 8049)
@@ -14,9 +14,6 @@
AVAILABLE_LANGUAGE("availableLanguage", String.class, "fr_FR", true),
USER_LANGUAGE("userLanguage", String.class, "fr_FR", true, new OptionValidatorLanguage("userLanguage")),
- KEEP_INITIAL_ORDER_BRANCHE("keepInitialOrder.branche", Boolean.class, Boolean.FALSE.toString(), true),
- KEEP_INITIAL_ORDER_CASIER("keepInitialOrder.casier", Boolean.class, Boolean.FALSE.toString(), true),
- KEEP_INITIAL_ORDER_SECTION("keepInitialOrder.section", Boolean.class, Boolean.FALSE.toString(), true),
UI_UPDATE_FREQ("uiUpdateProgressFrequence", Double.class, "0.2", true, new OptionValidatorMinDouble(Double.valueOf(0.1),
"uiUpdateProgressFrequence")),
EDITOR("externalEditor", File.class, null, true),
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagne.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagne.java 2012-11-21 07:25:22 UTC (rev 8048)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagne.java 2012-11-21 08:23:28 UTC (rev 8049)
@@ -2,7 +2,6 @@
import java.io.File;
import java.util.List;
-
import org.joda.time.LocalDateTime;
/**
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLineResult.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLineResult.java 2012-11-21 07:25:22 UTC (rev 8048)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneLineResult.java 2012-11-21 08:23:28 UTC (rev 8049)
@@ -1,7 +1,6 @@
package org.fudaa.dodico.crue.projet.otfa;
import java.util.List;
-
import org.fudaa.ctulu.CtuluLogGroup;
import org.fudaa.dodico.crue.comparaison.ExecuteComparaison.ExecuteComparaisonResult;
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneResult.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneResult.java 2012-11-21 07:25:22 UTC (rev 8048)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaCampagneResult.java 2012-11-21 08:23:28 UTC (rev 8049)
@@ -1,7 +1,6 @@
package org.fudaa.dodico.crue.projet.otfa;
import java.util.List;
-
import org.fudaa.ctulu.CtuluLogGroup;
import org.joda.time.LocalDateTime;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-11-28 12:48:34
|
Revision: 8079
http://fudaa.svn.sourceforge.net/fudaa/?rev=8079&view=rev
Author: deniger
Date: 2012-11-28 12:48:27 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/ModellingEditedCalculService.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/perspective/PerspectiveServiceStudy.java
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/ModellingEditedCalculService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/ModellingEditedCalculService.java 2012-11-27 23:05:41 UTC (rev 8078)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/services/ModellingEditedCalculService.java 2012-11-28 12:48:27 UTC (rev 8079)
@@ -13,7 +13,7 @@
import org.openide.util.lookup.ServiceProvider;
/**
- *
+ * Conserve le calcul en cours d'édition. Bien utiliser des UID pour ne pas être sensible au clonage.
* @author Frederic Deniger
*/
@ServiceProvider(service = ModellingEditedCalculService.class)
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/perspective/PerspectiveServiceStudy.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/perspective/PerspectiveServiceStudy.java 2012-11-27 23:05:41 UTC (rev 8078)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/perspective/PerspectiveServiceStudy.java 2012-11-28 12:48:27 UTC (rev 8079)
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.study.perspective;
import java.util.Arrays;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-12-04 08:36:08
|
Revision: 8095
http://fudaa.svn.sourceforge.net/fudaa/?rev=8095&view=rev
Author: deniger
Date: 2012-12-04 08:35:51 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemSeuilAvecPdc.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/dcsp/CrueConverterDCSP.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/neuf/CrueDHTest.java
trunk/soft/fudaa-crue/crue-io/src/test/resources/crue9/M3-0_c9.dc
trunk/soft/fudaa-crue/crue-io/src/test/resources/crue9/M3-0_c9.dh
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/ReportViewLine.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/ReportViewLineInfo.java
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemSeuilAvecPdc.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemSeuilAvecPdc.java 2012-12-03 22:13:16 UTC (rev 8094)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ElemSeuilAvecPdc.java 2012-12-04 08:35:51 UTC (rev 8095)
@@ -8,7 +8,7 @@
import org.fudaa.dodico.crue.metier.transformer.TransformerEMHHelper;
/**
- * @pdOid a4d8e83d-782f-484c-b94c-2f022f27019c
+ * ElemSeuilAvecPdc
*/
public class ElemSeuilAvecPdc extends ElemSeuil implements Cloneable {
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/dcsp/CrueConverterDCSP.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/dcsp/CrueConverterDCSP.java 2012-12-03 22:13:16 UTC (rev 8094)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/dcsp/CrueConverterDCSP.java 2012-12-04 08:35:51 UTC (rev 8095)
@@ -55,6 +55,7 @@
import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilLateral;
import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilTransversal;
import org.fudaa.dodico.crue.metier.emh.ElemSeuilAvecPdc;
+import org.fudaa.dodico.crue.metier.emh.EnumBrancheType;
import org.fudaa.dodico.crue.metier.emh.EnumFormulePdc;
import org.fudaa.dodico.crue.metier.emh.LoiFF;
import org.fudaa.dodico.crue.metier.factory.InfoEMHFactory;
@@ -62,13 +63,14 @@
/**
* Factory qui se charge de remplir les structures DAO du ficheir DCSP avec les donn�es m�tier et inversement.
- *
+ *
* @author Adrien Hadoux
*/
public class CrueConverterDCSP implements CrueDataConverter<CrueDaoDCSP, CrueData> {
- /** Incrémente le nombre d'erreur trouvées */
-
+ /**
+ * Incrémente le nombre d'erreur trouvées
+ */
@Override
public CrueData convertDaoToMetier(final CrueDaoDCSP dao, final CrueData dataLinked, final CtuluLog analyser) {
if (dataLinked == null) {
@@ -90,8 +92,10 @@
* @param analyser
*/
private void daoToMetierCasier(final List<DaoCasier> donCalcSansPrtCasiers, final CrueData dataLinked,
- final CtuluLog analyser) {
- if (CollectionUtils.isEmpty(donCalcSansPrtCasiers)) { return; }
+ final CtuluLog analyser) {
+ if (CollectionUtils.isEmpty(donCalcSansPrtCasiers)) {
+ return;
+ }
for (final DaoCasier daoCasier : donCalcSansPrtCasiers) {
final CatEMHCasier casier = dataLinked.findCasierByReference(daoCasier.NomRef);
if (casier == null) {
@@ -144,7 +148,7 @@
if (CollectionUtils.isNotEmpty(casiers)) {
for (final CatEMHCasier casier : casiers) {
final List<DonCalcSansPrtCasierProfil> listeDoncalc = EMHHelper.selectClass(casier.getDCSP(),
- DonCalcSansPrtCasierProfil.class);
+ DonCalcSansPrtCasierProfil.class);
if (CollectionUtils.isNotEmpty(listeDoncalc)) {
if (listeDoncalc.size() > 1) {
analyser.addSevereError("dcsp.tooMuchDonForCasier", casier.getNom());
@@ -163,16 +167,18 @@
/**
* Methode qui remplit une arrayList d'objets persistants qui constituent le fichier fichier DSCP: les Branches.
- *
+ *
* @param listePersistante
* @param branche
* @param dataCalc
* @param analyser
*/
private static void metierToDaoBranches(final List<DaoBrancheAbstract> listePersistante, final CatEMHBranche branche,
- final DonCalcSansPrt dataCalc, final CtuluLog analyser) {
+ final DonCalcSansPrt dataCalc, final CtuluLog analyser) {
DaoBrancheAbstract branchePersist = null;
- if (branche instanceof EMHBrancheBarrageFilEau) {
+ EnumBrancheType brancheType = branche == null ? null : branche.getBrancheType();
+
+ if (EnumBrancheType.EMHBrancheBarrageFilEau.equals(brancheType)) {
branchePersist = new DaoBrancheBarrageFilEau();
if (dataCalc instanceof DonCalcSansPrtBrancheBarrageFilEau) {
@@ -194,9 +200,7 @@
analyser.addInfo("io.dcsp.convert.brancheBarrageFilEau.error", branche.getNom());
}
- }
-
- else if (branche instanceof EMHBrancheBarrageGenerique) {
+ } else if (EnumBrancheType.EMHBrancheBarrageGenerique.equals(brancheType)) {
branchePersist = new DaoBrancheBarrageGenerique();
// -- recuperation de la donnee de calcul de la branche --//
if (dataCalc instanceof DonCalcSansPrtBrancheBarrageGenerique) {
@@ -226,10 +230,8 @@
analyser.addInfo("io.dcsp.convert.brancheBarrageGenerique.error", branche.getNom());
}
- }
+ } else if (EnumBrancheType.EMHBrancheOrifice.equals(brancheType)) {
- else if (branche instanceof EMHBrancheOrifice) {
-
branchePersist = new DaoBrancheOrifice();
// -- recuperation de la donnee de calcul de la branche --//
@@ -243,7 +245,7 @@
analyser.addInfo("io.dcsp.convert.brancheOrifice.error", branche.getNom());
}
- } else if (branche instanceof EMHBranchePdc) {
+ } else if (EnumBrancheType.EMHBranchePdc.equals(brancheType)) {
branchePersist = new DaoBranchePdc();
// -- recuperation de la donnee de calcul de la branche --//
@@ -259,13 +261,11 @@
br.Pdc = new DaoPdc();
AbstractDaoLoi.metierToDaoLoi(br.Pdc, loi);
}
- }
-
- else {
+ } else {
analyser.addInfo("io.dcsp.convert.branchePdc.error", branche.getNom());
}
- } else if (branche instanceof EMHBrancheNiveauxAssocies) {
+ } else if (EnumBrancheType.EMHBrancheNiveauxAssocies.equals(brancheType)) {
branchePersist = new DaoBrancheNiveauxAssocies();
// -- recuperation de la donnee de calcul de la branche --//
@@ -284,14 +284,10 @@
br.QLimInf = ((DonCalcSansPrtBrancheNiveauxAssocies) dataCalc).getQLimInf();
br.QLimSup = ((DonCalcSansPrtBrancheNiveauxAssocies) dataCalc).getQLimSup();
- }
-
- else {
+ } else {
analyser.addInfo("io.dcsp.convert.brancheNiveauAssocie.error", branche.getNom());
}
- }
-
- else if (branche instanceof EMHBrancheSaintVenant) {
+ } else if (EnumBrancheType.EMHBrancheSaintVenant.equals(brancheType)) {
branchePersist = new DaoBrancheSaintVenant();
// -- recuperation de la donnee de calcul de la branche --//
@@ -307,7 +303,7 @@
analyser.addInfo("io.dcsp.convert.brancheSeuilSaintVenant.error", branche.getNom());
}
- } else if (branche instanceof EMHBrancheSeuilLateral) {
+ } else if (EnumBrancheType.EMHBrancheSeuilLateral.equals(brancheType)) {
branchePersist = new DaoBrancheSeuilLateral();
if (dataCalc instanceof DonCalcSansPrtBrancheSeuilLateral) {
@@ -322,7 +318,7 @@
analyser.addInfo("io.dcsp.convert.brancheLongitudinale.error", branche.getNom());
}
- } else if (branche instanceof EMHBrancheSeuilTransversal) {
+ } else if (EnumBrancheType.EMHBrancheSeuilTransversal.equals(brancheType)) {
branchePersist = new DaoBrancheSeuilTransversal();
// -- recuperation de la donnee de calcul de la branche --//
@@ -350,7 +346,7 @@
/**
* Genere une liste d'elements seuils persistante a partir de la liste m�tier lue.
- *
+ *
* @param listeEltSeuilsEMH
* @return List<ElemAvecSeuilPdc>
*/
@@ -371,12 +367,12 @@
/**
* Genere une liste d'elements seuils persistante a partir de la liste m�tier lue.
- *
+ *
* @param listeEltSeuilsEMH
* @return List<ElemSeuil>
*/
private static List<CrueDaoStructureDCSP.DaoElemSeuil> metierToDaoSeuilBarrage(
- final Collection<org.fudaa.dodico.crue.metier.emh.ElemSeuil> listeEltSeuilsEMH) {
+ final Collection<org.fudaa.dodico.crue.metier.emh.ElemSeuil> listeEltSeuilsEMH) {
final List<CrueDaoStructureDCSP.DaoElemSeuil> listeSeuilsPersist = new ArrayList<CrueDaoStructureDCSP.DaoElemSeuil>();
for (final org.fudaa.dodico.crue.metier.emh.ElemSeuil seuilMetier : listeEltSeuilsEMH) {
final CrueDaoStructureDCSP.DaoElemSeuil seuilPersist = new CrueDaoStructureDCSP.DaoElemSeuil();
@@ -392,7 +388,7 @@
}
private static DaoElemSeuilOrifice metierToDaoSeuilOrifice(
- final org.fudaa.dodico.crue.metier.emh.ElemOrifice seuilMetier) {
+ final org.fudaa.dodico.crue.metier.emh.ElemOrifice seuilMetier) {
final DaoElemSeuilOrifice seuilPersist = new DaoElemSeuilOrifice();
seuilPersist.CoefD = seuilMetier.getCoefD();
seuilPersist.Largeur = seuilMetier.getLargeur();
@@ -404,15 +400,14 @@
}
/**
- * Methode qui met a jour les objets m�tier EMH branches a partir des donn�es persistantes de DPTI et les
- * pr�chargements de DRSO
- *
+ * Methode qui met a jour les objets m�tier EMH branches a partir des donn�es persistantes de DPTI et les pr�chargements de DRSO
+ *
* @param listePersistants
* @param data
* @param analyser
*/
private static void daoToMetierBranche(final List<DaoBrancheAbstract> listePersistants, final CrueData data,
- final CtuluLog analyser) {
+ final CtuluLog analyser) {
if (CollectionUtils.isNotEmpty(listePersistants)) {
for (final Object persist : listePersistants) {
if (persist instanceof DaoBrancheAbstract) {
@@ -425,13 +420,12 @@
if (branchePersist instanceof DaoBrancheClassiqueAbstract) {
final DaoBrancheClassiqueAbstract br = (DaoBrancheClassiqueAbstract) branchePersist;
final DonCalcSansPrtBrancheSaintVenant dataCalcul = new DonCalcSansPrtBrancheSaintVenant(data
- .getCrueConfigMetier());
+ .getCrueConfigMetier());
dataCalcul.setCoefBeta(br.CoefBeta);
dataCalcul.setCoefRuis(br.CoefRuis);
dataCalcul.setCoefRuisQdm(br.CoefRuisQdm);
branche.addInfosEMH(dataCalcul);
- }
- // -- branche seuil --//
+ } // -- branche seuil --//
else if (branchePersist instanceof DaoBrancheSeuilAbstract) {
final DaoBrancheSeuilAbstract br = (DaoBrancheSeuilAbstract) branchePersist;
@@ -463,16 +457,14 @@
analyser.addInfo("io.dcsp.convert.brancheSeuil.error", reference);
}
- }
- // -- branche seuils orifices --//
+ } // -- branche seuils orifices --//
else if (branchePersist instanceof DaoBrancheOrifice) {
final DaoBrancheOrifice br = (DaoBrancheOrifice) branchePersist;
final DonCalcSansPrtBrancheOrifice dataCalcul = new DonCalcSansPrtBrancheOrifice();
// -- on remplit la liste des elements seuils --//
dataCalcul.setElemOrifice(daoMetierBrancheOrifice(br.ElemOrifice, data));
branche.addInfosEMH(dataCalcul);
- }
- // -- branche seuils PDC --//
+ } // -- branche seuils PDC --//
else if (branchePersist instanceof DaoBranchePDCAbstract) {
final DaoBranchePDCAbstract br = (DaoBranchePDCAbstract) branchePersist;
final DonCalcSansPrtBranchePdc dataCalcul = new DonCalcSansPrtBranchePdc();
@@ -485,12 +477,11 @@
}
branche.addInfosEMH(dataCalcul);
- }
- // -- Branche niveau associé --//
+ } // -- Branche niveau associé --//
else if (branchePersist instanceof DaoBrancheNiveauxAssocies) {
final DaoBrancheNiveauxAssocies br = (DaoBrancheNiveauxAssocies) branchePersist;
final DonCalcSansPrtBrancheNiveauxAssocies dataCalcul = new DonCalcSansPrtBrancheNiveauxAssocies(data
- .getCrueConfigMetier());
+ .getCrueConfigMetier());
// -- recuperation de la Loi PDC --//
if (br.Zasso != null) {
final LoiFF newLoi = new LoiFF();
@@ -505,7 +496,7 @@
} else if (branchePersist instanceof DaoBrancheBarrageFilEauAbstract) {
final DaoBrancheBarrageFilEauAbstract br = (DaoBrancheBarrageFilEauAbstract) branchePersist;
final DonCalcSansPrtBrancheBarrageFilEau dataCalcul = new DonCalcSansPrtBrancheBarrageFilEau(data
- .getCrueConfigMetier());
+ .getCrueConfigMetier());
// -- recuperation de la Loi RegimeDenoye --//
if (br.RegimeDenoye != null) {
@@ -524,7 +515,7 @@
} else if (branchePersist instanceof DaoBrancheBarrageGeneriqueAbstract) {
final DaoBrancheBarrageGeneriqueAbstract br = (DaoBrancheBarrageGeneriqueAbstract) branchePersist;
final DonCalcSansPrtBrancheBarrageGenerique dataCalcul = new DonCalcSansPrtBrancheBarrageGenerique(data
- .getCrueConfigMetier());
+ .getCrueConfigMetier());
// -- recuperation de la Loi RegimeDenoye --//
if (br.RegimeDenoye != null) {
@@ -545,9 +536,7 @@
dataCalcul.setQLimSup(br.QLimSup);
branche.addInfosEMH(dataCalcul);
- }
-
- else {
+ } else {
analyser.addInfo("io.dcsp.convert.branche.inconnue.error", reference);
}
}
@@ -560,12 +549,12 @@
/**
* Genere une liste d'elements seuils persistante a partir de la liste m�tier lue.
- *
+ *
* @param listeSeuilsPersist
* @return List<ElemSeuilAvecPdc>
*/
private static List<ElemSeuilAvecPdc> daoToMetierElemSeuilAvecPdc(final List<DaoElemAvecSeuilPdc> listeSeuilsPersist,
- CrueData res) {
+ CrueData res) {
final List<ElemSeuilAvecPdc> listeEltSeuilsEMH = new ArrayList<ElemSeuilAvecPdc>();
if (listeSeuilsPersist != null) {
for (final DaoElemAvecSeuilPdc seuilPersist : listeSeuilsPersist) {
@@ -584,16 +573,16 @@
/**
* Genere une liste d'elements seuils persistante a partir de la liste m�tier lue.
- *
+ *
* @param listeSeuilsPersist
* @return List<org.fudaa.dodico.crue.metier.emh.ElemSeuil>
*/
private static List<org.fudaa.dodico.crue.metier.emh.ElemSeuil> daoToMetierElemSeuil(
- final List<CrueDaoStructureDCSP.DaoElemSeuil> listeSeuilsPersist, CrueData res) {
+ final List<CrueDaoStructureDCSP.DaoElemSeuil> listeSeuilsPersist, CrueData res) {
final List<org.fudaa.dodico.crue.metier.emh.ElemSeuil> listeEltSeuilsEMH = new ArrayList<org.fudaa.dodico.crue.metier.emh.ElemSeuil>();
for (final CrueDaoStructureDCSP.DaoElemSeuil seuilPersist : listeSeuilsPersist) {
final org.fudaa.dodico.crue.metier.emh.ElemSeuil seuilMetier = new org.fudaa.dodico.crue.metier.emh.ElemSeuil(res
- .getCrueConfigMetier());
+ .getCrueConfigMetier());
seuilMetier.setCoefD(seuilPersist.CoefD);
seuilMetier.setLargeur(seuilPersist.Largeur);
@@ -606,9 +595,9 @@
}
private static org.fudaa.dodico.crue.metier.emh.ElemOrifice daoMetierBrancheOrifice(
- final DaoElemSeuilOrifice seuilPersist, CrueData res) {
+ final DaoElemSeuilOrifice seuilPersist, CrueData res) {
final org.fudaa.dodico.crue.metier.emh.ElemOrifice seuilMetier = new org.fudaa.dodico.crue.metier.emh.ElemOrifice(
- res.getCrueConfigMetier());
+ res.getCrueConfigMetier());
seuilMetier.setCoefD(seuilPersist.CoefD);
seuilMetier.setLargeur(seuilPersist.Largeur);
seuilMetier.setZseuil(seuilPersist.Zseuil);
@@ -618,5 +607,4 @@
seuilMetier.setSensOrifice(seuilPersist.SensOrifice);
return seuilMetier;
}
-
}
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2012-12-03 22:13:16 UTC (rev 8094)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2012-12-04 08:35:51 UTC (rev 8095)
@@ -1214,6 +1214,9 @@
if (in_.getNumberOfFields() > 3) {
seuil.setCoefD(in_.doubleField(3));
}
+ if (in_.getNumberOfFields() > 4) {
+ seuil.setCoefPdc(in_.doubleField(4));
+ }
// -- ajout du seuil --//
dataDCSP.addElemSeuilAvecPdc(seuil);
// }
Modified: trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/neuf/CrueDHTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/neuf/CrueDHTest.java 2012-12-03 22:13:16 UTC (rev 8094)
+++ trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/neuf/CrueDHTest.java 2012-12-04 08:35:51 UTC (rev 8095)
@@ -6,6 +6,7 @@
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.common.BusinessMessages;
import org.fudaa.dodico.crue.common.DateDurationConverter;
@@ -67,24 +68,22 @@
/**
* Test de lecture
*/
- public CrueData testLecture() {
+ public void testLecture() {
final CtuluLog analyzer = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
final CrueIOResu<CrueData> data = readModeleCrue9(analyzer, FilesForTest.DH_M_30);
testAnalyser(analyzer);
assertEquals(
- "CrueX - Structuration des données||Modéle de test utilisant les éléments de modélisation hydraulique les plus courants||PBa Jan09 sur la base de Modele2",
- data.getCrueCommentaire());
+ "CrueX - Structuration des donnees||Modele de test utilisant les elements de modelisation hydraulique les plus courants||PBa Jan09 sur la base de Modele2",
+ StringUtils.replace(data.getCrueCommentaire(),"\n","|"));
testData(data.getMetier(), false);
//le dh active OCAL
CrueDCTest.assertSortieTrueAndDebug(data.getMetier().getOCAL().getSorties());
//mais pas les autres:
- CrueDCTest.assertSortieTrueAndInfo(data.getMetier().getOPTG().getSorties());
- CrueDCTest.assertSortieTrueAndInfo(data.getMetier().getOPTI().getSorties());
+ CrueDCTest.assertSortieTrueAndDebug(data.getMetier().getOPTG().getSorties());
+ CrueDCTest.assertSortieTrueAndDebug(data.getMetier().getOPTI().getSorties());
CrueDCTest.assertSortieTrueAndInfo(data.getMetier().getOPTR().getSorties());
-
- return data.getMetier();
}
public void testLectureIsortiVaut0() {
@@ -363,9 +362,9 @@
}
/**
- * Test de M3-2_c9
+ * Test de ETU40_M40_E1C9_DH
*/
- public void testLectureM3_2_e1c9() {
+ public void testLectureM40_e1c9() {
final CtuluLog log = new CtuluLog();
final CrueIOResu<CrueData> readModele = ReadHelper.readModele(log, FilesForTest.DC_M_40, FilesForTest.ETU40_M40_E1C9_DH);
assertTrue(readModele.getAnalyse().containsErrorOrSevereError());
@@ -383,12 +382,11 @@
final ParamCalcScenario pcal = data.getPCAL();
assertNotNull(pcal);
- assertNotNull(pcal.getDateDebSce());
+ assertNull(pcal.getDateDebSce());
List<OrdCalc> ordCalc = data.getOCAL().getOrdCalc();
OrdCalcTrans ordCalcTrans = EMHHelper.selectInstanceOf(ordCalc, OrdCalcTrans.class).get(0);
assertNotNull(ordCalcTrans.getPdtRes());
assertEquals("P0Y0M0DT1H0M0S", DateDurationConverter.durationToXsd(((PdtCst) ordCalcTrans.getPdtRes()).getPdtCst()));
- assertEquals("0001-01-01T00:00:00.000", DateDurationConverter.dateToXsd(pcal.getDateDebSce()));
assertEquals("P0Y0M1DT0H0M0S", DateDurationConverter.durationToXsd(ordCalcTrans.getDureeCalc()));
@@ -626,6 +624,7 @@
assertEquals(0.60, donnee2.getElemSeuilAvecPdc().get(0).getZseuil());
assertEquals(0.90, donnee2.getElemSeuilAvecPdc().get(0).getCoefD());
assertEquals(1.00, donnee2.getElemSeuilAvecPdc().get(0).getCoefPdc());
+ assertEquals(2.00, donnee2.getElemSeuilAvecPdc().get(1).getCoefPdc());
}
}
Modified: trunk/soft/fudaa-crue/crue-io/src/test/resources/crue9/M3-0_c9.dc
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/test/resources/crue9/M3-0_c9.dc 2012-12-03 22:13:16 UTC (rev 8094)
+++ trunk/soft/fudaa-crue/crue-io/src/test/resources/crue9/M3-0_c9.dc 2012-12-04 08:35:51 UTC (rev 8095)
@@ -34,7 +34,7 @@
BORDA 1.
* Larg Zseuil Cdebit Cpdc
SEUIL 20.00 0.60 0.900
-SEUIL 8.00 2.20 0.900 1.000
+SEUIL 8.00 2.20 0.900 2.000
* nom des profils amont et aval
PROF PROF3AM PROF3AV
*
Modified: trunk/soft/fudaa-crue/crue-io/src/test/resources/crue9/M3-0_c9.dh
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/test/resources/crue9/M3-0_c9.dh 2012-12-03 22:13:16 UTC (rev 8094)
+++ trunk/soft/fudaa-crue/crue-io/src/test/resources/crue9/M3-0_c9.dh 2012-12-04 08:35:51 UTC (rev 8095)
@@ -1,9 +1,9 @@
* Données générales
* --------------------------
* 5 lignes de titre
-CrueX - Structuration des données
+CrueX - Structuration des donnees
-Modéle de test utilisant les éléments de modélisation hydraulique les plus courants
+Modele de test utilisant les elements de modelisation hydraulique les plus courants
PBa Jan09 sur la base de Modele2
SEUIL_FROUDE 12 23
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/ReportViewLine.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/ReportViewLine.java 2012-12-03 22:13:16 UTC (rev 8094)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/ReportViewLine.java 2012-12-04 08:35:51 UTC (rev 8095)
@@ -11,7 +11,7 @@
import org.openide.windows.WindowManager;
/**
- *
+ * Représente une ligne de la vue des rapports
* @author Frederic Deniger
*/
public class ReportViewLine {
@@ -69,6 +69,10 @@
this.modified = modified;
}
+ /**
+ *
+ * @return le topComponent associé si crée
+ */
public ReportTopComponentConfigurable getTopComponent() {
if (contentType.isPlanimetry()) {
return (ReportTopComponentConfigurable) WindowManager.getDefault().findTopComponent(ReportVisualTopComponent.TOPCOMPONENT_ID);
@@ -76,6 +80,10 @@
return topComponent;
}
+ /**
+ *
+ * @param topComponent le topComponent associé si crée
+ */
public void setTopComponent(ReportTopComponentConfigurable topComponent) {
this.topComponent = topComponent;
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/ReportViewLineInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/ReportViewLineInfo.java 2012-12-03 22:13:16 UTC (rev 8094)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/view/ReportViewLineInfo.java 2012-12-04 08:35:51 UTC (rev 8095)
@@ -9,7 +9,7 @@
import org.openide.util.Exceptions;
/**
- *
+ * Les informations au sujet d'une ligne
* @author Frederic Deniger
*/
@XStreamAlias("VueConfig")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-12-05 14:00:39
|
Revision: 8098
http://fudaa.svn.sourceforge.net/fudaa/?rev=8098&view=rev
Author: deniger
Date: 2012-12-05 14:00:27 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
CRUE-349
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreatorOptions.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/PostRunService.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/service/OtfaService.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncher.java
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/PostServiceImpl.java
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2012-12-04 16:27:08 UTC (rev 8097)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2012-12-05 14:00:27 UTC (rev 8098)
@@ -24,6 +24,7 @@
import org.fudaa.dodico.crue.io.ctfa.CrueCTFAReaderWriter;
import org.fudaa.dodico.crue.io.otfa.OtfaFileUtils;
import org.fudaa.dodico.crue.io.rtfa.CrueRTFAReaderWriter;
+import org.fudaa.dodico.crue.metier.CrueFileType;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
import org.fudaa.dodico.crue.metier.etude.EMHRun;
@@ -34,8 +35,12 @@
import org.fudaa.dodico.crue.projet.ScenarioLoaderOperation;
import org.fudaa.dodico.crue.projet.calcul.CalculCrueContrat;
import org.fudaa.dodico.crue.projet.calcul.CalculCrueRunnerManager;
+import org.fudaa.dodico.crue.projet.calcul.Crue10OptionBuilder;
+import org.fudaa.dodico.crue.projet.calcul.ExecConfigurer;
import org.fudaa.dodico.crue.projet.calcul.ExecInputDefault;
import org.fudaa.dodico.crue.projet.create.InfosCreation;
+import org.fudaa.dodico.crue.projet.create.RunCalculOption;
+import org.fudaa.dodico.crue.projet.create.RunCreatorOptions;
import org.joda.time.LocalDateTime;
/**
@@ -43,7 +48,7 @@
*
*/
public class OtfaExecutor {
-
+
private final CoeurManager coeurManager;
private final ConnexionInformation user;
private final CalculCrueRunnerManager calculRunner;
@@ -59,22 +64,22 @@
this.user = user;
this.calculRunner = calculRunner;
}
-
+
public OtfaCampagneResult launch(OtfaCampagne in) {
OtfaCampagneResult result = new OtfaCampagneResult();
-
+
result.setCommentaire(in.getCommentaire());
result.setDate(new LocalDateTime());
-
+
OtfaContentValidator validator = new OtfaContentValidator(coeurManager);
CtuluLogGroup campagneLogs = validator.valid(in, true);
-
+
result.setGlobalValidation(campagneLogs);
CtuluLogGroup preloadSelector = executor.preloadSelector();
if (preloadSelector != null && preloadSelector.containsSomething()) {
campagneLogs.addGroup(preloadSelector);
}
-
+
if (campagneLogs.containsFatalError()) {
return result;
}
@@ -87,7 +92,7 @@
if (ctfaFile.isFile()) {
ctfaFile.delete();
}
-
+
if (rtfaFile.isFile()) {
rtfaFile.delete();
}
@@ -123,7 +128,7 @@
if (ctfaFile.isFile()) {
ctfaFile.delete();
}
-
+
if (rtfaFile.isFile()) {
rtfaFile.delete();
}
@@ -133,10 +138,10 @@
cftaWriter.writeXMLMetier(resu, ctfaFile, saveRtfaCtfalogs.createLog(), null);
final CrueRTFAReaderWriter rftaWriter = new CrueRTFAReaderWriter("1.2");
rftaWriter.writeXMLMetier(resu, rtfaFile, saveRtfaCtfalogs.createLog(), null);
-
+
return result;
}
-
+
private List<OtfaCampagneLineResult> processAllLines(OtfaCampagne in, CtuluLogGroup campagneLogs) {
if (in.getReferenceOptions().isEffacerRunAvant() || in.getCibleOptions().isEffacerRunAvant()) {
CtuluLogGroup logsBefore = campagneLogs.createGroup("otfa.deleteRunBefore.logs");
@@ -156,13 +161,13 @@
}
return linesResult;
}
-
+
private OtfaCampagneLineResult launch(OtfaCampagne campagne, OtfaCampagneLine line) {
final OtfaCampagneLineResult result = new OtfaCampagneLineResult();
final CtuluLogGroup logs = new CtuluLogGroup(BusinessMessages.RESOURCE_BUNDLE);
logs.setDescription("otfa.launchLine");
logs.setDescriptionArgs(Integer.toString(line.getIndice()));
-
+
result.setInitialLine(line);
result.setLogs(logs);
@@ -179,23 +184,23 @@
if (stoppedAskedByUser()) {
return result;
}
-
-
+
+
final CoeurConfigContrat coeurForItem = getCoeurForItem(campagne, line.getReference());
//la config est celle de la référence.
CrueConfigMetier config = coeurForItem.getCrueConfigMetier();
final EMHScenario refScenario = referenceResult == null ? null : referenceResult.getResult();
final EMHScenario cibleScenario = cibleResult == null ? null : cibleResult.getResult();
-
-
+
+
if ((refScenario != null) && (cibleScenario != null)) {
result.setComparisonResult(executor.compare(config, refScenario, cibleScenario, getSelectorType(line)));
}
-
+
return result;
}
-
+
protected ComparaisonSelectorEnum getSelectorType(OtfaCampagneLine line) {
if (line.getReference().isCrue9() && line.getFinalCible().isCrue9()) {
return ComparaisonSelectorEnum.C9_C9;
@@ -205,7 +210,7 @@
}
return ComparaisonSelectorEnum.C9_C10;
}
-
+
public CoeurConfigContrat getCoeurForItem(OtfaCampagne campagne, OtfaCampagneItem item) {
File etuFile = item.getEtuFile(campagne.getOtfaDir());
final CoeurConfigContrat coeur;
@@ -219,11 +224,11 @@
}
CalculCrueContrat currentRunner;
boolean batch;
-
+
public boolean isBatch() {
return batch;
}
-
+
public void setBatch(boolean batch) {
this.batch = batch;
}
@@ -246,10 +251,10 @@
if (projetResult.getResult() == null || stoppedAskedByUser()) {
return new CrueOperationResult<EMHScenario>(null, logs.createCleanGroup());
}
-
+
EMHProjet projet = projetResult.getResult();
EMHProjetController controller = new EMHProjetController(projet, user);
-
+
ManagerEMHScenario managerScenario = projet.getScenario(item.getScenarioNom());
// Conversion
if (ref != null) {
@@ -259,11 +264,11 @@
final CrueOperationResult<EMHScenarioContainer> conversionResult = controller.convertScenario(ref.getScenarioNom(), infos,
ref.getEtuFile(
campagne.getOtfaDir()));
-
+
logs.addGroup(conversionResult.getLogs().createCleanGroup());
EMHProjetController.writeProjet(etuFile, projet, logs, user);
projetResult = this.loadProjet(etuFile, getCoeurForItem(campagne, item));
-
+
logs.addGroup(projetResult.getLogs().createCleanGroup());
if (projetResult.getResult() == null) {
return new CrueOperationResult<EMHScenario>(null, (CtuluLog) null);
@@ -273,12 +278,14 @@
managerScenario = projet.getScenario(item.getScenarioNom());
controller = new EMHProjetController(projet, user);//important de faire cela pour la reference a projet.
}
-
+
if (item.isLaunchCompute()) {
-
-
// Création du run et sauvegarde dans l'étude
- CrueOperationResult<EMHRun> runResult = controller.createRun(managerScenario.getNom(),
+ //pour créer le runs on utilise des options sans run afin de forcer le lancement complet des calculs.
+ //fait suite à la demande:CRUE-349
+ final RunCreatorOptions runOptions = new RunCreatorOptions(null);
+ runOptions.setComputeAll(RunCalculOption.FORCE_EXCUTE);
+ CrueOperationResult<EMHRun> runResult = controller.createRun(managerScenario.getNom(), runOptions,
item.getEtuFile(campagne.getOtfaDir()));
logs.addGroup(runResult.getLogs().createCleanGroup());
if (runResult.getResult() != null) {
@@ -289,13 +296,15 @@
} else {
final ExecInputDefault execInput = new ExecInputDefault(projet, managerScenario,
runResult.getResult());
- currentRunner = calculRunner.getCrue10Runner(projet.getCoeurConfig()).createRunner(execInput, null);
+ Crue10OptionBuilder optionsBuilder = new Crue10OptionBuilder(calculRunner.getExecOptions());
+ ExecConfigurer defaultConfigurer = optionsBuilder.createConfigurer(execInput, RunCreatorOptions.createMap(RunCalculOption.FORCE_EXCUTE));
+ currentRunner = calculRunner.getCrue10Runner(projet.getCoeurConfig()).createRunner(execInput, defaultConfigurer);
currentRunner.run();
}
}
}
ScenarioLoader loader = new ScenarioLoader(managerScenario, projet, projet.getCoeurConfig());
-
+
ScenarioLoaderOperation load = loader.load(managerScenario.getRunCourant());//on charge le run courant:
logs.addGroup(load.getLogs().createCleanGroup());
@@ -303,14 +312,13 @@
if (!load.getLogs().containsFatalError()) {
emhScenario = load.getResult();
}
-
return new CrueOperationResult<EMHScenario>(emhScenario, logs.createCleanGroup());
}
-
+
private CrueOperationResult<EMHProjet> loadProjet(File etuFile, CoeurConfigContrat version) {
return EMHProjetController.readProjet(etuFile, version);
}
-
+
public void deleteRuns(OtfaCampagne in, boolean reference, boolean cible, CtuluLogGroup logs) {
//rien a faire:
if (!reference && !cible) {
@@ -332,7 +340,7 @@
}
}
}
-
+
private void deleteRuns(File referenceFile, String scenarioNom, OtfaCampagne campagne,
OtfaCampagneItem item, CtuluLogGroup logs) {
CrueOperationResult<EMHProjet> projetResult = this.loadProjet(referenceFile, getCoeurForItem(campagne, item));
@@ -362,10 +370,10 @@
scenario.setRunCourant(null);
controller.saveProjet(referenceFile, logs);
}
-
-
+
+
}
-
+
}
private volatile boolean stoppedByUser;
@@ -378,7 +386,7 @@
currentRunner.stop();
}
}
-
+
private boolean stoppedAskedByUser() {
return Thread.currentThread().isInterrupted() || stoppedByUser;
}
Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreatorOptions.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreatorOptions.java 2012-12-04 16:27:08 UTC (rev 8097)
+++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/create/RunCreatorOptions.java 2012-12-05 14:00:27 UTC (rev 8098)
@@ -46,11 +46,12 @@
}
public static Map<CrueFileType, RunCalculOption> createDefaultMap() {
+ return createMap(RunCalculOption.EXECUTE_IF_NEEDED);
+ }
+
+ public static Map<CrueFileType, RunCalculOption> createMap(RunCalculOption runCalculOption) {
Map<CrueFileType, RunCalculOption> res = new EnumMap<CrueFileType, RunCalculOption>(CrueFileType.class);
- res.put(CrueFileType.RPTR, RunCalculOption.EXECUTE_IF_NEEDED);
- res.put(CrueFileType.RPTG, RunCalculOption.EXECUTE_IF_NEEDED);
- res.put(CrueFileType.RPTI, RunCalculOption.EXECUTE_IF_NEEDED);
- res.put(CrueFileType.RCAL, RunCalculOption.EXECUTE_IF_NEEDED);
+ setComputeAll(res, runCalculOption);
return res;
}
@@ -64,4 +65,20 @@
public void setCompute(CrueFileType crueFileType, RunCalculOption calculOption) {
optionsByCompute.put(crueFileType, calculOption);
}
+
+ /**
+ * permet d'initialiser le type de calcul identique pour chaque moteur
+ *
+ * @param runCalculOption
+ */
+ public void setComputeAll(RunCalculOption runCalculOption) {
+ setComputeAll(optionsByCompute, runCalculOption);
+ }
+
+ public static void setComputeAll(Map<CrueFileType, RunCalculOption> map, RunCalculOption runCalculOption) {
+ map.put(CrueFileType.RPTR, runCalculOption);
+ map.put(CrueFileType.RPTG, runCalculOption);
+ map.put(CrueFileType.RPTI, runCalculOption);
+ map.put(CrueFileType.RCAL, runCalculOption);
+ }
}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/PostRunService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/PostRunService.java 2012-12-04 16:27:08 UTC (rev 8097)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/services/PostRunService.java 2012-12-05 14:00:27 UTC (rev 8098)
@@ -32,7 +32,7 @@
void run(final ExecInputDefault execInputDefault, Map<CrueFileType, RunCalculOption> options);
- CalculCrueRunnerManager getCalculCrueRunnerManagerBatch();
+ CalculCrueRunnerManager getCalculCrueRunnerManagerOtfa();
boolean isRunLoaded();
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/service/OtfaService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/service/OtfaService.java 2012-12-04 16:27:08 UTC (rev 8097)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/service/OtfaService.java 2012-12-05 14:00:27 UTC (rev 8098)
@@ -217,7 +217,8 @@
}
OtfaExecutor executor = new OtfaExecutor(configurationManagerService.getCoeurManager(),
installationService.getConnexionInformation(),
- postRunService.getCalculCrueRunnerManagerBatch());
+ postRunService.getCalculCrueRunnerManagerOtfa());
+
final LaunchOtfaCampagneRunner process = new LaunchOtfaCampagneRunner(executor, getCurrentOTFA().getOtfaCampagne(), this);
process.go();
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncher.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncher.java 2012-12-04 16:27:08 UTC (rev 8097)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/CrueRunLauncher.java 2012-12-05 14:00:27 UTC (rev 8098)
@@ -52,7 +52,7 @@
return true;
}
- public CalculCrueRunnerManager getCalculCrueRunnerManager() {
+ public CalculCrueRunnerManager createCalculCrueRunnerManager() {
CalculCrueRunnerManagerImpl manager = new CalculCrueRunnerManagerImpl();
final Option option = configurationManagerService.getOptionsManager().getOption(OptionsEnum.CRUE9_EXE);
if (option != null) {
@@ -75,7 +75,7 @@
}
public CalculCrueRunner getCrue10Runner(CoeurConfigContrat coeur) {
- return getCalculCrueRunnerManager().getCrue10Runner(coeur);
+ return createCalculCrueRunnerManager().getCrue10Runner(coeur);
}
public void run(final ExecInputDefault execInputDefault, Map<CrueFileType, RunCalculOption> options, Runnable runAfter) {
@@ -155,6 +155,6 @@
public CalculCrueRunner getCrue9Runner() {
validCrue9();
- return new CalculCrue9RunnerWrapper(getCalculCrueRunnerManager().getCrue9Runner());
+ return new CalculCrue9RunnerWrapper(createCalculCrueRunnerManager().getCrue9Runner());
}
}
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/PostServiceImpl.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/PostServiceImpl.java 2012-12-04 16:27:08 UTC (rev 8097)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/services/PostServiceImpl.java 2012-12-05 14:00:27 UTC (rev 8098)
@@ -75,8 +75,9 @@
}
@Override
- public CalculCrueRunnerManager getCalculCrueRunnerManagerBatch() {
- return getRunLauncher().getCalculCrueRunnerManager();
+ public CalculCrueRunnerManager getCalculCrueRunnerManagerOtfa() {
+ final CalculCrueRunnerManager createCalculCrueRunnerManager = getRunLauncher().createCalculCrueRunnerManager();
+ return createCalculCrueRunnerManager;
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-12-11 11:01:26
|
Revision: 8111
http://fudaa.svn.sourceforge.net/fudaa/?rev=8111&view=rev
Author: deniger
Date: 2012-12-11 11:01:14 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/ComparaisonFactoryTest.java
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/CrueConfigMetier.java
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/ItemContentAbstract.java
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyEpsilon.java
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
trunk/soft/fudaa-crue/crue-config/src/test/resources/CrueConfigMetier.xml
trunk/soft/fudaa-crue/crue-config/src/test/resources/xsd/frag-pnum-1.2.xsd
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcTrans.java
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumModeleBase.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilPopupMenuReceiver.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionOpenFrtTarget.java
trunk/soft/fudaa-crue/ui-loi/src/test/java/org/fudaa/fudaa/crue/loi/ProfilSectionUIControllerExample.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingModelePNUMTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingOpenDFRTAction.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
trunk/soft/fudaa-crue/ui-options/src/main/resources/default-coeurs.zip
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/find/PlanimetryFindEMHGroupAction.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/find/PlanimetryFindEMHLayerAction.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueNode.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyFichierCrueFile.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/DecimalFormatEpsilonEnum.java
trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/emh/ParamNumModeleBaseTest.java
Modified: trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/ComparaisonFactoryTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/ComparaisonFactoryTest.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/ComparaisonFactoryTest.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -108,6 +108,7 @@
public void testCompareBean() {
final FactoryEqualsTester factory = buildFactory();
final ParamNumModeleBase pnum1 = new ParamNumModeleBase(CrueConfigMetierLoaderDefaultTest.DEFAULT);
+ pnum1.setParamNumCalcPseudoPerm(null);
pnum1.setFrLinInf(0.1);
final ParamNumModeleBase pnum2 = new ParamNumModeleBase(CrueConfigMetierLoaderDefaultTest.DEFAULT);
pnum2.setParamNumCalcPseudoPerm(new ParamNumCalcPseudoPerm(CrueConfigMetierLoaderDefaultTest.DEFAULT));
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/CrueConfigMetier.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/CrueConfigMetier.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/CrueConfigMetier.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -246,7 +246,7 @@
PropertyFormaterBuilder formatBuilder = new PropertyFormaterBuilder();
for (ItemVariable prop : propDefinition.values()) {
if (!prop.getNature().isEnum()) {
- prop.setFormat(formatBuilder.getFormatter(prop));
+ prop.setFormat(formatBuilder.getFormatter(prop, DecimalFormatEpsilonEnum.PRESENTATION), formatBuilder.getFormatter(prop, DecimalFormatEpsilonEnum.COMPARISON));
}
}
@@ -257,13 +257,11 @@
PropertyFormaterBuilder formatBuilder = new PropertyFormaterBuilder();
for (ItemConstant prop : propDefinition.values()) {
if (!prop.getNature().isEnum()) {
- prop.setFormat(formatBuilder.getFormatter(prop));
+ prop.setFormat(formatBuilder.getFormatter(prop, DecimalFormatEpsilonEnum.PRESENTATION), formatBuilder.getFormatter(prop, DecimalFormatEpsilonEnum.COMPARISON));
}
}
}
-
-
private SeveriteManager verbositeManager;
public SeveriteManager getVerbositeManager() {
Added: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/DecimalFormatEpsilonEnum.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/DecimalFormatEpsilonEnum.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/DecimalFormatEpsilonEnum.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -0,0 +1,14 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.config.ccm;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public enum DecimalFormatEpsilonEnum {
+
+ PRESENTATION,
+ COMPARISON;
+}
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/ItemContentAbstract.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/ItemContentAbstract.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/ItemContentAbstract.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -1,6 +1,9 @@
package org.fudaa.dodico.crue.config.ccm;
import java.text.NumberFormat;
+import java.text.ParseException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.apache.commons.lang.StringUtils;
import org.fudaa.dodico.crue.common.DateDurationConverter;
@@ -11,6 +14,7 @@
public abstract class ItemContentAbstract {
private NumberFormat presentationFormat;
+ private NumberFormat comparisonFormat;
protected boolean isStringValue;
protected final PropertyNature nature;
private final String nom;
@@ -114,7 +118,32 @@
/**
* @param presentationFormat the presentationFormat to set
*/
- protected void setFormat(NumberFormat presentationFormat) {
+ protected void setFormat(NumberFormat presentationFormat, NumberFormat comparisonFormat) {
this.presentationFormat = presentationFormat;
+ this.comparisonFormat = comparisonFormat;
}
+
+ public double[] getNormalizedValues(double[] in) {
+ if (in == null) {
+ return in;
+ }
+ double[] res = new double[in.length];
+ for (int i = 0; i < in.length; i++) {
+ res[i] = getNormalizedValue(in[i]);
+ }
+ return res;
+ }
+
+ public double getNormalizedValue(double in) {
+ if (comparisonFormat == null) {
+ return in;
+ }
+ String fmt = comparisonFormat.format(in);
+ try {
+ return comparisonFormat.parse(fmt).doubleValue();
+ } catch (ParseException ex) {
+ Logger.getLogger(ItemContentAbstract.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ return in;
+ }
}
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyEpsilon.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyEpsilon.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyEpsilon.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -24,6 +24,13 @@
public double getEpsilonComparaison() {
return epsilonComparaison;
}
+
+ public double getEpsilon(DecimalFormatEpsilonEnum presentation){
+ if(DecimalFormatEpsilonEnum.PRESENTATION.equals(presentation)){
+ return getEpsilonPresentation();
+ }
+ return getEpsilonComparaison();
+ }
/**
* @return the epsilonPresentation
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -13,7 +13,7 @@
private final Map<Integer, NumberFormat> nbDecFormat = new HashMap<Integer, NumberFormat>();
private NumberFormat nbDecFormatForInteger;
- public NumberFormat getFormatter(final ItemContentAbstract prop) {
+ public NumberFormat getFormatter(final ItemContentAbstract prop,DecimalFormatEpsilonEnum presentionOrComparison) {
if (prop.getNature().getTypeNumerique().isEntier()) {
if (nbDecFormatForInteger == null) {
DecimalFormat numberFormat = new DecimalFormat();
@@ -31,7 +31,7 @@
if (prop.getNature() == null || "nbr".equalsIgnoreCase(natureNom) || "num".equalsIgnoreCase(natureNom)) {
return null;
}
- int nbDec = Math.abs((int) Math.log10(prop.getEpsilon().getEpsilonPresentation()));
+ int nbDec = Math.abs((int) Math.log10(prop.getEpsilon().getEpsilon(presentionOrComparison)));
NumberFormat numberFormat = this.nbDecFormat.get(nbDec);
if (numberFormat == null) {
numberFormat = new DecimalFormat();
Modified: trunk/soft/fudaa-crue/crue-config/src/test/resources/CrueConfigMetier.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/test/resources/CrueConfigMetier.xml 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/crue-config/src/test/resources/CrueConfigMetier.xml 2012-12-11 11:01:14 UTC (rev 8111)
@@ -1447,6 +1447,14 @@
<MinNormalite Strict="false">0.01</MinNormalite>
<MaxNormalite Strict="false">86400</MaxNormalite>
</ItemVariable>
+ <ItemVariable Nom="PdtTrans">
+ <Nature NomRef="Nat_Dt" />
+ <ValeurDefaut>900</ValeurDefaut>
+ <MinValidite Strict="true">0</MinValidite>
+ <MaxValidite Strict="false">+Infini</MaxValidite>
+ <MinNormalite Strict="false">0.01</MinNormalite>
+ <MaxNormalite Strict="false">86400</MaxNormalite>
+ </ItemVariable>
<ItemVariable Nom="PdtCouplage">
<Nature NomRef="Nat_Dt" />
<ValeurDefaut></ValeurDefaut>
@@ -1479,14 +1487,7 @@
<MinNormalite Strict="false">1</MinNormalite>
<MaxNormalite Strict="false">86400</MaxNormalite>
</ItemVariable>
- <ItemVariable Nom="PdtTrans">
- <Nature NomRef="Nat_Dt" />
- <ValeurDefaut></ValeurDefaut>
- <MinValidite Strict="true">0</MinValidite>
- <MaxValidite Strict="false">+Infini</MaxValidite>
- <MinNormalite Strict="false">0.01</MinNormalite>
- <MaxNormalite Strict="false">86400</MaxNormalite>
- </ItemVariable>
+
<ItemVariable Nom="PdtVar">
<Nature NomRef="Nat_Dt" />
<ValeurDefaut></ValeurDefaut>
Modified: trunk/soft/fudaa-crue/crue-config/src/test/resources/xsd/frag-pnum-1.2.xsd
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/test/resources/xsd/frag-pnum-1.2.xsd 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/crue-config/src/test/resources/xsd/frag-pnum-1.2.xsd 2012-12-11 11:01:14 UTC (rev 8111)
@@ -6,7 +6,7 @@
<xs:annotation>
<!-- La Version et la Release doivent être mises à jour à chaque modification de cette xsd -->
<xs:documentation xml:lang="fr">
- Version 1.2 Release 2
+ Version 1.2 Release 3
schema incomplet: voir le meme sans le préfixe frag-
pour la validation par fichier
</xs:documentation>
@@ -14,7 +14,7 @@
<xs:element name="Pdt">
<xs:complexType>
- <xs:choice minOccurs="0">
+ <xs:choice>
<xs:element name="PdtCst" type="TypeDuree" />
<xs:element ref="PdtVar" />
</xs:choice>
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcTrans.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcTrans.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumCalcTrans.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -37,7 +37,7 @@
crMaxFlu = defaultValues.getDefaultDoubleValue(CrueConfigMetierConstants.PROP_CR_MAX_FLU);
crMaxTor = defaultValues.getDefaultDoubleValue(CrueConfigMetierConstants.PROP_CR_MAX_TOR);
thetaPreissmann = defaultValues.getDefaultDoubleValue(CrueConfigMetierConstants.PROP_THETA_PREISSMANN);
- pdt = PdtCst.getDefaultPdtValue(defaultValues, "pdt");
+ pdt = PdtCst.getDefaultPdtValue(defaultValues, "pdtTrans");
}
@Override
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumModeleBase.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumModeleBase.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ParamNumModeleBase.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -31,28 +31,31 @@
private ParamNumCalcPseudoPerm paramNumCalcPseudoPerm;
private ParamNumCalcTrans paramNumCalcTrans;
private ParamNumCalcVraiPerm paramNumCalcVraiPerm;
-
+
public ParamNumModeleBase(CrueConfigMetier defaults) {
frLinInf = defaults.getDefaultDoubleValue(CrueConfigMetierConstants.PROP_FR_LIN_INF);
frLinSup = defaults.getDefaultDoubleValue(CrueConfigMetierConstants.PROP_FR_LIN_SUP);
zref = defaults.getDefaultDoubleValue("zref");
+ paramNumCalcPseudoPerm = new ParamNumCalcPseudoPerm(defaults);
+ paramNumCalcTrans = new ParamNumCalcTrans(defaults);
+
}
-
+
@Override
- public Object clone() {
+ public ParamNumModeleBase clone() {
try {
- return super.clone();
+ return (ParamNumModeleBase) super.clone();
} catch (CloneNotSupportedException cloneNotSupportedException) {
}
throw new IllegalAccessError("why ?");
}
-
+
public ParamNumModeleBase deepClone() {
ParamNumModeleBase res = (ParamNumModeleBase) clone();
res.paramNumCalcPseudoPerm = paramNumCalcPseudoPerm == null ? null : paramNumCalcPseudoPerm.deepClone();
res.paramNumCalcTrans = paramNumCalcTrans == null ? null : paramNumCalcTrans.deepClone();
res.paramNumCalcVraiPerm = paramNumCalcVraiPerm == null ? null : paramNumCalcVraiPerm.deepClone();
- res.emh=null;
+ res.emh = null;
return res;
}
@@ -100,12 +103,12 @@
public void setParamNumCalcVraiPerm(ParamNumCalcVraiPerm newParamNumCalcVraiPerm) {
this.paramNumCalcVraiPerm = newParamNumCalcVraiPerm;
}
-
+
@Override
public final EnumInfosEMH getCatType() {
return EnumInfosEMH.PARAM_NUM_MODELE_BASE;
}
-
+
@PropertyDesc(i18n = "frLinInf.property")
public final double getFrLinInf() {
return frLinInf;
@@ -118,7 +121,7 @@
public final void setFrLinInf(double newFrLinInf) {
frLinInf = newFrLinInf;
}
-
+
@PropertyDesc(i18n = "frLinSup.property")
public final double getFrLinSup() {
return frLinSup;
@@ -131,7 +134,7 @@
public final void setFrLinSup(double newFrLinSup) {
frLinSup = newFrLinSup;
}
-
+
@PropertyDesc(i18n = "zref.property")
public final double getZref() {
return zref;
@@ -144,9 +147,9 @@
public final void setZref(double newZref) {
zref = newZref;
}
-
+
@Override
public String toString(CrueConfigMetier props, EnumToString format) {
return getClass().getSimpleName();
}
-}
\ No newline at end of file
+}
Added: trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/emh/ParamNumModeleBaseTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/emh/ParamNumModeleBaseTest.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/emh/ParamNumModeleBaseTest.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -0,0 +1,27 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.metier.emh;
+
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierLoaderDefaultTest;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class ParamNumModeleBaseTest {
+
+ public ParamNumModeleBaseTest() {
+ }
+
+ @Test
+ public void testConstructor() {
+ ParamNumModeleBase pnum=new ParamNumModeleBase(CrueConfigMetierLoaderDefaultTest.DEFAULT);
+ assertNotNull(pnum.getParamNumCalcPseudoPerm());
+ assertNotNull(pnum.getParamNumCalcTrans());
+ assertNotNull(pnum.getParamNumCalcTrans().getPdt());
+ assertEquals(900,((PdtCst)pnum.getParamNumCalcTrans().getPdt()).getPdtCst().toStandardSeconds().getSeconds());
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -507,12 +507,20 @@
}
@Override
- public boolean setValue(int _i, double _x, double _y, CtuluCommandContainer _cmd) {
+ public boolean setValue(int _i, double newX, double newY, CtuluCommandContainer _cmd) {
+ double _x = newX;
+ double _y = newY;
+ LoiLine ptEvol = getLoiLine(_i);
+ double oldX = ptEvol.getPtEvolutionFF().getAbscisse();
+ double oldY = ptEvol.getPtEvolutionFF().getOrdonnee();
+ if (configLoi.getVarAbscisse().getEpsilon().isSame(oldX, _x)
+ && configLoi.getVarAbscisse().getEpsilon().isSame(oldY, _y)) {
+ return false;
+ }
if (!isRangeValid(_x, _y)) {
DialogHelper.showError(NbBundle.getMessage(LoiMessages.class, "LoiChangePoint.NotValid"));
return false;
}
- LoiLine ptEvol = getLoiLine(_i);
if (strictlyIncreasingSet != null) {
strictlyIncreasingSet.remove(ptEvol.ptEvolutionFF);
if (strictlyIncreasingSet.contains(new PtEvolutionFF(_x, _y))) {
@@ -563,14 +571,23 @@
strictlyIncreasingSet = newSet;
}
+ boolean changed = false;
for (int i = 0; i < nb; i++) {
LoiLine loiLine = getLoiLine(_idx[i]);
- loiLine.ptEvolutionFF.setAbscisse(_x[i]);
- loiLine.ptEvolutionFF.setOrdonnee(_y[i]);
+ double oldX = loiLine.getPtEvolutionFF().getAbscisse();
+ double oldY = loiLine.getPtEvolutionFF().getOrdonnee();
+ if (configLoi.getVarAbscisse().getEpsilon().isSame(oldX, _x[i])
+ && configLoi.getVarAbscisse().getEpsilon().isSame(oldY, _y[i])) {
+ changed = true;
+ loiLine.ptEvolutionFF.setAbscisse(_x[i]);
+ loiLine.ptEvolutionFF.setOrdonnee(_y[i]);
+ }
loiLine.updateValidity(configLoi);
}
- changeDone();
- return true;
+ if (changed) {
+ changeDone();
+ }
+ return changed;
}
@Override
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilPopupMenuReceiver.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilPopupMenuReceiver.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilPopupMenuReceiver.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -55,9 +55,7 @@
@Override
public void updateStateBeforeShow() {
CtuluListSelection selection = sectionController.getPanel().getSelection();
- final boolean canOpenFrtEditor = sectionController.canOpenFrtEditor();
- setEnabled(canOpenFrtEditor && selection != null && selection.getNbSelectedIndex() == 1);
- setDefaultToolTip(NbBundle.getMessage(LoiMessages.class, canOpenFrtEditor ? "OpenFrt.EnableTooltip":"OpenFrt.DisableTooltip" ));
+ setEnabled(selection != null && selection.getNbSelectedIndex() == 1);
}
}
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -400,8 +400,8 @@
this.profilSectionOpenFrtTarget = profilSectionOpenFrtTarget;
}
- protected boolean canOpenFrtEditor() {
- return profilSectionOpenFrtTarget != null && profilSectionOpenFrtTarget.canOpen();
+ protected boolean validateBeforeOpenFrtEditor() {
+ return profilSectionOpenFrtTarget != null && profilSectionOpenFrtTarget.validateBeforeOpenFrtEditor();
}
@Override
@@ -414,7 +414,9 @@
CtuluListSelection selection = getPanel().getSelection();
if (selection != null && selection.getNbSelectedIndex() == 1) {
ProfilSectionLine loi = ((ProfiLSectionCourbeModel) super.getLoiModel()).getLoiLine(selection.getMinIndex());
- profilSectionOpenFrtTarget.openFrt(loi.getFrt());
+ if (profilSectionOpenFrtTarget.validateBeforeOpenFrtEditor()) {
+ profilSectionOpenFrtTarget.openFrt(loi.getFrt());
+ }
}
}
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionOpenFrtTarget.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionOpenFrtTarget.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionOpenFrtTarget.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -15,6 +15,10 @@
void openFrt(DonFrt frt);
- boolean canOpen();
+ /**
+ * appelée avant l'ouverture des frottements
+ * @return
+ */
+ boolean validateBeforeOpenFrtEditor();
}
Modified: trunk/soft/fudaa-crue/ui-loi/src/test/java/org/fudaa/fudaa/crue/loi/ProfilSectionUIControllerExample.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/test/java/org/fudaa/fudaa/crue/loi/ProfilSectionUIControllerExample.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/ui-loi/src/test/java/org/fudaa/fudaa/crue/loi/ProfilSectionUIControllerExample.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -87,7 +87,7 @@
}
@Override
- public boolean canOpen() {
+ public boolean validateBeforeOpenFrtEditor() {
return true;
}
});
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingModelePNUMTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingModelePNUMTopComponent.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingModelePNUMTopComponent.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -1,16 +1,8 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.modelling.calcul;
-import com.memoire.bu.BuGridLayout;
import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import javax.swing.JCheckBox;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
@@ -73,12 +65,9 @@
tabbedPane.removeAll();
tabbedPane.setName("tabbedPane");
addTab(tabbedPane, editedObject, "PNUM.General.DisplayName");
- if (editedObject.getParamNumCalcPseudoPerm() != null) {
- addTab(tabbedPane, editedObject.getParamNumCalcPseudoPerm(), "PNUM.ParamNumCalcPseudoPerm.DisplayName");
- }
- if (editedObject.getParamNumCalcTrans() != null) {
- addTab(tabbedPane, editedObject.getParamNumCalcTrans(), "PNUM.ParamNumCalcTrans.DisplayName");
- }
+ addTab(tabbedPane, editedObject.getParamNumCalcPseudoPerm(), "PNUM.ParamNumCalcPseudoPerm.DisplayName");
+ addTab(tabbedPane, editedObject.getParamNumCalcTrans(), "PNUM.ParamNumCalcTrans.DisplayName");
+ //à voir pour la suite ?
if (editedObject.getParamNumCalcVraiPerm() != null) {
addTab(tabbedPane, editedObject.getParamNumCalcVraiPerm(), "PNUM.ParamNumCalcVraiPerm.DisplayName");
}
@@ -105,43 +94,7 @@
editedObject = modele.getParamNumModeleBase().deepClone();
JPanel panel = new JPanel(new BorderLayout());
-
- JPanel btActive = new JPanel();
- btActive.setLayout(new BuGridLayout(1));
- final JCheckBox cbPseudoPerm = new JCheckBox(NbBundle.getMessage(ModellingModelePNUMTopComponent.class, "PNUM.UseParamNumCalcPseudoPerm.CheckBox"));
- final JCheckBox cbTrans = new JCheckBox(NbBundle.getMessage(ModellingModelePNUMTopComponent.class, "PNUM.UseParamNumCalcTrans.CheckBox"));
-
- cbPseudoPerm.setSelected(editedObject.getParamNumCalcPseudoPerm() != null);
- cbTrans.setSelected(editedObject.getParamNumCalcTrans() != null);
- btActive.add(cbPseudoPerm);
- btActive.add(cbTrans);
-
- panel.add(btActive, BorderLayout.NORTH);
-
final JTabbedPane tabbedPane = new JTabbedPane();
-
- cbPseudoPerm.addActionListener(new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- if (cbPseudoPerm.isSelected()) {
- editedObject.setParamNumCalcPseudoPerm(new ParamNumCalcPseudoPerm(getCcm()));
- } else {
- editedObject.setParamNumCalcPseudoPerm(null);
- }
- rebuildTabbedPane(tabbedPane);
- }
- });
- cbTrans.addActionListener(new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- if (cbTrans.isSelected()) {
- editedObject.setParamNumCalcTrans(new ParamNumCalcTrans(getCcm()));
- } else {
- editedObject.setParamNumCalcTrans(null);
- }
- rebuildTabbedPane(tabbedPane);
- }
- });
rebuildTabbedPane(tabbedPane);
panel.add(tabbedPane, BorderLayout.CENTER);
JComponent oldtabbedPane = CtuluLibSwing.findChildByName(oldCenter, "tabbedPane");
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingOpenDFRTAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingOpenDFRTAction.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ModellingOpenDFRTAction.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.modelling.loi;
import javax.swing.Action;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -757,7 +757,7 @@
}
@Override
- public boolean canOpen() {
- return !isModified();
+ public boolean validateBeforeOpenFrtEditor() {
+ return true;
}
}
Modified: trunk/soft/fudaa-crue/ui-options/src/main/resources/default-coeurs.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/find/PlanimetryFindEMHGroupAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/find/PlanimetryFindEMHGroupAction.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/find/PlanimetryFindEMHGroupAction.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -41,11 +41,13 @@
BCalque[] calques = groupe.getCalques();
boolean found = false;
for (BCalque bCalque : calques) {
- PlanimetryLayerWithEMHContrat emhLayer = (PlanimetryLayerWithEMHContrat) bCalque;
- CtuluListSelection findSelection = PlanimetryFindEMHLayerAction.findSelection(emhLayer, name, null);
- boolean changed = ((ZCalqueAffichageDonnees) emhLayer).changeSelection(findSelection, _selOption);
- if (changed) {
- found = true;
+ if (bCalque instanceof PlanimetryLayerWithEMHContrat) {
+ PlanimetryLayerWithEMHContrat emhLayer = (PlanimetryLayerWithEMHContrat) bCalque;
+ CtuluListSelection findSelection = PlanimetryFindEMHLayerAction.findSelection(emhLayer, name, null);
+ boolean changed = ((ZCalqueAffichageDonnees) emhLayer).changeSelection(findSelection, _selOption);
+ if (changed) {
+ found = true;
+ }
}
}
if (found) {
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/find/PlanimetryFindEMHLayerAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/find/PlanimetryFindEMHLayerAction.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/find/PlanimetryFindEMHLayerAction.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -109,7 +109,7 @@
if (subCategories == null) {
add = isSelectedByName;
} else {
- add = subCategories.contains(emhFromLayerPosition.getSubCatType());
+ add =isSelectedByName && subCategories.contains(emhFromLayerPosition.getSubCatType());
}
if (add) {
newSelection.add(i);
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -478,11 +478,6 @@
resultatEMHsSelected.removeLookupListener(selectedEMHsLookupListener);
resultatEMHsSelected = null;
}
- if (panel != null) {
- panel.clearListeners();
- }
- removeAll();
-
}
void writeProperties(java.util.Properties p) {
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueNode.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueNode.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.study.node;
import java.awt.datatransfer.Transferable;
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyFichierCrueFile.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyFichierCrueFile.java 2012-12-11 10:57:24 UTC (rev 8110)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/property/PropertyFichierCrueFile.java 2012-12-11 11:01:14 UTC (rev 8111)
@@ -2,6 +2,7 @@
import java.io.File;
import java.lang.reflect.InvocationTargetException;
+import org.apache.commons.lang.StringUtils;
import org.fudaa.dodico.crue.metier.etude.EMHProjet;
import org.fudaa.dodico.crue.metier.etude.FichierCrue;
import org.openide.nodes.PropertySupport.ReadOnly;
@@ -17,13 +18,14 @@
private final EMHProjet projet;
public PropertyFichierCrueFile(final FichierCrue fichierCrue, EMHProjet projet) {
- super("AbsolutePath", File.class, NbBundle.getMessage(ManagerPropertyFactory.class, "File.AbsolutePath.Property"), org.openide.util.NbBundle.getMessage(ManagerPropertyFactory.class, "File.AbsolutePath.Property.Description"));
+ super("AbsolutePath", String.class, NbBundle.getMessage(ManagerPropertyFactory.class, "File.AbsolutePath.Property"), org.openide.util.NbBundle.getMessage(ManagerPropertyFactory.class, "File.AbsolutePath.Property.Description"));
this.fichierCrue = fichierCrue;
this.projet = projet;
}
@Override
public Object getValue() throws IllegalAccessException, InvocationTargetException {
- return fichierCrue.getProjectFile(projet);
+ final File projectFile = fichierCrue.getProjectFile(projet);
+ return projectFile==null?StringUtils.EMPTY:projectFile.getAbsolutePath();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-12-12 22:49:00
|
Revision: 8125
http://fudaa.svn.sourceforge.net/fudaa/?rev=8125&view=rev
Author: deniger
Date: 2012-12-12 22:48:52 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiInfoPanelController.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java
trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/OpenFileProcess.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfiguration.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java
trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFichierCrueNodeAction.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFileExec.java
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -32,19 +32,19 @@
* @author deniger ( genesis)
*/
public class DialogHelper {
-
+
public static < T extends JComponent> List<T> findComponent(JComponent parent, Class<T> type) {
List<T> res = new ArrayList<T>();
findComponent(parent, type, res);
return res;
}
-
+
public static < T extends JComponent> void findComponent(JComponent currentComponent, Class<T> type, List<T> target) {
if (currentComponent instanceof JScrollPane) {
findComponent((JComponent) ((JScrollPane) currentComponent).getViewport().getView(), type, target);
return;
}
-
+
if (type.isAssignableFrom(currentComponent.getClass())) {
target.add((T) currentComponent);
return;
@@ -59,34 +59,34 @@
}
}
}
-
+
public static void showDialogAndTable(final CtuluDialogPanel pn, final int dialogOption,
final JXTable table, final String dialogName, final String dialogTitle) {
-
+
final CtuluDialog s = pn.createDialog(WindowManager.getDefault().getMainWindow());
s.setInitParent(WindowManager.getDefault().getMainWindow());
s.setOption(dialogOption);
s.setTitle(dialogTitle);
s.setName(dialogName);
-
+
s.afficheDialogModal(new Runnable() {
@Override
public void run() {
UserPreferencesSaver.loadDialogLocationAndDimension(s);
loadTablePreferencesLater(table);
-
+
}
});
UserPreferencesSaver.saveLocationAndDimension(s);
UserPreferencesSaver.saveTablePreferences(table);
-
+
}
-
+
public static void writeProperties(OutlineView view, String prefix, java.util.Properties p) {
p.setProperty(prefix, "true");
view.getOutline().writeSettings(p, prefix + ".");
}
-
+
public static void writeInPreferences(OutlineView view, String prefix, Class classForPreferences) {
Preferences pref = NbPreferences.forModule(classForPreferences);
Properties prop = new Properties();
@@ -98,7 +98,7 @@
pref.put((String) entry.getKey(), (String) entry.getValue());
}
}
-
+
public static void readInPreferences(OutlineView view, String prefix, Class classForPreferences) {
Preferences pref = NbPreferences.forModule(classForPreferences);
String completePrefix = classForPreferences.getCanonicalName() + "." + prefix;
@@ -118,41 +118,43 @@
Exceptions.printStackTrace(ex);
}
}
-
+
public static void readProperties(OutlineView view, String prefix, java.util.Properties p) {
if ("true".equals(p.getProperty(prefix))) {
view.getOutline().readSettings(p, prefix + ".");
}
}
-
+
public static void showError(Object _msg) {
NotifyDescriptor nd = new NotifyDescriptor.Message(_msg, NotifyDescriptor.ERROR_MESSAGE);
+ nd.setTitle(org.openide.util.NbBundle.getMessage(DialogHelper.class, "Error"));
DialogDisplayer.getDefault().notify(nd);
}
-
+
public static void showError(String title, String _msg) {
NotifyDescriptor nd = new NotifyDescriptor.Message(_msg, NotifyDescriptor.ERROR_MESSAGE);
nd.setTitle(title);
DialogDisplayer.getDefault().notify(nd);
}
-
+
public static void showWarn(String title, String _msg) {
NotifyDescriptor nd = new NotifyDescriptor.Message(_msg, NotifyDescriptor.WARNING_MESSAGE);
nd.setTitle(title);
DialogDisplayer.getDefault().notify(nd);
}
-
+
public static void showWarn(String _msg) {
NotifyDescriptor nd = new NotifyDescriptor.Message(_msg, NotifyDescriptor.WARNING_MESSAGE);
+ nd.setTitle(org.openide.util.NbBundle.getMessage(DialogHelper.class, "Warn"));
DialogDisplayer.getDefault().notify(nd);
}
-
+
public static void showInfo(String title, Object _msg) {
NotifyDescriptor nd = new NotifyDescriptor.Message(_msg, NotifyDescriptor.INFORMATION_MESSAGE);
nd.setTitle(title);
DialogDisplayer.getDefault().notify(nd);
}
-
+
public static void showInfo(final String title, final Object msg, boolean later) {
if (later) {
EventQueue.invokeLater(new Runnable() {
@@ -165,25 +167,25 @@
showInfo(title, msg);
}
}
-
+
public static void show(String title, Object _msg) {
NotifyDescriptor nd = new NotifyDescriptor.Message(_msg, NotifyDescriptor.PLAIN_MESSAGE);
nd.setTitle(title);
DialogDisplayer.getDefault().notify(nd);
}
-
+
public static boolean showQuestion(String msg) {
NotifyDescriptor nd = new NotifyDescriptor.Confirmation(msg);
nd.setOptions(new Object[]{NotifyDescriptor.YES_OPTION, NotifyDescriptor.NO_OPTION});
return DialogDisplayer.getDefault().notify(nd).equals(NotifyDescriptor.YES_OPTION);
}
-
+
public static boolean showQuestion(String title, Object message) {
NotifyDescriptor nd = new NotifyDescriptor.Confirmation(message, title);
nd.setOptions(new Object[]{NotifyDescriptor.YES_OPTION, NotifyDescriptor.NO_OPTION});
return DialogDisplayer.getDefault().notify(nd).equals(NotifyDescriptor.YES_OPTION);
}
-
+
public static boolean showQuestionAndSaveDialogConf(String title, Object message, Class classToSave) {
DialogDescriptor descriptor = new DialogDescriptor(message, title);
return showQuestionAndSaveDialogConf(descriptor, classToSave);
@@ -202,7 +204,7 @@
nd.setOptions(options);
return DialogDisplayer.getDefault().notify(nd);
}
-
+
public static UserSaveAnswer confirmSaveOrNot() {
return confirmSaveOrNot(
NbBundle.getMessage(DialogHelper.class, "SaveDialog.Title"), NbBundle.getMessage(DialogHelper.class,
@@ -210,13 +212,13 @@
NbBundle.getMessage(DialogHelper.class, "SaveDialog.SaveAction"),
NbBundle.getMessage(DialogHelper.class, "SaveDialog.DontSaveAction"));
}
-
+
public static UserSaveAnswer confirmSaveOrNot(String title, Object message, String messageSave, String messageNotSave) {
-
+
return confirmSaveOrNot(title, message, messageSave, messageNotSave, NbBundle.getMessage(DialogHelper.class,
"dialog.cancel.label"));
}
-
+
public static UserSaveAnswer confirmSaveOrNot(String title, Object message, String messageSave, String messageNotSave,
String cancelMessage) {
assert !cancelMessage.equals(messageNotSave);
@@ -239,7 +241,7 @@
nd.setOptions(new Object[]{NotifyDescriptor.YES_OPTION, NotifyDescriptor.NO_OPTION, NotifyDescriptor.CANCEL_OPTION});
return DialogDisplayer.getDefault().notify(nd);
}
-
+
public static boolean showQuestionOkCancel(String title, Object _msg) {
NotifyDescriptor nd = new NotifyDescriptor.Confirmation(_msg, title);
nd.setOptions(new Object[]{NotifyDescriptor.OK_OPTION, NotifyDescriptor.CANCEL_OPTION});
@@ -255,11 +257,11 @@
public static boolean isCancelOption(Object in) {
return NotifyDescriptor.CANCEL_OPTION.equals(in) || NotifyDescriptor.CLOSED_OPTION.equals(in);
}
-
+
public static boolean isYesOption(Object in) {
return NotifyDescriptor.YES_OPTION.equals(in);
}
-
+
public static boolean isNoOption(Object in) {
return NotifyDescriptor.NO_OPTION.equals(in);
}
@@ -272,16 +274,16 @@
nd.setOptions(new Object[]{NotifyDescriptor.YES_OPTION, NotifyDescriptor.NO_OPTION, NotifyDescriptor.CANCEL_OPTION});
return DialogDisplayer.getDefault().notify(nd);
}
-
+
public static void showNotifyOperationTermine(String details) {
showNotifyOperationTermine(NbBundle.getMessage(DialogHelper.class, "NotifyOperationSucceed"), details);
}
-
+
public static void showNotifyOperationTermine(String title, String details) {
NotificationDisplayer.getDefault().notify(title, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/ok.png"),
details, null);
}
-
+
protected static void loadTablePreferencesLater(final JXTable table) {
EventQueue.invokeLater(new Runnable() {
@Override
@@ -290,7 +292,7 @@
}
});
}
-
+
public static boolean showQuestionAndSaveDialogConf(DialogDescriptor descriptor, Class classToSave) {
JDialog createDialog = (JDialog) DialogDisplayer.getDefault().createDialog(descriptor);
createDialog.pack();
Modified: trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/helper/Bundle.properties 2012-12-12 22:48:52 UTC (rev 8125)
@@ -15,3 +15,5 @@
ChangeName.Empty.Error=Le nom est vide
NewName.Label=Nom
NewName.DialogTitle=Choisir un nom
+Error=Erreur
+Warn=Avertissement
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiInfoPanelController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiInfoPanelController.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiInfoPanelController.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -1,6 +1,7 @@
package org.fudaa.fudaa.crue.loi.loiff;
import com.memoire.bu.BuGridLayout;
+import java.awt.BorderLayout;
import java.awt.FlowLayout;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -45,6 +46,7 @@
lbTypeControlLoi = new JLabel(NbBundle.getMessage(LoiMessages.class, "TypeControleLoi.Label"));
lbExtrapolInf = new JLabel(NbBundle.getMessage(LoiMessages.class, "ExtrapolInf.Label"));
lbExtrapolSup = new JLabel(NbBundle.getMessage(LoiMessages.class, "ExtrapolSup.Label"));
+
lbAbscisseValidityContent = new JLabel();
lbAbscisseValidity = new JLabel(NbBundle.getMessage(LoiMessages.class, "AbscisseValidity.Label"));
lbOrdonneValidityContent = new JLabel();
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListFrottementTopComponent.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -89,7 +89,7 @@
boolean modified = false;
for (LineContent lineContent : lines) {
List<ColumnContent> components = lineContent.getComponents();
- for (int i = 1; i < components.size(); i++) {//la première colonne est le titre
+ for (int i = 2; i < components.size(); i++) {//la première colonne est le branche puis le titre
ColumnContent<JComboBox> content = components.get(i);
List<JComboBox> cbs = content.getComponents();
for (JComboBox jComboBox : cbs) {
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DLHYTopComponent.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -142,7 +142,7 @@
add(splitPane);
JPanel nomComment = new JPanel(new BuGridLayout(3, 10, 10));
- nomComment.add(new JLabel(NbBundle.getMessage(DLHYTopComponent.class, "Nom.DisplayName")));
+
final DocumentListener documentListener = super.createDocumentListener();
DocumentListener nameChanged = new DocumentListener() {
@Override
@@ -162,17 +162,25 @@
};
txtNom = new JTextField(30);
lbNomValidation = new JLabel();
+
+ //ligne 1
+ nomComment.add(new JLabel(NbBundle.getMessage(DLHYTopComponent.class, "Nom.DisplayName")));
nomComment.add(txtNom);
nomComment.add(lbNomValidation);
- nomComment.add(new JLabel(NbBundle.getMessage(DLHYTopComponent.class, "Commentaire.DisplayName")));
+
txtCommentaire = new JTextField(30);
txtCommentaire.setEditable(false);
txtCommentaire.getDocument().addDocumentListener(documentListener);
txtNom.getDocument().addDocumentListener(documentListener);
txtNom.getDocument().addDocumentListener(nameChanged);
+ //ligne 2
+ nomComment.add(new JLabel(NbBundle.getMessage(DLHYTopComponent.class, "Commentaire.DisplayName")));
nomComment.add(txtCommentaire);
+ nomComment.add(new JLabel());
+
+ dateDeb = new DateDebEditor();
+ //ligne 3
nomComment.add(new JLabel(NbBundle.getMessage(DLHYTopComponent.class, "DateDebut.DisplayName")));
- dateDeb = new DateDebEditor();
nomComment.add(dateDeb.getPn());
JPanel pnInfo = new JPanel(new BorderLayout(5, 5));
pnInfo.add(loiUiController.getInfoController().getPanel());
@@ -210,7 +218,6 @@
return new TableExportCommentSupplier(false).getComments(getName());
}
-
@Override
protected void componentOpenedHandler() {
super.componentOpenedHandler();
Modified: trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/OpenFileProcess.java
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/OpenFileProcess.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-options/src/main/java/org/fudaa/fudaa/crue/options/services/OpenFileProcess.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -1,13 +1,8 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package org.fudaa.fudaa.crue.options.services;
import java.awt.EventQueue;
import java.io.File;
import java.util.List;
-import java.util.MissingResourceException;
import org.apache.commons.lang.StringUtils;
import org.fudaa.dodico.calcul.CalculExec;
import org.fudaa.dodico.calcul.CalculExecDefault;
@@ -27,9 +22,10 @@
ConfigurationManagerService configurationManagerService = Lookup.getDefault().lookup(ConfigurationManagerService.class);
- @Messages({"OpenFichier.EditorFileIsNotConfigured=Vous devez ouvrir les options ( Menu Outils) pour configurer l'\u00e9diteur \u00e0 utiliser", "#Echec ouverture editeur externe",
- "ExterneEditorFailed=<html><body>L''\u00e9diteur externe ne peut pas \u00eatre lanc\u00e9. L''\u00e9diteur utilis\u00e9e est:<br><ul><li>{0}</li></ul></body></html>", "OpenFile.Error=Erreur: ouverture d'un fichier"})
- public void openFiles(final List<File> files) throws MissingResourceException {
+ @Messages({"OpenFichier.EditorFileIsNotConfigured=Vous devez ouvrir les options ( Menu Outils) pour configurer l'\u00e9diteur \u00e0 utilisé",
+ "ExterneEditorFailed=<html><body>L''\u00e9diteur externe ne peut pas \u00eatre lanc\u00e9. L''\u00e9diteur utilis\u00e9 est:<br><ul><li>{0}</li></ul></body></html>",
+ "OpenFile.Error=Erreur: ouverture d'un fichier"})
+ public void openFiles(final List<File> files) {
final Option option = configurationManagerService.getOptionsManager().getOption(OptionsEnum.EDITOR);
if (option == null || StringUtils.isEmpty(option.getValeur())) {
DialogHelper.showError(OpenFile_Error(), OpenFichier_EditorFileIsNotConfigured());
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfiguration.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfiguration.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfiguration.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -17,7 +17,6 @@
*/
public class TraceConfiguration extends AbstractLigneBriseeConfiguration {
- public static final String PROPERTY_ANGLE_IN_DEGREE = "angleInDegree";
public static final String PROPERTY_PROFIL_VUE_DE_AMONT = "profilVueDeAmont";
public static final String PROPERTY_SECTION_LABEL_POSITION = "sectionLabelPosition";
TraceLigneModel lineModel = new TraceLigneModel(TraceLigne.LISSE, 1.5f, Color.BLACK);
@@ -26,7 +25,7 @@
LabelConfiguration sectionLabelConfiguration = new LabelConfiguration();
private final VisuConfiguration parent;
boolean profilVueDeAmont = false;
- private int angleInDegree = 30;
+ private int angleInDegree = 0;
int sectionLabelPosition = SwingConstants.RIGHT;
public TraceConfiguration(VisuConfiguration parent) {
@@ -110,10 +109,6 @@
return getSectionLabelConfiguration().isDisplayLabels();
}
- public void setAngleInDegree(int angleInDegree) {
- this.angleInDegree = angleInDegree;
- }
-
public String getDisplayName(DonPrtGeoProfilSection profilSection, PlanimetryTraceLayerModel modeleDonnees, boolean selected) {
String nom = null;
if (modeleDonnees.getTraceConfigurationExtra() != null) {
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/TraceConfigurationInfo.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -4,11 +4,9 @@
import java.util.ArrayList;
import java.util.List;
import java.util.MissingResourceException;
-import javax.swing.SpinnerNumberModel;
import javax.swing.SwingConstants;
import org.fudaa.fudaa.crue.common.editor.CodeTranslation;
import org.fudaa.fudaa.crue.common.editor.JcomboBoxIntegerInplaceEditor;
-import org.fudaa.fudaa.crue.common.editor.SpinnerInplaceEditor;
import org.fudaa.fudaa.crue.planimetry.configuration.editor.SectionPositionPropertyEditorSupport;
import org.openide.nodes.PropertySupport;
import org.openide.nodes.PropertySupport.Reflection;
@@ -35,12 +33,6 @@
try {
set.put(ConfigurationInfoHelper.create(TraceConfiguration.PROPERTY_PROFIL_VUE_DE_AMONT, Boolean.TYPE, in,
"TraceConfiguration.profilVueDeAmont", VisuConfigurationInfo.class));
- final Reflection angleProperty = ConfigurationInfoHelper.create(TraceConfiguration.PROPERTY_ANGLE_IN_DEGREE, Integer.TYPE,
- in,
- "TraceConfiguration.angle", VisuConfigurationInfo.class);
- SpinnerInplaceEditor inplaceEditor = new SpinnerInplaceEditor(new SpinnerNumberModel(0, -90, 90, 1));
- angleProperty.setValue("inplaceEditor", inplaceEditor);
- set.put(angleProperty);
set.setDisplayName(NbBundle.getMessage(TraceConfigurationInfo.class, "TraceConfiguration.DisplayName"));
set.setShortDescription(set.getDisplayName());
res.add(set);
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -50,7 +50,6 @@
res.add("traces.visible");
res.add("traces.transparenceAlpha");
res.add("traces.profilVueDeAmont");
- res.add("traces.angleInDegree");
res.add("traces.line.typeTrait");
res.add("traces.line.epaisseur");
res.add("traces.line.couleur");
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFichierCrueNodeAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFichierCrueNodeAction.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFichierCrueNodeAction.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -11,6 +11,7 @@
import org.apache.commons.lang.ArrayUtils;
import org.fudaa.dodico.crue.metier.etude.FichierCrue;
import org.fudaa.fudaa.crue.common.node.NodeHelper;
+import org.fudaa.fudaa.crue.options.services.OpenFileProcess;
import org.fudaa.fudaa.crue.study.services.EMHProjetServiceImpl;
import org.openide.nodes.Node;
import org.openide.util.HelpCtx;
@@ -24,7 +25,7 @@
*/
public class OpenFichierCrueNodeAction extends NodeAction {
- private final OpenFileExec nodeAction = new OpenFileExec();
+ private final OpenFileProcess nodeAction = new OpenFileProcess();
EMHProjetServiceImpl projetService = Lookup.getDefault().lookup(EMHProjetServiceImpl.class);
@Override
Deleted: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFileExec.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFileExec.java 2012-12-12 17:43:15 UTC (rev 8124)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/OpenFileExec.java 2012-12-12 22:48:52 UTC (rev 8125)
@@ -1,89 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.fudaa.fudaa.crue.study.actions;
-
-import java.awt.EventQueue;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
-import org.fudaa.dodico.calcul.CalculExec;
-import org.fudaa.dodico.calcul.CalculExecDefault;
-import org.fudaa.dodico.crue.projet.conf.Option;
-import org.fudaa.dodico.crue.projet.conf.OptionsEnum;
-import org.fudaa.fudaa.crue.common.helper.DialogHelper;
-import org.fudaa.fudaa.crue.common.helper.UiContext;
-import org.fudaa.fudaa.crue.options.services.ConfigurationManagerService;
-import org.openide.nodes.Node;
-import org.openide.util.Lookup;
-import org.openide.util.NbBundle;
-
-/**
- *
- * @author genesis
- */
-public class OpenFileExec {
-
- ConfigurationManagerService configurationManagerService = Lookup.getDefault().lookup(ConfigurationManagerService.class);
-
- public void openFiles(final List<File> files) throws MissingResourceException {
- final Option option = configurationManagerService.getOptionsManager().getOption(OptionsEnum.EDITOR);
- if (option == null || StringUtils.isEmpty(option.getValeur())) {
- DialogHelper.showError(NbBundle.getMessage(OpenFileExec.class, "OpenFichierAction.Name"), NbBundle.getMessage(OpenFileExec.class, "OpenFichier.EditorFileIsNotConfigured"));
- }
- final CalculExec exec = new CalculExecDefault(new String[]{option.getValeur()});
- exec.setLauchInNewTerm(false);
- exec.setStartCmdUse(false);
- exec.setShowErrorInUI(false);
- exec.setUI(new UiContext());
- new Thread() {
- @Override
- public void run() {
- boolean launch = true;
- for (File file : files) {
- launch = exec.launch(file, null);
- if (!launch) {
- break;
- }
- }
- if (!launch) {
- EventQueue.invokeLater(new Runnable() {
- @Override
- public void run() {
- DialogHelper.showError(org.openide.util.NbBundle.getMessage(OpenFileExec.class, "ExterneEditorFailed", option.getValeur()));
- }
- });
-
- }
- }
- }.start();
- }
-
- protected boolean enable(Node[] activatedNodes) {
- if (ArrayUtils.isEmpty(activatedNodes)) {
- return false;
- }
- for (Node node : activatedNodes) {
- File fichier = node.getLookup().lookup(File.class);
- if (fichier != null && fichier.isFile()) {
- return true;
- }
- }
- return false;
- }
-
- protected void performAction(Node[] activatedNodes) {
- final List<File> files = new ArrayList<File>();
- for (Node node : activatedNodes) {
- File fichier = node.getLookup().lookup(File.class);
- if (fichier != null && fichier.isFile()) {
- files.add(fichier);
- }
- }
- openFiles(files);
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-12-14 10:00:07
|
Revision: 8131
http://fudaa.svn.sourceforge.net/fudaa/?rev=8131&view=rev
Author: deniger
Date: 2012-12-14 09:59:58 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertSelectOnItemMerge.java
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterRPTG.java
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeo.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/ResPrtReseauCrue9Adapter.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java
trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue10Result.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiConstanteCourbeModel.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiDefaultCourbeModel.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/SimpleLoiCourbeModel.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportProfilLongitudinalTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarTopComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGTopComponent.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/transversal/ReportProfilTransversalTopComponent.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/DefaultTestedContent.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiWithValideStateCourbeModel.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/CourbesUiResController.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/LoiStateResCellRenderer.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/ProfilSectionLoiUiResController.java
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertSelectOnItemMerge.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertSelectOnItemMerge.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertSelectOnItemMerge.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -9,6 +9,7 @@
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -90,22 +91,25 @@
}
private void merge(final List listInitialA, final List listInitialB, final List targetListA, final List targetListB,
- String[] attribut)
+ String[] attribut)
throws Exception {
- final Map propA = getMap(listInitialA, attribut);
- final Map propB = getMap(listInitialB, attribut);
+ final LinkedHashMap propA = getMap(listInitialA, attribut);
+ final LinkedHashMap propB = getMap(listInitialB, attribut);
targetListA.clear();
targetListB.clear();
//on trie les clés de A:
List keysInListA = new ArrayList(propA.keySet());
- if (!keysInListA.isEmpty()) {
- Object first = keysInListA.get(0);
- if (first instanceof Comparable) {
- Collections.sort(keysInListA);
- } else if (first instanceof MultiKey) {
- Collections.sort(keysInListA, new MultiKeyComparator());
- }
- }
+ //suite demande CRUE-394 on ne tri pas
+ //a enlever si pas de retours...
+// if (!keysInListA.isEmpty()) {
+// Object first = keysInListA.get(0);
+// if (first instanceof Comparable) {
+// Collections.sort(keysInListA);
+// } else if (first instanceof MultiKey) {
+// Collections.sort(keysInListA, new MultiKeyComparator());
+// }
+// }
+ //a optimiser si pas de retours sur le tri.
for (Object key : keysInListA) {
final Object inB = propB.get(key);
if (inB != null) {
@@ -115,8 +119,8 @@
}
}
- public static Map getMap(final Collection obj, final String[] keyProp) throws Exception {
- final Map res = new HashMap(obj.size());
+ private static LinkedHashMap getMap(final Collection obj, final String[] keyProp) throws Exception {
+ final LinkedHashMap res = new LinkedHashMap(obj.size());
for (final Object object : obj) {
if (keyProp.length == 1) {
final Object property = PropertyUtilsCache.getInstance().getProperty(object, keyProp[0]);
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterRPTG.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterRPTG.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterRPTG.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -4,7 +4,9 @@
package org.fudaa.dodico.crue.comparaison.tester;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -35,6 +37,22 @@
protected boolean mustTestAlreadyDone() {
return false;
}
+ private Set<String> variablesC9 = new HashSet<String>(Arrays.asList(
+ "zLimGLitSto",
+ "zLimDLitSto",
+ "zLimGLitMaj",
+ "zLimDLitMaj",
+ "zLimGLitMin",
+ "zLimDLitMin",
+ "coefKextrapol",
+ "loiZSmin",
+ "loiZPmin",
+ "loiZLmin",
+ "loiZSmaj",
+ "loiZPmaj",
+ "loiZLmaj",
+ "loiZCoefW1",
+ "loiZCoefW2"));
@Override
public boolean isSameSafe(final ResPrtGeo o1, final ResPrtGeo o2, final ResultatTest res,
@@ -43,6 +61,22 @@
try {
Map<String, Object> values1 = o1.getValues();
Map<String, Object> values2 = o2.getValues();
+ //certaines variables ne sont calculées que dans C9: il faut les enlever dans le cas des comparaison c9c10.
+ //CRUE-376
+ boolean values1IsC9 = o1.isC9();
+ boolean values2IsC9 = o2.isC9();
+ if (values1IsC9 != values2IsC9) {
+ values1 = new HashMap<String, Object>(values1);
+ values2 = new HashMap<String, Object>(values2);
+ for (String varC9ToRemove : variablesC9) {
+ if (values1IsC9) {
+ values1.remove(varC9ToRemove);
+ }
+ if (values2IsC9) {
+ values2.remove(varC9ToRemove);
+ }
+ }
+ }
Set<String> props = new HashSet<String>();
props.addAll(values1.keySet());
props.addAll(values2.keySet());
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/Loi.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -19,20 +19,16 @@
/**
* Loi abstraite pour LoiDF et LoiFF
*
- * @pdOid 18b21fd9-4872-47c7-91fe-7a88a1518e32
*/
public abstract class Loi implements ObjetNomme, Cloneable,LoiContrat {
/**
- * @pdOid b0f23fb3-fc63-4722-8913-6c935b97733c
*/
private String nom;
/**
- * @pdOid 7db4b936-5375-418f-92a5-b14ce48f3d75
*/
private String commentaire = StringUtils.EMPTY;
/**
- * @pdOid 8bff8b79-2087-4cb2-92f2-79dc364082ad
*/
private EnumTypeLoi type;
// TODO Voir si mettre pd0id
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeo.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeo.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/ResPrtGeo.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -13,16 +13,26 @@
protected Map<String, Object> values = new HashMap<String, Object>();
protected Map<String, Object> valuesExt = Collections.unmodifiableMap(values);
private String nom;
+
+ private final boolean c9;
- public ResPrtGeo() {
- }
-
- public ResPrtGeo(Map<String, Object> map, String nom) {
+ public ResPrtGeo(Map<String, Object> map, String nom,boolean isC9) {
values.putAll(map);
setNom(nom);
+ this.c9=isC9;
}
/**
+ * Doit être uniquement utilisé pour les comparaisons.
+ * @return
+ */
+ public boolean isC9() {
+ return c9;
+ }
+
+
+
+ /**
* @pdOid fd63dd73-c455-4857-8356-8fa8bc0048de
*/
@Override
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/ResPrtReseauCrue9Adapter.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/ResPrtReseauCrue9Adapter.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/ResPrtReseauCrue9Adapter.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -45,7 +45,7 @@
final String nomCasier = CruePrefix.changePrefix(it.getKey(), CruePrefix.getPrefix(EnumCatEMH.NOEUD),
CruePrefix.getPrefix(EnumCatEMH.CASIER));
tmplistCasier.add(nomCasier);
- ResPrtGeo rptg = new ResPrtGeo(it.getValue().getValues(), nomCasier);
+ ResPrtGeo rptg = new ResPrtGeo(it.getValue().getValues(), nomCasier,true);
resSto.put(nomCasier, rptg);
}
listCasier = Collections.unmodifiableList(tmplistCasier);
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -156,7 +156,7 @@
cache.put(nomProfilCrue9, res);
}
Crue9ResPrtGeoSection resultat = res.getResultat();
- return new ResPrtGeo(resultat.getValues(), resultat.getNom());
+ return new ResPrtGeo(resultat.getValues(), resultat.getNom(),true);
}
Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue10Result.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue10Result.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/ScenarioLoaderCrue10Result.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -336,7 +336,7 @@
prevalidationLog.addSevereError(ex.getMessage());
}
if (readData != null) {
- emh.addInfosEMH(new ResPrtGeo(readData, emh.getNom()));
+ emh.addInfosEMH(new ResPrtGeo(readData, emh.getNom(),false));
}
}
}
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -34,80 +34,80 @@
* @author Frederic Deniger
*/
public class CourbesUiController implements CtuluImageProducer {
-
+
protected EGFillePanel panel;
protected EGTableGraphePanel tableGraphePanel;
protected EGAxeHorizontal axeH;
protected JPanel toolbar;
protected List<EbliActionInterface> editCourbeActions = new ArrayList<EbliActionInterface>();
-
+
protected void configureTablePanel() {
tableGraphePanel.getTable().setModel(createTableModel());
tableGraphePanel.setPreferredSize(new Dimension(300, 600));
}
-
+
public void installComboxSelector() {
tableGraphePanel.getTitleLabel().setVisible(false);
tableGraphePanel.remove(tableGraphePanel.getTitleLabel());
ComboboxCourbeSelector cb = new ComboboxCourbeSelector(getGraphe());
tableGraphePanel.add(cb.getCb(), BorderLayout.NORTH);
-
+
}
-
+
public EGGrapheSimpleModel getEGGrapheSimpleModel() {
return (EGGrapheSimpleModel) getGraphe().getModel();
}
-
+
public EGTableGraphePanel getTableGraphePanel() {
return tableGraphePanel;
}
-
+
public EGAxeHorizontal getAxeX() {
return getEGGrapheSimpleModel().getAxeX();
}
-
+
public List<EGAxeVertical> getAxesY() {
return getGraphe().getAllAxeVertical();
}
-
+
@Override
public BufferedImage produceImage(final Map _params) {
return panel.produceImage(_params);
-
+
}
-
+
@Override
public BufferedImage produceImage(int _w, int _h, Map _params) {
return panel.produceImage(_w, _h, _params);
}
-
+
@Override
public Dimension getDefaultImageDimension() {
return panel.getDefaultImageDimension();
}
-
+
public void addExportImagesToToolbar() {
toolbar.add(new ExportImageAction(panel).buildToolButton(EbliComponentFactory.INSTANCE));
toolbar.add(new ExportImageToClipboardAction(panel).buildToolButton(EbliComponentFactory.INSTANCE));
}
-
+
public JPanel getToolbar() {
return toolbar;
}
-
+
public EGFillePanel getPanel() {
return panel;
}
-
+
public EGGraphe getGraphe() {
return panel.getGraphe();
}
-
+
public void removeEditActions() {
tableGraphePanel.removeEditButtons();
removeActions("MOVE_POINT", "SIMPLIFY");
}
-
+
public void removeActions(String... actionCommands) {
if (toolbar != null) {
Set<String> command = new HashSet<String>(Arrays.asList(actionCommands));
@@ -119,12 +119,12 @@
toolbar.remove(component);
}
}
-
+
}
}
-
+
}
-
+
public List<EbliActionInterface> getActions(String... command) {
EbliActionInterface[] specificActions = panel.getSpecificActions();
List<EbliActionInterface> res = new ArrayList<EbliActionInterface>();
@@ -140,11 +140,11 @@
}
return res;
}
-
+
public List<EbliActionInterface> getEditActions() {
return getActions("CONFIGURE", "CONFIGURE_REPERE");
}
-
+
public CourbesUiController() {
final EGGrapheSimpleModel grapheModel = new LoiGrapheSimpleModel();
axeH = new EGAxeHorizontal();
@@ -188,16 +188,16 @@
popupGraphe.install(panel.getGraphe(), tableGraphePanel.getTable(), CtuluUIForNetbeans.DEFAULT);
}
protected boolean editable;
-
+
public void setEditable(boolean b) {
editable = b;
tableGraphePanel.updateState();
for (EbliActionInterface ebliActionInterface : editCourbeActions) {
ebliActionInterface.setEnabled(b);
-
+
}
}
-
+
protected AbstractTableModel createTableModel() {
return new EGTableGraphePanel.SpecTableModel(tableGraphePanel);
}
@@ -213,7 +213,7 @@
axeH.setUnite(varAbscisse.getNature().getUnite());
installFormatter(varAbscisse, axeH);
}
-
+
public EGAxeVertical findAxe(final ItemVariable varOrdonnee) {
if (varOrdonnee == null) {
return null;
@@ -226,7 +226,7 @@
}
return null;
}
-
+
public EGAxeVertical createAxeVertical(final ItemVariable varOrdonnee) {
EGAxeVertical axeV = new EGAxeVertical(varOrdonnee.getDisplayNom(), varOrdonnee.getNature().getUnite());
axeV.setUniteModifiable(false);
@@ -235,9 +235,9 @@
installFormatter(varOrdonnee, axeV);
return axeV;
}
-
+
protected void installFormatter(final ItemVariable var, EGAxe axeV) {
-
+
if (var.getNature().isEnum()) {
axeV.setSpecificFormat(new EnumNumberFormatter(var));
axeV.setModeGraduations(EGAxe.MANUEL_LONGUEURPAS);
@@ -245,9 +245,10 @@
axeV.setSpecificFormat(new CtuluNumberFormatDefault(var.getFormatter(DecimalFormatEpsilonEnum.PRESENTATION)));
axeV.setSpecificDetailFormat(new CtuluNumberFormatDefault(var.getFormatter(DecimalFormatEpsilonEnum.COMPARISON)));
}
+ axeV.setUserObject(var);
axeV.setIsDiscret(var.getNature().isEnum() || var.isEntier());
}
-
+
public LoiPopupMenuReceiver createLoiPoupReceiver() {
return new LoiPopupMenuReceiver(panel);
}
Added: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/DefaultTestedContent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/DefaultTestedContent.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/DefaultTestedContent.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -0,0 +1,46 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.loi.common;
+
+import gnu.trove.TIntObjectHashMap;
+import java.util.BitSet;
+import org.fudaa.ctulu.CtuluLog;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class DefaultTestedContent implements LoiWithValideStateCourbeModel {
+
+ private final BitSet testedX = new BitSet();
+ private final BitSet testedY = new BitSet();
+ private final TIntObjectHashMap<CtuluLog> logsByRowX = new TIntObjectHashMap<CtuluLog>();
+ private final TIntObjectHashMap<CtuluLog> logsByRowY = new TIntObjectHashMap<CtuluLog>();
+
+ private BitSet getTest(boolean isX) {
+ return isX ? testedX : testedY;
+ }
+
+ private TIntObjectHashMap<CtuluLog> getLogs(boolean isX) {
+ return isX ? logsByRowX : logsByRowY;
+ }
+
+ @Override
+ public void setTested(int row, boolean isX, CtuluLog log) {
+ getTest(isX).set(row);
+ if (log != null) {
+ getLogs(isX).put(row, log);
+ }
+ }
+
+ @Override
+ public boolean isTested(int row, boolean isX) {
+ return getTest(isX).get(row);
+ }
+
+ @Override
+ public CtuluLog getLog(int row, boolean isX) {
+ return getLogs(isX).get(row);
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiConstanteCourbeModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiConstanteCourbeModel.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiConstanteCourbeModel.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -21,7 +21,7 @@
*
* @author Frederic Deniger
*/
-public class LoiConstanteCourbeModel implements CourbeModelWithKey {
+public class LoiConstanteCourbeModel extends DefaultTestedContent implements CourbeModelWithKey {
public static LoiConstanteCourbeModel create(Object key, double xmin, double xmax, double y) {
LoiConstanteCourbeModel res = new LoiConstanteCourbeModel(new double[]{xmin, xmax}, new double[]{y, y});
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiDefaultCourbeModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiDefaultCourbeModel.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiDefaultCourbeModel.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -18,7 +18,7 @@
*
* @author Frederic Deniger
*/
-public class LoiDefaultCourbeModel implements CourbeModelWithKey {
+public class LoiDefaultCourbeModel extends DefaultTestedContent implements CourbeModelWithKey {
List<? extends Point2D> points;
double deltaY;
Added: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiWithValideStateCourbeModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiWithValideStateCourbeModel.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiWithValideStateCourbeModel.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -0,0 +1,20 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.loi.common;
+
+import org.fudaa.ctulu.CtuluLog;
+
+/**
+ * Pour des raisons de perf permet de stocker les validations des valeurs. A utilise que pour des courbes immuables !
+ *
+ * @author Frederic Deniger
+ */
+public interface LoiWithValideStateCourbeModel {
+
+ void setTested(int row, boolean isX, CtuluLog log);
+
+ boolean isTested(int row,boolean isX);
+
+ CtuluLog getLog(int row, boolean isX);
+}
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/SimpleLoiCourbeModel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/SimpleLoiCourbeModel.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/SimpleLoiCourbeModel.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -4,6 +4,7 @@
import java.util.Observable;
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluListSelectionInterface;
+import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.dodico.crue.metier.emh.LoiFF;
import org.fudaa.ebli.courbe.EGGrapheModel;
@@ -15,7 +16,7 @@
*
* @author deniger
*/
-public class SimpleLoiCourbeModel extends Observable implements CourbeModelWithKey {
+public class SimpleLoiCourbeModel extends Observable implements CourbeModelWithKey, LoiWithValideStateCourbeModel {
double yMax;
double yMin;
@@ -25,12 +26,28 @@
boolean xrangeComputed;
Object key;
LoiFF loi;
+ DefaultTestedContent testedContent = new DefaultTestedContent();
public SimpleLoiCourbeModel(LoiFF loi) {
this.loi = loi;
}
@Override
+ public void setTested(int row, boolean isX, CtuluLog log) {
+ testedContent.setTested(row, isX, log);
+ }
+
+ @Override
+ public boolean isTested(int row, boolean isX) {
+ return testedContent.isTested(row, isX);
+ }
+
+ @Override
+ public CtuluLog getLog(int row, boolean isX) {
+ return testedContent.getLog(row, isX);
+ }
+
+ @Override
public Object getKey() {
return key;
}
Added: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/CourbesUiResController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/CourbesUiResController.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/CourbesUiResController.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -0,0 +1,19 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.loi.res;
+
+import org.fudaa.fudaa.crue.loi.common.CourbesUiController;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class CourbesUiResController extends CourbesUiController {
+
+ @Override
+ protected void configureTablePanel() {
+ super.configureTablePanel();
+ tableGraphePanel.getDefaultRenderer().setDecorator(new LoiStateResCellRenderer());
+ }
+}
Copied: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/LoiStateResCellRenderer.java (from rev 8048, trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/LoiStateCellRenderer.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/LoiStateResCellRenderer.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/LoiStateResCellRenderer.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -0,0 +1,75 @@
+package org.fudaa.fudaa.crue.loi.res;
+
+import org.fudaa.fudaa.crue.loi.common.*;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JTable;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.ctulu.CtuluLogLevel;
+import org.fudaa.ctulu.gui.CtuluCellDecorator;
+import org.fudaa.dodico.crue.common.BusinessMessages;
+import org.fudaa.dodico.crue.config.ccm.ItemVariable;
+import org.fudaa.ebli.courbe.EGAxe;
+import org.fudaa.ebli.courbe.EGModel;
+import org.fudaa.ebli.courbe.EGTableGraphePanel;
+import org.fudaa.ebli.courbe.EGTableGraphePanel.SpecTableModel;
+import org.fudaa.fudaa.crue.common.log.LogIconTranslationProvider;
+import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class LoiStateResCellRenderer implements CtuluCellDecorator {
+
+ @Override
+ public void decore(JComponent _c, JList _table, Object _value, int _index) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void decore(JComponent _c, JTable _table, Object _value, int _row, int _col) {
+ EGTableGraphePanel.SpecTableModel model = (EGTableGraphePanel.SpecTableModel) _table.getModel();
+ EGModel courbeModel = model.getCourbe().getModel();
+ final boolean stateCanBeSaved = courbeModel instanceof LoiWithValideStateCourbeModel;
+ CtuluLog log = null;
+ boolean isX = model.getXColIndex() == _col;
+ boolean isY = model.getYColIndex() == _col;
+ if (!isX && !isY) {
+ return;
+ }
+ if (stateCanBeSaved) {
+ LoiWithValideStateCourbeModel savedModel = (LoiWithValideStateCourbeModel) courbeModel;
+ if (savedModel.isTested(_row, isX)) {
+ log = savedModel.getLog(_row, isX);
+ } else {
+ log = createLog(model, _row, isX);
+ savedModel.setTested(_row, isX, log.isEmpty() ? null : log);
+ }
+ } else {
+ log = createLog(model, _row, isX);
+ }
+ ((JLabel) _c).setIcon(null);
+ if (log != null && log.isNotEmpty()) {
+ _c.setToolTipText(LogsDisplayer.toHtml(log));
+ if (log.containsErrorOrSevereError()) {
+ ((JLabel) _c).setIcon(LogIconTranslationProvider.getIcon(CtuluLogLevel.ERROR));
+ } else if (log.containsWarnings()) {
+ ((JLabel) _c).setIcon(LogIconTranslationProvider.getIcon(CtuluLogLevel.WARNING));
+ }
+ }
+ }
+
+ public CtuluLog createLog(SpecTableModel model, int _row, boolean isX) {
+ EGAxe axe = isX ? model.getCourbe().getAxeX() : model.getCourbe().getAxeY();
+ Object userObject = axe.getUserObject();
+ CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
+ if (userObject instanceof ItemVariable) {
+ ItemVariable var = (ItemVariable) userObject;
+ double value = isX ? model.getInitX(_row) : model.getInitY(_row);
+ var.getValidator().validateNumber(null, value, log, true);
+ }
+ return log;
+ }
+}
Added: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/ProfilSectionLoiUiResController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/ProfilSectionLoiUiResController.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/res/ProfilSectionLoiUiResController.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -0,0 +1,24 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.loi.res;
+
+import org.fudaa.fudaa.crue.common.config.ConfigDefaultValuesProvider;
+import org.fudaa.fudaa.crue.loi.section.ProfilSectionLoiUiController;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class ProfilSectionLoiUiResController extends ProfilSectionLoiUiController {
+
+ public ProfilSectionLoiUiResController(ConfigDefaultValuesProvider defaultValuesProvider) {
+ super(defaultValuesProvider);
+ }
+
+ @Override
+ protected void configureTablePanel() {
+ super.configureTablePanel();
+ tableGraphePanel.getDefaultRenderer().setDecorator(new LoiStateResCellRenderer());
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -366,6 +366,7 @@
axeFrt = new EGAxeVertical(configLoi.getVarOrdonnee().getNom(), configLoi.getVarOrdonnee().getNature().getUnite());
axeFrt.setSpecificFormat(new CtuluNumberFormatDefault(configLoi.getVarOrdonnee().getFormatter(DecimalFormatEpsilonEnum.PRESENTATION)));
axeFrt.setSpecificDetailFormat(new CtuluNumberFormatDefault(configLoi.getVarOrdonnee().getFormatter(DecimalFormatEpsilonEnum.COMPARISON)));
+ axeFrt.setUserObject(configLoi.getVarOrdonnee());
axeFrt.setUniteModifiable(false);
axeFrt.setTitleModifiable(false);
axeFrt.setDroite(true);
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/AbstractReportTimeViewTopComponent.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -9,7 +9,6 @@
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.image.BufferedImage;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.MissingResourceException;
@@ -38,6 +37,7 @@
import org.fudaa.fudaa.crue.loi.ViewCourbeManager;
import org.fudaa.fudaa.crue.loi.common.CourbesUiController;
import org.fudaa.fudaa.crue.loi.common.CourbeModelWithKey;
+import org.fudaa.fudaa.crue.loi.res.CourbesUiResController;
import org.fudaa.fudaa.crue.report.config.AbstractReportGrapheBuilder;
import org.fudaa.fudaa.crue.report.config.CourbeViewReportConfigurationButtonUI;
import org.fudaa.fudaa.crue.report.data.ExternFileKey;
@@ -125,7 +125,6 @@
this.lineInfo = info;
}
-
protected final void updateAspectFor(EGObject _c) {
if (updating) {
return;
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportProfilLongitudinalTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportProfilLongitudinalTopComponent.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportProfilLongitudinalTopComponent.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -17,7 +17,7 @@
import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.ebli.courbe.EGCourbePersist;
-import org.fudaa.fudaa.crue.loi.common.CourbesUiController;
+import org.fudaa.fudaa.crue.loi.res.CourbesUiResController;
import org.fudaa.fudaa.crue.report.AbstractReportTimeViewTopComponent;
import org.fudaa.fudaa.crue.report.data.ReportExpressionHelper;
import org.fudaa.fudaa.crue.report.data.ReportKeyContract;
@@ -166,8 +166,8 @@
}
@Override
- protected CourbesUiController createCourbesUiController() {
- CourbesUiController res = new CourbesUiController();
+ protected CourbesUiResController createCourbesUiController() {
+ CourbesUiResController res = new CourbesUiResController();
return res;
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -34,11 +34,11 @@
* @author Frederic Deniger
*/
public class ReportMultiVarGrapheBuilder extends AbstractReportGrapheBuilder<CourbesUiController, ReportMultiVarConfig> {
-
+
public ReportMultiVarGrapheBuilder(CourbesUiController uiController, ViewCourbeManager loiLabelsManager) {
super(uiController, loiLabelsManager);
}
-
+
@Override
public List<EGCourbeSimple> getInternCourbes(ReportMultiVarConfig content) {
if (!reportService.isRunLoaded()) {
@@ -60,6 +60,7 @@
axeX.setUniteModifiable(false);
axeX.setSpecificFormat(new CtuluNumberFormatDefault(propertyHorizontal.getFormatter(DecimalFormatEpsilonEnum.PRESENTATION)));
axeX.setSpecificDetailFormat(new CtuluNumberFormatDefault(propertyHorizontal.getFormatter(DecimalFormatEpsilonEnum.COMPARISON)));
+ axeX.setUserObject(propertyHorizontal);
EGCourbe selectedComponent = uiController.getEGGrapheSimpleModel().getSelectedComponent();
Object selectedKey = null;
if (selectedComponent != null && selectedComponent.getModel() != null) {
@@ -95,16 +96,16 @@
}
return courbes;
}
-
+
@Override
public void updateResultCurvesAfterTimeChanged(ReportMultiVarConfig content) {
}
-
+
@Override
public List<EGCourbeSimple> getInternCourbesAfterTimeChanged(ReportMultiVarConfig content) {
return Collections.emptyList();
}
-
+
private LoiConstanteCourbeModel createCourbeModel(ReportMultiVarConfig config, List<ResultatKey> times, ReportRunVariableEmhKey key) {
ReportRunVariableKey hKey = new ReportRunVariableKey(key.getRunVariableKey().getRunKey(), config.horizontalVar);
TDoubleArrayList x = new TDoubleArrayList();
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarTopComponent.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarTopComponent.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -24,7 +24,7 @@
import org.fudaa.ebli.courbe.EGCourbePersist;
import org.fudaa.fudaa.crue.common.helper.CapitalizeCellRenderer;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
-import org.fudaa.fudaa.crue.loi.common.CourbesUiController;
+import org.fudaa.fudaa.crue.loi.res.CourbesUiResController;
import org.fudaa.fudaa.crue.report.AbstractReportTimeViewTopComponent;
import org.fudaa.fudaa.crue.report.data.ReportKeyContract;
import org.fudaa.fudaa.crue.report.data.ReportRunEmhKey;
@@ -103,8 +103,8 @@
}
@Override
- protected CourbesUiController createCourbesUiController() {
- CourbesUiController res = new CourbesUiController();
+ protected CourbesUiResController createCourbesUiController() {
+ CourbesUiResController res = new CourbesUiResController();
return res;
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGTopComponent.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGTopComponent.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -13,7 +13,7 @@
import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.ebli.courbe.EGCourbePersist;
-import org.fudaa.fudaa.crue.loi.common.CourbesUiController;
+import org.fudaa.fudaa.crue.loi.res.CourbesUiResController;
import org.fudaa.fudaa.crue.report.AbstractReportTimeViewTopComponent;
import org.fudaa.fudaa.crue.report.data.ReportExpressionHelper;
import org.fudaa.fudaa.crue.report.data.ReportKeyContract;
@@ -65,8 +65,8 @@
}
@Override
- protected CourbesUiController createCourbesUiController() {
- CourbesUiController res = new CourbesUiController();
+ protected CourbesUiResController createCourbesUiController() {
+ CourbesUiResController res = new CourbesUiResController();
return res;
}
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 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalTopComponent.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -27,7 +27,7 @@
import org.fudaa.ebli.courbe.EGCourbePersist;
import org.fudaa.fudaa.crue.common.helper.CapitalizeCellRenderer;
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
-import org.fudaa.fudaa.crue.loi.common.CourbesUiController;
+import org.fudaa.fudaa.crue.loi.res.CourbesUiResController;
import org.fudaa.fudaa.crue.report.AbstractReportTimeViewTopComponent;
import org.fudaa.fudaa.crue.report.data.ReportExpressionHelper;
import org.fudaa.fudaa.crue.report.data.ReportKeyContract;
@@ -100,8 +100,8 @@
}
@Override
- protected CourbesUiController createCourbesUiController() {
- CourbesUiController res = new CourbesUiController();
+ protected CourbesUiResController createCourbesUiController() {
+ CourbesUiResController res = new CourbesUiResController();
return res;
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportProfilTransversalTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportProfilTransversalTopComponent.java 2012-12-14 09:58:50 UTC (rev 8130)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/transversal/ReportProfilTransversalTopComponent.java 2012-12-14 09:59:58 UTC (rev 8131)
@@ -25,6 +25,7 @@
import org.fudaa.fudaa.crue.common.helper.DialogHelper;
import org.fudaa.fudaa.crue.common.view.ChooseInListHelper;
import org.fudaa.fudaa.crue.loi.common.CourbesUiController;
+import org.fudaa.fudaa.crue.loi.res.ProfilSectionLoiUiResController;
import org.fudaa.fudaa.crue.loi.section.ProfilSectionLoiUiController;
import org.fudaa.fudaa.crue.report.AbstractReportTimeViewTopComponent;
import org.fudaa.fudaa.crue.report.data.ReportExpressionHelper;
@@ -78,7 +79,7 @@
@Override
protected CourbesUiController createCourbesUiController() {
- ProfilSectionLoiUiController res = new ProfilSectionLoiUiController(null);
+ ProfilSectionLoiUiResController res = new ProfilSectionLoiUiResController(null);
res.setUseSectionName(true);
res.setAddFrt(false);
return res;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-12-18 23:01:22
|
Revision: 8153
http://fudaa.svn.sourceforge.net/fudaa/?rev=8153&view=rev
Author: deniger
Date: 2012-12-18 23:01:12 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/helper/ToStringTest.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRReader.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java
trunk/soft/fudaa-crue/crue-io/src/test/java/files/FilesForTest.java
trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/neuf/CrueSTRTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-io/src/test/resources/Etu30Branche6/M3-0_c9.STO_lin
trunk/soft/fudaa-crue/crue-io/src/test/resources/Etu30Branche6/M3-0_c9.STR_lin
trunk/soft/fudaa-crue/crue-io/src/test/resources/etu50/M5-0_c9c9.STO_lin
trunk/soft/fudaa-crue/crue-io/src/test/resources/etu50/M5-0_c9c9.STR_lin
Modified: trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/helper/ToStringTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/helper/ToStringTest.java 2012-12-18 15:42:54 UTC (rev 8152)
+++ trunk/soft/fudaa-crue/crue-emh/src/test/java/org/fudaa/dodico/crue/metier/helper/ToStringTest.java 2012-12-18 23:01:12 UTC (rev 8153)
@@ -22,7 +22,7 @@
CrueConfigMetier def = CrueConfigMetierLoaderDefaultTest.DEFAULT;
ToStringTransformer create = ToStringTransfomerFactory.create(def,DecimalFormatEpsilonEnum.PRESENTATION);
ParamNumCalcPseudoPerm pseudo = new ParamNumCalcPseudoPerm(def);
- assertEquals("ParamNumCalcPseudoPerm [coefRelaxQ=1.00000, coefRelaxZ=1.00000, crMaxFlu=1.0E30, crMaxTor=1.0E30, nbrPdtDecoup=1, nbrPdtMax=40, pdt=Cst: 3600.000 s, tolMaxQ=0.01000, tolMaxZ=0.0010000]", create.transform(pseudo));
+ assertEquals("ParamNumCalcPseudoPerm [coefRelaxQ=1, coefRelaxZ=1, crMaxFlu=1.0E30, crMaxTor=1.0E30, nbrPdtDecoup=1, nbrPdtMax=40, pdt=Cst: 3600 s, tolMaxQ=0.01, tolMaxZ=0.001]", create.transform(pseudo));
}
}
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRReader.java 2012-12-18 15:42:54 UTC (rev 8152)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRReader.java 2012-12-18 23:01:12 UTC (rev 8153)
@@ -44,12 +44,27 @@
// 49 + 2*Npo + (17 + 2*NbStr)*NbLitMax + 9*NbHaut
int longueurEnregistrement = 49 + 2 * data.npo + (17 + 2 * data.nbStr) * data.nbLitMax + 9 * data.nbHaut;
longueurEnregistrement = longueurEnregistrement * 4;
- final int longueurEnregistrementSTO = sto.getLReclProf() * 4;
+ // 37 + (7+TAILLE_STRI)*NBLITMAX + 2*NPO + 2*(2*NBLITMAX) + 12 + 9*NBHAUT + 4 + 12*NBHAUT)
+ int longueurEnregistrement2 = 37 + (7+ (8+2*(data.nbStr)) )*data.nbLitMax + 2*data.npo + 2*(2*data.nbLitMax) + 12 + 9*data.nbHaut + 4 + 12*data.nbHaut;
+ longueurEnregistrement2 = longueurEnregistrement2 * 4;
- if (longueurEnregistrement != longueurEnregistrementSTO) {
+ final int longueurEnregistrementSTO = sto.getLReclProf();
+
+ if (longueurEnregistrement == (longueurEnregistrementSTO)) {
+ //Format fortran non standard (intel) non windows
+ data.setFormatFortranStandard(false);
+ data.longueurEnregistrement = longueurEnregistrementSTO;
+ } else if (longueurEnregistrement == (longueurEnregistrementSTO*4)) {
+ //Format fortran non standard (intel) windows
+ data.setFormatFortranStandard(false);
+ data.longueurEnregistrement = longueurEnregistrementSTO * 4;
+ } else if (longueurEnregistrement2 == longueurEnregistrementSTO) {
+ //Format fortran standard (gcc)
+ data.setFormatFortranStandard(true);
+ data.longueurEnregistrement = longueurEnregistrementSTO;
+ } else {
analyze_.addWarn("io.str.lg.enreg.diff.error");
}
- data.longueurEnregistrement = longueurEnregistrementSTO;
final int nbProfil = (int) (helper.getChannel().size() / data.longueurEnregistrement);
final int nbProfilStoRes = sto.getNbRecProf();
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java 2012-12-18 15:42:54 UTC (rev 8152)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRSequentialReader.java 2012-12-18 23:01:12 UTC (rev 8153)
@@ -37,6 +37,7 @@
private static final String TYPE_LIMITE_LIT_J = "LIMITEJ";
private static final String TYPE_LIMITE_LIT_X = "LIMITEX";
protected ByteOrder byteOrder;
+ protected boolean formatFortranStandard = false;
/**
* Permet d'avoir la correspondance entre le nom du profil et sa position dans le STR. Rempli par StrReader. Le nom est le nom dans le str et non le
* nom crue 10 avec les prefixes.
@@ -57,6 +58,10 @@
this.ccm = ccm;
}
+ public void setFormatFortranStandard(boolean formatFortranStandard) {
+ this.formatFortranStandard = formatFortranStandard;
+ }
+
/**
* @return le nombre de profil lu.
*/
@@ -156,7 +161,7 @@
cache.put(nomProfilCrue9, res);
}
Crue9ResPrtGeoSection resultat = res.getResultat();
- return new ResPrtGeo(resultat.getValues(), resultat.getNom(),true);
+ return new ResPrtGeo(resultat.getValues(), resultat.getNom(), true);
}
@@ -315,23 +320,58 @@
donneesSection.setTypeLimLit(typeLimLit);
DonneesLimites limites = null;
- if (TYPE_LIMITE_LIT_J.equals(typeLimLit)) {
- limites = getDonneesLimiteJ(bf, nbLit);
- } else if (TYPE_LIMITE_LIT_X.equals(typeLimLit)) {
- limites = getDonneesLimiteX(bf, nbLit);
+ if (this.formatFortranStandard) {
+ //En fortran standard : il faut lire les 2, mais ne garder que la bonne
+ if (TYPE_LIMITE_LIT_J.equals(typeLimLit)) {
+ limites = getDonneesLimiteJ(bf, nbLit);
+ /**
+ * DonneesLimites limitesBidon = *
+ */
+ getDonneesLimiteX(bf, nbLit);
+ } else if (TYPE_LIMITE_LIT_X.equals(typeLimLit)) {
+ /**
+ * DonneesLimites limitesBidon = *
+ */
+ getDonneesLimiteJ(bf, nbLit);
+ limites = getDonneesLimiteX(bf, nbLit);
+ } else {
+ // sinon, on saute la partie concernant les limites des lits
+ // soit 2 fois la lecture de nbLitMax float.
+ skip(bf, 4 * (4 * nbLitMax));
+ }
} else {
- // sinon, on saute la partie concernant les limites des lits
- // soit 2 fois la lecture de nbLitMax float.
- skip(bf, 2 * (4 * nbLitMax));
+ if (TYPE_LIMITE_LIT_J.equals(typeLimLit)) {
+ limites = getDonneesLimiteJ(bf, nbLit);
+ } else if (TYPE_LIMITE_LIT_X.equals(typeLimLit)) {
+ limites = getDonneesLimiteX(bf, nbLit);
+ } else {
+ // sinon, on saute la partie concernant les limites des lits
+ // soit 2 fois la lecture de nbLitMax float. X 2
+// skip(bf, 4 * (4 * nbLitMax));
+ //Fred bizarre dans le code c'est 2*
+ skip(bf, 2 * (4 * nbLitMax));
+ }
}
donneesSection.setDonneesLimites(limites);
DonneesSectionPourBranche donneesBranche = null;
- // cas particulier des branche 9.
- if (isTypeBrancheOld) {
- donneesBranche = getBranche0Ou9(bf);
+ if (this.formatFortranStandard) {
+ //En fortran standard : il faut lire les 2, mais ne garder que la bonne
+ // cas particulier des branche 9.
+ if (isTypeBrancheOld) {
+ donneesBranche = getBranche0Ou9(bf);
+ DonneesSectionPourBranche donneesBrancheBidon = getAutreBranche(bf, nbLit);
+ } else {
+ DonneesSectionPourBranche donneesBrancheBidon = getBranche0Ou9(bf);
+ donneesBranche = getAutreBranche(bf, nbLit);
+ }
} else {
- donneesBranche = getAutreBranche(bf, nbLit);
+ // cas particulier des branche 9.
+ if (isTypeBrancheOld) {
+ donneesBranche = getBranche0Ou9(bf);
+ } else {
+ donneesBranche = getAutreBranche(bf, nbLit);
+ }
}
donneesSection.setDonneesPourBranche(donneesBranche);
// On enregistre la valeur du nombre de pas de hauteur par section car cela permettra de calculer la liste des
Modified: trunk/soft/fudaa-crue/crue-io/src/test/java/files/FilesForTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/test/java/files/FilesForTest.java 2012-12-18 15:42:54 UTC (rev 8152)
+++ trunk/soft/fudaa-crue/crue-io/src/test/java/files/FilesForTest.java 2012-12-18 23:01:12 UTC (rev 8153)
@@ -127,8 +127,14 @@
public static final String STO_MODELE30 = "/Etu30/M3-0_C9.STO";
public static final String STO_MODELE50 = "/etu50/M5-0_C9C9.STO";
+ public static final String STO_MODELE50_LINUX = "/etu50/M5-0_c9c9.STO_lin";
+ public static final String STR_MODELE50_LINUX = "/etu50/M5-0_c9c9.STR_lin";
+
public static final String STO_MODELE30_BRANCHE6 = "/Etu30Branche6/M3-0_C9.STO";
public static final String STR_MODELE30_BRANCHE6 = "/Etu30Branche6/M3-0_C9.STR";
+ public static final String STO_MODELE30_BRANCHE6_LINUX = "/Etu30Branche6/M3-0_c9.STO_lin";
+ public static final String STR_MODELE30_BRANCHE6_LINUX = "/Etu30Branche6/M3-0_c9.STR_lin";
+
public static final String STR_MODELE50 = "/etu50/M5-0_C9C9.STR";
public static final String AVCT_LOG_V1_2_SC_M30_C10 = "/v1_2/Sc_M3-0_c10.avct.log";
public static final String ETUDE_XML_FUDAA_CRUE = "/FudaaCrue_Etude.xml";
Modified: trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/neuf/CrueSTRTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/neuf/CrueSTRTest.java 2012-12-18 15:42:54 UTC (rev 8152)
+++ trunk/soft/fudaa-crue/crue-io/src/test/java/org/fudaa/dodico/crue/io/neuf/CrueSTRTest.java 2012-12-18 23:01:12 UTC (rev 8153)
@@ -5,6 +5,7 @@
import files.FilesForTest;
import gnu.trove.TObjectDoubleHashMap;
+import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
@@ -13,13 +14,9 @@
import org.fudaa.dodico.crue.io.AbstractIOBinaryTestCase;
import org.fudaa.dodico.crue.io.Crue9FileFormatFactory;
import org.fudaa.dodico.crue.io.ReadHelper;
-import org.fudaa.dodico.crue.io.neuf.ResPrtReseauCrue9Adapter;
-import org.fudaa.dodico.crue.io.neuf.STOReader;
-import org.fudaa.dodico.crue.io.neuf.STOSequentialReader;
-import org.fudaa.dodico.crue.io.neuf.STRFactory;
-import org.fudaa.dodico.crue.io.neuf.STRSequentialReader;
import org.fudaa.dodico.crue.metier.CrueData;
import org.fudaa.dodico.crue.metier.emh.LoiFF;
+import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF;
import org.fudaa.dodico.crue.metier.emh.ResPrtGeo;
/**
@@ -57,12 +54,63 @@
Map<String, float[]> zDactForBranche6 = STRFactory.getLoiZDactForBranche6((STOSequentialReader) testRes.data.getSto(), testRes.data);
testZDactForSectionPROFSTR2(zDactForBranche6.get("ST_PROFSTR2"));
testZDactForSectionPROFSTR1(zDactForBranche6.get("ST_PROFSTR1"));
-
+
TObjectDoubleHashMap coefSinuoBySection = STRFactory.getCoefSinuoBySection((STOSequentialReader) testRes.data.getSto(), testRes.data);
assertEquals(1d, coefSinuoBySection.get("ST_PROFSTR1"), 1e-6);
assertEquals(1d, coefSinuoBySection.get("ST_PROFSTR2"), 1e-6);
+
+ ResPrtGeo resultatOnProfil = res.getResultatOnProfil("ST_B1_00050");
+ assertNotNull(resultatOnProfil);
+ LoiFF loi = resultatOnProfil.getLoi("loiZBeta");
+ final List<PtEvolutionFF> loiZBeta = loi.getEvolutionFF().getPtEvolutionFF();
+ assertEquals(51, loiZBeta.size());
+ assertDoubleEquals(1.05, loiZBeta.get(0).getAbscisse());
+ assertDoubleEquals(1, loiZBeta.get(0).getOrdonnee());
+ assertDoubleEquals(6.05, loiZBeta.get(50).getAbscisse());
+ assertDoubleEquals(1.2816799879074097, loiZBeta.get(50).getOrdonnee());
+
}
+ //Tests Fortran non standard
+ public void testLectureSTRModele30_LINUX() {
+ TestRes testRes = testLectureFichierSTR(FilesForTest.STR_MODELE30_BRANCHE6_LINUX, FilesForTest.STO_MODELE30_BRANCHE6_LINUX,
+ "/Etu30Branche6/M3-0_c9.dc", "/Etu30Branche6/M3-0_c9.dh");
+ ResPrtReseauCrue9Adapter res = testRes.res;
+ int nbProf = 25;
+ assertEquals(25, res.getNbResOnProfil());
+ for (int i = 0; i < nbProf; i++) {
+ String profilNom = res.getProfilNom(i);
+ assertFalse(StringUtils.isBlank(profilNom));
+ assertNotNull(res.getResultatOnProfil(profilNom));
+ if ("ST_PROF3AM".equals(profilNom)) {
+ testStProf3AM(res.getResultatOnProfil(profilNom));
+ }
+ if ("ST_PROFSTR1".equals(profilNom)) {
+ testStProfTableauxLength(res.getResultatOnProfil(profilNom), 1);
+ testStProfStr1(res.getResultatOnProfil(profilNom));
+ }
+ }
+ int nbCasier = 2;
+ assertEquals(nbCasier, res.getNbResOnCasier());
+ for (int i = 0; i < nbCasier; i++) {
+ assertFalse(StringUtils.isBlank(res.getCasierNom(i)));
+ }
+ // on remplit les données pour les sections appartenant a des branches de type 6:
+ Map<String, float[]> zDactForBranche6 = STRFactory.getLoiZDactForBranche6((STOSequentialReader) testRes.data.getSto(), testRes.data);
+ testZDactForSectionPROFSTR2_LINUX(zDactForBranche6.get("ST_PROFSTR2"));
+ testZDactForSectionPROFSTR1_LINUX(zDactForBranche6.get("ST_PROFSTR1"));
+
+ ResPrtGeo resultatOnProfil = res.getResultatOnProfil("ST_B1_00050");
+ assertNotNull(resultatOnProfil);
+ LoiFF loi = resultatOnProfil.getLoi("loiZBeta");
+ final List<PtEvolutionFF> loiZBeta = loi.getEvolutionFF().getPtEvolutionFF();
+ assertEquals(51, loiZBeta.size());
+ assertEquals(1.05, loiZBeta.get(0).getAbscisse(),1e-5);//bizarre on trouve 1.0499999
+ assertDoubleEquals(1, loiZBeta.get(0).getOrdonnee());
+ assertDoubleEquals(6.05, loiZBeta.get(50).getAbscisse());
+ assertDoubleEquals(1.2816799879074097, loiZBeta.get(50).getOrdonnee());
+ }
+
private void testStProfStr1(ResPrtGeo resultat) {
LoiFF loi = resultat.getLoi("lstLitTypeLit");
assertNotNull(loi);
@@ -80,6 +128,13 @@
testStProfTableauxLength(resultatOnProfil, 5);
}
+ public void testLectureSTRModele50_LINUX() {
+ TestRes testRes = testLectureFichierSTR(FilesForTest.STR_MODELE50_LINUX, FilesForTest.STO_MODELE50_LINUX, FilesForTest.DC_MODELE50, FilesForTest.DH_MODELE50);
+ ResPrtReseauCrue9Adapter res = testRes.res;
+ ResPrtGeo resultatOnProfil = res.getResultatOnProfil("ST_PROFAV");
+ testStProfTableauxLength(resultatOnProfil, 5);
+ }
+
private static class TestRes {
CrueData data;
@@ -145,9 +200,9 @@
// LstLitSsup
loi = resultat.getLoi("lstLitSsup");
assertDoubleEquals(0, loi.getOrdonnee(0));
- assertDoubleEquals(75.00001, loi.getOrdonnee(1));
+ assertEquals(75.00001, loi.getOrdonnee(1), 1e-4);
assertDoubleEquals(132.0, loi.getOrdonnee(2));
- assertDoubleEquals(75.00001, loi.getOrdonnee(3));
+ assertEquals(75.00001, loi.getOrdonnee(3), 1e-4);
assertDoubleEquals(0, loi.getOrdonnee(4));
// LstLitPsup
loi = resultat.getLoi("lstLitPsup");
@@ -198,12 +253,17 @@
}
protected void testZDactForSectionPROFSTR2(float[] values) {
- //
assertEquals(4.833968, values[0], 1e-4);
assertEquals(15.333833, values[1], 1e-4);
assertEquals(3048.2847, values[values.length - 2], 1e-4);
assertEquals(3150.1428, values[values.length - 1], 1e-4);
+ }
+ protected void testZDactForSectionPROFSTR2_LINUX(float[] values) {
+ assertEquals(4.833968, values[0], 1e-4);
+ assertEquals(15.333833, values[1], 1e-4);
+ assertEquals(3048.2847, values[values.length - 2], 1e-4);
+ assertEquals(3150.1421, values[values.length - 1], 1e-4);
}
protected void testZDactForSectionPROFSTR1(float[] values) {
@@ -211,6 +271,12 @@
assertEquals(9.497381, values[1], 1e-4);
assertEquals(1906.0226, values[values.length - 2], 1e-4);
assertEquals(1970.089, values[values.length - 1], 1e-4);
+ }
+ protected void testZDactForSectionPROFSTR1_LINUX(float[] values) {
+ assertEquals(2.9933994, values[0], 1e-4);
+ assertEquals(9.497381, values[1], 1e-4);
+ assertEquals(1906.0227, values[values.length - 2], 1e-4);
+ assertEquals(1970.0892, values[values.length - 1], 1e-4);
}
}
Added: trunk/soft/fudaa-crue/crue-io/src/test/resources/Etu30Branche6/M3-0_c9.STO_lin
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/crue-io/src/test/resources/Etu30Branche6/M3-0_c9.STO_lin
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/soft/fudaa-crue/crue-io/src/test/resources/Etu30Branche6/M3-0_c9.STR_lin
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/crue-io/src/test/resources/Etu30Branche6/M3-0_c9.STR_lin
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/soft/fudaa-crue/crue-io/src/test/resources/etu50/M5-0_c9c9.STO_lin
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/crue-io/src/test/resources/etu50/M5-0_c9c9.STO_lin
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/soft/fudaa-crue/crue-io/src/test/resources/etu50/M5-0_c9c9.STR_lin
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/crue-io/src/test/resources/etu50/M5-0_c9c9.STR_lin
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-12-18 23:26:15
|
Revision: 8154
http://fudaa.svn.sourceforge.net/fudaa/?rev=8154&view=rev
Author: deniger
Date: 2012-12-18 23:26:07 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIni.java
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBranche.java
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBrancheOrifice.java
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBrancheSaintVenant.java
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniCasierProfil.java
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniNoeudNiveauContinu.java
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniSection.java
trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/edition/EditionDPTIChanged.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CondInitNodeFactory.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponent.java
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIni.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIni.java 2012-12-18 23:01:12 UTC (rev 8153)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIni.java 2012-12-18 23:26:07 UTC (rev 8154)
@@ -3,7 +3,7 @@
/**
* @pdOid 3c448e8e-0967-42a5-9bb5-a6ecbb4cf791
*/
-public abstract class DonPrtCIni extends AbstractInfosEMH implements Cloneable {
+public abstract class DonPrtCIni<T extends DonPrtCIni> extends AbstractInfosEMH implements Cloneable {
/**
* @pdOid 3681abe7-e53c-4cf8-85f1-7d5344c18225
@@ -13,6 +13,8 @@
return EnumInfosEMH.DON_PRT_CINI;
}
+ public abstract void initFrom(T dpti);
+
@Override
protected Object clone() {
try {
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBranche.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBranche.java 2012-12-18 23:01:12 UTC (rev 8153)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBranche.java 2012-12-18 23:26:07 UTC (rev 8154)
@@ -6,7 +6,7 @@
/**
* @author Adrien Hadoux Utilise pour DPTI a la fois pour branche et casier.
*/
-public class DonPrtCIniBranche extends DonPrtCIni {
+public class DonPrtCIniBranche extends DonPrtCIni<DonPrtCIniBranche> {
/**
* @pdOid 49462937-9dc3-4428-8141-69531acf15d2
@@ -27,7 +27,6 @@
}
/**
- * @param newQini @pdOid dcc8b50e-bb81-4e1c-93e5-f6ae6e3c41c1
*/
public final void setQini(double newQini) {
qini = newQini;
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBrancheOrifice.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBrancheOrifice.java 2012-12-18 23:01:12 UTC (rev 8153)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBrancheOrifice.java 2012-12-18 23:26:07 UTC (rev 8154)
@@ -44,14 +44,21 @@
}
}
-
@PropertyDesc(i18n = "ouv.property")
public final double getOuv() {
return ouv;
}
+ @Override
+ public void initFrom(DonPrtCIniBranche donPrtCIniBranche) {
+ super.initFrom(donPrtCIniBranche);
+ ouv = ((DonPrtCIniBrancheOrifice) donPrtCIniBranche).ouv;
+ sensOuv = ((DonPrtCIniBrancheOrifice) donPrtCIniBranche).sensOuv;
+ }
+
/**
- * @param newOuv @pdOid 736e9469-8d18-418f-8f6c-c829c1880d9a
+ * @param newOuv
+ * @pdOid 736e9469-8d18-418f-8f6c-c829c1880d9a
*/
public final void setOuv(double newOuv) {
ouv = newOuv;
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBrancheSaintVenant.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBrancheSaintVenant.java 2012-12-18 23:01:12 UTC (rev 8153)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniBrancheSaintVenant.java 2012-12-18 23:26:07 UTC (rev 8154)
@@ -3,12 +3,8 @@
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
import org.fudaa.dodico.crue.common.annotation.PropertyDesc;
-// ** @pdOid ed3ea8f4-4a5b-474e-b418-154451f41191 */
public class DonPrtCIniBrancheSaintVenant extends DonPrtCIniBranche {
- /**
- * @pdOid 5ca78cba-32d2-4106-8363-f13660756436
- */
private double qruis;
/**
@@ -28,8 +24,14 @@
return qruis;
}
+ @Override
+ public void initFrom(DonPrtCIniBranche donPrtCIniBranche) {
+ super.initFrom(donPrtCIniBranche);
+ qruis = ((DonPrtCIniBrancheSaintVenant) donPrtCIniBranche).qruis;
+ }
+
/**
- * @param newQruis @pdOid 547ffb46-5854-47ab-b4cc-7e772e9dcca0
+ * @param newQruis
*/
public void setQruis(double newQruis) {
qruis = newQruis;
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniCasierProfil.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniCasierProfil.java 2012-12-18 23:01:12 UTC (rev 8153)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniCasierProfil.java 2012-12-18 23:26:07 UTC (rev 8154)
@@ -1,7 +1,7 @@
/**
* *********************************************************************
* Module: DonPrtCIniCasierProfil.java Author: battista Purpose: Defines the Class DonPrtCIniCasierProfil
- **********************************************************************
+ * *********************************************************************
*/
package org.fudaa.dodico.crue.metier.emh;
@@ -9,9 +9,8 @@
import org.fudaa.dodico.crue.common.annotation.PropertyDesc;
/**
- * @pdOid 658774af-10cb-4bbf-bd58-5a41b5958f14
*/
-public class DonPrtCIniCasierProfil extends DonPrtCIni {
+public final class DonPrtCIniCasierProfil extends DonPrtCIni<DonPrtCIniCasierProfil> {
private double qruis;
@@ -22,6 +21,11 @@
qruis = def.getDefaultDoubleValue("qruis");
}
+ @Override
+ public void initFrom(DonPrtCIniCasierProfil dpti) {
+ this.qruis = dpti.qruis;
+ }
+
@PropertyDesc(i18n = "qruis.property")
public double getQruis() {
return qruis;
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniNoeudNiveauContinu.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniNoeudNiveauContinu.java 2012-12-18 23:01:12 UTC (rev 8153)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniNoeudNiveauContinu.java 2012-12-18 23:26:07 UTC (rev 8154)
@@ -3,9 +3,8 @@
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
import org.fudaa.dodico.crue.common.annotation.PropertyDesc;
-/** @pdOid c6c7ea5b-9ca5-4a74-ac7d-e86e406c5b48 */
-public class DonPrtCIniNoeudNiveauContinu extends DonPrtCIni {
- /** @pdOid b151682c-b6d9-40a5-8cd6-c55a4172fc7d */
+public final class DonPrtCIniNoeudNiveauContinu extends DonPrtCIni<DonPrtCIniNoeudNiveauContinu> {
+
private double zini;
/**
@@ -15,7 +14,12 @@
zini = def.getDefaultDoubleValue("zini");
}
- @PropertyDesc(i18n="zini.property")
+ @Override
+ public void initFrom(DonPrtCIniNoeudNiveauContinu dpti) {
+ this.zini = dpti.zini;
+ }
+
+ @PropertyDesc(i18n = "zini.property")
public final double getZini() {
return zini;
}
@@ -27,5 +31,4 @@
public final void setZini(double newZini) {
zini = newZini;
}
-
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniSection.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniSection.java 2012-12-18 23:01:12 UTC (rev 8153)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/DonPrtCIniSection.java 2012-12-18 23:26:07 UTC (rev 8154)
@@ -2,9 +2,8 @@
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
-/** @pdOid e4a6d3c3-64e5-4fc6-b895-754829f6310f */
-public class DonPrtCIniSection extends DonPrtCIni {
- /** @pdOid b4c2a8a4-16c3-4b62-9386-b0586e7d34fe */
+public final class DonPrtCIniSection extends DonPrtCIni<DonPrtCIniSection> {
+
private double zini;
/**
@@ -14,7 +13,14 @@
zini = def.getDefaultDoubleValue("zini");
}
- /** @pdOid cb68f4f8-53cf-4c4d-bf9c-945ebcc5d3ef */
+ @Override
+ public void initFrom(DonPrtCIniSection dpti) {
+ zini = dpti.zini;
+ }
+
+ /**
+ * @pdOid cb68f4f8-53cf-4c4d-bf9c-945ebcc5d3ef
+ */
public final double getZini() {
return zini;
}
@@ -26,5 +32,4 @@
public final void setZini(double newZini) {
zini = newZini;
}
-
}
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/edition/EditionDPTIChanged.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/edition/EditionDPTIChanged.java 2012-12-18 23:01:12 UTC (rev 8153)
+++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/edition/EditionDPTIChanged.java 2012-12-18 23:26:07 UTC (rev 8154)
@@ -33,10 +33,13 @@
}
for (Pair<EMH, DonPrtCIni> pair : toModify) {
final EMH emh = pair.first;
- //normallement, il n'y a qu'un dptiC
+ //normallement, il n'y a qu'un dpti
List<DonPrtCIni> dpti = emh.getDPTI();
- emh.removeInfosEMH(dpti);
- emh.addInfosEMH(pair.second.deepClone());
+ if (dpti.isEmpty()) {
+ emh.addInfosEMH(pair.second.deepClone());
+ } else {
+ dpti.get(0).initFrom(pair.second);
+ }
}
return log;
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CondInitNodeFactory.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CondInitNodeFactory.java 2012-12-18 23:01:12 UTC (rev 8153)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CondInitNodeFactory.java 2012-12-18 23:26:07 UTC (rev 8154)
@@ -28,6 +28,7 @@
/**
*
+ * Construit des noms en clonant les dpti: un seul dpti cloné par EMH.
* @author Frédéric Deniger
*/
public class CondInitNodeFactory {
@@ -41,7 +42,7 @@
CrueConfigMetier ccm = modellingScenarioService.getSelectedProjet().getCoeurConfig().getCrueConfigMetier();
List<Node> nodes = new ArrayList<Node>();
if (methodeInterpol.isNoeudActiveRequireDPTI()) {
- nodes.add(buildNoeud(methodeInterpol,sousModele, ccm));
+ nodes.add(buildNoeud(methodeInterpol, sousModele, ccm));
}
if (methodeInterpol.isBrancheActiveRequireDPTI()) {
nodes.add(buildBranche(sousModele, ccm));
@@ -55,7 +56,7 @@
return nodes;
}
- private Node buildNoeud(EnumMethodeInterpol methodeInterpol,EMHSousModele sousModele, CrueConfigMetier ccm) {
+ private Node buildNoeud(EnumMethodeInterpol methodeInterpol, EMHSousModele sousModele, CrueConfigMetier ccm) {
List<Node> nodes = createNodes(sousModele.getNoeuds(), ccm);
if (EnumMethodeInterpol.BAIGNOIRE.equals(methodeInterpol) && !nodes.isEmpty()) {
CondInitNode first = (CondInitNode) nodes.get(0);
@@ -77,20 +78,26 @@
return NodeHelper.createNode(nodes, NbBundle.getMessage(CondInitNodeFactory.class, "CiniNoeuds.DisplayName"));
}
- private void addNodes(Map<Class, List<Description>> cache, DonPrtCIni cini, PropertyFinder finder, EMH noeud, CrueConfigMetier ccm, List<Node> nodes) {
+ private void addNodes(Map<Class, List<Description>> cache, DonPrtCIni cini, PropertyFinder finder, EMH emh, CrueConfigMetier ccm, List<Node> nodes) {
List<Description> descriptions = cache.get(cini.getClass());
if (descriptions == null) {
descriptions = finder.getAvailablePropertiesSorted(cini.getClass());
cache.put(cini.getClass(), descriptions);
}
for (Description description : descriptions) {
- CondInitNode node = createNode(noeud, cini, description, ccm);
+ CondInitNode node = createNode(emh, cini, description, ccm);
nodes.add(node);
}
}
+ HashMap<String, DonPrtCIni> clonedByEmhName = new HashMap<String, DonPrtCIni>();
- private CondInitNode createNode(EMH noeud, DonPrtCIni cini, Description description, CrueConfigMetier ccm) {
- CondInitNode node = new CondInitNode(noeud, cini.deepClone(), description.property, ccm, perspectiveServiceModelling);
+ private CondInitNode createNode(EMH emh, DonPrtCIni cini, Description description, CrueConfigMetier ccm) {
+ DonPrtCIni dpti = clonedByEmhName.get(emh.getNom());
+ if (dpti == null) {
+ dpti = cini.deepClone();
+ clonedByEmhName.put(emh.getNom(), dpti);
+ }
+ CondInitNode node = new CondInitNode(emh, dpti, description.property, ccm, perspectiveServiceModelling);
return node;
}
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 2012-12-18 23:01:12 UTC (rev 8153)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCiniTopComponent.java 2012-12-18 23:26:07 UTC (rev 8154)
@@ -7,7 +7,9 @@
import java.awt.BorderLayout;
import java.awt.EventQueue;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.swing.*;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.common.Pair;
@@ -148,12 +150,16 @@
public void valideModificationHandler() {
Node[] nodes = getExplorerManager().getRootContext().getChildren().getNodes();
List<Pair<EMH, DonPrtCIni>> toModify = new ArrayList<Pair<EMH, DonPrtCIni>>();
+ Set<String> emhDone = new HashSet<String>();
for (Node node : nodes) {
Node[] emhNodes = node.getChildren().getNodes();
for (Node emhNode : emhNodes) {
EMH emh = emhNode.getLookup().lookup(EMH.class);
- DonPrtCIni content = emhNode.getLookup().lookup(DonPrtCIni.class);
- toModify.add(new Pair(emh, content));
+ if (!emhDone.contains(emh.getNom())) {
+ emhDone.add(emh.getNom());
+ DonPrtCIni content = emhNode.getLookup().lookup(DonPrtCIni.class);
+ toModify.add(new Pair(emh, content));
+ }
}
}
EditionDPTIChanged change = new EditionDPTIChanged();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-12-19 16:33:28
|
Revision: 8156
http://fudaa.svn.sourceforge.net/fudaa/?rev=8156&view=rev
Author: deniger
Date: 2012-12-19 16:33:20 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMHSectionDansBranche.java
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiUiController.java
trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/AbstractModellingTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/SousModeleBrancheComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/loi/Bundle.properties
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheCartouche.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/longitudinal/ReportLongitudinalPositionSection.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalPositionSectionByRun.java
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMHSectionDansBranche.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMHSectionDansBranche.java 2012-12-19 14:22:39 UTC (rev 8155)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/RelationEMHSectionDansBranche.java 2012-12-19 16:33:20 UTC (rev 8156)
@@ -4,11 +4,8 @@
package org.fudaa.dodico.crue.metier.emh;
-/** @pdOid 4da4c4ab-b0aa-4d5f-acad-e03e74ec0fda */
public class RelationEMHSectionDansBranche extends RelationEMH<CatEMHSection> {
- /** @pdOid 976a6b2d-60bb-4d47-a36e-732b33c7a21b */
private double xp;
- /** @pdOid 0906b00a-6643-4707-9077-37a1887f7571 */
private EnumPosSection pos;
/**
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java 2012-12-19 14:22:39 UTC (rev 8155)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java 2012-12-19 16:33:20 UTC (rev 8156)
@@ -74,6 +74,18 @@
}
+ public static List<EMHSectionProfil> getAllEMHSectionProfil(EMHSousModele sousModele) {
+ List<EMHSectionProfil> res = new ArrayList<EMHSectionProfil>();
+ List<CatEMHSection> sections = sousModele.getSections();
+ for (CatEMHSection catEMHSection : sections) {
+ if (catEMHSection.getClass().equals(EMHSectionProfil.class)) {
+ res.add((EMHSectionProfil) catEMHSection);
+ }
+ }
+ return res;
+
+ }
+
public static void fillWithEMHSectionProfilWithoutBranches(EMHSousModele sousModele, List<EMHSectionProfil> toFill) {
if (sousModele == null) {
return;
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java 2012-12-19 14:22:39 UTC (rev 8155)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/STRFactory.java 2012-12-19 16:33:20 UTC (rev 8156)
@@ -54,7 +54,6 @@
public static Map<String, float[]> getLoiZDactForBranche6(STOSequentialReader sto, CrueData data) {
Map<String, float[]> res = new HashMap<String, float[]>();
List<DonneesBranche> donneesBranches = sto.getDonneesBranches();
- // final int nbHaut = sto.getParametresGeneraux().getNbhaut();
for (DonneesBranche dataBr : donneesBranches) {
if (dataBr.getNTyp() == STRICKLER) {
String nom = CruePrefix.addPrefix(dataBr.getNomBr().trim(), EnumCatEMH.BRANCHE).toUpperCase();
@@ -82,12 +81,9 @@
floatsAval.add(dataBr.getSing()[i]);
}
res.put(emhAval.getId(), floatsAval.toNativeArray());
-
}
}
-
}
-
}
}
return res;
@@ -396,9 +392,6 @@
specOut.setLoiZCoefW1(createLoi(abscissesZ, inSection.getListeCoefW1(), nom, EnumTypeLoi.LoiZCoefW1));
// LoiZCoefW2 LoiFF STR.coefw2(NbHaut)
specOut.setLoiZCoefW2(createLoi(abscissesZ, inSection.getListeCoefW2(), nom, EnumTypeLoi.LoiZCoefW2));
-
-
-
}
private static void fillSectionPourAutreBranche(final DonneesSectionOuProfil inDonneesSection,
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiUiController.java 2012-12-19 14:22:39 UTC (rev 8155)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiUiController.java 2012-12-19 16:33:20 UTC (rev 8156)
@@ -18,10 +18,10 @@
* @author Frederic Deniger
*/
public abstract class AbstractLoiUiController extends CourbesUiController {
-
+
protected EGCourbeSimple courbe;
protected LoiInfoPanelController infoController;
-
+
public LoiInfoPanelController getInfoController() {
if (infoController == null) {
infoController = new LoiInfoPanelController();
@@ -31,11 +31,11 @@
}
return infoController;
}
-
+
public EGCourbeSimple getCourbe() {
return courbe;
}
-
+
@Override
protected void configureTablePanel() {
tableGraphePanel.getTable().setModel(createTableModel());
@@ -45,17 +45,17 @@
tableGraphePanel.getTable().getColumnModel().getColumn(2).setPreferredWidth(80);
tableGraphePanel.setPreferredSize(new Dimension(300, 600));
}
-
+
public AbstractLoiUiController() {
getGraphe().getModel().setSelectedComponent(courbe);
}
-
+
public AbstractLoiCourbeModel getLoiModel() {
return courbe == null ? null : (AbstractLoiCourbeModel) courbe.getModel();
}
-
+
protected abstract AbstractLoiCourbeModel createCourbeModel(Loi loi, ConfigLoi configLoi);
-
+
protected void setLoi(Loi loi, CrueConfigMetier ccm, boolean usePresentationFormat) {
final EGGrapheSimpleModel grapheModel = getEGGrapheSimpleModel();
EGCourbeSimple oldCourbe = getCourbe();
@@ -90,7 +90,7 @@
tableGraphePanel.getTable().getColumnModel().getColumn(2).setHeaderValue(varOrdonnee.getNom());
getGraphe().restore();
getGraphe().fullRepaint();
-
+
loiModel.addObserver(new Observer() {
@Override
public void update(Observable o, Object arg) {
@@ -99,8 +99,9 @@
getGraphe().fullRepaint();
}
});
+ setEditable(super.editable);
}
-
+
@Override
public void setEditable(boolean b) {
super.setEditable(b);
Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java 2012-12-19 14:22:39 UTC (rev 8155)
+++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/section/ProfilSectionLoiUiController.java 2012-12-19 16:33:20 UTC (rev 8156)
@@ -6,6 +6,7 @@
import com.jidesoft.popup.JidePopup;
import java.awt.BorderLayout;
import java.awt.Color;
+import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Collections;
@@ -84,6 +85,16 @@
pnEtiquettes.setOpaque(false);
panel.add(pnEtiquettes, BorderLayout.NORTH);
this.defaultValuesProvider = defaultValuesProvider;
+ super.getGraphe().addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ if (e.getClickCount() == 2) {
+ popup(e);
+ }
+ }
+ });
+
+
}
@Override
@@ -223,7 +234,7 @@
if (profil == null) {
this.profil = null;
this.sousModeleParent = null;
- super.setLoi(null, ccm,false);
+ super.setLoi(null, ccm, false);
updateWithAvailableFrottements(Collections.<DonFrt>emptyList());
return;
}
@@ -246,7 +257,7 @@
}
}
updating = true;
- super.setLoi(LoiHelper.createFromProfil(profil.getPtProfil(), nom), ccm,false);
+ super.setLoi(LoiHelper.createFromProfil(profil.getPtProfil(), nom), ccm, false);
final TableColumn etiquetteColumn = tableGraphePanel.getTable().getColumnModel().getColumn(3);
//faut ajouter le renderer et editor.
etiquetteColumn.setCellRenderer(new ProfilSectionEtiquetteCellRenderer());
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/AbstractModellingTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/AbstractModellingTopComponent.java 2012-12-19 14:22:39 UTC (rev 8155)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/AbstractModellingTopComponent.java 2012-12-19 16:33:20 UTC (rev 8156)
@@ -84,11 +84,6 @@
if (updating) {
return;
}
-// if (!this.modified && modified) {
-// if (perspectiveServiceModelling != null) {//pour les tests uniquement
-// wasDirty = perspectiveServiceModelling.isDirty();
-// }
-// }
this.modified = modified;
if (modified) {
if (perspectiveServiceModelling != null) {//pour les tests uniquement
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java 2012-12-19 14:22:39 UTC (rev 8155)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/DcspEditorLoiTopComponent.java 2012-12-19 16:33:20 UTC (rev 8156)
@@ -83,7 +83,6 @@
return new TableExportCommentSupplier(false).getComments(getName());
}
-
@Override
public void cancelModificationHandler() {
scenarioReloaded();
@@ -125,7 +124,7 @@
@Override
protected void scenarioLoaded() {
- updating = false;
+ updating = true;
EMH emh = modellingScenarioModificationService.getModellingScenarioService().getScenarioLoaded().getIdRegistry().getEmh(uid);
Loi loi = getLoi(emh);
txtCommentaire.setText(StringUtils.EMPTY);
@@ -145,14 +144,14 @@
lbNom.setText(desc);
setName(desc);
}
- loiUiController.setLoi(loi, getCcm(),false);
+ loiUiController.setLoi(loi, getCcm(), false);
loiUiController.getLoiModel().addObserver(new Observer() {
@Override
public void update(Observable o, Object arg) {
setModified(true);
}
});
- updating = true;
+ updating = false;
loiUiController.getGraphe().setExportTableCommentSupplier(this);
setModified(false);
}
@@ -173,7 +172,7 @@
@Override
protected void scenarioUnloaded() {
- loiUiController.setLoi(null, null,false);
+ loiUiController.setLoi(null, null, false);
close();
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java 2012-12-19 14:22:39 UTC (rev 8155)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/ProfilSectionTopComponent.java 2012-12-19 16:33:20 UTC (rev 8156)
@@ -249,7 +249,11 @@
EMHSousModele sousModele = getSelectedSousModele();
List<EMHSectionProfil> sections = null;
if (branche == null) {
- sections = EMHHelper.getEMHSectionProfilWithoutBranches(sousModele);
+ if (sousModeleBranches.isAllBrancheSelected()) {
+ sections = EMHHelper.getAllEMHSectionProfil(sousModele);
+ } else {
+ sections = EMHHelper.getEMHSectionProfilWithoutBranches(sousModele);
+ }
} else {
sections = EMHHelper.getEMHSectionProfil(branche, getCcm());
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/SousModeleBrancheComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/SousModeleBrancheComponent.java 2012-12-19 14:22:39 UTC (rev 8155)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/loi/SousModeleBrancheComponent.java 2012-12-19 16:33:20 UTC (rev 8156)
@@ -18,6 +18,7 @@
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
import org.fudaa.fudaa.crue.common.helper.ComboBoxHelper;
import org.fudaa.fudaa.crue.common.helper.ObjetNommeCellRenderer;
+import org.openide.util.NbBundle;
/**
*
@@ -31,6 +32,12 @@
throw new UnsupportedOperationException("Not supported yet.");
}
};
+ static final CatEMHBranche All_BRANCHE = new CatEMHBranche(NbBundle.getMessage(SousModeleBrancheComponent.class, "AllBranche")) {
+ @Override
+ public EnumBrancheType getBrancheType() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+ };
JComboBox cbBranches;
JComboBox cbSousModeles;
@@ -52,9 +59,14 @@
}
+ public boolean isAllBrancheSelected() {
+ CatEMHBranche branche = (CatEMHBranche) cbBranches.getSelectedItem();
+ return All_BRANCHE == branche;
+ }
+
protected CatEMHBranche getSelectedBranche() {
CatEMHBranche branche = (CatEMHBranche) cbBranches.getSelectedItem();
- if (branche == SousModeleBrancheComponent.NULL_BRANCHE) {
+ if (branche == SousModeleBrancheComponent.NULL_BRANCHE || branche == SousModeleBrancheComponent.All_BRANCHE) {
branche = null;
}
return branche;
@@ -117,6 +129,7 @@
return Collections.emptyList();
}
List<CatEMHBranche> branchesWithProfil = new ArrayList<CatEMHBranche>();
+ branchesWithProfil.add(All_BRANCHE);
for (CatEMHBranche branche : sousModeleToSelect.getBranches()) {
if (EMHHelper.containEMHSectionProfil(branche)) {
branchesWithProfil.add(branche);
@@ -147,13 +160,13 @@
}
public void clearComboBoxes() {
- updating=true;
+ updating = true;
cbBranches.setModel(new DefaultComboBoxModel());
cbSousModeles.setModel(new DefaultComboBoxModel());
- updating=false;
+ updating = false;
}
void setSelectedBranche(CatEMHBranche branche) {
- cbBranches.setSelectedItem(branche==null?NULL_BRANCHE:branche);
+ cbBranches.setSelectedItem(branche == null ? NULL_BRANCHE : branche);
}
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/loi/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/loi/Bundle.properties 2012-12-19 14:22:39 UTC (rev 8155)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/loi/Bundle.properties 2012-12-19 16:33:20 UTC (rev 8156)
@@ -62,3 +62,4 @@
CreationProfil.XpDuplicate.error=Une section est d\u00e9j\u00e0 d\u00e9finie pour cette valeur d'abscisse Xp
CreateSectionInSousModele.Label=La section sera ajout\u00e9e au sous-mod\u00e8le {0}
CreateSectionInBranche.Label=La section sera ajout\u00e9e \u00e0 la branche {0} \u00e0 la position {1}
+AllBranche=Toutes
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheCartouche.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheCartouche.java 2012-12-19 14:22:39 UTC (rev 8155)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheCartouche.java 2012-12-19 16:33:20 UTC (rev 8156)
@@ -27,10 +27,10 @@
private final double xpMaxDisplay;
Map<ReportRunKey, ReportLongitudinalPositionSectionByRun> sections = new HashMap<ReportRunKey, ReportLongitudinalPositionSectionByRun>();
- public ReportLongitudinalBrancheCartouche(String brancheName, double xtMin, double xtMax, boolean negativeDecal) {
- this.xpMinDisplay = xtMin;
+ public ReportLongitudinalBrancheCartouche(String brancheName, double xpMin, double xpMax, boolean negativeDecal) {
+ this.xpMinDisplay = xpMin;
this.brancheName = brancheName;
- this.xpMaxDisplay = xtMax;
+ this.xpMaxDisplay = xpMax;
this.negativeDecal = negativeDecal;
}
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 2012-12-19 14:22:39 UTC (rev 8155)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java 2012-12-19 16:33:20 UTC (rev 8156)
@@ -67,14 +67,14 @@
public List<EGCourbeSimple> getInternCourbes(ReportLongitudinalConfig content) {
ReportLongitudinalGrapheBuilderCourbe courbeBuilder = new ReportLongitudinalGrapheBuilderCourbe(reportService.getCcm(), this, content);
EGAxeVertical axeZ = courbeBuilder.getAxeZ();
- uiController.configureAxeH(reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_XT),true);
- double xtInit = 0;
+ uiController.configureAxeH(reportService.getCcm().getProperty(CrueConfigMetierConstants.PROP_XP), true);
+ double xpInit = 0;
result = new ReportLongitudinalPositionBrancheContent();
Set<ReportRunKey> keys = getRunKeysToUse(content);
for (ReportLongitudinalBrancheConfig brancheConfig : content.branchesConfig) {
- xtInit = xtInit + brancheConfig.getDecalXp();
- buildPositions(xtInit, brancheConfig, result, keys);
- xtInit = xtInit + brancheConfig.getLength();
+ xpInit = xpInit + brancheConfig.getDecalXp();
+ buildPositions(xpInit, brancheConfig, result, keys);
+ xpInit = xpInit + brancheConfig.getLength();
}
uiController.getGraphe().setHorizontalBanner(new ReportLongitudinalBanner(content, result));
final List<EGCourbeSimple> res = createNonTimeStepCourbes(content, axeZ, courbeBuilder);
@@ -149,7 +149,7 @@
/**
*
- * @param xtInit le xt initial à utiliser pour
+ * @param xpInit le xt initial à utiliser pour
* @param brancheConfig
*/
private void buildPositions(double xpInit, ReportLongitudinalBrancheConfig brancheConfig, ReportLongitudinalPositionBrancheContent result, Collection<ReportRunKey> runKeys) {
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalPositionSection.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalPositionSection.java 2012-12-19 14:22:39 UTC (rev 8155)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalPositionSection.java 2012-12-19 16:33:20 UTC (rev 8156)
@@ -14,8 +14,8 @@
private double xpDisplay;
private CatEMHSection name;
- public ReportLongitudinalPositionSection(double xt, CatEMHSection section) {
- this.xpDisplay = xt;
+ public ReportLongitudinalPositionSection(double xp, CatEMHSection section) {
+ this.xpDisplay = xp;
this.name = section;
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalPositionSectionByRun.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalPositionSectionByRun.java 2012-12-19 14:22:39 UTC (rev 8155)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalPositionSectionByRun.java 2012-12-19 16:33:20 UTC (rev 8156)
@@ -29,7 +29,7 @@
return sectionDisplayPositions;
}
- protected void addSection(double xtDisplay, CatEMHSection name) {
- sectionDisplayPositions.add(new ReportLongitudinalPositionSection(xtDisplay, name));
+ protected void addSection(double xpDisplay, CatEMHSection name) {
+ sectionDisplayPositions.add(new ReportLongitudinalPositionSection(xpDisplay, name));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-12-21 13:12:22
|
Revision: 8165
http://fudaa.svn.sourceforge.net/fudaa/?rev=8165&view=rev
Author: deniger
Date: 2012-12-21 13:12:15 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java
trunk/soft/fudaa-crue/ui-post/pom.xml
trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportsTopComponent.java
trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java 2012-12-21 10:58:20 UTC (rev 8164)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/log/CtuluLogsTopComponent.java 2012-12-21 13:12:15 UTC (rev 8165)
@@ -101,6 +101,12 @@
jLogDescription.setText(StringUtils.EMPTY);
}
+ public void setWaiting() {
+ CtuluLog log = new CtuluLog();
+ log.setDesc("Loading...");
+ setLog(log);
+ }
+
public void addCommonMenuItem(JPopupMenu menu) {
final CtuluTableExportAction ctuluTableExportAction = new CtuluTableExportAction(new UiContext(), outlineLogsView.getOutline());
ctuluTableExportAction.setSeparator(';');
Modified: trunk/soft/fudaa-crue/ui-post/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/pom.xml 2012-12-21 10:58:20 UTC (rev 8164)
+++ trunk/soft/fudaa-crue/ui-post/pom.xml 2012-12-21 13:12:15 UTC (rev 8165)
@@ -36,6 +36,10 @@
<type>nbm</type>
</dependency>
<dependency>
+ <groupId>org.swinglabs.swingx</groupId>
+ <artifactId>swingx-all</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>ui-loader</artifactId>
<type>nbm</type>
Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportsTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportsTopComponent.java 2012-12-21 10:58:20 UTC (rev 8164)
+++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/PostReportsTopComponent.java 2012-12-21 13:12:15 UTC (rev 8165)
@@ -1,8 +1,18 @@
package org.fudaa.fudaa.crue.post;
+import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuBorders;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.ExecutionException;
+import javax.swing.JPanel;
import javax.swing.JTabbedPane;
+import javax.swing.SwingConstants;
+import javax.swing.SwingWorker;
import org.apache.commons.collections.CollectionUtils;
import org.fudaa.ctulu.CtuluLogGroup;
import org.fudaa.dodico.crue.config.ccm.SeveriteManager;
@@ -13,6 +23,9 @@
import org.fudaa.fudaa.crue.common.services.PostRunService;
import org.fudaa.fudaa.crue.post.node.ReportNodesBuilder;
import org.fudaa.fudaa.crue.study.services.EMHProjetServiceImpl;
+import org.jdesktop.swingx.JXBusyLabel;
+import org.jdesktop.swingx.icon.EmptyIcon;
+import org.jdesktop.swingx.painter.BusyPainter;
import org.netbeans.api.settings.ConvertAsProperties;
import org.openide.awt.ActionID;
import org.openide.awt.ActionReference;
@@ -151,20 +164,62 @@
private void runLoadedFromCurrentProject() {
removeAllLogComponents();
- EMHScenario scenarioLoaded = postService.getScenarioLoaded();
- ReportNodesBuilder builder = new ReportNodesBuilder();
- List<CtuluLogGroup> buildGroups = builder.buildGroups(scenarioLoaded, this.projetService.getSelectedProject().getCoeurConfig());
- if (buildGroups.size() == 1) {
- final CtuluLogGroup traces = buildGroups.get(0);
- add(createTraceComponent(traces));
- } else {
- JTabbedPane pane = new JTabbedPane();
- add(pane);
- for (CtuluLogGroup ctuluLogGroup : buildGroups) {
- pane.addTab(ctuluLogGroup.getDesci18n(), createTraceComponent(ctuluLogGroup));
+ final JXBusyLabel label = new JXBusyLabel(new Dimension(38, 38));
+ label.setText(NbBundle.getMessage(PostReportsTopComponent.class, "Loading.txt"));
+ BusyPainter painter = new BusyPainter(
+ new Rectangle2D.Float(0, 0, 8.0f, 8.0f),
+ new Rectangle2D.Float(5.5f, 5.5f, 27.0f, 27.0f));
+ painter.setTrailLength(4);
+ painter.setPoints(8);
+ painter.setFrame(-1);
+ painter.setBaseColor(Color.CYAN);
+ painter.setHighlightColor(Color.ORANGE);
+ label.setPreferredSize(new Dimension(38, 38));
+ label.setIcon(new EmptyIcon(38, 38));
+ label.setBusyPainter(painter);
+ label.setBusy(true);
+ label.setHorizontalAlignment(SwingConstants.CENTER);
+ JPanel pn = new JPanel(new BuBorderLayout());
+ pn.setBorder(BuBorders.EMPTY5555);
+ pn.add(label, BorderLayout.CENTER);
+ add(pn);
+
+ SwingWorker<List<CtuluLogGroup>, Object> worker = new SwingWorker<List<CtuluLogGroup>, Object>() {
+ @Override
+ protected List<CtuluLogGroup> doInBackground() throws Exception {
+ EMHScenario scenarioLoaded = postService.getScenarioLoaded();
+ ReportNodesBuilder builder = new ReportNodesBuilder();
+ List<CtuluLogGroup> buildGroups = builder.buildGroups(scenarioLoaded, projetService.getSelectedProject().getCoeurConfig());
+ return buildGroups;
}
- }
+ @Override
+ protected void done() {
+ label.setBusy(false);
+ PostReportsTopComponent.this.removeAll();
+ try {
+ List<CtuluLogGroup> buildGroups = get();
+ if (buildGroups.size() == 1) {
+ final CtuluLogGroup traces = buildGroups.get(0);
+ add(createTraceComponent(traces));
+ } else {
+ JTabbedPane pane = new JTabbedPane();
+ PostReportsTopComponent.this.add(pane);
+ for (CtuluLogGroup ctuluLogGroup : buildGroups) {
+ pane.addTab(ctuluLogGroup.getDesci18n(), createTraceComponent(ctuluLogGroup));
+ }
+ }
+ PostReportsTopComponent.this.revalidate();
+ } catch (InterruptedException interruptedException) {
+ } catch (ExecutionException executionException) {
+ }
+ }
+ };
+ worker.execute();
+
+
+
+
}
private void runUnloaded() {
Modified: trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties 2012-12-21 10:58:20 UTC (rev 8164)
+++ trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties 2012-12-21 13:12:15 UTC (rev 8165)
@@ -22,3 +22,4 @@
LaunchCrue9.ExecNotDefined.DialogTitle=Ex\u00e9cutable Crue9 non d\u00e9fini
avctPanel.noDate=Pas de date
+Loading.txt=Chargement...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-01-18 18:22:41
|
Revision: 8227
http://fudaa.svn.sourceforge.net/fudaa/?rev=8227&view=rev
Author: deniger
Date: 2013-01-18 18:22:33 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/pom.xml
trunk/soft/fudaa-crue/crue-config/pom.xml
trunk/soft/fudaa-crue/crue-core/pom.xml
trunk/soft/fudaa-crue/crue-emh/pom.xml
trunk/soft/fudaa-crue/crue-io/pom.xml
trunk/soft/fudaa-crue/crue-otfa/pom.xml
trunk/soft/fudaa-crue/crue-project/pom.xml
trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
trunk/soft/fudaa-crue/crue-test/pom.xml
trunk/soft/fudaa-crue/crue-validation/pom.xml
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-application/pom.xml
trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
trunk/soft/fudaa-crue/ui-branding/pom.xml
trunk/soft/fudaa-crue/ui-commandline/pom.xml
trunk/soft/fudaa-crue/ui-common/pom.xml
trunk/soft/fudaa-crue/ui-comparison/pom.xml
trunk/soft/fudaa-crue/ui-emh/pom.xml
trunk/soft/fudaa-crue/ui-loader/pom.xml
trunk/soft/fudaa-crue/ui-loi/pom.xml
trunk/soft/fudaa-crue/ui-modelling/pom.xml
trunk/soft/fudaa-crue/ui-options/pom.xml
trunk/soft/fudaa-crue/ui-otfa/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/pom.xml
trunk/soft/fudaa-crue/ui-post/pom.xml
trunk/soft/fudaa-crue/ui-report/pom.xml
trunk/soft/fudaa-crue/ui-study/pom.xml
trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
trunk/soft/fudaa-crue/ui-wrapper/pom.xml
Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-compare</artifactId>
<name>Crue Compare</name>
Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-config</artifactId>
<name>Crue Config</name>
Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-core</artifactId>
<name>Crue Core</name>
Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-emh</artifactId>
<name>Crue EMH</name>
Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-io</artifactId>
<name>Crue IO</name>
Modified: trunk/soft/fudaa-crue/crue-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-otfa</artifactId>
<name>Crue OTFA</name>
Modified: trunk/soft/fudaa-crue/crue-project/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/crue-project/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-project</artifactId>
<name>Crue Project</name>
Modified: trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-sysdoc</artifactId>
<name>Crue Sysdoc</name>
Modified: trunk/soft/fudaa-crue/crue-test/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-test/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/crue-test/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-test</artifactId>
Modified: trunk/soft/fudaa-crue/crue-validation/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/crue-validation/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-validation</artifactId>
<name>Crue Validation</name>
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
<name>Fudaa-Crue</name>
<packaging>pom</packaging>
<ciManagement>
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>application</artifactId>
Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2013-01-18 18:22:33 UTC (rev 8227)
@@ -1,8 +1,8 @@
# ${HOME} will be replaced by user home directory according to platform
#default_userdir="${DEFAULT_USERDIR_ROOT}/0.62"
#default_cachedir="${DEFAULT_CACHEDIR_ROOT}/0.62"
-default_userdir="${HOME}\.${APPNAME}\0.63"
-default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/0.63/"
+default_userdir="${HOME}\.${APPNAME}\0.65"
+default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/0.65/"
# options used by the launcher by default, can be overridden by explicit
# command line switches
default_options="--branding fudaacrue -J-Xms24m -J-Xmx512m --multi-instances"
Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-branding</artifactId>
Modified: trunk/soft/fudaa-crue/ui-commandline/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-commandline</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-common/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-common/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-common</artifactId>
Modified: trunk/soft/fudaa-crue/ui-comparison/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-comparison</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-emh</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loader/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-loader</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loi/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-loi</artifactId>
Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-modelling</artifactId>
Modified: trunk/soft/fudaa-crue/ui-options/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-options/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-options</artifactId>
<name>Crue UI Options</name>
Modified: trunk/soft/fudaa-crue/ui-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-otfa/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-otfa</artifactId>
Modified: trunk/soft/fudaa-crue/ui-planimetry/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-planimetry</artifactId>
Modified: trunk/soft/fudaa-crue/ui-post/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-post/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-post</artifactId>
Modified: trunk/soft/fudaa-crue/ui-report/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-report/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-report/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-report</artifactId>
Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-study</artifactId>
Modified: trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-sysdoc/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-sysdoc</artifactId>
Modified: trunk/soft/fudaa-crue/ui-wrapper/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2013-01-18 18:05:03 UTC (rev 8226)
+++ trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2013-01-18 18:22:33 UTC (rev 8227)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.63-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-wrapper</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-03 21:16:43
|
Revision: 8258
http://fudaa.svn.sourceforge.net/fudaa/?rev=8258&view=rev
Author: deniger
Date: 2013-02-03 21:16:35 +0000 (Sun, 03 Feb 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/pom.xml
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractEqualsTesterBean.java
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBeanMap.java
trunk/soft/fudaa-crue/crue-config/pom.xml
trunk/soft/fudaa-crue/crue-core/pom.xml
trunk/soft/fudaa-crue/crue-emh/pom.xml
trunk/soft/fudaa-crue/crue-io/pom.xml
trunk/soft/fudaa-crue/crue-otfa/pom.xml
trunk/soft/fudaa-crue/crue-project/pom.xml
trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/IntegrationHelper.java
trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
trunk/soft/fudaa-crue/crue-test/pom.xml
trunk/soft/fudaa-crue/crue-validation/pom.xml
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-application/pom.xml
trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
trunk/soft/fudaa-crue/ui-branding/pom.xml
trunk/soft/fudaa-crue/ui-commandline/pom.xml
trunk/soft/fudaa-crue/ui-common/pom.xml
trunk/soft/fudaa-crue/ui-comparison/pom.xml
trunk/soft/fudaa-crue/ui-emh/pom.xml
trunk/soft/fudaa-crue/ui-loader/pom.xml
trunk/soft/fudaa-crue/ui-loi/pom.xml
trunk/soft/fudaa-crue/ui-modelling/pom.xml
trunk/soft/fudaa-crue/ui-options/pom.xml
trunk/soft/fudaa-crue/ui-otfa/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/pom.xml
trunk/soft/fudaa-crue/ui-post/pom.xml
trunk/soft/fudaa-crue/ui-report/pom.xml
trunk/soft/fudaa-crue/ui-study/pom.xml
trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
trunk/soft/fudaa-crue/ui-wrapper/pom.xml
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu201.java
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/Etu201.zip
Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-compare</artifactId>
<name>Crue Compare</name>
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractEqualsTesterBean.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractEqualsTesterBean.java 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/AbstractEqualsTesterBean.java 2013-02-03 21:16:35 UTC (rev 8258)
@@ -47,9 +47,11 @@
String notDefined;
Collection<String> propToIgnore = new HashSet<String>(Arrays.asList("class", "value"));
boolean useNameForLoi = true;
-
- public AbstractEqualsTesterBean(final FactoryEqualsTester factory) {
+private final boolean compareClass;
+
+ public AbstractEqualsTesterBean(final FactoryEqualsTester factory,final boolean compareClass) {
this.factory = factory;
+ this.compareClass=compareClass;
}
protected ResultatTest addDiff(final Object o1, final ResultatTest res, final String propName, final Object a, final Object b, final TesterContext context) {
@@ -243,7 +245,7 @@
public boolean isSameSafe(final T o1, final T o2, final ResultatTest res, final TesterContext context, final Collection<String> propToUse) {
boolean classEquals = o1.getClass().equals(o2.getClass());
- if (CollectionUtils.isEmpty(context.getPropToCompare()) && !classEquals) {
+ if (compareClass && CollectionUtils.isEmpty(context.getPropToCompare()) && !classEquals) {
if (res != null) {
String prefix1 = toString(o1);
if (o1 instanceof Pdt) {
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBean.java 2013-02-03 21:16:35 UTC (rev 8258)
@@ -21,7 +21,7 @@
* @param factory la factory
*/
public EqualsTesterBean(final FactoryEqualsTester factory) {
- super(factory);
+ super(factory,true);
}
@Override
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBeanMap.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBeanMap.java 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterBeanMap.java 2013-02-03 21:16:35 UTC (rev 8258)
@@ -21,7 +21,7 @@
* @param factory la factory
*/
public EqualsTesterBeanMap(final FactoryEqualsTester factory) {
- super(factory);
+ super(factory,false);
}
@Override
Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-config</artifactId>
<name>Crue Config</name>
Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-core</artifactId>
<name>Crue Core</name>
Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-emh</artifactId>
<name>Crue EMH</name>
Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-io</artifactId>
<name>Crue IO</name>
Modified: trunk/soft/fudaa-crue/crue-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-otfa/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-otfa</artifactId>
<name>Crue OTFA</name>
Modified: trunk/soft/fudaa-crue/crue-project/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-project/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-project/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-project</artifactId>
<name>Crue Project</name>
Modified: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/IntegrationHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/IntegrationHelper.java 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/IntegrationHelper.java 2013-02-03 21:16:35 UTC (rev 8258)
@@ -97,7 +97,7 @@
final OrdResDynamicPropertyFilter filter = new OrdResDynamicPropertyFilter(scenario1.getOrdResScenario(),
scenario2.getOrdResScenario());
final ExecuteComparaison comp = new ExecuteComparaison(read, projet.getPropDefinition(), filter);
- final List<ExecuteComparaisonResult> launch = comp.launch(scenario1, scenario2,PredicateUtils.truePredicate());
+ final List<ExecuteComparaisonResult> launch = comp.launch(scenario1, scenario2, PredicateUtils.truePredicate());
Collections.sort(launch);
Collection<String> comparisonIds = new HashSet<String>();
for (ExecuteComparaisonResult executeComparaisonResult : launch) {
@@ -116,6 +116,17 @@
return comparisonIds;
}
+ public static List<ExecuteComparaisonResult> compareResult(EMHProjet projet, EMHScenario scenario1, EMHScenario scenario2) {
+ final ReaderConfig readerConfig = new ReaderConfig();
+ final ConfComparaisonConteneur read = readerConfig.read(ReaderConfig.class.getResource("default-comparaison.xml"));
+ final OrdResDynamicPropertyFilter filter = new OrdResDynamicPropertyFilter(scenario1.getOrdResScenario(),
+ scenario2.getOrdResScenario());
+ final ExecuteComparaison comp = new ExecuteComparaison(read, projet.getPropDefinition(), filter);
+ final List<ExecuteComparaisonResult> launch = comp.launch(scenario1, scenario2, PredicateUtils.truePredicate());
+ Collections.sort(launch);
+ return launch;
+ }
+
public static CrueOperationResult<EMHScenarioContainer> loadScenario(ManagerEMHScenario managerEMHScenario, EMHProjet projet) {
return loadScenario(managerEMHScenario, projet, true);
}
@@ -157,7 +168,7 @@
toCrue9.exportFor(new File(targetDir, nomFichierTo).getAbsolutePath());
assertFalse(toCrue9.getErrorManager().containsFatalError());
ManagerEMHScenario managerScenarioTo = projet.getScenario(nomScenarioTo);
- loader = new ScenarioLoader(managerScenarioTo, projet, projet.getCoeurConfig() );
+ loader = new ScenarioLoader(managerScenarioTo, projet, projet.getCoeurConfig());
result = loader.loadRunCourant();
testErrorsManager(result.getLogs());
assertFalse(result.getLogs().containsFatalError());
Copied: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu201.java (from rev 8048, trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu30.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu201.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu201.java 2013-02-03 21:16:35 UTC (rev 8258)
@@ -0,0 +1,68 @@
+/**
+ * License GPL v2
+ */
+package org.fudaa.dodico.crue.integration;
+
+import java.io.File;
+import java.util.List;
+import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.dodico.crue.comparaison.ExecuteComparaisonResult;
+import org.fudaa.dodico.crue.config.coeur.TestCoeurConfig;
+import org.fudaa.dodico.crue.metier.etude.EMHProjet;
+import org.fudaa.dodico.crue.projet.EMHScenarioContainer;
+import org.fudaa.dodico.crue.test.AbstractTestCase;
+import org.junit.*;
+import static org.junit.Assert.*;
+import org.junit.experimental.categories.Category;
+
+/**
+ *
+ * @author deniger
+ */
+@Category(org.fudaa.dodico.crue.test.TestIntegration.class)
+public class TestIntegrationEtu201 {
+
+ static File target;
+ static EMHProjet projet;
+
+ public TestIntegrationEtu201() {
+ }
+
+ @BeforeClass
+ public static void setUpClass() throws Exception {
+ target = CtuluLibFile.createTempDir();
+ AbstractTestCase.exportZip(target, "/integration/Etu201.zip");
+ final File file = new File(target, "Etu201.etu.xml");
+ assertTrue(file.exists());
+ projet = IntegrationHelper.loadEtu(file, TestCoeurConfig.INSTANCE);
+ assertNotNull(projet);
+ }
+
+ @AfterClass
+ public static void tearDownClass() throws Exception {
+ CtuluLibFile.deleteDir(target);
+
+ }
+
+ public static ExecuteComparaisonResult find(List<ExecuteComparaisonResult> compare, String id) {
+ for (ExecuteComparaisonResult executeComparaisonResult : compare) {
+ if (id.equals(executeComparaisonResult.getId())) {
+ return executeComparaisonResult;
+ }
+ }
+ return null;
+ }
+
+ @Test
+ public void testRuns() {
+
+ EMHScenarioContainer runc9 = IntegrationHelper.loadRun("Sc_M201-1_c9c9", projet, 0);
+ EMHScenarioContainer runc10 = IntegrationHelper.loadRun("Sc_M201-1_c9c9c10", projet, 0);
+ assertNotNull(runc9.getEmhScenario().getModeles().get(0).getResultatCalculPasDeTemps());
+ assertNotNull(runc9.getEmhScenario().getModeles().get(0).getResultatCalculPasDeTemps());
+ final List<ExecuteComparaisonResult> compare = IntegrationHelper.compareResult(projet, runc9.getEmhScenario(), runc10.getEmhScenario());
+ ExecuteComparaisonResult find = find(compare, "RCAL4.1");
+ assertEquals(346, find.getNbDifferences());
+ }
+
+}
Added: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/Etu201.zip
===================================================================
(Binary files differ)
Property changes on: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/Etu201.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/soft/fudaa-crue/crue-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-sysdoc/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-sysdoc</artifactId>
<name>Crue Sysdoc</name>
Modified: trunk/soft/fudaa-crue/crue-test/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-test/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-test/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-test</artifactId>
Modified: trunk/soft/fudaa-crue/crue-validation/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/crue-validation/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>crue-validation</artifactId>
<name>Crue Validation</name>
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
<name>Fudaa-Crue</name>
<packaging>pom</packaging>
<ciManagement>
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>application</artifactId>
Modified: trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf
===================================================================
--- trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-application/src/main/resources/etc/fudaacrue.conf 2013-02-03 21:16:35 UTC (rev 8258)
@@ -1,7 +1,7 @@
# ${HOME} will be replaced by user home directory according to platform
#default_userdir="${DEFAULT_USERDIR_ROOT}/0.62"
#default_cachedir="${DEFAULT_CACHEDIR_ROOT}/0.62"
-default_userdir="${HOME}\.${APPNAME}\0.66"
+default_userdir="${HOME}\.${APPNAME}\0.65"
default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/0.66/"
# options used by the launcher by default, can be overridden by explicit
# command line switches
Modified: trunk/soft/fudaa-crue/ui-branding/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-branding/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-branding</artifactId>
Modified: trunk/soft/fudaa-crue/ui-commandline/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-commandline/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-commandline</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-common/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-common/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-common/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-common</artifactId>
Modified: trunk/soft/fudaa-crue/ui-comparison/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-comparison/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-comparison</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-emh/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-emh</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loader/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-loader/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-loader</artifactId>
<packaging>nbm</packaging>
Modified: trunk/soft/fudaa-crue/ui-loi/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-loi/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-loi</artifactId>
Modified: trunk/soft/fudaa-crue/ui-modelling/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-modelling/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-modelling</artifactId>
Modified: trunk/soft/fudaa-crue/ui-options/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-options/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-options</artifactId>
<name>Crue UI Options</name>
Modified: trunk/soft/fudaa-crue/ui-otfa/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-otfa/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-otfa</artifactId>
Modified: trunk/soft/fudaa-crue/ui-planimetry/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-planimetry/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-planimetry</artifactId>
Modified: trunk/soft/fudaa-crue/ui-post/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-post/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-post/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-post</artifactId>
Modified: trunk/soft/fudaa-crue/ui-report/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-report/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-report/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-report</artifactId>
Modified: trunk/soft/fudaa-crue/ui-study/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-study/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-study/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<packaging>nbm</packaging>
<artifactId>ui-study</artifactId>
Modified: trunk/soft/fudaa-crue/ui-sysdoc/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-sysdoc/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-sysdoc/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-sysdoc</artifactId>
Modified: trunk/soft/fudaa-crue/ui-wrapper/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2013-02-01 13:45:30 UTC (rev 8257)
+++ trunk/soft/fudaa-crue/ui-wrapper/pom.xml 2013-02-03 21:16:35 UTC (rev 8258)
@@ -4,7 +4,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.65-SNAPSHOT</version>
</parent>
<artifactId>ui-wrapper</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-02-19 07:37:48
|
Revision: 8282
http://fudaa.svn.sourceforge.net/fudaa/?rev=8282&view=rev
Author: deniger
Date: 2013-02-19 07:37:39 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
corrections tests unitaires
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/formule/FormuleCalculatorExpr.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/MockResultProvider.java
trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java 2013-02-19 07:37:03 UTC (rev 8281)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ConfigTest.java 2013-02-19 07:37:39 UTC (rev 8282)
@@ -133,6 +133,11 @@
res.add("condLimite.positions.tarage");
res.add("condLimite.positions.manoeuvre");
res.add("condLimite.positions.qruis");
+ res.add("groupeDessin.visible");
+ res.add("groupHydraulique.visible");
+ res.add("groupeImage.visible");
+ res.add("groupeAutre.visible");
+ res.add("groupeFichierSIG.visible");
return res;
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/formule/FormuleCalculatorExpr.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/formule/FormuleCalculatorExpr.java 2013-02-19 07:37:03 UTC (rev 8281)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/formule/FormuleCalculatorExpr.java 2013-02-19 07:37:39 UTC (rev 8282)
@@ -25,8 +25,19 @@
this.parser = parser;
findUsedVar = this.parser.findUsedVar();
}
+
+ /**
+ * pour les tests
+ * @param service
+ */
+ protected void setService(ReportReadResultServiceContrat service) {
+ this.service = service;
+ }
+
+
+
@Override
public Double getValue(ResultatTimeKey selectedTime, ReportRunVariableKey key, String emhNom) {
Copied: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/MockResultProvider.java (from rev 8279, trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/variable/MockResultProvider.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/MockResultProvider.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/MockResultProvider.java 2013-02-19 07:37:39 UTC (rev 8282)
@@ -0,0 +1,40 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.report.formule;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierLoaderDefaultTest;
+import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey;
+import org.fudaa.fudaa.crue.report.data.ReportRunVariableKey;
+import org.fudaa.fudaa.crue.report.service.ReportReadResultServiceContrat;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class MockResultProvider implements ReportReadResultServiceContrat {
+
+ Map<String, Double> values = new HashMap<String, Double>();
+
+ public void setValue(String name, double val) {
+ values.put(name, val);
+ }
+
+ @Override
+ public Double getReadValue(ReportRunVariableKey key, String emhNom) {
+ return values.get(key.getVariable().getVariableName());
+ }
+
+ @Override
+ public CrueConfigMetier getCcm() {
+ return CrueConfigMetierLoaderDefaultTest.DEFAULT;
+ }
+
+ @Override
+ public Double getReadValue(ResultatTimeKey selectedTime, ReportRunVariableKey key, String emhNom) {
+ return values.get(key.getVariable().getVariableName());
+ }
+}
Copied: trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java (from rev 8279, trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/variable/VariableContentFormuleTest.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-report/src/test/java/org/fudaa/fudaa/crue/report/formule/VariableContentFormuleTest.java 2013-02-19 07:37:39 UTC (rev 8282)
@@ -0,0 +1,54 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.report.formule;
+
+import org.fudaa.fudaa.crue.report.formule.FormuleCalculatorExpr;
+import org.fudaa.fudaa.crue.report.formule.FormuleParametersExpr;
+import org.fudaa.fudaa.crue.report.formule.FormuleContentExpr;
+import java.util.Arrays;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.ctulu.CtuluLogRecord;
+import org.fudaa.fudaa.crue.report.data.ReportRunKey;
+import org.fudaa.fudaa.crue.report.data.ReportRunVariableKey;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class VariableContentFormuleTest {
+
+ public VariableContentFormuleTest() {
+ }
+
+ @Test
+ public void testGoodFormula() {
+ FormuleParametersExpr params = new FormuleParametersExpr();
+ params.setFormule("x+y+10");
+ params.setVariables(Arrays.asList("x", "y"));
+ FormuleContentExpr content = new FormuleContentExpr();
+ CtuluLog log = content.setParameter(params);
+ assertFalse(log.containsErrors());
+ FormuleCalculatorExpr calculator = content.getCalculator();
+ MockResultProvider mock = new MockResultProvider();
+ mock.setValue("x", 100);
+ mock.setValue("y", 1000);
+ calculator.setService(mock);
+ Double value = calculator.getValue(null, new ReportRunVariableKey(new ReportRunKey(), ""), null);
+ assertEquals(1110, value.intValue());
+ }
+
+ @Test
+ public void testBadFormula() {
+ FormuleParametersExpr params = new FormuleParametersExpr();
+ params.setFormule("x+y+10");
+ params.setVariables(Arrays.asList("x"));
+ FormuleContentExpr content = new FormuleContentExpr();
+ CtuluLog log = content.setParameter(params);
+ assertTrue(log.containsErrorOrSevereError());
+ CtuluLogRecord get = log.getRecords().get(0);
+ assertEquals("Unrecognized symbol \"y\"", get.getMsg().trim());
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-14 15:57:24
|
Revision: 8329
http://fudaa.svn.sourceforge.net/fudaa/?rev=8329&view=rev
Author: deniger
Date: 2013-03-14 15:57:13 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/AbstractTopComponent.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/ItemVariableView.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListAddTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListCasierAddTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListNoeudAddTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListSectionAddTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/list/Bundle.properties
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -1,5 +1,5 @@
/**
- *
+ *
*/
package org.fudaa.dodico.crue.config.ccm;
@@ -16,9 +16,9 @@
private final NumberFormat base;
private final CtuluNumberFormatFixedFigure scientific;
-
private final double maxValue;
private final double minValue;
+ private final PropertyEpsilon epsilon;
/**
* @param base
@@ -26,16 +26,20 @@
* @param maxValue
* @param minValue
*/
- public NumberFormatChoice(final NumberFormat base, final CtuluNumberFormatFixedFigure scientific,
- final double maxValue, final double minValue) {
+ public NumberFormatChoice(PropertyEpsilon epsilon, final NumberFormat base, final CtuluNumberFormatFixedFigure scientific,
+ final double maxValue, final double minValue) {
super();
this.base = base;
+ this.epsilon = epsilon;
this.scientific = scientific;
this.maxValue = maxValue;
this.minValue = minValue;
}
private boolean useScientific(final double value) {
+ if (epsilon != null && epsilon.isZero(value)) {
+ return false;
+ }
final double absValue = Math.abs(value);
return (absValue > maxValue || absValue < minValue);
}
@@ -51,7 +55,9 @@
@Override
public StringBuffer format(final long number, final StringBuffer toAppendTo, final FieldPosition pos) {
- if (useScientific(number)) { return scientific.format(number, toAppendTo, pos); }
+ if (useScientific(number)) {
+ return scientific.format(number, toAppendTo, pos);
+ }
return base.format(number, toAppendTo, pos);
}
@@ -59,5 +65,4 @@
public Number parse(final String source, final ParsePosition parsePosition) {
return base.parse(source, parsePosition);
}
-
}
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -14,19 +14,21 @@
private NumberFormat nbDecFormatForInteger;
public NumberFormat getFormatter(final PropertyNature nature, DecimalFormatEpsilonEnum presentionOrComparison) {
+ if (nature == null) {
+ return null;
+ }
if (nature.getTypeNumerique().isEntier()) {
if (nbDecFormatForInteger == null) {
DecimalFormat numberFormat = new DecimalFormat();
numberFormat.setGroupingUsed(false);
numberFormat.setMaximumFractionDigits(0);
- NumberFormatChoice fmt = new NumberFormatChoice(numberFormat, new CtuluNumberFormatFixedFigure(10), 1E10, 1E-10);
+ NumberFormatChoice fmt = new NumberFormatChoice(nature.getEpsilon(), numberFormat, new CtuluNumberFormatFixedFigure(10), 1E10, 1E-10);
nbDecFormatForInteger = new NumberFormatInfini(fmt, nature);
}
return nbDecFormatForInteger;
}
-
String natureNom = nature.getNom();
- if (nature == null || "nbr".equalsIgnoreCase(natureNom) || "num".equalsIgnoreCase(natureNom)) {
+ if ("nbr".equalsIgnoreCase(natureNom) || "num".equalsIgnoreCase(natureNom)) {
return null;
}
int nbDec = Math.abs((int) Math.log10(nature.getEpsilon().getEpsilon(presentionOrComparison)));
@@ -37,7 +39,7 @@
numberFormat.setGroupingUsed(false);
numberFormat.setMaximumFractionDigits(nbDec);
// pour ecrire correctement + et - infini
- NumberFormatChoice fmt = new NumberFormatChoice(numberFormat, new CtuluNumberFormatFixedFigure(10), 1E10, 1E-10);
+ NumberFormatChoice fmt = new NumberFormatChoice(nature.getEpsilon(), numberFormat, new CtuluNumberFormatFixedFigure(10), 1E10, 1E-10);
numberFormat = new NumberFormatInfini(fmt, nature);
nbDecFormat.put(nbDec, numberFormat);
}
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -907,7 +907,7 @@
* @param distance la distance actuelle
* @return l'entier a utiliser pour diviser la distance afin de créer des profils distancés de moins de distmax.
*/
- public static int getDistDiviseurForDistMax(final float distmax, final float distance) {
+ public static int getDistDiviseurForDistMax(final double distmax, final double distance) {
return (int) Math.ceil(distance / distmax);
}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/AbstractTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/AbstractTopComponent.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/AbstractTopComponent.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -3,6 +3,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import org.fudaa.ctulu.action.ActionsInstaller;
+import org.fudaa.ctulu.action.SwitchMinMaxDialogAction;
+import org.fudaa.ctulu.border.BorderWithIconInstaller;
import org.fudaa.fudaa.crue.common.services.TopComponentOpenCloseHelper;
import org.openide.util.HelpCtx;
import org.openide.windows.TopComponent;
@@ -21,7 +23,8 @@
public AbstractTopComponent() {
setFocusable(true);
- ActionsInstaller.install(this);
+ SwitchMinMaxDialogAction installAndCreateSwitchAction = ActionsInstaller.installAndCreateSwitchAction(this);
+ BorderWithIconInstaller.install(this, installAndCreateSwitchAction, true);
}
protected abstract String getHelpCtxId();
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/ItemVariableView.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/ItemVariableView.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/ItemVariableView.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -174,13 +174,21 @@
}
txt.setToolTipText(property.getValidator().getHtmlDesc(tltip));
setChanged();
+ validateData();
notifyObservers(this);
- validateData();
}
@Override
public Number getValue() {
- Object value = txt.getValue();
+ String txtValue = txt.getText();
+ if (StringUtils.isBlank(txtValue)) {
+ return null;
+ }
+ Object value = null;
+ try {
+ value = Double.valueOf(txtValue);
+ } catch (Exception ex) {
+ }
if (value == null) {
return null;
}
@@ -217,17 +225,19 @@
}
@Override
- protected void validateData() {
+ public void validateData() {
super.validateData();
if (valid) {
Number distance = getValue();
- if (distance != null) {
- if (property.getEpsilon().isZero(distance.doubleValue())) {
- valid = false;
- label.setToolTipText(NbBundle.getMessage(ItemVariableView.class, "Editor.DistanceCantBeNull"));
- label.setIcon(LogIconTranslationProvider.getIcon(CtuluLogLevel.FATAL));
- }
+ boolean isNull = distance == null;
+ if (!isNull) {
+ isNull = property.getEpsilon().isZero(distance.doubleValue());
}
+ if (isNull) {
+ valid = false;
+ label.setToolTipText(NbBundle.getMessage(ItemVariableView.class, "Editor.DistanceCantBeNull"));
+ label.setIcon(LogIconTranslationProvider.getIcon(CtuluLogLevel.FATAL));
+ }
}
}
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListAddTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListAddTopComponent.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListAddTopComponent.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -64,6 +64,10 @@
ExplorerUtils.activateActions(getExplorerManager(), false);
}
+ protected JButton createAdditionnalAddButton() {
+ return null;
+ }
+
protected final void initActionComponents() {
btAddEMH = new JButton(NbBundle.getMessage(AbstractModellingListAddTopComponent.class, "Add.Name"));
btAddEMH.addActionListener(new ActionListener() {
@@ -89,6 +93,10 @@
JPanel addRemove = new JPanel(new BuGridLayout(1));
addRemove.setBorder(BorderFactory.createEmptyBorder(0, 3, 0, 3));
addRemove.add(btAddEMH);
+ JButton createAdditionnalAddButton = createAdditionnalAddButton();
+ if (createAdditionnalAddButton != null) {
+ addRemove.add(createAdditionnalAddButton);
+ }
addRemove.add(new JSeparator());
final JButton jButtonDelete = new JButton(actionDelete);
jButtonDelete.setText(NbBundle.getMessage(AbstractModellingListAddTopComponent.class, "Delete.Name"));
@@ -152,7 +160,7 @@
boolean editable;
@Override
- protected final void setEditable(boolean b) {
+ protected void setEditable(boolean b) {
this.editable = b;
super.setEditable(b);
btAddEMH.setEnabled(b);
Added: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -0,0 +1,120 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.modelling.list;
+
+import com.memoire.bu.BuBorders;
+import com.memoire.bu.BuGridLayout;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Observable;
+import java.util.Observer;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierConstants;
+import org.fudaa.dodico.crue.config.ccm.DecimalFormatEpsilonEnum;
+import org.fudaa.dodico.crue.config.ccm.ItemVariable;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.EMHSousModele;
+import org.fudaa.fudaa.crue.common.helper.ComboBoxHelper;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
+import org.fudaa.fudaa.crue.common.view.ItemVariableView;
+import org.openide.DialogDescriptor;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class AddSectionInBranchePanelContent implements Observer, ItemListener {
+
+ private JLabel lbDistance;
+ private JComboBox cbBranches;
+ private ItemVariableView.TextFiedDistance tfDistance;
+ private DialogDescriptor dialog;
+ private Map<String, EMHBrancheSaintVenant> branchesByName;
+ private ItemVariable xp;
+ private JPanel pn;
+
+ protected AddSectionInBranchePanelContent(CrueConfigMetier ccm, EMHSousModele sousModele) {
+ List<EMHBrancheSaintVenant> branches = sousModele.getBranchesSaintVenant();
+ List<String> branchesNoms = TransformerHelper.toNom(branches);
+ Collections.sort(branchesNoms);
+ branchesByName = TransformerHelper.toMapOfNom(branches);
+ xp = ccm.getProperty(CrueConfigMetierConstants.PROP_XP);
+ tfDistance = new ItemVariableView.TextFiedDistance(ccm, DecimalFormatEpsilonEnum.COMPARISON);
+
+ cbBranches = new JComboBox();
+ ComboBoxHelper.setDefaultModel(cbBranches, branchesNoms);
+ lbDistance = new JLabel();
+ pn = new JPanel(new BuGridLayout(3, 5, 10, true, true));
+ pn.setBorder(BuBorders.EMPTY3333);
+ pn.add(new JLabel(NbBundle.getMessage(ModellingListSectionAddTopComponent.class, "BrancheName.Name")));
+ pn.add(cbBranches);
+ pn.add(lbDistance);
+ lbDistance.setText(" ");
+ pn.add(new JLabel(NbBundle.getMessage(AddSectionInBranchePanelContent.class, "DistanceMax")));
+ pn.add(tfDistance.getTxt());
+ pn.add(tfDistance.getLabel());
+ //listener
+ cbBranches.addItemListener(this);
+ tfDistance.addObserver(this);
+ }
+
+ CatEMHBranche getSelectedBranche() {
+ return branchesByName.get(cbBranches.getSelectedItem());
+ }
+
+ Double getDistance() {
+ return (Double) tfDistance.getValue();
+ }
+
+ @Override
+ public void update(Observable o, Object arg) {
+ if (dialog != null) {
+ String errorMsg = tfDistance.getErrorMsg();
+ dialog.setValid(errorMsg == null);
+ dialog.getNotificationLineSupport().setErrorMessage(errorMsg);
+ }
+ }
+
+ public boolean show() {
+ dialog = new DialogDescriptor(pn, NbBundle.getMessage(AddSectionInBranchePanelContent.class, "AddSectionsInBanche.ActionName"));
+ dialog.createNotificationLineSupport();
+ tfDistance.validateData();
+ update(null, null);
+ updateBrancheDistance();
+ return DialogHelper.showQuestionAndSaveDialogConf(dialog, getClass());
+ }
+
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ if (e.getStateChange() == ItemEvent.SELECTED) {
+ updateBrancheDistance();
+ }
+ }
+
+ private void updateBrancheDistance() {
+ String brancheNom = (String) cbBranches.getSelectedItem();
+ EMHBrancheSaintVenant branche = branchesByName.get(brancheNom);
+ if (branche == null) {
+ lbDistance.setText(null);
+ lbDistance.setToolTipText(null);
+ return;
+ }
+ double length = branche.getLength();
+ String txt = xp.format(length, DecimalFormatEpsilonEnum.COMPARISON)
+ + xp.getNature().getUniteSuffixe();
+ lbDistance.setText(ListBrancheContentNode.getLongueurDisplayName() + ": "
+ + txt);
+ lbDistance.setToolTipText(NbBundle.getMessage(AddSectionInBranchePanelContent.class, "Branche.InitialLength") + ": "
+ + txt);
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -5,6 +5,7 @@
import java.text.NumberFormat;
import java.util.MissingResourceException;
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierConstants;
import org.fudaa.dodico.crue.config.ccm.DecimalFormatEpsilonEnum;
import org.fudaa.dodico.crue.edition.bean.ListBrancheContent;
import org.fudaa.dodico.crue.edition.bean.ListCommonProperties;
@@ -106,7 +107,7 @@
CrueConfigMetier propDefinition = modellingScenarioService.getSelectedProjet().getPropDefinition();
- NumberFormat formatter = propDefinition.getFormatter("xp",DecimalFormatEpsilonEnum.COMPARISON);
+ NumberFormat formatter = propDefinition.getFormatter(CrueConfigMetierConstants.PROP_XP, DecimalFormatEpsilonEnum.COMPARISON);
String longeurFormatted = null;
if (formatter != null) {
longeurFormatted = formatter.format(brancheContent.getLongueur());
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListCasierAddTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListCasierAddTopComponent.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListCasierAddTopComponent.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -7,7 +7,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import javax.swing.JButton;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
import org.fudaa.dodico.crue.edition.UniqueNomFinder;
@@ -38,8 +37,6 @@
public static final String TOPCOMPONENT_ID = "ModellingListCasierAddTopComponent";
public static final String TOPCOMPONENT_ACTION = "CTL_" + TOPCOMPONENT_ID;
public static final String TOPCOMPONENT_ACTION_DISPLAYNAME = "#" + TOPCOMPONENT_ACTION;
- JButton btAddCasier;
- JButton btAddNodesFromClipboard;
public ModellingListCasierAddTopComponent() {
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListNoeudAddTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListNoeudAddTopComponent.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListNoeudAddTopComponent.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -5,7 +5,6 @@
package org.fudaa.fudaa.crue.modelling.list;
import java.util.Collection;
-import javax.swing.JButton;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
@@ -29,8 +28,8 @@
//@ConvertAsProperties(dtd = "-//org.fudaa.fudaa.crue.modelling//ModellingListNoeudTopComponent//EN",
// autostore = false)
@TopComponent.Description(preferredID = ModellingListNoeudAddTopComponent.TOPCOMPONENT_ID,
-iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png",
-persistenceType = TopComponent.PERSISTENCE_ALWAYS)
+ iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png",
+ persistenceType = TopComponent.PERSISTENCE_ALWAYS)
@TopComponent.Registration(mode = ModellingListNoeudAddTopComponent.MODE, openAtStartup = false, position = 0)
public final class ModellingListNoeudAddTopComponent extends AbstractModellingListAddTopComponent {
//attention le mode modelling-listAddNoeuds doit être déclaré dans le projet branding (layer.xml)
@@ -39,8 +38,6 @@
public static final String TOPCOMPONENT_ID = "ModellingListNoeudAddTopComponent";
public static final String TOPCOMPONENT_ACTION = "CTL_" + TOPCOMPONENT_ID;
public static final String TOPCOMPONENT_ACTION_DISPLAYNAME = "#" + TOPCOMPONENT_ACTION;
- JButton btAddNodes;
- JButton btAddNodesFromClipboard;
public ModellingListNoeudAddTopComponent() {
super();
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListSectionAddTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListSectionAddTopComponent.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListSectionAddTopComponent.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -4,7 +4,11 @@
*/
package org.fudaa.fudaa.crue.modelling.list;
+import gnu.trove.TDoubleArrayList;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.util.Collection;
+import java.util.List;
import javax.swing.JButton;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
@@ -12,10 +16,14 @@
import org.fudaa.dodico.crue.edition.UniqueNomFinder;
import org.fudaa.dodico.crue.edition.bean.ListCommonProperties;
import org.fudaa.dodico.crue.edition.bean.ListRelationSectionContent;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.emh.EMHSousModele;
import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
+import org.fudaa.dodico.crue.metier.emh.EnumSectionType;
+import org.fudaa.dodico.crue.metier.emh.RelationEMHSectionDansBranche;
import org.fudaa.dodico.crue.metier.factory.CruePrefix;
+import org.fudaa.dodico.crue.metier.helper.EMHHelper;
import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
import org.fudaa.fudaa.crue.modelling.edition.ListAjoutRelationSectionProcess;
import org.openide.nodes.Children;
@@ -37,8 +45,7 @@
public static final String TOPCOMPONENT_ID = "ModellingListSectionAddTopComponent";
public static final String TOPCOMPONENT_ACTION = "CTL_" + TOPCOMPONENT_ID;
public static final String TOPCOMPONENT_ACTION_DISPLAYNAME = "#" + TOPCOMPONENT_ACTION;
- JButton btAddNodes;
- JButton btAddNodesFromClipboard;
+ JButton btAddSectionInBranche;
public ModellingListSectionAddTopComponent() {
super();
@@ -52,18 +59,48 @@
}
@Override
+ protected void setEditable(boolean b) {
+ super.setEditable(b);
+ btAddSectionInBranche.setEnabled(b);
+ }
+
+ protected void addSectionsInBranche() {
+ AddSectionInBranchePanelContent builder = new AddSectionInBranchePanelContent(getCcm(), getSousModele());
+ if (builder.show() && builder.getDistance() != null && builder.getSelectedBranche() != null) {
+ CatEMHBranche branche = builder.getSelectedBranche();
+ double maxDistance = builder.getDistance();
+ TDoubleArrayList newXp = createNewXps(branche, maxDistance);
+ ListRelationSectionContentAddNode[] nodes = createNewNodes(newXp, branche);
+ if (nodes.length > 0) {
+ prepareRootContext();
+ Children children = getExplorerManager().getRootContext().getChildren();
+ children.add(nodes);
+ }
+ }
+ }
+
+ @Override
+ protected JButton createAdditionnalAddButton() {
+ btAddSectionInBranche = new JButton(NbBundle.getMessage(ModellingListSectionAddTopComponent.class, "AddSectionsInBanche.ActionName"));
+ btAddSectionInBranche.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ addSectionsInBranche();
+ }
+ });
+ return btAddSectionInBranche;
+ }
+
+ @Override
protected void addEMHsFromClipboard() {
addNodesFromClipboard(ListAjoutRelationSectionProcess.createNodes(perspectiveServiceModelling, getSousModele()));
}
- @Override
- protected void addEMH() {
+ private Collection<String> getExsistingName() {
EMHScenario scenarioLoaded = getModellingService().getScenarioLoaded();
Children children = getExplorerManager().getRootContext().getChildren();
Collection<String> existingNames = TransformerHelper.toSetNom(scenarioLoaded.getIdRegistry().getEMHs(EnumCatEMH.SECTION));
-// List<String> sectionsNoms = ListAjoutRelationSectionProcess.getAvailableSectionForSectionIdem(getSousModele());
-// List<String> branchesNoms = ListAjoutRelationSectionProcess.getAvailableBranchesForSections(getSousModele());
Node[] nodes = children.getNodes();
for (Node node : nodes) {
ListRelationSectionContent content = node.getLookup().lookup(ListRelationSectionContent.class);
@@ -71,9 +108,15 @@
existingNames.add(content.getNom());
}
}
+ return existingNames;
+ }
+
+ @Override
+ protected void addEMH() {
UniqueNomFinder nomFinder = new UniqueNomFinder();
- String newName = nomFinder.findNewName(existingNames, CruePrefix.P_SECTION);
+ String newName = nomFinder.findNewName(getExsistingName(), CruePrefix.P_SECTION);
ListRelationSectionContentAddNode.NamesContent brancheSectionNames = ListAjoutRelationSectionProcess.getAvailableData(getSousModele());
+ Children children = getExplorerManager().getRootContext().getChildren();
children.add(new Node[]{new ListRelationSectionContentAddNode(new ListRelationSectionContent(newName), perspectiveServiceModelling,
brancheSectionNames)});
}
@@ -122,4 +165,42 @@
}// </editor-fold>//GEN-END:initComponents
// Variables declaration - do not modify//GEN-BEGIN:variables
// End of variables declaration//GEN-END:variables
+
+ public TDoubleArrayList createNewXps(CatEMHBranche branche, double maxDistance) {
+ List<RelationEMHSectionDansBranche> listeSectionsSortedXP = branche.getListeSectionsSortedXP(getCcm());
+ TDoubleArrayList newXp = new TDoubleArrayList();
+ for (int i = 0; i < listeSectionsSortedXP.size() - 1; i++) {
+ double x0 = listeSectionsSortedXP.get(i).getXp();
+ double x1 = listeSectionsSortedXP.get(i + 1).getXp();
+ final double distance = x1 - x0;
+ if (maxDistance < (distance)) {
+ final int nbProfilsToAdd = EMHHelper.getDistDiviseurForDistMax(maxDistance, distance);
+ double distMaxCorrige = distance / nbProfilsToAdd;
+ double xToAdd = x0 + distMaxCorrige;
+ while (xToAdd < x1) {
+ newXp.add(xToAdd);
+ xToAdd += distMaxCorrige;
+ }
+ }
+ }
+ return newXp;
+ }
+
+ public ListRelationSectionContentAddNode[] createNewNodes(TDoubleArrayList newXp, CatEMHBranche branche) {
+ ListRelationSectionContentAddNode.NamesContent brancheSectionNames = ListAjoutRelationSectionProcess.getAvailableData(getSousModele());
+ int nb = newXp.size();
+ ListRelationSectionContentAddNode[] nodes = new ListRelationSectionContentAddNode[nb];
+ UniqueNomFinder nomFinder = new UniqueNomFinder();
+ List<String> newName = nomFinder.findNewNames(getExsistingName(), CruePrefix.P_SECTION, nb);
+ for (int i = 0; i < nb; i++) {
+ ListRelationSectionContent newSection = new ListRelationSectionContent(newName.get(i));
+ newSection.setAbscisseHydraulique(newXp.get(i));
+ newSection.setBrancheNom(branche.getNom());
+ ListRelationSectionContent.SectionData data = new ListRelationSectionContent.SectionData();
+ data.setSectionType(EnumSectionType.EMHSectionProfil);
+ newSection.setSection(data);
+ nodes[i] = new ListRelationSectionContentAddNode(newSection, perspectiveServiceModelling, brancheSectionNames);
+ }
+ return nodes;
+ }
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/list/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/list/Bundle.properties 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/list/Bundle.properties 2013-03-14 15:57:13 UTC (rev 8329)
@@ -48,3 +48,6 @@
OpenFrt.Menu=Ouvrir le frottement dans l'\u00e9diteur
OpenFrtImpossibleModificationDone=Modification non valid\u00e9e: impossible d'ouvrir l'\u00e9diteur de frottement
OrderNodesWithBranches.Name=ordonner d'apr\u00e8s l'ordre des branches
+AddSectionsInBanche.ActionName=Peupler une branche
+DistanceMax=Distance maximum entre 2 sections
+Branche.InitialLength=Longueur initiale de la branche
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -35,8 +35,8 @@
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
import org.fudaa.ebli.calque.ZSelectionEvent;
import org.fudaa.ebli.calque.ZSelectionListener;
-import org.fudaa.ebli.calque.action.AddSommetAction;
-import org.fudaa.ebli.calque.action.CalqueNormalSelectionAction;
+import org.fudaa.ebli.calque.action.AddVertexAction;
+import org.fudaa.ebli.calque.action.CalqueSelectNormalSelectionAction;
import org.fudaa.ebli.calque.action.SceneSelectNextAction;
import org.fudaa.ebli.calque.action.SceneSelectPreviousAction;
import org.fudaa.ebli.calque.edition.ZEditorDefault;
@@ -121,7 +121,7 @@
((FSigEditor) gisEditor_).setDisplayInfo(false);
SceneSelectPreviousAction sceneSelectPreviousAction = new SceneSelectPreviousAction(gisEditor_.getSceneEditor());
SceneSelectNextAction sceneSelectNextAction = new SceneSelectNextAction(gisEditor_.getSceneEditor());
- CalqueNormalSelectionAction normalSelection = new CalqueNormalSelectionAction(gisEditor_.getSupport());
+ CalqueSelectNormalSelectionAction normalSelection = new CalqueSelectNormalSelectionAction(gisEditor_.getSupport());
EbliLib.updateMapKeyStroke(this, new Action[]{sceneSelectPreviousAction, sceneSelectNextAction, normalSelection});
selectNext = (JMenuItem) sceneSelectNextAction.buildMenuItem(EbliComponentFactory.INSTANCE);
selectPrevious = (JMenuItem) sceneSelectPreviousAction.buildMenuItem(EbliComponentFactory.INSTANCE);
@@ -184,10 +184,10 @@
_menu.addMenuItem(BuResource.BU.getString("Rechercher..."), "RECHERCHER", BuResource.BU.getIcon("rechercher"), true, KeyEvent.VK_F).addActionListener(this);
_menu.addSeparator();
if (itemAddAtomic == null) {
- AddSommetAction action = new AddSommetAction(getScene());
+ AddVertexAction action = new AddVertexAction(getScene());
itemAddAtomic = new JMenuItem(action);
}
- AddSommetAction action = (AddSommetAction) itemAddAtomic.getAction();
+ AddVertexAction action = (AddVertexAction) itemAddAtomic.getAction();
if (action.isActivatedFor(cqActif)) {
_menu.add(itemAddAtomic);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-19 17:05:12
|
Revision: 8340
http://fudaa.svn.sourceforge.net/fudaa/?rev=8340&view=rev
Author: deniger
Date: 2013-03-19 17:05:04 +0000 (Tue, 19 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/pom.xml
trunk/soft/fudaa-crue/crue-config/pom.xml
trunk/soft/fudaa-crue/crue-core/pom.xml
trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/crue-emh/pom.xml
trunk/soft/fudaa-crue/crue-io/pom.xml
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataXmlReaderWriterImpl.java
Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-03-19 17:05:04 UTC (rev 8340)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.67-SNAPSHOT</version>
</parent>
<artifactId>crue-compare</artifactId>
<name>Crue Compare</name>
Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml 2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml 2013-03-19 17:05:04 UTC (rev 8340)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.67-SNAPSHOT</version>
</parent>
<artifactId>crue-config</artifactId>
<name>Crue Config</name>
Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml 2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml 2013-03-19 17:05:04 UTC (rev 8340)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.67-SNAPSHOT</version>
</parent>
<artifactId>crue-core</artifactId>
<name>Crue Core</name>
Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-03-19 17:05:04 UTC (rev 8340)
@@ -787,7 +787,7 @@
otfaBatch.noArgument=Pas d'arguments. Commande attendue: java -DSiteConfigDir="C:\\data\\etc" -jar <otfa>.jar "C:\\cheminVersOtfa\\fichier.otfa.xml"
otfaBatch.fileNotExists=Le fichier OTFA n''existe pas: {0}
otfaBatch.fileLoaded=Fichier OTFA pris en compte: {0}
-otfaBatch.ctfaCantBeDeleted=Le fichier CTFA ne peut pas \u00eatre effac\u00e9: {0}
+otfaBatch.rtfaZipCantBeDeleted=Le fichier zip RTFA ne peut pas \u00eatre effac\u00e9: {0}
otfaBatch.rtfaCantBeDeleted=Le fichier RTFA ne peut pas \u00eatre effac\u00e9: {0}
otfaBatch.fileNotValid=Le fichier OTFA n''est pas valide. Le compte-rendu est disponible: {0}
otfaBatch.fileCantBeLoaded=Le fichier OTFA ne peut pas \u00eatre charg\u00e9. Le compte-rendu est disponible: {0}
Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-03-19 17:05:04 UTC (rev 8340)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.67-SNAPSHOT</version>
</parent>
<artifactId>crue-emh</artifactId>
<name>Crue EMH</name>
Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml 2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml 2013-03-19 17:05:04 UTC (rev 8340)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.67-SNAPSHOT</version>
</parent>
<artifactId>crue-io</artifactId>
<name>Crue IO</name>
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataXmlReaderWriterImpl.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataXmlReaderWriterImpl.java 2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataXmlReaderWriterImpl.java 2013-03-19 17:05:04 UTC (rev 8340)
@@ -340,6 +340,18 @@
}
+ public final CrueIOResu<M> readXML(final InputStream f, final CtuluLog analyzer, final CrueData dataLinked) {
+ analyzer.setDefaultResourceBundle(BusinessMessages.RESOURCE_BUNDLE);
+ analyzer.setDesc("read.file");
+// analyzer.setDescriptionArgs(f.getName());
+ final D d = readDao(f, analyzer, dataLinked);
+ if (d != null) {
+ return createResu(d, converter.convertDaoToMetier(d, dataLinked, analyzer), analyzer);
+ }
+ return createResu(null, null, analyzer);
+
+ }
+
public final CrueIOResu<M> readXML(final String pathToResource, final CtuluLog analyzer) {
return readXML(pathToResource, analyzer, null);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-04-02 15:59:49
|
Revision: 8369
http://fudaa.svn.sourceforge.net/fudaa/?rev=8369&view=rev
Author: deniger
Date: 2013-04-02 15:59:38 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
Support donn?\195?\169es issues de GGCrue
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertCompare.java
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfCompareListe.java
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/io/ReaderConfig.java
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java
trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java
trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml
trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/Dde.java
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdRes.java
trunk/soft/fudaa-crue/pom.xml
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilSectionImporterAction.java
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertCompare.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertCompare.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/ConvertCompare.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -109,6 +109,7 @@
final ConfCompareListe inObject = (ConfCompareListe) in;
final EqualsTesterIsIncludeCollection res = new EqualsTesterIsIncludeCollection(inObject.getAttribut(), inObject
.isBidirect());
+ res.setPrefixDiffMessageId(inObject.getDiffTranslation());
computeOptions(inObject, res.getContextFactory(), analyze);
return new ExecuteCompareActionOnList(res, false);
} else if (ConfCompareListeOrder.class.equals(inClass)) {
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfCompareListe.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfCompareListe.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfCompareListe.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -8,7 +8,8 @@
public class ConfCompareListe extends AbstractConfCompare {
private String attribut;
-
+ //si non null doit contenir le prefix pour l'id du message contenant la traduction.
+ private String diffTranslation;
private boolean bidirect;
/**
@@ -18,6 +19,15 @@
return attribut;
}
+ public String getDiffTranslation() {
+ return diffTranslation;
+ }
+
+ public void setDiffTranslation(String diffTranslation) {
+ this.diffTranslation = diffTranslation;
+ }
+
+
/**
* @param attribut the attribut to set
*/
@@ -38,5 +48,4 @@
public void setBidirect(boolean bidirect) {
this.bidirect = bidirect;
}
-
}
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/io/ReaderConfig.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/io/ReaderConfig.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/io/ReaderConfig.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -34,7 +34,6 @@
public class ReaderConfig {
private final static Logger LOGGER = Logger.getLogger(ReaderConfig.class.getName());
-
private CtuluLog analyze;
public CtuluLog getAnalyze() {
@@ -63,9 +62,8 @@
}
} catch (final Exception e) {
analyze.addSevereError("file.read.error", file, e.getMessage());
- LOGGER.log(Level.SEVERE,"read " + file, e);
- }
- finally{
+ LOGGER.log(Level.SEVERE, "read " + file, e);
+ } finally {
CtuluLibFile.close(in);
}
return res;
@@ -105,6 +103,7 @@
xstream.alias("Compare-Liste", ConfCompareListe.class);
xstream.aliasAttribute(ConfCompareListe.class, "attribut", "Attribut");
xstream.aliasAttribute(ConfCompareListe.class, "bidirect", "Bidirect");
+ xstream.aliasAttribute(ConfCompareListe.class, "diffTranslation", "DiffTranslation");
xstream.alias("Compare-Liste-Order", ConfCompareListeOrder.class);
xstream.aliasAttribute(ConfCompareListeOrder.class, "attribut", "Attribut");
xstream.aliasAttribute(ConfCompareListeOrder.class, "onlyIfSameList", "OnlyIfSameList");
@@ -130,12 +129,10 @@
public Object fromString(String arg0) {
return StringUtils.trim(arg0);
}
-
}
private Converter createSingleValueConverterRequete() {
return new Converter() {
-
@Override
public boolean canConvert(final Class arg0) {
return ConfSelectionItemRequete.class.equals(arg0);
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterIsIncludeCollection.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -29,6 +29,9 @@
private static final String DIFF_INCLUDE_DANS_A_PAS_DANS_B = BusinessMessages
.getString("diff.include.dansA.pasDansB");
private final String propName;
+ private String prefixDiffMessageId;
+ private String diffMessageIdDansBPasDansA;
+ private String diffMessageIdDansAPasDansB;
/**
* @return the propName
@@ -37,6 +40,27 @@
return propName;
}
+ private String getDansAPasDansB() {
+ if (prefixDiffMessageId == null) {
+ return DIFF_INCLUDE_DANS_A_PAS_DANS_B;
+ }
+ if (diffMessageIdDansAPasDansB == null) {
+ diffMessageIdDansAPasDansB = BusinessMessages.getString(prefixDiffMessageId + ".dansA.pasDansB");
+ }
+ return diffMessageIdDansAPasDansB;
+
+ }
+
+ private String getDansBPasDansA() {
+ if (prefixDiffMessageId == null) {
+ return DIFF_INCLUDE_DANS_B_PAS_DANS_A;
+ }
+ if (diffMessageIdDansBPasDansA == null) {
+ diffMessageIdDansBPasDansA = BusinessMessages.getString(prefixDiffMessageId + ".dansB.pasDansA");
+ }
+ return diffMessageIdDansBPasDansA;
+ }
+
/**
* @return the bidirect
*/
@@ -80,13 +104,13 @@
list.subList(0, nbMaxItemInDiff);
}
if (CollectionUtils.isNotEmpty(subtract)) {
- addDiff(DIFF_INCLUDE_DANS_A_PAS_DANS_B, res, toString(subtract), StringUtils.EMPTY);
+ addDiff(getDansAPasDansB(), res, toString(subtract), StringUtils.EMPTY);
resFinal = false;
}
if (bidirect) {
subtract = CollectionUtils.subtract(propInB, propInA);
if (CollectionUtils.isNotEmpty(subtract)) {
- addDiff(DIFF_INCLUDE_DANS_B_PAS_DANS_A, res, StringUtils.EMPTY, toString(subtract));
+ addDiff(getDansBPasDansA(), res, StringUtils.EMPTY, toString(subtract));
resFinal = false;
}
}
@@ -100,4 +124,12 @@
res.addDiff(new ResultatTest(obj1, obj2, msg, true));
}
}
+
+ public String getPrefixDiffMessageId() {
+ return prefixDiffMessageId;
+ }
+
+ public void setPrefixDiffMessageId(String prefixDiffMessageId) {
+ this.prefixDiffMessageId = prefixDiffMessageId;
+ }
}
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/java/org/fudaa/dodico/crue/comparaison/tester/ResultatTest.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -188,11 +188,11 @@
return String.class.equals(c) || Double.class.equals(c) || Integer.class.equals(c);
}
- public void setMsg(final String msg) {
+ public final void setMsg(final String msg) {
setMsg(msg, null);
}
- public void setMsg(final String msg, final Object... msgArguments) {
+ public final void setMsg(final String msg, final Object... msgArguments) {
this.msg = msg;
this.msgArguments = msgArguments;
}
Modified: trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-compare/src/main/resources/org/fudaa/dodico/crue/comparaison/io/default-comparaison.xml 2013-04-02 15:59:38 UTC (rev 8369)
@@ -2,29 +2,29 @@
<Comparaisons xmlns="http://www.fudaa.fr/xsd/crue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fudaa.fr/xsd/crue
http://www.fudaa.fr/xsd/crue/comparaison-1.0.0.xsd">
<!--
- Dans toutes les requetes, on part de EMHScenario. On a ajouté des
- methodes pour faciliter les requetes
- -->
+ Dans toutes les requetes, on part de EMHScenario. On a ajouté des
+ methodes pour faciliter les requetes
+ -->
<Comparaison>
<Id>DRSO1.1</Id>
<Nom>Quelle EMH, présente (et active) dans A, est absente (ou inactive) dans B</Nom>
<Selection>
<!--
- allSimpleEMH donne la liste des tous les EMH simple (non conteneur)
- contenu par les sous-modeles du scenario
- -->
+ allSimpleEMH donne la liste des tous les EMH simple (non conteneur)
+ contenu par les sous-modeles du scenario
+ -->
<!--
- allSimpleEMH[actuallyActive='true'] signifie que l'on ne recupere que les EMH qui sont
- actives
- -->
+ allSimpleEMH[actuallyActive='true'] signifie que l'on ne recupere que les EMH qui sont
+ actives
+ -->
<Requete Description="EMH active">
allSimpleEMH[actuallyActive='true']
</Requete>
</Selection>
<!--
- Compare-Liste Attribut="id": signifie que dans les listes obtenues on
- teste si l'id dans la liste A est présent dans B
- -->
+ Compare-Liste Attribut="id": signifie que dans les listes obtenues on
+ teste si l'id dans la liste A est présent dans B
+ -->
<!-- Bidirect="true" signifie que l'on fait le test dans les 2 sens-->
<Compare-Liste Bidirect="true" Attribut="id" />
</Comparaison>
@@ -43,9 +43,9 @@
<Nom>Quelle EMH, présente dans A et B, a un type différent</Nom>
<Selection>
<!--
- Merge signifie que l'on va "merger" le contenu de la requete "allSimpleEMH" et faire concorder les EMH qui ont le même Id Attribut="Id" La comparaison portera sur toutes les
- EMH qui ont même id
- -->
+ Merge signifie que l'on va "merger" le contenu de la requete "allSimpleEMH" et faire concorder les EMH qui ont le même Id Attribut="Id" La comparaison portera sur toutes les
+ EMH qui ont même id
+ -->
<Merge Attribut="id" Description="EMH présente dans A et B de même Id">
<Requete Description="Toutes les EMH">allSimpleEMH[actuallyActive='true']
</Requete>
@@ -80,9 +80,9 @@
</Merge>
</Selection>
<!--
- La classe CatEMHNoeud possede une methode idCasier qui renvoie
- l'identifiant du casier attache
- -->
+ La classe CatEMHNoeud possede une methode idCasier qui renvoie
+ l'identifiant du casier attache
+ -->
<Compare-Objet>
<Attribut>idCasier</Attribut>
</Compare-Objet>
@@ -99,8 +99,8 @@
<Requete Description="Toutes les sections de la branche">sections</Requete>
</Selection>
<!--
- On compare les id des emh contenues par les relations
- -->
+ On compare les id des emh contenues par les relations
+ -->
<Compare-Liste Bidirect="true" Attribut="emhId" />
</Comparaison>
<Comparaison>
@@ -118,8 +118,8 @@
</Merge>
</Selection>
<!--
- On compare les xp
- -->
+ On compare les xp
+ -->
<Compare-Objet>
<Attribut>xp</Attribut>
<Attribut>pos</Attribut>
@@ -140,9 +140,9 @@
</Merge>
</Selection>
<!--
- On compare les 3 coefficients. En ne mettant rien, on compare toutes
- les propriétés
- -->
+ On compare les 3 coefficients. En ne mettant rien, on compare toutes
+ les propriétés
+ -->
<Compare-Objet>
<Attribut>coefConv</Attribut>
<Attribut>coefDiv</Attribut>
@@ -156,9 +156,9 @@
<Requete Description="Tous les noeuds">noeuds[actuallyActive='true']</Requete>
</Selection>
<!--
- On compare les 3 coefficients. En ne mettant rien, on compare toutes
- les propriétés
- -->
+ On compare les 3 coefficients. En ne mettant rien, on compare toutes
+ les propriétés
+ -->
<Compare-Liste-Order Attribut="id" />
</Comparaison>
<Comparaison>
@@ -211,10 +211,10 @@
</Requete>
</Merge>
<!--
- les EMH ont une methode getDPTG qui liste toutes les DonPrtGeo qui
- sont nommées: soit DonPrtGeoBatiCasier,
- DonPrtGeoProfilCasier,DonPrtGeoProfilSection
- -->
+ les EMH ont une methode getDPTG qui liste toutes les DonPrtGeo qui
+ sont nommées: soit DonPrtGeoBatiCasier,
+ DonPrtGeoProfilCasier,DonPrtGeoProfilSection
+ -->
<Requete Description="Les dptg nommés">DPTGNommes</Requete>
</Selection>
<Compare-Liste Bidirect="true" Attribut="id" />
@@ -233,9 +233,9 @@
</Merge>
</Selection>
<!--
- Par defaut le Compare-Objet ne compare que les attributs simple de premier niveau Pour descendre dans l'arborescence d'objet il est possible d'utiliser le paramètre deep. Par
- exemple: <Compare-Objet Deep="2"/> si on ne veut pas de limite, il faut utiliser la valeur -1
- -->
+ Par defaut le Compare-Objet ne compare que les attributs simple de premier niveau Pour descendre dans l'arborescence d'objet il est possible d'utiliser le paramètre deep. Par
+ exemple: <Compare-Objet Deep="2"/> si on ne veut pas de limite, il faut utiliser la valeur -1
+ -->
<Compare-Objet Deep="1">
<AttributToIgnore>nombreLitNumerote</AttributToIgnore>
</Compare-Objet>
@@ -347,10 +347,10 @@
<Requete Description="Les LitNumerote">litNumerote</Requete>
</Selection>
<!--
- On va descendre dans l'arborescence des objets Deep permet de
- controler le nombre d'étage a descendre. Deep=-1 signifie que l'on ne
- s'arrete pas.
- -->
+ On va descendre dans l'arborescence des objets Deep permet de
+ controler le nombre d'étage a descendre. Deep=-1 signifie que l'on ne
+ s'arrete pas.
+ -->
<Compare-Objet Deep="-1">
<Attribut>frotId</Attribut>
<Option>
@@ -606,9 +606,9 @@
<Nom>Quel calcul, présent (et utilisé) dans A, est absent (ou inutilisé) dans B</Nom>
<Selection>
<!--
- un calcul est utilise s'il appartient a un Ordre de calcul du
- scenario?
- -->
+ un calcul est utilise s'il appartient a un Ordre de calcul du
+ scenario?
+ -->
<Requete Description="tous les calculs utilisés">
ordCalcScenario/ordCalc/calc
</Requete>
@@ -682,9 +682,9 @@
</Requete>
</Selection>
<!--
- Compare-Liste Attribut="id" : signifie que dans les listes obtenues
- on teste si l'id dans la liste A est présent dans B
- -->
+ Compare-Liste Attribut="id" : signifie que dans les listes obtenues
+ on teste si l'id dans la liste A est présent dans B
+ -->
<!-- Bidirect="true" signifie que l'on fait le test dans les 2 sens-->
<Compare-Liste Bidirect="true" Attribut="id" />
</Comparaison>
@@ -737,11 +737,17 @@
<Id>ORES1</Id>
<Nom>Quelles demandes de résultat sont différentes entre les scénarios A et B</Nom>
<Selection>
- <Requete Description="Les OrdRes du scenario">
- ordResScenario
+ <Merge Attribut="key" Description="Les OrdRes de même id">
+ <Requete Description="Les OrdRes du scenario">
+ ordResScenario/listOfOrdRes
+ </Requete>
+ </Merge>
+ <Requete Description="Les OrdRes actives">
+ activeOrdResDisplayName
</Requete>
</Selection>
- <Compare-Objet Deep="2" />
+ <!--DiffTranslation= permet de préciser le préfixe à utiliser pour les différences trouvées dans des listes-->
+ <Compare-Liste Bidirect="true" DiffTranslation="diff.include.oresActive"/>
</Comparaison>
<Comparaison>
@@ -866,9 +872,9 @@
</Compare-Objet>
</Comparaison>
<!--
- Attention, pour que cette comparaison fonctionne, il faut qu'il y le
- meme nombre de modele
- -->
+ Attention, pour que cette comparaison fonctionne, il faut qu'il y le
+ meme nombre de modele
+ -->
<Comparaison>
<Id>OPTG2</Id>
<Nom>Quel modèle, présent dans A et B, a des listes de règles à vérifier différentes</Nom>
Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-04-02 15:59:38 UTC (rev 8369)
@@ -241,6 +241,8 @@
diff.include.dansA.pasDansB = Des objets sont pr\u00e9sents dans A et pas dans B
diff.include.dansB.pasDansA = Des objets sont pr\u00e9sents dans B et pas dans A
+diff.include.oresActive.dansA.pasDansB=Des OrdRes sont actives dans A et pas dans B
+diff.include.oresActive.dansB.pasDansA=Des OrdRes sont actives dans B et pas dans A
compare.nbPdt.diff=Le nombre de pas de temps est diff\u00e9rent
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/Dde.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/Dde.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/Dde.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -1,5 +1,6 @@
package org.fudaa.dodico.crue.metier.emh;
+import org.apache.commons.lang.StringUtils;
import org.fudaa.dodico.crue.common.contrat.ObjetWithID;
/**
@@ -21,6 +22,10 @@
return getNom();
}
+ public String getDisplayName() {
+ return StringUtils.capitalize(getNom());
+ }
+
@Override
public int hashCode() {
int hash = 7 + (valeur ? 8 : 101);
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdRes.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdRes.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/emh/OrdRes.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -104,12 +104,12 @@
}
@UsedByComparison
- public List<String> getActiveOrdRes() {
+ public List<String> getActiveOrdResDisplayName() {
Collection<Dde> ddes = values.values();
ArrayList<String> res = new ArrayList<String>();
for (Dde dde : ddes) {
if (dde.isValeur()) {
- res.add(dde.getId());
+ res.add(dde.getDisplayName());
}
}
return res;
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/pom.xml 2013-04-02 15:59:38 UTC (rev 8369)
@@ -18,8 +18,8 @@
<properties>
<projetEncoding>UTF-8</projetEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <javaCompiler>1.6</javaCompiler>
- <targetJdk>1.6</targetJdk>
+ <javaCompiler>1.7</javaCompiler>
+ <targetJdk>1.7</targetJdk>
<fudaa-sig.version>1.4-SNAPSHOT</fudaa-sig.version>
<netbeans.run.params.ide/>
<netbeans.run.params>${netbeans.run.params.ide}</netbeans.run.params>
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilSectionImporterAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilSectionImporterAction.java 2013-04-02 15:27:26 UTC (rev 8368)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/TraceProfilSectionImporterAction.java 2013-04-02 15:59:38 UTC (rev 8369)
@@ -40,7 +40,7 @@
PlanimetryController controller;
public TraceProfilSectionImporterAction(PlanimetryController controller) {
- super(NbBundle.getMessage(TraceProfilSectionImporterAction.class, "TraceProfilImporterAction.ActioName"), null, "IMPORT");
+ super(NbBundle.getMessage(TraceProfilSectionImporterAction.class, "TraceProfilImporterAction.ActionName"), null, "IMPORT");
assert controller != null;
this.controller = controller;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X