Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8111] trunk/soft/fudaa-crue
|
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.
|
