Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7393] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-06-25 07:54:45
|
Revision: 7393
http://fudaa.svn.sourceforge.net/fudaa/?rev=7393&view=rev
Author: deniger
Date: 2012-06-25 07:54:30 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionBrancheCreator.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionProfilCreator.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionSectionCreator.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/factory/CruePrefix.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/factory/LoiFactory.java
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/action/AddCasierAction.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/CreationEMHSelectedType.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionLoiCreator.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddBrancheAction.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddNoeudAction.java
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionBrancheCreator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionBrancheCreator.java 2012-06-25 07:52:58 UTC (rev 7392)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionBrancheCreator.java 2012-06-25 07:54:30 UTC (rev 7393)
@@ -5,15 +5,37 @@
import org.fudaa.dodico.crue.config.CrueConfigMetier;
import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheBarrageGenerique;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheNiveauxAssocies;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheOrifice;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBranchePdc;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSeuilLateral;
+import org.fudaa.dodico.crue.metier.emh.DonCalcSansPrtBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.DonPrtGeoBrancheSaintVenant;
import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageFilEau;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheBarrageGenerique;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheEnchainement;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheNiveauxAssocies;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheOrifice;
+import org.fudaa.dodico.crue.metier.emh.EMHBranchePdc;
import org.fudaa.dodico.crue.metier.emh.EMHBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilLateral;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSeuilTransversal;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheStrickler;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionSansGeometrie;
import org.fudaa.dodico.crue.metier.emh.EMHSousModele;
+import org.fudaa.dodico.crue.metier.emh.ElemOrifice;
+import org.fudaa.dodico.crue.metier.emh.ElemSeuil;
+import org.fudaa.dodico.crue.metier.emh.ElemSeuilAvecPdc;
import org.fudaa.dodico.crue.metier.emh.EnumBrancheType;
import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
import org.fudaa.dodico.crue.metier.emh.EnumNoeudType;
import org.fudaa.dodico.crue.metier.emh.EnumPosSection;
+import org.fudaa.dodico.crue.metier.emh.EnumTypeLoi;
import org.fudaa.dodico.crue.metier.emh.RelationEMHSectionDansBranche;
import org.fudaa.dodico.crue.metier.factory.EMHFactory;
@@ -25,10 +47,12 @@
EditionSectionCreator sectionCreator;
EditionNoeudCreator noeudCreator;
+ EditionLoiCreator loiCreator;
public EditionBrancheCreator(EditionSectionCreator sectionCreator, EditionNoeudCreator noeudCreator) {
this.sectionCreator = sectionCreator;
this.noeudCreator = noeudCreator;
+ loiCreator = new EditionLoiCreator(sectionCreator.getUniqueNomFinder());
}
public CatEMHBranche createBranche(EMHSousModele sousModele, EnumBrancheType brancheType, CatEMHNoeud noeudAmont,
@@ -45,7 +69,7 @@
if (noeudAvalToUse == null) {
noeudAvalToUse = noeudCreator.createNoeud(sousModele, EnumNoeudType.EMHNoeudNiveauContinu);
}
- assert !noeudAmontToUse.getNom().equals(noeudAmontToUse.getNom());
+ assert !noeudAmontToUse.getNom().equals(noeudAvalToUse.getNom());
branche.setNoeudAmont(noeudAmontToUse);
branche.setNoeudAval(noeudAvalToUse);
EditionCreateEMH.addInScenario(sousModele, branche, scenario);
@@ -84,54 +108,102 @@
double distance) {
EMHBrancheBarrageFilEau branche = new EMHBrancheBarrageFilEau(name);
addDefaultsSectionProfils(ccm, name, sousModele, branche, distance);
+ final DonCalcSansPrtBrancheBarrageFilEau dcsp = new DonCalcSansPrtBrancheBarrageFilEau(ccm);
+ dcsp.setRegimeDenoye(loiCreator.createLoiFF(name, sousModele.getParent().getParent(), EnumTypeLoi.LoiQpilZam, ccm));
+ dcsp.addElemSeuil(new ElemSeuil(ccm));
+
+ branche.addInfosEMH(dcsp);
return branche;
}
- private static CatEMHBranche createEMHBrancheBarrageGenerique(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
- double distance) {
- throw new UnsupportedOperationException("Not yet implemented");
+ private CatEMHBranche createEMHBrancheBarrageGenerique(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
+ double distance) {
+ EMHBrancheBarrageGenerique branche = new EMHBrancheBarrageGenerique(name);
+ addDefaultsSectionProfils(ccm, name, sousModele, branche, distance);
+ final DonCalcSansPrtBrancheBarrageGenerique dcsp = new DonCalcSansPrtBrancheBarrageGenerique(ccm);
+ dcsp.setRegimeDenoye(loiCreator.createLoiFF(name, sousModele.getParent().getParent(), EnumTypeLoi.LoiQpilZam, ccm));
+ dcsp.setRegimeNoye(loiCreator.createLoiFF(name, sousModele.getParent().getParent(), EnumTypeLoi.LoiQDz, ccm));
+ branche.addInfosEMH(dcsp);
+
+ return branche;
}
- private static CatEMHBranche createEMHBrancheEnchainement(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
- double distance) {
- throw new UnsupportedOperationException("Not yet implemented");
+ private CatEMHBranche createEMHBrancheEnchainement(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
+ double distance) {
+ EMHBrancheEnchainement branche = new EMHBrancheEnchainement(name);
+// final DonCalcSansPrtBrancheNiveauxAssocies dcsp = new DonCalcSansPrtBrancheNiveauxAssocies(ccm);
+// dcsp.setZasso(loiCreator.createLoiFF(name, sousModele.getParent().getParent(), EnumTypeLoi.LoiZavZam, ccm));
+// branche.addInfosEMH(dcsp);
+ addDefaultsSectionSansGeometrie(ccm, name, sousModele, branche, distance);
+ return branche;
}
- private static CatEMHBranche createEMHBrancheNiveauxAssocies(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
- double distance) {
- throw new UnsupportedOperationException("Not yet implemented");
+ private CatEMHBranche createEMHBrancheNiveauxAssocies(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
+ double distance) {
+ EMHBrancheNiveauxAssocies branche = new EMHBrancheNiveauxAssocies(name);
+ final DonCalcSansPrtBrancheNiveauxAssocies dcsp = new DonCalcSansPrtBrancheNiveauxAssocies(ccm);
+ dcsp.setZasso(loiCreator.createLoiFF(name, sousModele.getParent().getParent(), EnumTypeLoi.LoiZavZam, ccm));
+ branche.addInfosEMH(dcsp);
+ addDefaultsSectionSansGeometrie(ccm, name, sousModele, branche, distance);
+ return branche;
}
- private static CatEMHBranche createEMHBrancheOrifice(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
- double distance) {
- throw new UnsupportedOperationException("Not yet implemented");
+ private CatEMHBranche createEMHBrancheOrifice(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
+ double distance) {
+ EMHBrancheOrifice branche = new EMHBrancheOrifice(name);
+ final DonCalcSansPrtBrancheOrifice donCalcSansPrtBrancheOrifice = new DonCalcSansPrtBrancheOrifice();
+ donCalcSansPrtBrancheOrifice.setElemOrifice(new ElemOrifice(ccm));
+ branche.addInfosEMH(donCalcSansPrtBrancheOrifice);
+ addDefaultsSectionSansGeometrie(ccm, name, sousModele, branche, distance);
+ return branche;
}
- private static CatEMHBranche createEMHBranchePdc(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
- double distance) {
- throw new UnsupportedOperationException("Not yet implemented");
+ private CatEMHBranche createEMHBranchePdc(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
+ double distance) {
+ EMHBranchePdc branche = new EMHBranchePdc(name);
+ final DonCalcSansPrtBranchePdc dcsp = new DonCalcSansPrtBranchePdc();
+ dcsp.setPdc(loiCreator.createLoiFF(name, sousModele.getParent().getParent(), EnumTypeLoi.LoiQPdc, ccm));
+ branche.addInfosEMH(dcsp);
+ addDefaultsSectionSansGeometrie(ccm, name, sousModele, branche, distance);
+ return branche;
}
private CatEMHBranche createEMHBrancheSaintVenant(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
double distance) {
EMHBrancheSaintVenant branche = new EMHBrancheSaintVenant(name);
addDefaultsSectionProfils(ccm, name, sousModele, branche, distance);
+ DonPrtGeoBrancheSaintVenant dptg = new DonPrtGeoBrancheSaintVenant(ccm);
+ DonCalcSansPrtBrancheSaintVenant dcsp = new DonCalcSansPrtBrancheSaintVenant(ccm);
+ branche.addInfosEMH(dptg);
+ branche.addInfosEMH(dcsp);
return branche;
}
- private static CatEMHBranche createEMHBrancheSeuilLateral(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
- double distance) {
- throw new UnsupportedOperationException("Not yet implemented");
+ private CatEMHBranche createEMHBrancheSeuilLateral(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
+ double distance) {
+ EMHBrancheSeuilLateral branche = new EMHBrancheSeuilLateral(name);
+ final DonCalcSansPrtBrancheSeuilLateral dcsp = new DonCalcSansPrtBrancheSeuilLateral();
+ dcsp.addElemSeuilAvecPdc(new ElemSeuilAvecPdc(ccm));
+ branche.addInfosEMH(dcsp);
+ addDefaultsSectionSansGeometrie(ccm, name, sousModele, branche, distance);
+ return branche;
}
- private static CatEMHBranche createEMHBrancheSeuilTransversal(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
- double distance) {
- throw new UnsupportedOperationException("Not yet implemented");
+ private CatEMHBranche createEMHBrancheSeuilTransversal(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
+ double distance) {
+ EMHBrancheSeuilTransversal branche = new EMHBrancheSeuilTransversal(name);
+ final DonCalcSansPrtBrancheSeuilTransversal dcsp = new DonCalcSansPrtBrancheSeuilTransversal();
+ dcsp.addElemSeuilAvecPdc(new ElemSeuilAvecPdc(ccm));
+ branche.addInfosEMH(dcsp);
+ addDefaultsSectionSansGeometrie(ccm, name, sousModele, branche, distance);
+ return branche;
}
- private static CatEMHBranche createEMHBrancheStrickler(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
- double distance) {
- throw new UnsupportedOperationException("Not yet implemented");
+ private CatEMHBranche createEMHBrancheStrickler(String name, CrueConfigMetier ccm, EMHSousModele sousModele,
+ double distance) {
+ EMHBrancheStrickler branche = new EMHBrancheStrickler(name);
+ addDefaultsSectionProfils(ccm, name, sousModele, branche, distance);
+ return branche;
}
public void addDefaultsSectionProfils(CrueConfigMetier ccm, String name, EMHSousModele sousModele,
@@ -145,4 +217,16 @@
EnumPosSection.AVAL, ccm);
branche.addListeSections(Arrays.asList(relationAmont, relationAval));
}
+
+ public void addDefaultsSectionSansGeometrie(CrueConfigMetier ccm, String name, EMHSousModele sousModele,
+ CatEMHBranche branche, double distance) {
+ List<EMHSectionSansGeometrie> newSections = sectionCreator.createEMHSectionSansGeometrie(ccm, name, sousModele);
+ EMHSectionSansGeometrie amont = newSections.get(0);
+ EMHSectionSansGeometrie aval = newSections.get(1);
+ RelationEMHSectionDansBranche relationAmont = EMHFactory.createRelationSectionDansBranche(branche, amont, 0,
+ EnumPosSection.AMONT, ccm);
+ RelationEMHSectionDansBranche relationAval = EMHFactory.createRelationSectionDansBranche(branche, aval, distance,
+ EnumPosSection.AVAL, ccm);
+ branche.addListeSections(Arrays.asList(relationAmont, relationAval));
+ }
}
Added: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionLoiCreator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionLoiCreator.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionLoiCreator.java 2012-06-25 07:54:30 UTC (rev 7393)
@@ -0,0 +1,51 @@
+package org.fudaa.dodico.crue.edition;
+
+import java.util.List;
+import java.util.Set;
+import org.fudaa.dodico.crue.config.ConfigLoi;
+import org.fudaa.dodico.crue.config.CrueConfigMetier;
+import org.fudaa.dodico.crue.metier.emh.EMHScenario;
+import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
+import org.fudaa.dodico.crue.metier.emh.EnumTypeLoi;
+import org.fudaa.dodico.crue.metier.emh.Loi;
+import org.fudaa.dodico.crue.metier.emh.LoiFF;
+import org.fudaa.dodico.crue.metier.factory.CruePrefix;
+import org.fudaa.dodico.crue.metier.factory.LoiFactory;
+import org.fudaa.dodico.crue.metier.transformer.TransformerHelper;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class EditionLoiCreator {
+
+ private UniqueNomFinder uniqueNomFinder;
+
+ public EditionLoiCreator(UniqueNomFinder uniqueNomFinder) {
+ this.uniqueNomFinder = uniqueNomFinder;
+ }
+
+ /**
+ * Rappel: ces lois ne sont pas ajouté dans le dlhy.
+ * @param name
+ * @param scenario
+ * @param typeLoi
+ * @param ccm
+ * @return
+ */
+ public LoiFF createLoiFF(String name, EMHScenario scenario, EnumTypeLoi typeLoi, CrueConfigMetier ccm) {
+ List<Loi> lois = scenario.getLoiConteneur().getLois();
+ Set<String> toSetOfId = TransformerHelper.toSetOfId(lois);
+ String prefix = CruePrefix.getPrefix(typeLoi);
+ String loiName = CruePrefix.getNomAvecPrefixe(prefix, name);
+ loiName = uniqueNomFinder.findUniqueName(toSetOfId, loiName);
+ LoiFF loi = new LoiFF();
+ LoiFactory.alimenteDebutLoiFF(loi, loiName, typeLoi);
+ ConfigLoi configLoi = ccm.getConfLoi().get(typeLoi);
+ double x = configLoi.getVarAbscisse().getDefaultValue().doubleValue();
+ double y = configLoi.getVarOrdonnee().getDefaultValue().doubleValue();
+ LoiFactory.alimenteEvolutionFF(loi, new double[]{x}, new double[]{y});
+// scenario.getLoiConteneur().addLois(loi);
+ return loi;
+ }
+}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionProfilCreator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionProfilCreator.java 2012-06-25 07:52:58 UTC (rev 7392)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionProfilCreator.java 2012-06-25 07:54:30 UTC (rev 7393)
@@ -37,8 +37,6 @@
protected UniqueNomFinder getUniqueNomFinder() {
return uniqueNomFinder;
}
-
-
protected DonFrt getFrt(String name, EMHSousModele sousModele, CrueConfigMetier ccm) {
DonFrt defaultFrt = sousModele.getFrtConteneur().getDefaultFrt();
@@ -63,10 +61,9 @@
DonFrtStrickler newFrt = EMHFactory.createDonFrtStrickler(frtName);
ConfigLoi configLoi = ccm.getConfLoi().get(EnumTypeLoi.LoiZFK);
PtEvolutionFF point = new PtEvolutionFF();
- point.setAbscisse(configLoi.getVarAbscisse().getDefaultValue().doubleValue());
- point.setOrdonnee(configLoi.getVarOrdonnee().getDefaultValue().doubleValue());
+ point.setAbscisse(configLoi.getVarAbscisse().getValidator().getRangeNormalite().getMin().doubleValue());
+ point.setOrdonnee(configLoi.getVarOrdonnee().getValidator().getRangeNormalite().getMin().doubleValue());
newFrt.getLoi().getEvolutionFF().getPtEvolutionFF().add(point);
- newFrt.setStrickler(null);
return newFrt;
}
@@ -86,11 +83,12 @@
protected DonPrtGeoProfilSection createProfilSection(CrueConfigMetier ccm, String name, EMHSousModele ssModele) {
DonPrtGeoProfilSection section = new DonPrtGeoProfilSection();
- String nom = CruePrefix.getNomAvecPrefixe(name, CruePrefix.P_PROFIL_SECTION);
+ String nom = CruePrefix.getNomAvecPrefixe(CruePrefix.P_PROFIL_SECTION, name);
//on s'assure de l'unicite du nom:
nom = uniqueNomFinder.findUniqueNameProfilSection(nom, ssModele.getParent().getParent());
section.setNom(nom);
List<PtProfil> ptProfils = createDefaultPtProfil(ccm);
+ section.setPtProfil(ptProfils);
assert ptProfils.size() == 2;
DonFrt frt = getFrt(name, ssModele, ccm);
LitNumerote litMineur = new LitNumerote();
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionSectionCreator.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionSectionCreator.java 2012-06-25 07:52:58 UTC (rev 7392)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/EditionSectionCreator.java 2012-06-25 07:54:30 UTC (rev 7393)
@@ -7,6 +7,7 @@
import org.fudaa.dodico.crue.metier.emh.DonPrtGeoProfilSection;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
+import org.fudaa.dodico.crue.metier.emh.EMHSectionSansGeometrie;
import org.fudaa.dodico.crue.metier.emh.EMHSousModele;
import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
import org.fudaa.dodico.crue.metier.factory.CruePrefix;
@@ -55,4 +56,22 @@
EditionCreateEMH.addInScenario(ssModele, sectionAval, scenario);
return Arrays.asList(sectionAmont, sectionAval);
}
+
+ protected List<EMHSectionSansGeometrie> createEMHSectionSansGeometrie(CrueConfigMetier ccm, String brancheName,
+ EMHSousModele ssModele) {
+ EMHScenario scenario = ssModele.getParent().getParent();
+ String sectionName = CruePrefix.getNomAvecPrefixFor(brancheName, EnumCatEMH.SECTION);
+ String sectionAvalName = BusinessMessages.getString("create.SectionAval", sectionName);
+ String sectionAmontName = BusinessMessages.getString("create.SectionAmont", sectionName);
+ //on s'assure de l'unicité:
+ sectionAmontName = profilCreator.getUniqueNomFinder().findUniqueName(EnumCatEMH.SECTION, scenario, sectionAmontName);
+ sectionAvalName = profilCreator.getUniqueNomFinder().findUniqueName(EnumCatEMH.SECTION, scenario, sectionAvalName);
+
+ EMHSectionSansGeometrie sectionAmont = new EMHSectionSansGeometrie(sectionAmontName);
+ EditionCreateEMH.addInScenario(ssModele, sectionAmont, scenario);//toujours faire cela à la fin de la creation pour assure des noms uniques
+
+ EMHSectionSansGeometrie sectionAval = new EMHSectionSansGeometrie(sectionAvalName);
+ EditionCreateEMH.addInScenario(ssModele, sectionAval, scenario);
+ return Arrays.asList(sectionAmont, sectionAval);
+ }
}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/factory/CruePrefix.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/factory/CruePrefix.java 2012-06-25 07:52:58 UTC (rev 7392)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/factory/CruePrefix.java 2012-06-25 07:54:30 UTC (rev 7393)
@@ -224,7 +224,7 @@
return !nom.startsWith(prefixe);
}
- private static String getPrefix(final EnumTypeLoi typeLoi) {
+ public static String getPrefix(final EnumTypeLoi typeLoi) {
return typeLoi.getId() + "_";
}
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/factory/LoiFactory.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/factory/LoiFactory.java 2012-06-25 07:52:58 UTC (rev 7392)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/metier/factory/LoiFactory.java 2012-06-25 07:54:30 UTC (rev 7393)
@@ -1,5 +1,5 @@
/**
- *
+ *
*/
package org.fudaa.dodico.crue.metier.factory;
@@ -20,7 +20,7 @@
/**
* Alimente les données unitaires d'une LoiFF
- *
+ *
* @param loiFF Loi à alimenter
* @param nom Nom de la loi
*/
@@ -51,17 +51,17 @@
/**
* Alimente la liste des points de la LoiFF seulement s'il existe un moins un point et s'il y a autant d'abscisses que
* d'ordonnées
- *
+ *
* @param loiFF Loi à alimenter
* @param abscisses Liste des abscisses
* @param ordonnees Liste des ordonnées
- * @return true si EvolutionFF a pu être alimentée, false si le tableau des abscisses et celui des ordonnées n'ont pas
- * la même taille ou si aucun point défini
+ * @return true si EvolutionFF a pu être alimentée, false si le tableau des abscisses et celui des ordonnées n'ont pas la même
+ * taille ou si aucun point défini
*/
public static boolean alimenteEvolutionFF(final LoiFF loiFF, final float[] abscisses, final float[] ordonnees) {
- if (abscisses == null || ordonnees == null || abscisses.length != ordonnees.length || abscisses.length == 0) {
- return false;
+ if (abscisses == null || ordonnees == null || abscisses.length != ordonnees.length || abscisses.length == 0) {
+ return false;
}
final EvolutionFF evolutionFF = new EvolutionFF();
@@ -77,16 +77,35 @@
return true;
}
+ public static boolean alimenteEvolutionFF(final LoiFF loiFF, final double[] abscisses, final double[] ordonnees) {
+
+ if (abscisses == null || ordonnees == null || abscisses.length != ordonnees.length || abscisses.length == 0) {
+ return false;
+ }
+
+ final EvolutionFF evolutionFF = new EvolutionFF();
+ loiFF.setEvolutionFF(evolutionFF);
+ final List<PtEvolutionFF> ptsFF = new ArrayList<PtEvolutionFF>();
+
+ for (int i = 0, imax = abscisses.length; i < imax; i++) {
+ final PtEvolutionFF ptFF = new PtEvolutionFF(abscisses[i], ordonnees[i]);
+ ptsFF.add(ptFF);
+ }
+ evolutionFF.setPtEvolutionFF(ptsFF);
+
+ return true;
+ }
+
/**
* Récupère une loi (indépendemment du type d'abscisses), à partir des données passées en paramètres
- *
+ *
* @param abscisses Ensemble des abscisses
* @param ordonnees Ensemble d'ordonnées
* @param nomLoi Nom à donner à la loi
* @return LoiFF ou null si la loi n'a pas eu être créée
*/
public static LoiFF getLoiFFRPTG(final float[] abscisses, final float[] ordonnees, final String nomLoi,
- final EnumTypeLoi type) {
+ final EnumTypeLoi type) {
final LoiFF loiFF = new LoiFF();
final boolean ok = alimenteEvolutionFF(loiFF, abscisses, ordonnees);
@@ -97,5 +116,4 @@
return null;
}
-
}
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-06-25 07:52:58 UTC (rev 7392)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java 2012-06-25 07:54:30 UTC (rev 7393)
@@ -35,7 +35,9 @@
import org.fudaa.ebli.commun.EbliActionMap;
import org.fudaa.ebli.commun.EbliComponentFactory;
import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.fudaa.crue.planimetry.action.AddBrancheAction;
import org.fudaa.fudaa.crue.planimetry.action.AddCasierAction;
+import org.fudaa.fudaa.crue.planimetry.action.AddNoeudAction;
import org.fudaa.fudaa.crue.planimetry.action.EditZonePanel;
import org.fudaa.fudaa.sig.layer.FSigEditor;
import org.fudaa.fudaa.sig.layer.FSigLayerGroup;
@@ -222,9 +224,15 @@
action.updateBeforeShow();
editZonePanel = new EditZonePanel();
PlanimetryGisPaletteEdition palette = action.getPalette();
- AddCasierAction addCasier = new AddCasierAction(palette,planimetryCalqueContext, editZonePanel);
+ AddNoeudAction addNoeud = new AddNoeudAction(palette, planimetryCalqueContext, editZonePanel);
+ AddCasierAction addCasier = new AddCasierAction(palette, planimetryCalqueContext, editZonePanel);
+ AddBrancheAction addBranche = new AddBrancheAction(palette, planimetryCalqueContext, editZonePanel);
+ getPlanimetryVisuController().addEditAction(addNoeud);
getPlanimetryVisuController().addEditAction(addCasier);
+ getPlanimetryVisuController().addEditAction(addBranche);
content.add(new JSeparator());
+ content.add(add(addNoeud.buildToolButton(EbliComponentFactory.INSTANCE)));
+ content.add(add(addBranche.buildToolButton(EbliComponentFactory.INSTANCE)));
content.add(add(addCasier.buildToolButton(EbliComponentFactory.INSTANCE)));
return content;
}
Copied: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddBrancheAction.java (from rev 7375, trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddCasierAction.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddBrancheAction.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddBrancheAction.java 2012-06-25 07:54:30 UTC (rev 7393)
@@ -0,0 +1,45 @@
+package org.fudaa.fudaa.crue.planimetry.action;
+
+import java.awt.Color;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
+import org.fudaa.ebli.calque.edition.BPaletteEdition;
+import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.fudaa.crue.planimetry.PlanimetryGisPaletteEdition;
+import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryController;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class AddBrancheAction extends AbstractAddAction {
+
+ private static Icon createIcon() {
+ TraceIconModel model = new TraceIconModel(TraceIcon.LIGNE_OBLIQUE, 10, Color.CYAN);
+ model.setEpaisseurLigne(2);
+ return new TraceIcon(model);
+ }
+
+ public AddBrancheAction(PlanimetryGisPaletteEdition palette, PlanimetryController controller, EditZone zone) {
+ super(palette, controller, zone, NbBundle.getMessage(AddBrancheAction.class, "AddBrancheAction.Name"), createIcon(),
+ "ADD_BRANCHE");
+ }
+
+ @Override
+ public String getDefaultPaletteAction() {
+ return BPaletteEdition.ADD_POLYLINE_ACTION;
+ }
+
+ @Override
+ protected JComponent getEditionComponent() {
+ return controller.getHelper().getCreationEMH().getBrancheComboBox();
+ }
+
+ @Override
+ protected ZCalqueAffichageDonnees getLayer() {
+ return controller.getBrancheController().getLayer();
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddCasierAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddCasierAction.java 2012-06-25 07:52:58 UTC (rev 7392)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddCasierAction.java 2012-06-25 07:54:30 UTC (rev 7393)
@@ -29,6 +29,7 @@
"ADD_CASIER");
}
+ @Override
public String getDefaultPaletteAction() {
return BPaletteEdition.ADD_RECTANGLE_ACTION;
}
Copied: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddNoeudAction.java (from rev 7375, trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddCasierAction.java)
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddNoeudAction.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddNoeudAction.java 2012-06-25 07:54:30 UTC (rev 7393)
@@ -0,0 +1,45 @@
+package org.fudaa.fudaa.crue.planimetry.action;
+
+import java.awt.Color;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
+import org.fudaa.ebli.calque.edition.BPaletteEdition;
+import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.fudaa.crue.planimetry.PlanimetryGisPaletteEdition;
+import org.fudaa.fudaa.crue.planimetry.controller.PlanimetryController;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author deniger ( genesis)
+ */
+public class AddNoeudAction extends AbstractAddAction {
+
+ private static Icon createIcon() {
+ TraceIconModel model = new TraceIconModel(TraceIcon.CERCLE, 10, Color.BLACK);
+ model.setBackgroundColor(Color.WHITE);
+ model.setBackgroundColorPainted(true);
+ return new TraceIcon(model);
+ }
+
+ public AddNoeudAction(PlanimetryGisPaletteEdition palette, PlanimetryController controller, EditZone zone) {
+ super(palette, controller, zone, NbBundle.getMessage(AddNoeudAction.class, "AddNoeudAction.Name"), createIcon(),
+ "ADD_NOEUD");
+ }
+
+ public String getDefaultPaletteAction() {
+ return BPaletteEdition.ADD_POINT_ACTION;
+ }
+
+ @Override
+ protected JComponent getEditionComponent() {
+ return null;
+ }
+
+ @Override
+ protected ZCalqueAffichageDonnees getLayer() {
+ return controller.getNodeController().getLayer();
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/CreationEMHSelectedType.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/CreationEMHSelectedType.java 2012-06-25 07:52:58 UTC (rev 7392)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/CreationEMHSelectedType.java 2012-06-25 07:54:30 UTC (rev 7393)
@@ -56,10 +56,11 @@
return cbCasier;
}
- public JComboBox createBrancheComboBox() {
+ public JComboBox getBrancheComboBox() {
if (cbBranche == null) {
-// List<EnumBrancheType> values = new ArrayList<EnumBrancheType>(Arrays.asList(EnumBrancheType.values()));
- cbBranche = new JComboBox(EnumBrancheType.values());
+ List<EnumBrancheType> values = new ArrayList<EnumBrancheType>(Arrays.asList(EnumBrancheType.values()));
+ values.remove(EnumBrancheType.EMHBrancheEnchainement);
+ cbBranche = new JComboBox(values.toArray());
cbBranche.setRenderer(renderer);
cbBranche.setSelectedItem(brancheType);
cbBranche.addItemListener(new ItemListener() {
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties 2012-06-25 07:52:58 UTC (rev 7392)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/action/Bundle.properties 2012-06-25 07:54:30 UTC (rev 7393)
@@ -5,3 +5,5 @@
SigLoaderAction.ImportLignes.Confirmation=Le fichier comporte {0} ligne(s). Voulez-vous l''importer ?
SigLoaderAction.ImportPoints.Confirmation=Le fichier comporte {0} point(s). Voulez-vous l''importer ?
AddCasierAction.Name=Ajouter des casiers
+AddNoeudAction.Name=Ajouter des noeuds
+AddBrancheAction.Name=Ajouter des branches
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
