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. |