You can subscribe to this list here.
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(46) |
Jul
(37) |
Aug
(154) |
Sep
(140) |
Oct
(132) |
Nov
(104) |
Dec
(67) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
(113) |
Feb
(73) |
Mar
(102) |
Apr
(106) |
May
(114) |
Jun
(67) |
Jul
(116) |
Aug
(48) |
Sep
(108) |
Oct
(296) |
Nov
(56) |
Dec
(53) |
2010 |
Jan
(95) |
Feb
(31) |
Mar
(40) |
Apr
(12) |
May
(10) |
Jun
(27) |
Jul
(19) |
Aug
(81) |
Sep
(48) |
Oct
(45) |
Nov
(40) |
Dec
(7) |
2011 |
Jan
(16) |
Feb
(32) |
Mar
(55) |
Apr
(38) |
May
(24) |
Jun
(37) |
Jul
(12) |
Aug
(16) |
Sep
(97) |
Oct
(90) |
Nov
(101) |
Dec
(89) |
2012 |
Jan
(18) |
Feb
(2) |
Mar
(54) |
Apr
(69) |
May
(97) |
Jun
(131) |
Jul
(70) |
Aug
(48) |
Sep
(48) |
Oct
(119) |
Nov
(194) |
Dec
(60) |
2013 |
Jan
(73) |
Feb
(35) |
Mar
(42) |
Apr
(28) |
May
(7) |
Jun
(17) |
Jul
(27) |
Aug
(10) |
Sep
(38) |
Oct
(12) |
Nov
(4) |
Dec
(16) |
2014 |
Jan
(33) |
Feb
(37) |
Mar
(19) |
Apr
(3) |
May
(47) |
Jun
(26) |
Jul
(22) |
Aug
|
Sep
(10) |
Oct
(30) |
Nov
(24) |
Dec
(19) |
2015 |
Jan
(13) |
Feb
(16) |
Mar
(36) |
Apr
(19) |
May
(5) |
Jun
(5) |
Jul
(3) |
Aug
(11) |
Sep
(22) |
Oct
(7) |
Nov
(14) |
Dec
|
2016 |
Jan
|
Feb
(26) |
Mar
(13) |
Apr
(61) |
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
(27) |
Nov
(14) |
Dec
(21) |
2017 |
Jan
(30) |
Feb
(4) |
Mar
(3) |
Apr
(5) |
May
(69) |
Jun
(29) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <de...@us...> - 2016-03-21 22:25:02
|
Revision: 9316 http://sourceforge.net/p/fudaa/svn/9316 Author: deniger Date: 2016-03-21 22:24:59 +0000 (Mon, 21 Mar 2016) Log Message: ----------- CRUE-634 CRUE-692 Modified Paths: -------------- 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/projet/conf/GlobalOptionsManager.java 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/SiteConfiguration.java trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/UserConfiguration.java trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties Added Paths: ----------- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/Crue9DecimalFormat.java trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/Crue9DecimalFormatter.java trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/Crue9DecimalFormatBuilder.java trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/Crue9DecimalFormatterTest.java trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/projet/ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/projet/conf/ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/projet/conf/Crue9DecimalFormatBuilderTest.java Property Changed: ---------------- trunk/soft/fudaa-crue/crue-config/ Index: trunk/soft/fudaa-crue/crue-config =================================================================== --- trunk/soft/fudaa-crue/crue-config 2016-03-20 22:10:48 UTC (rev 9315) +++ trunk/soft/fudaa-crue/crue-config 2016-03-21 22:24:59 UTC (rev 9316) Property changes on: trunk/soft/fudaa-crue/crue-config ___________________________________________________________________ Modified: svn:ignore ## -1 +1,2 ## target +nbproject Added: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/Crue9DecimalFormat.java =================================================================== --- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/Crue9DecimalFormat.java (rev 0) +++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/Crue9DecimalFormat.java 2016-03-21 22:24:59 UTC (rev 9316) @@ -0,0 +1,46 @@ +/* +GPL 2 + */ +package org.fudaa.dodico.crue.config.ccm; + +/** + * + * @author Frederic Deniger + */ +public class Crue9DecimalFormat { + + public enum STATE { + ACTIVE, NON_ACTIVE; + } + + private final int numberOfDigits; + private final STATE state; + + public static Crue9DecimalFormat getDefault() { + return new Crue9DecimalFormat(0, STATE.NON_ACTIVE); + } + + public Crue9DecimalFormat(int numberOfDigits, STATE state) { + this.numberOfDigits = numberOfDigits; + this.state = state; + } + + public boolean isInactive() { + return STATE.NON_ACTIVE.equals(this.state) || numberOfDigits <= 0; + } + public boolean isActive() { + return !isInactive(); + } + + public int getNumberOfDigits() { + return numberOfDigits; + } + + /** + * @return si actif ou non. + */ + public STATE getState() { + return state; + } + +} Added: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/Crue9DecimalFormatter.java =================================================================== --- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/Crue9DecimalFormatter.java (rev 0) +++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/Crue9DecimalFormatter.java 2016-03-21 22:24:59 UTC (rev 9316) @@ -0,0 +1,31 @@ +/* +GPL 2 + */ +package org.fudaa.dodico.crue.config.ccm; + +import org.fudaa.ctulu.CtuluNumberFormatFortran; + +/** + * + * @author Frederic Deniger + */ +public class Crue9DecimalFormatter { + + private final CtuluNumberFormatFortran formatter; + + public Crue9DecimalFormatter(Crue9DecimalFormat format) { + if (format != null && format.isActive()) { + formatter = new CtuluNumberFormatFortran(format.getNumberOfDigits()); + } else { + formatter = null; + } + } + + public String format(double in) { + if (formatter == null) { + return Double.toString(in); + } + return formatter.format(in); + } + +} 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 2016-03-20 22:10:48 UTC (rev 9315) +++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/CrueConfigMetier.java 2016-03-21 22:24:59 UTC (rev 9316) @@ -29,18 +29,28 @@ final Map<String, PropertyNature> propNature; final Map<String, PropertyNature> propEnum; CrueConfigMetierLitNomme litNomme; + Crue9DecimalFormat crue9DecimalFormat = Crue9DecimalFormat.getDefault(); protected CrueConfigMetier(final Map<String, PropertyNature> propNature, final Map<String, PropertyNature> propEnums) { super(); this.propNature = propNature; this.propEnum = propEnums; - this.litNomme = new CrueConfigMetierLitNomme(propEnums.get(CrueConfigMetierConstants.ENUM_LIT_NOMME), propEnums.get(CrueConfigMetierConstants.ENUM_ETIQUETTE)); + this.litNomme = new CrueConfigMetierLitNomme(propEnums.get(CrueConfigMetierConstants.ENUM_LIT_NOMME), propEnums.get( + CrueConfigMetierConstants.ENUM_ETIQUETTE)); } public CrueConfigMetierLitNomme getLitNomme() { return litNomme; } + public void setCrue9DecimalFormat(Crue9DecimalFormat crue9DecimalFormat) { + this.crue9DecimalFormat = crue9DecimalFormat; + } + + public Crue9DecimalFormat getCrue9DecimalFormat() { + return crue9DecimalFormat; + } + /** * * @return liste des types de lois pouvant être créées par l'utilisateur @@ -269,7 +279,8 @@ PropertyNature nature = prop.getNature(); if (!nature.isEnum() && !doneNature.contains(nature.getNom())) { doneNature.add(nature.getNom()); - nature.setFormat(formatBuilder.getFormatter(nature, DecimalFormatEpsilonEnum.PRESENTATION), formatBuilder.getFormatter(nature, DecimalFormatEpsilonEnum.COMPARISON)); + nature.setFormat(formatBuilder.getFormatter(nature, DecimalFormatEpsilonEnum.PRESENTATION), formatBuilder.getFormatter(nature, + DecimalFormatEpsilonEnum.COMPARISON)); } @@ -284,7 +295,8 @@ final PropertyNature nature = prop.getNature(); if (!nature.isEnum() && !doneNature.contains(nature.getNom())) { doneNature.add(nature.getNom()); - nature.setFormat(formatBuilder.getFormatter(nature, DecimalFormatEpsilonEnum.PRESENTATION), formatBuilder.getFormatter(nature, DecimalFormatEpsilonEnum.COMPARISON)); + nature.setFormat(formatBuilder.getFormatter(nature, DecimalFormatEpsilonEnum.PRESENTATION), formatBuilder.getFormatter(nature, + DecimalFormatEpsilonEnum.COMPARISON)); } } Added: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/Crue9DecimalFormatBuilder.java =================================================================== --- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/Crue9DecimalFormatBuilder.java (rev 0) +++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/Crue9DecimalFormatBuilder.java 2016-03-21 22:24:59 UTC (rev 9316) @@ -0,0 +1,45 @@ +/* +GPL 2 + */ +package org.fudaa.dodico.crue.projet.conf; + +import java.util.List; +import org.fudaa.dodico.crue.config.ccm.Crue9DecimalFormat; +import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier; + +/** + * + * @author Frederic Deniger + */ +public class Crue9DecimalFormatBuilder { + + int read(SiteConfiguration in) { + final List<SiteOption> options = in.getOptions(); + if (options == null) { + return -1; + } + for (SiteOption option : options) { + if (OptionsEnum.NB_EXPORT_CRUE9_SIGNIFICANT_FIGURES.getId().equals(option.getId())) { + try { + return Integer.parseInt(option.getValeur()); + } catch (NumberFormatException numberFormatException) { + } + } + } + + return -1; + } + + public Crue9DecimalFormat intialize(Configuration configuration, CrueConfigMetier ccm) { + int i = read(configuration.getSite()); + Crue9DecimalFormat fmt = null; + if (i < 0) { + fmt = Crue9DecimalFormat.getDefault(); + } else { + fmt = new Crue9DecimalFormat(i, Crue9DecimalFormat.STATE.ACTIVE); + } + ccm.setCrue9DecimalFormat(fmt); + return fmt; + } + +} Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/GlobalOptionsManager.java =================================================================== --- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/GlobalOptionsManager.java 2016-03-20 22:10:48 UTC (rev 9315) +++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/GlobalOptionsManager.java 2016-03-21 22:24:59 UTC (rev 9316) @@ -128,7 +128,7 @@ OptionsEnum[] values = OptionsEnum.values(); for (OptionsEnum optionsEnum : values) { enumById.put(optionsEnum.getId(), optionsEnum); - } + } } public OptionsEnum getOptionEnum(Option option) { @@ -164,14 +164,14 @@ return option; } - public SiteAide getAideOption() { + public SiteAide getAideOption() { return aide; } - + public void setAideOption(SiteAide aide) { - this.aide = aide; + this.aide = aide; } - + protected CtuluLogLevel getLevel(boolean useFatal) { return useFatal ? CtuluLogLevel.ERROR : CtuluLogLevel.WARNING; } @@ -251,10 +251,11 @@ Map<OptionsEnum, Option> siteReadOnlyOptionMap = build(siteReadOnlyOptions, false); Map<OptionsEnum, Option> siteAllOptionMap = build(siteModifiableByUserOptions.getOptions(), false); siteAllOptionMap.putAll(siteReadOnlyOptionMap); - if(siteConfiguration.getSite().getAide() != null) - setAideOption(siteConfiguration.getSite().getAide()); - else - siteLog.addRecord(getLevel(true), "conf.undefinedHelpConfiguration", "<SiteAide>"); + if (siteConfiguration.getSite().getAide() != null) { + setAideOption(siteConfiguration.getSite().getAide()); + } else { + siteLog.addRecord(getLevel(true), "conf.undefinedHelpConfiguration", "<SiteAide>"); + } validIsAllSetKnown(siteLog, siteAllOptionMap, true);//toutes les options doivent être définies validSiteOptions(siteLog, siteReadOnlyOptions, siteReadOnlyOptionMap); validValuesOfOption(siteLog, siteAllOptionMap, siteReadOnlyOptionMap); 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 2016-03-20 22:10:48 UTC (rev 9315) +++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsEnum.java 2016-03-21 22:24:59 UTC (rev 9316) @@ -11,11 +11,13 @@ AVAILABLE_LANGUAGE("availableLanguage", String.class, "fr_FR", true), USER_LANGUAGE("userLanguage", String.class, "fr_FR", true, new OptionValidatorLanguage("userLanguage")), UI_UPDATE_FREQ("uiUpdateProgressFrequence", Double.class, "0.2", true, new OptionValidatorMinDouble(Double.valueOf(0.1), - "uiUpdateProgressFrequence")), + "uiUpdateProgressFrequence")), MAX_COMPARAISON_ITEM("maxComparisonItemsDisplayed", Integer.class, "500", true, new OptionValidatorMinDouble(Double.valueOf(1), - "maxComparisonItemsDisplayed")), + "maxComparisonItemsDisplayed")), MAX_RESULTAT_DIFF_BY_EMH("maxComparisonResultsByEMH", Integer.class, "100", true, new OptionValidatorMinDouble(Double.valueOf(1), - "maxComparisonResultsByEMH")), + "maxComparisonResultsByEMH")), + NB_EXPORT_CRUE9_SIGNIFICANT_FIGURES("nbExportCrue9SignificantFigures", Integer.class, "7", true, new OptionValidatorMinDouble(Double.valueOf(-1), + "nbExportCrue9SignificantFigures")), MAX_LOG_ITEM("maxLogLinesRead", Integer.class, "500", true, new OptionValidatorMinDouble(Double.valueOf(1), "maxLogLinesRead")), EDITOR("externalEditor", File.class, null, true), CRUE9_EXE("crue9Exe", File.class, null, true), Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/SiteConfiguration.java =================================================================== --- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/SiteConfiguration.java 2016-03-20 22:10:48 UTC (rev 9315) +++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/SiteConfiguration.java 2016-03-21 22:24:59 UTC (rev 9316) @@ -1,7 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package org.fudaa.dodico.crue.projet.conf; import java.util.List; Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/UserConfiguration.java =================================================================== --- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/UserConfiguration.java 2016-03-20 22:10:48 UTC (rev 9315) +++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/UserConfiguration.java 2016-03-21 22:24:59 UTC (rev 9316) @@ -1,7 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package org.fudaa.dodico.crue.projet.conf; import java.util.ArrayList; @@ -13,7 +9,7 @@ */ public class UserConfiguration { - private Collection<UserOption> options = new ArrayList<UserOption>(); + private Collection<UserOption> options = new ArrayList<>(); public Collection<UserOption> getOptions() { return options; Added: trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/Crue9DecimalFormatterTest.java =================================================================== --- trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/Crue9DecimalFormatterTest.java (rev 0) +++ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/config/ccm/Crue9DecimalFormatterTest.java 2016-03-21 22:24:59 UTC (rev 9316) @@ -0,0 +1,27 @@ +/* +GPL 2 + */ +package org.fudaa.dodico.crue.config.ccm; + +import org.junit.Test; +import static org.junit.Assert.*; + +/** + * + * @author Frederic Deniger + */ +public class Crue9DecimalFormatterTest { + + public Crue9DecimalFormatterTest() { + } + + @Test + public void testFormat() { + Crue9DecimalFormatter formatter = new Crue9DecimalFormatter(new Crue9DecimalFormat(8, Crue9DecimalFormat.STATE.ACTIVE)); + assertEquals("1.23", formatter.format(1.23)); + assertEquals("5.0E-9", formatter.format(0.000000005)); + assertEquals(".1234568", formatter.format(0.12345678)); + assertEquals("1.2346E8", formatter.format(123456789)); + } + +} Added: trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/projet/conf/Crue9DecimalFormatBuilderTest.java =================================================================== --- trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/projet/conf/Crue9DecimalFormatBuilderTest.java (rev 0) +++ trunk/soft/fudaa-crue/crue-config/src/test/java/org/fudaa/dodico/crue/projet/conf/Crue9DecimalFormatBuilderTest.java 2016-03-21 22:24:59 UTC (rev 9316) @@ -0,0 +1,41 @@ +/* +GPL 2 + */ +package org.fudaa.dodico.crue.projet.conf; + +import java.util.Arrays; +import org.fudaa.dodico.crue.config.ccm.Crue9DecimalFormat; +import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier; +import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierLoaderDefaultTest; +import org.junit.Test; +import static org.junit.Assert.*; + +/** + * + * @author Frederic Deniger + */ +public class Crue9DecimalFormatBuilderTest { + + public Crue9DecimalFormatBuilderTest() { + } + + @Test + public void testIntialize() { + Configuration configuration = new Configuration(); + SiteConfiguration siteConfiguration = new SiteConfiguration(); + configuration.setSite(siteConfiguration); + Crue9DecimalFormatBuilder builder = new Crue9DecimalFormatBuilder(); + CrueConfigMetier ccm = CrueConfigMetierLoaderDefaultTest.DEFAULT; + builder.intialize(configuration, ccm); + assertEquals(Crue9DecimalFormat.STATE.NON_ACTIVE, ccm.getCrue9DecimalFormat().getState()); + assertEquals(0, ccm.getCrue9DecimalFormat().getNumberOfDigits()); + + SiteOption option = new SiteOption(OptionsEnum.NB_EXPORT_CRUE9_SIGNIFICANT_FIGURES.getId(), "8", "", true); + siteConfiguration.setOptions(Arrays.asList(option)); + builder.intialize(configuration, ccm); + assertEquals(Crue9DecimalFormat.STATE.ACTIVE, ccm.getCrue9DecimalFormat().getState()); + assertEquals(8, ccm.getCrue9DecimalFormat().getNumberOfDigits()); + + } + +} 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 2016-03-20 22:10:48 UTC (rev 9315) +++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2016-03-21 22:24:59 UTC (rev 9316) @@ -632,6 +632,9 @@ option.maxLogLinesRead.name=Nombre maximal de lignes lues dans un CR option.maxLogLinesRead.comment=La lecture d'un CR est limit\u00e9 aux n premi\u00e8res lignes +option.nbExportCrue9SignificantFigures.name=Nombre de chiffres significatifs export Crue 9 +option.nbExportCrue9SignificantFigures.comment=D\u00e9finit le nombre de chiffres significatifs pour les export Crue9 + maxReadLineReached=... (la lecture du CR a \u00e9t\u00e9 stopp\u00e9e apr\u00e8s {0} lignes) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bma...@us...> - 2016-03-20 22:10:50
|
Revision: 9315 http://sourceforge.net/p/fudaa/svn/9315 Author: bmarchan Date: 2016-03-20 22:10:48 +0000 (Sun, 20 Mar 2016) Log Message: ----------- Fix : Plus de suppression des d?\195?\169bits en cas de modification des parametres des transects Modified Paths: -------------- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java 2016-03-15 22:22:06 UTC (rev 9314) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java 2016-03-20 22:10:48 UTC (rev 9315) @@ -897,9 +897,9 @@ * @param _trans Les transects. <tt>null</tt> est autoris\xE9. */ public void setTransects(PivTransect[] _trans) { - // On met a null les r\xE9sultats de d\xE9bit en cas de tableau diff\xE9rents, + // On met a null les r\xE9sultats de d\xE9bit en cas de tableaux diff\xE9rents, // car le nombre de r\xE9sultats doit \xEAtre identique. - if (!Arrays.equals(transects, _trans)) { + if ((transects==null ^ _trans==null) || transects!=null && transects.length!=_trans.length) { setFlowResults(null); } transects=_trans; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-03-15 22:22:09
|
Revision: 9314 http://sourceforge.net/p/fudaa/svn/9314 Author: deniger Date: 2016-03-15 22:22:06 +0000 (Tue, 15 Mar 2016) Log Message: ----------- CRUE-634 CRUE-692 Modified Paths: -------------- 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/PropertyNature.java trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsEnum.java trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.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/loiff/LoiTimeExportDecorator.java Modified: 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 2016-03-14 14:59:20 UTC (rev 9313) +++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/DecimalFormatEpsilonEnum.java 2016-03-15 22:22:06 UTC (rev 9314) @@ -8,7 +8,6 @@ * @author Frederic Deniger */ public enum DecimalFormatEpsilonEnum { - PRESENTATION, COMPARISON; } Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyNature.java =================================================================== --- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyNature.java 2016-03-14 14:59:20 UTC (rev 9313) +++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyNature.java 2016-03-15 22:22:06 UTC (rev 9314) @@ -75,8 +75,14 @@ } public String format(double value, DecimalFormatEpsilonEnum type) { - NumberFormat formatter = getFormatter(type); - return formatter == null ? Double.toString(value) : formatter.format(value); + try { + NumberFormat formatter = getFormatter(type); + return formatter == null ? Double.toString(value) : formatter.format(value); + } catch (Exception e) { + e.printStackTrace(); + System.err.println("yes"); + } + return null; } public String format(Number value, DecimalFormatEpsilonEnum type) { 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 2016-03-14 14:59:20 UTC (rev 9313) +++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/projet/conf/OptionsEnum.java 2016-03-15 22:22:06 UTC (rev 9314) @@ -4,7 +4,7 @@ /** * - * @author deniger ( genesis) + * @author deniger */ public enum OptionsEnum { 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 2016-03-14 14:59:20 UTC (rev 9313) +++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2016-03-15 22:22:06 UTC (rev 9314) @@ -153,7 +153,8 @@ NotifyDescriptor nd = new NotifyDescriptor.Message(msg, NotifyDescriptor.ERROR_MESSAGE); nd.setTitle(title); DialogDisplayer.getDefault().notify(nd); - NotificationDisplayer.getDefault().notify(title, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-bloquante.png"), panelInfo, + NotificationDisplayer.getDefault().notify(title, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-bloquante.png"), + panelInfo == null ? title : panelInfo, null, NotificationDisplayer.Priority.SILENT); } 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 2016-03-14 14:59:20 UTC (rev 9313) +++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/AbstractLoiCourbeModel.java 2016-03-15 22:22:06 UTC (rev 9314) @@ -452,6 +452,10 @@ return lines.get(idx).ptEvolutionFF; } + public boolean isDefined(int idx) { + return idx >= 0 && idx < lines.size(); + } + protected LoiLine getLoiLine(int idx) { return lines.get(idx); } Modified: trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiTimeExportDecorator.java =================================================================== --- trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiTimeExportDecorator.java 2016-03-14 14:59:20 UTC (rev 9313) +++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/loiff/LoiTimeExportDecorator.java 2016-03-15 22:22:06 UTC (rev 9314) @@ -42,6 +42,9 @@ if (col == 1 && table.getModel() instanceof DefaultLoiTableModel) { DefaultLoiTableModel model = (DefaultLoiTableModel) table.getModel(); AbstractLoiCourbeModel loiCourbeModel = (AbstractLoiCourbeModel) model.getCourbe().getModel(); + if (!loiCourbeModel.isDefined(row)) { + return null; + } ItemVariable varAbscisse = loiCourbeModel.getConfigLoi().getVarAbscisse(); if (varAbscisse.getNature().isDate() || varAbscisse.getNature().isDuration()) { return varAbscisse.format(loiCourbeModel.getX(row), DecimalFormatEpsilonEnum.COMPARISON); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-03-09 15:22:13
|
Revision: 9312 http://sourceforge.net/p/fudaa/svn/9312 Author: deniger Date: 2016-03-09 15:22:09 +0000 (Wed, 09 Mar 2016) Log Message: ----------- CRUE-634 CRUE-692 Modified Paths: -------------- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/actions/Bundle_fr.properties trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CrueSwingWorker.java 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/UiContext.java trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.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/export/ReportExportHelper.java trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportExportWriter.java trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalCourbesUiResController.java trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/export/Bundle.properties Modified: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/actions/Bundle_fr.properties =================================================================== --- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/actions/Bundle_fr.properties 2016-03-09 15:19:34 UTC (rev 9311) +++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/actions/Bundle_fr.properties 2016-03-09 15:22:09 UTC (rev 9312) @@ -22,9 +22,9 @@ LBL_WindowTransparencyHint=Maintenir la touche [Ctrl+clavier num\u00e9rique 0] pour rendre transparente une fen\u00eatre minimis\u00e9e CTL_CloseModeAction=Fermer le groupe CTL_MinimizeModeAction=Minimiser le groupe -CTL_MinimizeWindowAction=Minimiser LBL_CloseAllDocumentsAction=Tout Fermer CTL_CloseAllButThisAction=Fermer les autres vues CTL_MoveWindowLeftContextAction=D\u00e9placer \u00e0 gauche CTL_MoveWindowRightContextAction=D\u00e9placer \u00e0 droite + Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CrueSwingWorker.java =================================================================== --- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CrueSwingWorker.java 2016-03-09 15:19:34 UTC (rev 9311) +++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/CrueSwingWorker.java 2016-03-09 15:22:09 UTC (rev 9312) @@ -15,11 +15,17 @@ public abstract class CrueSwingWorker<R> extends SwingWorker<R, Object> { private final ProgressHandle ph; + private final String progressName; public CrueSwingWorker(String progessName) { + this.progressName = progessName; this.ph = ProgressHandleFactory.createHandle(progessName); } + public String getProgressName() { + return progressName; + } + @Override protected R doInBackground() throws Exception { ph.start(); 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 2016-03-09 15:19:34 UTC (rev 9311) +++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/DialogHelper.java 2016-03-09 15:22:09 UTC (rev 9312) @@ -153,25 +153,34 @@ NotifyDescriptor nd = new NotifyDescriptor.Message(msg, NotifyDescriptor.ERROR_MESSAGE); nd.setTitle(title); DialogDisplayer.getDefault().notify(nd); - NotificationDisplayer.getDefault().notify(title, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-bloquante.png"), panelInfo, null, NotificationDisplayer.Priority.SILENT); + NotificationDisplayer.getDefault().notify(title, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-bloquante.png"), panelInfo, + null, NotificationDisplayer.Priority.SILENT); } public static void showWarn(String title, String msg) { NotifyDescriptor nd = new NotifyDescriptor.Message(msg, NotifyDescriptor.WARNING_MESSAGE); nd.setTitle(title); DialogDisplayer.getDefault().notify(nd); + NotificationDisplayer.getDefault().notify(title, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/avertissement.png"), msg, + null, NotificationDisplayer.Priority.SILENT); } 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); + NotificationDisplayer.getDefault().notify(msg, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/avertissement.png"), msg, + null, NotificationDisplayer.Priority.SILENT); } public static void showInfo(String title, Object msg) { NotifyDescriptor nd = new NotifyDescriptor.Message(msg, NotifyDescriptor.INFORMATION_MESSAGE); nd.setTitle(title); DialogDisplayer.getDefault().notify(nd); + if (msg instanceof String) { + NotificationDisplayer.getDefault().notify(title, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/information.png"), + (String) msg, null, NotificationDisplayer.Priority.SILENT); + } } public static void showInfo(final String title, final Object msg, boolean later) { @@ -221,7 +230,8 @@ return showQuestion(dialogDescriptor, classToSave); } - public static boolean showQuestionAndSaveDialogConf(String title, Object message, Class classToSave, String helpId, PerspectiveEnum perspective, boolean bDisplayHelpButton) { + public static boolean showQuestionAndSaveDialogConf(String title, Object message, Class classToSave, String helpId, PerspectiveEnum perspective, + boolean bDisplayHelpButton) { DialogDescriptor descriptor = new DialogDescriptor(message, title); if (helpId != null) { SysdocUrlBuilder.installDialogHelpCtx(descriptor, helpId, perspective, bDisplayHelpButton); @@ -246,7 +256,7 @@ public static UserSaveAnswer confirmSaveOrNot() { return confirmSaveOrNot( NbBundle.getMessage(DialogHelper.class, "SaveDialog.Title"), NbBundle.getMessage(DialogHelper.class, - "SaveDialog.Content"), + "SaveDialog.Content"), NbBundle.getMessage(DialogHelper.class, "SaveDialog.SaveAction"), NbBundle.getMessage(DialogHelper.class, "SaveDialog.DontSaveAction")); } Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/UiContext.java =================================================================== --- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/UiContext.java 2016-03-09 15:19:34 UTC (rev 9311) +++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/helper/UiContext.java 2016-03-09 15:22:09 UTC (rev 9312) @@ -16,10 +16,12 @@ import org.fudaa.ctulu.ProgressionFuAdapter; import org.fudaa.ctulu.ProgressionInterface; import org.fudaa.ctulu.gui.PopupMenuReceiver; +import org.fudaa.fudaa.crue.common.CrueIconsProvider; import org.jdesktop.swingx.JXTree; import org.jdesktop.swingx.treetable.DefaultTreeTableModel; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; +import org.openide.awt.NotificationDisplayer; import org.openide.windows.WindowManager; /** @@ -46,6 +48,8 @@ NotifyDescriptor nd = new NotifyDescriptor(_msg, _titre, NotifyDescriptor.DEFAULT_OPTION, NotifyDescriptor.ERROR_MESSAGE, new Object[]{NotifyDescriptor.OK_OPTION}, NotifyDescriptor.OK_OPTION); DialogDisplayer.getDefault().notify(nd); + NotificationDisplayer.getDefault().notify(_titre, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/erreur-bloquante.png"), _msg, + null, NotificationDisplayer.Priority.SILENT); } @@ -88,11 +92,14 @@ public void message(String _titre, String _msg, boolean _tempo) { NotifyDescriptor nd = new NotifyDescriptor.Message(_msg, NotifyDescriptor.INFORMATION_MESSAGE); DialogDisplayer.getDefault().notify(nd); + NotificationDisplayer.getDefault().notify(_titre, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/information.png"), + _msg, null, NotificationDisplayer.Priority.SILENT); } @Override public boolean question(String _titre, String _text) { - NotifyDescriptor nd = new NotifyDescriptor(_text, _titre, NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.QUESTION_MESSAGE, null, NotifyDescriptor.OK_OPTION); + NotifyDescriptor nd = new NotifyDescriptor(_text, _titre, NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.QUESTION_MESSAGE, null, + NotifyDescriptor.OK_OPTION); Object notify = DialogDisplayer.getDefault().notify(nd); return NotifyDescriptor.YES_OPTION.equals(notify); } @@ -102,6 +109,8 @@ NotifyDescriptor nd = new NotifyDescriptor(_msg, _titre, NotifyDescriptor.DEFAULT_OPTION, NotifyDescriptor.WARNING_MESSAGE, new Object[]{NotifyDescriptor.OK_OPTION}, NotifyDescriptor.OK_OPTION); DialogDisplayer.getDefault().notify(nd); + NotificationDisplayer.getDefault().notify(_titre, CrueIconsProvider.getIcon("org/fudaa/fudaa/crue/common/icons/avertissement.png"), _msg, + null, NotificationDisplayer.Priority.SILENT); } public static JXTreeTableExtended createTreeTable(final DefaultTreeTableModel model, PopupMenuReceiver receiver) { 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 2016-03-09 15:19:34 UTC (rev 9311) +++ trunk/soft/fudaa-crue/ui-loi/src/main/java/org/fudaa/fudaa/crue/loi/common/CourbesUiController.java 2016-03-09 15:22:09 UTC (rev 9312) @@ -202,6 +202,7 @@ toolbar.add(new JSeparator()); toolbar.add(new CourbeVisibiltyUIAction(graphe).buildToolButton(EbliComponentFactory.INSTANCE)); EGTableAction tableAction = (EGTableAction) getActions("TABLE").get(0); + tableAction.setUi(CtuluUIForNetbeans.DEFAULT); tableAction.setAddOptions(false); tableAction.setAddCheckbox(true); tableAction.setShowColumnToExport(false); 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 2016-03-09 15:19:34 UTC (rev 9311) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java 2016-03-09 15:22:09 UTC (rev 9312) @@ -82,7 +82,7 @@ preferredID = ReportVisualTopComponent.TOPCOMPONENT_ID) public final class ReportVisualTopComponent extends AbstractReportTimeTopComponent implements LookupListener, ExplorerManager.Provider, CtuluImageProducer, ReportTopComponentConfigurable<ReportPlanimetryConfig>, PropertyChangeListener { - + public static final String TOPCOMPONENT_ID = "ReportVisualTopComponent"; public static final String TOPCOMPONENT_ACTION = "CTL_" + TOPCOMPONENT_ID; public static final String TOPCOMPONENT_ACTION_DISPLAYNAME = "#" + TOPCOMPONENT_ACTION; @@ -94,8 +94,9 @@ private Lookup.Result<Long> resultatEMHsSelected; private final ExplorerManager em = new ExplorerManager(); ReportPlanimetryConfig reportPlanimetryConfig = new ReportPlanimetryConfig(); + private boolean runOpenedAndZoomSet = false; private final ReportPlanimetryConfigurer reportPlanimetryConfigurer = new ReportPlanimetryConfigurer(); - + public ReportVisualTopComponent() { initComponents(); setDefaultName(); @@ -107,27 +108,27 @@ ActionMap map = this.getActionMap(); associateLookup(ExplorerUtils.createLookup(em, map)); } - + @Override protected String getHelpCtxId() { return SysdocUrlBuilder.getTopComponentHelpCtxId("vuePlanimetrie", PerspectiveEnum.REPORT); } - + @Override public ReportPlanimetryConfig getReportConfig() { return reportPlanimetryConfig; } - + @Override public boolean isClosable() { return false; } - + @Override public void rangeChanged() { setReportConfig(getReportConfig(), false); } - + @Override public void setReportConfig(ReportPlanimetryConfig newConfig, boolean fromTemplate) { super.updating = true; @@ -154,27 +155,27 @@ } } private ReportViewLineInfo info; - + @Override public void setReportInfo(ReportViewLineInfo info) { this.info = info; } - + @Override public AbstractReportTopComponent getTopComponent() { return this; } - + @Override public void updateFrameName() { setName(info == null ? "" : info.getNom()); updateTopComponentName(); } - + public ReportPlanimetryConfigurer getReportPlanimetryConfigurer() { return reportPlanimetryConfigurer; } - + private void updateConfigurer() { if (panel != null) { final PlanimetryController planimetryController = panel.getPlanimetryController(); @@ -199,22 +200,22 @@ panel.getVueCalque().repaint(0); } } - + @Override public BufferedImage produceImage(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(); } - + @Override protected void componentActivated() { super.componentActivated(); @@ -223,19 +224,19 @@ panel.requestFocusInWindow(); } } - + @Override protected void componentDeactivated() { super.componentDeactivated(); ExplorerUtils.activateActions(em, false); } - + @Override public ExplorerManager getExplorerManager() { return em; } Map<String, Long> calcByName; - + @Override public void selectedTimeChanged() { if (reportService.getRunCourant() != null & panel != null) { @@ -248,11 +249,11 @@ panel.getPlanimetryController().setEditedCalcul(calcSelected); } } - + @Override public void timeFormatChanged() { } - + @Override public void setEditable(boolean b) { this.editable = b; @@ -261,7 +262,7 @@ planimetryVisuPanel.getPlanimetryController().setEditable(b, false); } } - + @Override public void setModified(boolean modified) { super.setModified(modified); @@ -271,7 +272,7 @@ } } } - + @Override protected void runLoadedHandler() { if (reportVisuService.getPlanimetryVisuPanel() != null) { @@ -279,11 +280,11 @@ } } VisuConfiguration initConfiguration; - + protected void scenarioVisuLoaded() { - final double[][] repere = panel == null ? null : panel.getVueCalque().getRepere(); + final double[][] repere = (panel == null) ? null : panel.getVueCalque().getRepere(); this.removeAll(); - + panel = reportVisuService.getPlanimetryVisuPanel(); List<BCalque> mainLayers = panel.getPlanimetryController().getMainLayers(); for (BCalque bCalque : mainLayers) { @@ -308,18 +309,21 @@ main.add(bottom, BorderLayout.SOUTH); this.repaint(); super.revalidate(); + EventQueue.invokeLater(new Runnable() { @Override public void run() { - if (repere != null) { + if (repere != null && isOpened() && runOpenedAndZoomSet) { panel.getVueCalque().setRepere(repere); - + } else { panel.restaurer(); } - + if (isOpened()) { + runOpenedAndZoomSet = true; + } selectedTimeChanged(); - + panel.getPlanimetryController() .setEditable(editable); } @@ -328,20 +332,20 @@ } private final Set<String> ignoreProperties = new TreeSet<String>(Arrays.asList("versEcran", "versReel")); VisuChangerListener modificationChangeListener = new VisuChangerListener(); - + @Override public void propertyChange(PropertyChangeEvent evt) { if (panel != null && !updating) { reportPlanimetryConfig.setVisibility(panel.getPlanimetryController().getLayerVisibility()); reportViewServiceContrat.changesDoneIn(ReportVisualTopComponent.this); - + } - + } private PlanimetryVisuPanel panel; private LayerSelectionListener selectionListener = null; SelectedEMHsLookupListener selectedEMHsLookupListener; - + public void buildCalcMapIfNeeded() { if (calcByName == null) { calcByName = new HashMap<String, Long>(); @@ -352,7 +356,7 @@ } } } - + @Override public void clearReportModifications() { updating = true; @@ -364,13 +368,13 @@ } clearModificationState(); updating = false; - + } - + private void setDefaultName() throws MissingResourceException { setName(NbBundle.getMessage(ReportVisualTopComponent.class, TOPCOMPONENT_ACTION)); } - + private void restoreDefaultConfigurationData() { ReportTemplateFileProvider template = new ReportTemplateFileProvider(); reportPlanimetryConfig = (ReportPlanimetryConfig) template.loadTemplate(ReportContentType.PLANIMETRY); @@ -384,20 +388,20 @@ setDefaultName(); setModified(false); } - + private void clearModificationState() { setModified(false); - + } - + private class LayerSelectionListener implements ZSelectionListener { - + @Override public void selectionChanged(ZSelectionEvent _evt) { selectionChangedInPanel(); } } - + protected void selectionChangedInPanel() { if (updating) { return; @@ -424,12 +428,12 @@ //met à jour la sélection des EMHs. reportSelectedEMHService.setSelectedEMHs(selected); } - + protected JComponent createToolbar(PlanimetryVisuPanel panel) { SaveTemplateAction action = new SaveTemplateAction(this); return PlanimetryVisuPanelBuilder.buildTopComponent(panel, action.buildButton(EbliComponentFactory.INSTANCE)); } - + @Override protected void runUnloadedHandler() { updating = true; @@ -442,14 +446,15 @@ bCalque.removePropertyChangeListener(BSelecteurCheckBox.PROP_USER_VISIBLE, this); } } - + panel = null; calcByName = null; + runOpenedAndZoomSet = false; this.removeAll(); - + this.add(new JLabel(NbBundle.getMessage(ReportVisualTopComponent.class, "TopComponent.NoScenarioLoadedInformations"))); super.revalidate(); - + this.repaint(); updating = false; } @@ -476,7 +481,7 @@ } } VisuPanelLookupListener visuLookupListener; - + @Override protected void componentOpenedHandler() { if (resultatVisuPanel == null) { @@ -495,16 +500,16 @@ } if (info != null) { updateFrameName(); - + } - + } - + private class SelectedEMHsLookupListener implements LookupListener { - + @Override public void resultChanged(LookupEvent ev) { - + if (panel == null || WindowManager.getDefault().getRegistry().getActivated() == ReportVisualTopComponent.this) { return; } @@ -515,14 +520,14 @@ Collection<Long> uids = new ArrayList<Long>(allItems.size()); for (Long uid : allItems) { uids.add(uid); - + } updating = true; panel.setSelectedEMHFromUids(uids); updating = false; } } - + @Override protected void componentClosedDefinitlyHandler() { if (resultatVisuPanel != null) { @@ -534,12 +539,12 @@ resultatEMHsSelected = null; } } - + @Override public void componentClosedTemporarily() { super.componentClosedTemporarily(); } - + void writeProperties(java.util.Properties p) { // better to version settings since initial version as advocated at // http://wiki.apidesign.org/wiki/PropertyFiles @@ -547,16 +552,16 @@ // TODO store your settings } - + void readProperties(java.util.Properties p) { // TODO read your settings according to their version } - + private class VisuChangerListener implements PropertyChangeListener, Observer { - + public VisuChangerListener() { } - + @Override public void update(Observable o, Object arg) { if (!updating && "visible".equals(arg)) { @@ -564,16 +569,16 @@ reportViewServiceContrat.changesDoneIn(ReportVisualTopComponent.this); } } - + @Override public void propertyChange(PropertyChangeEvent evt) { - + if (panel == null) { return; } if (evt.getSource() == panel.getCqLegend() && (!editable || ignoreProperties.contains(evt.getPropertyName()))) { return; - + } if (updating) { return; Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportExportHelper.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportExportHelper.java 2016-03-09 15:19:34 UTC (rev 9311) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportExportHelper.java 2016-03-09 15:22:09 UTC (rev 9312) @@ -81,7 +81,8 @@ List<ResultatTimeKey> times = reportService.getTimeContent().getTimes(); ReportTimeChooser timeChooser = new ReportTimeChooser(times, reportService.getReportTimeFormatter().getResulatKeyTempsSimuToStringTransformer()); pn.add(timeChooser.getPanel()); - final CtuluFileChooser fileChooser = new CtuluFileChooserWriter(CtuluUIForNetbeans.DEFAULT, Arrays.<CtuluWriter>asList(new CtuluTableCsvWriter())); + final CtuluFileChooser fileChooser = new CtuluFileChooserWriter(CtuluUIForNetbeans.DEFAULT, Arrays. + <CtuluWriter>asList(new CtuluTableCsvWriter())); final CtuluFileChooserPanel fileChooserPanel = new CtuluFileChooserPanel() { @Override protected CtuluFileChooser createFileChooser() { @@ -93,7 +94,8 @@ pnSouth.add(fileChooserPanel); pn.add(pnSouth, BorderLayout.SOUTH); pn.setBorder(BuBorders.EMPTY3333); - final DialogDescriptor dialogDescriptor = new DialogDescriptor(pn, NbBundle.getMessage(ReportExportHelper.class, "Export.DialogTitle"), true, new Object[]{NotifyDescriptor.OK_OPTION, NotifyDescriptor.CANCEL_OPTION}, + final DialogDescriptor dialogDescriptor = new DialogDescriptor(pn, NbBundle.getMessage(ReportExportHelper.class, "Export.DialogTitle"), true, + new Object[]{NotifyDescriptor.OK_OPTION, NotifyDescriptor.CANCEL_OPTION}, NotifyDescriptor.OK_OPTION, DialogDescriptor.DEFAULT_ALIGN, HelpCtx.DEFAULT_HELP, @@ -106,7 +108,7 @@ listener.setNode(node); listener.setTimeChooser(timeChooser); dialogDescriptor.setButtonListener(listener); - SysdocUrlBuilder.installDialogHelpCtx(dialogDescriptor, "exporterResultats", PerspectiveEnum.REPORT,false); + SysdocUrlBuilder.installDialogHelpCtx(dialogDescriptor, "exporterResultats", PerspectiveEnum.REPORT, false); final Dialog dialog = DialogDisplayer.getDefault().createDialog(dialogDescriptor); listener.setDialog((JDialog) dialog); dialog.pack(); @@ -199,18 +201,24 @@ } dialog.dispose(); - SwingWorker<Boolean, Object> worker = new CrueSwingWorker<Boolean>(NbBundle.getMessage(ReportExportHelper.class, + final CrueSwingWorker<Boolean> worker = new CrueSwingWorker<Boolean>(NbBundle.getMessage(ReportExportHelper.class, "Export.Task.Name")) { @Override protected Boolean doProcess() throws Exception { ReportExportWriter writer = new ReportExportWriter(); - writer.write(fileWithExt, selected, contentByEMH, reportService.getReportTimeFormatter()); - return Boolean.TRUE; + return writer.write(fileWithExt, selected, contentByEMH, reportService.getReportTimeFormatter()); } @Override protected void done(Boolean res) { - DialogHelper.showNotifyOperationTermine(NbBundle.getMessage(ReportExportHelper.class, "Export.OperationFinish", fileChooserPanel.getFileWithExt().getAbsolutePath())); + if (Boolean.TRUE.equals(res)) { + DialogHelper.showNotifyOperationTermine(NbBundle.getMessage(ReportExportHelper.class, "Export.OperationFinish", fileChooserPanel. + getFileWithExt().getAbsolutePath())); + } else { + DialogHelper.showError(NbBundle.getMessage(ReportExportHelper.class, "Export.DialogTitle"), org.openide.util.NbBundle.getMessage( + ReportExportHelper.class, "Exportg.OperationFailed", + fileChooserPanel.getFileWithExt().getAbsolutePath())); + } } }; worker.execute(); Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportExportWriter.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportExportWriter.java 2016-03-09 15:19:34 UTC (rev 9311) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportExportWriter.java 2016-03-09 15:22:09 UTC (rev 9312) @@ -5,6 +5,7 @@ import com.Ostermiller.util.CSVPrinter; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.util.List; @@ -35,9 +36,10 @@ public ReportExportWriter() { } - public void write(File f, List<ResultatTimeKey> times, List<ReportExportContentByEMH> content, ReportTimeFormatter timeFormatter) { + public boolean write(File f, List<ResultatTimeKey> times, List<ReportExportContentByEMH> content, ReportTimeFormatter timeFormatter) { CSVPrinter writer = null; ReportRunKey runKey = reportResultProviderService.getReportService().getRunCourant().getRunKey(); + boolean ok = false; try { writer = new CSVPrinter(new FileOutputStream(f)); writer.changeQuote('"'); @@ -68,12 +70,17 @@ for (String string : variables) { PropertyNature variable = reportResultProviderService.getPropertyNature(string); ReportVariableKey createVariableKey = reportResultProviderService.createVariableKey(string); - Double value = reportResultProviderService.getValue(resultatKey, new ReportRunVariableKey(runKey, createVariableKey), reportExportContentByEMH.emh.getNom()); - writer.write(TransformerEMHHelper.formatFromNature(variable, value, reportResultProviderService.getReportService().getCcm(), DecimalFormatEpsilonEnum.COMPARISON)); + Double value = reportResultProviderService.getValue(resultatKey, new ReportRunVariableKey(runKey, createVariableKey), + reportExportContentByEMH.emh.getNom()); + writer.write(TransformerEMHHelper.formatFromNature(variable, value, reportResultProviderService.getReportService().getCcm(), + DecimalFormatEpsilonEnum.COMPARISON)); } } writer.writeln(); + ok = true; } + } catch (FileNotFoundException ex) { + } catch (IOException ex) { Exceptions.printStackTrace(ex); } finally { @@ -85,6 +92,7 @@ } } } + return ok; } } Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java 2016-03-09 15:19:34 UTC (rev 9311) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalCourbesUiResController.java 2016-03-09 15:22:09 UTC (rev 9312) @@ -10,6 +10,7 @@ import org.fudaa.ebli.courbe.EGCourbe; import org.fudaa.ebli.courbe.EGTableAction; import org.fudaa.ebli.courbe.EGTableGraphePanel; +import org.fudaa.fudaa.crue.common.helper.CtuluUIForNetbeans; import org.fudaa.fudaa.crue.loi.common.LoiConstanteCourbeModel; import org.fudaa.fudaa.crue.loi.res.CourbesUiResController; import org.openide.util.NbBundle; @@ -19,9 +20,10 @@ * @author Frederic Deniger */ public final class ReportLongitudinalCourbesUiResController extends CourbesUiResController { - + public ReportLongitudinalCourbesUiResController() { EGTableAction tableAction = (EGTableAction) getActions("TABLE").get(0); + tableAction.setUi(CtuluUIForNetbeans.DEFAULT); tableAction.setAddOptions(false); tableAction.setAddCheckbox(false); tableAction.setShowColumnToExport(false); @@ -30,34 +32,34 @@ setUseVariableForAxeH(true); getGraphe().setExportDataBuilder(new ReportLongitudinalExportDataBuilder()); } - + @Override protected AbstractTableModel createTableModel() { return new ReportLongitudinalTableModel(getTableGraphePanel()); } - + @Override protected void configureTablePanel() { super.configureTablePanel(); tableGraphePanel.getTable().getColumnModel().getColumn(0).setCellRenderer(new CtuluCellTextRenderer()); } - + protected static class ReportLongitudinalTableModel extends EGTableGraphePanel.SpecTableModel { - + public static final int COLUMN_BRANCHE = 0; public static final int COLUMN_SECTION = 1; - + public ReportLongitudinalTableModel(EGTableGraphePanel graphePanel) { super(graphePanel); xColIndex = 2; yColIndex = 3; } - + @Override public int getColumnCount() { return 4; } - + @Override public Object getValueAt(int _rowIndex, int _columnIndex) { if (_columnIndex == COLUMN_SECTION || _columnIndex == COLUMN_BRANCHE) { @@ -75,7 +77,7 @@ } return super.getValueAt(_rowIndex, _columnIndex); } - + @Override public String getColumnName(int _column) { if (_column == COLUMN_SECTION) { @@ -86,7 +88,7 @@ } return super.getColumnName(_column); } - + @Override public Class getColumnClass(int _columnIndex) { if (_columnIndex <= COLUMN_SECTION) { @@ -94,7 +96,7 @@ } return Double.class; } - + @Override public void setValueAt(Object _value, int _rowIndex, int _columnIndex) { } Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalCourbesUiResController.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalCourbesUiResController.java 2016-03-09 15:19:34 UTC (rev 9311) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/temporal/ReportTemporalCourbesUiResController.java 2016-03-09 15:22:09 UTC (rev 9312) @@ -9,6 +9,7 @@ import org.fudaa.ebli.courbe.EGCourbe; import org.fudaa.ebli.courbe.EGTableAction; import org.fudaa.ebli.courbe.EGTableGraphePanel; +import org.fudaa.fudaa.crue.common.helper.CtuluUIForNetbeans; import org.fudaa.fudaa.crue.loi.res.CourbesUiResController; import org.openide.util.NbBundle; @@ -21,6 +22,7 @@ public ReportTemporalCourbesUiResController() { EGTableAction tableAction = (EGTableAction) getActions("TABLE").get(0); tableAction.setAddOptions(false); + tableAction.setUi(CtuluUIForNetbeans.DEFAULT); tableAction.setAddCheckbox(true); tableAction.setShowColumnToExport(false); tableAction.setDisplayAll(true); Modified: trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/export/Bundle.properties =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/export/Bundle.properties 2016-03-09 15:19:34 UTC (rev 9311) +++ trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/export/Bundle.properties 2016-03-09 15:22:09 UTC (rev 9312) @@ -8,8 +8,8 @@ Export.NoVariable.Error=Aucune variable s\u00e9lection\u00e9e Export.NoTime.Error=Aucun pas de temps s\u00e9lection\u00e9 Export.FileNotWritable.Error=Le fichier n'est pas disponible en \u00e9criture -Export.Task.Name=Exportation en cours -Export.OperationFinish=Exportation termin\u00e9e: {0} +Export.Task.Name=Export en cours +Export.OperationFinish=Export termin\u00e9: {0} ReportExportNodeAction.DisplayName=Exporter Export.ChooseFile.LabelName=Fichier CSV: DefaultExportType=type export: action exporter perspective Rapports @@ -18,3 +18,4 @@ ExportEnded=Export termin\u00e9 vers le fichier {0} cantWriteToFile.error=Il est impossible d''\u00e9crire dans le fichier {0}.\nRaison: {1} cantWriteToFileUsedByAnotherProcess.error=il est probablement ouvert par une autre application (Excel) +Exportg.OperationFailed=L''export vers le fichier {0} a \u00e9chou\u00e9.\n Il est probablement en cours d''utilisation par un autre process (Excel). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-03-09 15:19:37
|
Revision: 9311 http://sourceforge.net/p/fudaa/svn/9311 Author: deniger Date: 2016-03-09 15:19:34 +0000 (Wed, 09 Mar 2016) Log Message: ----------- organisation des imports Modified Paths: -------------- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java =================================================================== --- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java 2016-03-03 09:20:09 UTC (rev 9310) +++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGTableAction.java 2016-03-09 15:19:34 UTC (rev 9311) @@ -30,6 +30,7 @@ import javax.swing.SwingUtilities; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumnModel; +import org.fudaa.ctulu.CtuluUI; import org.fudaa.ctulu.gui.CtuluCellTextDecimalRenderer; import org.fudaa.ctulu.gui.CtuluPopupMenu; import org.fudaa.ctulu.gui.CtuluTableExportPanel; @@ -53,18 +54,24 @@ final EGGraphe graphe_; EbliTableInfoPanel infoPanel = null; + private CtuluUI ui; + public EGTableAction(final EGGraphe _graphe) { super(EbliLib.getS("Tableau des valeurs"), BuResource.BU.getToolIcon("tableau"), "TABLE"); graphe_ = _graphe; } + public void setUi(CtuluUI ui) { + this.ui = ui; + } + @Override public void actionPerformed(final ActionEvent _e) { - infoPanel = new EbliTableInfoPanel(new CtuluUIDialog(graphe_), this, null); - infoPanel.setExportTableCommentSupplier(graphe_.getExportTableCommentSupplier()); - infoPanel.showInDialog(); - + infoPanel = new EbliTableInfoPanel(ui == null ? new CtuluUIDialog(graphe_) : ui, this, null); + infoPanel.setExportTableCommentSupplier(graphe_.getExportTableCommentSupplier()); + infoPanel.showInDialog(); + } boolean displayAll; boolean addOptions = true; @@ -85,7 +92,6 @@ this.showColumnToExport = showColumnToExport; } - public boolean isAddCheckbox() { return addCheckbox; } @@ -198,21 +204,18 @@ } }); - - if(table.getModel() instanceof EGMultiCourbeTableModel ) { - EGMultiCourbeTableModel modelInit = ((EGMultiCourbeTableModel)table.getModel()); - int[] vals = modelInit.getSelectedRows(); - if(vals != null && vals.length>0 ) { - //TODO... ajout de la checkbox pour filtrer - ActionListener actionL = new OptionActionListener(modelInit, table); - menu.addCheckBox(EbliLib.getS("Afficher les points initiaux"), "SHOW_INITIAL_POINT", true,false) - .addActionListener(actionL); - } + if (table.getModel() instanceof EGMultiCourbeTableModel) { + EGMultiCourbeTableModel modelInit = ((EGMultiCourbeTableModel) table.getModel()); + int[] vals = modelInit.getSelectedRows(); + if (vals != null && vals.length > 0) { + //TODO... ajout de la checkbox pour filtrer + ActionListener actionL = new OptionActionListener(modelInit, table); + menu.addCheckBox(EbliLib.getS("Afficher les points initiaux"), "SHOW_INITIAL_POINT", true, false) + .addActionListener(actionL); + } } - - + //EbliTableInfoPanel.setJMenuBarComponents(table, new JComponent[]{menu}); - components.add(menu); } @@ -264,13 +267,13 @@ ((CtuluTableColumnHeader) table_.getTableHeader()).adjustWidth(table_.getColumnModel().getColumn(i)); } putCellsRenderer(cellsRenderer); - } else if("SHOW_INITIAL_POINT".equals(com)) { - //-- AHX - TODO filter table model --// - boolean activateFilter = ((AbstractButton) _e.getSource()).isSelected(); - target_.setSelectRows(activateFilter); - //-- refresh table --// - target_.fireTableDataChanged(); - + } else if ("SHOW_INITIAL_POINT".equals(com)) { + //-- AHX - TODO filter table model --// + boolean activateFilter = ((AbstractButton) _e.getSource()).isSelected(); + target_.setSelectRows(activateFilter); + //-- refresh table --// + target_.fireTableDataChanged(); + } if (idx > 0 && model != null) { model.removeSortingColumn(idx); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bma...@us...> - 2016-03-03 09:20:11
|
Revision: 9310 http://sourceforge.net/p/fudaa/svn/9310 Author: bmarchan Date: 2016-03-03 09:20:09 +0000 (Thu, 03 Mar 2016) Log Message: ----------- Ajout centre de rotation dans panneau de transformation + sauvegarde/restitution Modified Paths: -------------- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivCoordinatesSystemPanel.java trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlParam.java trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlReader.java trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlWriter.java trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProjectPersistence.java trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransformationParameters.java Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivCoordinatesSystemPanel.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivCoordinatesSystemPanel.java 2016-02-26 10:04:29 UTC (rev 9309) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivCoordinatesSystemPanel.java 2016-03-03 09:20:09 UTC (rev 9310) @@ -23,7 +23,7 @@ import com.memoire.bu.BuGridLayout; import com.memoire.bu.BuLabel; -import com.memoire.bu.BuPanel; +import com.memoire.bu.BuLib; import com.memoire.bu.BuResource; import com.memoire.bu.BuTextField; import com.memoire.bu.BuToolButton; @@ -40,8 +40,9 @@ protected BuTextField tfTx_; protected BuTextField tfTy_; protected BuTextField tfTz_; + protected BuTextField tfXCenter_; + protected BuTextField tfYCenter_; protected BuTextField tfRz_; - protected BuLabel lbRz_; protected PivProject prj_; /** @@ -57,8 +58,10 @@ tfTx_.setPreferredSize(new Dimension(90, tfTx_.getPreferredSize().height)); tfTy_ = BuTextField.createDoubleField(); tfTz_ = BuTextField.createDoubleField(); + tfXCenter_ = BuTextField.createDoubleField(); + tfYCenter_ = BuTextField.createDoubleField(); tfRz_ = BuTextField.createDoubleField(); - lbRz_ = new BuLabel("Rz:"); + tfRz_.setToolTipText(PivResource.getS("Angle en degr\xE9s")); btApply_ = new BuToolButton(BuResource.BU.getToolIcon("appliquer")); btApply_.addActionListener(new ActionListener() { @@ -70,13 +73,17 @@ Double ty = (Double) tfTy_.getValue(); Double tz = (Double) tfTz_.getValue(); Double rz = (Double)tfRz_.getValue(); + Double xc = (Double)tfXCenter_.getValue(); + Double yc = (Double)tfYCenter_.getValue(); - if (tx != null && ty != null && tz != null && rz != null && prj_!=null) { + if (tx != null && ty != null && tz != null && rz != null && xc != null && yc != null && prj_!=null) { PivTransformationParameters params=prj_.getTransformationParameters(); params.setTranslationX(tx); params.setTranslationY(ty); params.setTranslationZ(tz); params.setRotationZ(rz); + params.setXCenter(xc); + params.setYCenter(yc); prj_.setTransformationParameters(params); } } @@ -100,27 +107,47 @@ tfTy_.setValue(formatter_.getXYFormatter().format(prj_.getTransformationParameters().getTranslationY())); tfTz_.setValue(formatter_.getXYFormatter().format(prj_.getTransformationParameters().getTranslationZ())); tfRz_.setValue(formatter_.getXYFormatter().format(prj_.getTransformationParameters().getRotationZ())); + tfXCenter_.setValue(formatter_.getXYFormatter().format(prj_.getTransformationParameters().getXCenter())); + tfYCenter_.setValue(formatter_.getXYFormatter().format(prj_.getTransformationParameters().getYCenter())); } protected void buildComponent() { - BuPanel pnMain = new BuPanel(); - pnMain.setLayout(new BuGridLayout(2, 2, 2)); - pnMain.add(new BuLabel("Tx:")); - pnMain.add(tfTx_); - pnMain.add(new BuLabel("Ty:")); - pnMain.add(tfTy_); - pnMain.add(new BuLabel("Tz:")); - pnMain.add(tfTz_); - pnMain.add(lbRz_); - pnMain.add(tfRz_); + JLabel lbTx = new JLabel("Tx:"); + JLabel lbXCenter = new BuLabel(PivResource.getS("X centre:")); + BuLib.giveSameWidth(lbTx,lbXCenter); + + JPanel pnTrans = new JPanel(); + pnTrans.setLayout(new BuGridLayout(2, 2, 2)); + pnTrans.setBorder(BorderFactory.createTitledBorder(PivResource.getS("Translation"))); + pnTrans.add(lbTx); + pnTrans.add(tfTx_); + pnTrans.add(new BuLabel("Ty:")); + pnTrans.add(tfTy_); + pnTrans.add(new BuLabel("Tz:")); + pnTrans.add(tfTz_); + + JPanel pnRot = new JPanel(); + pnRot.setLayout(new BuGridLayout(2, 2, 2)); + pnRot.setBorder(BorderFactory.createTitledBorder(PivResource.getS("Rotation"))); + pnRot.add(lbXCenter); + pnRot.add(tfXCenter_); + pnRot.add(new BuLabel(PivResource.getS("Y centre:"))); + pnRot.add(tfYCenter_); + pnRot.add(new BuLabel("Rz:")); + pnRot.add(tfRz_); + + JPanel pnMain = new JPanel(); + pnMain.setLayout(new BuGridLayout(1, 2, 2)); + pnMain.add(pnTrans); + pnMain.add(pnRot); - BuPanel pnButtons = new BuPanel(); + JPanel pnButtons = new JPanel(); pnButtons.setLayout(new BorderLayout(5, 5)); pnButtons.add(btApply_, BorderLayout.SOUTH); setLayout(new BorderLayout(5, 5)); setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2)); - add(new JLabel(PivResource.getS("<html><p>Param\xE8tres de transformation<br>du rep\xE8re d'origine<br>vers le rep\xE8re de calcul</html>")), BorderLayout.NORTH); + add(new JLabel(PivResource.getS("<html><p>Param\xE8tres de transformation du rep\xE8re<br>d'origine vers le rep\xE8re de calcul</html>")), BorderLayout.NORTH); add(pnMain, BorderLayout.CENTER); add(pnButtons, BorderLayout.EAST); Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlParam.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlParam.java 2016-02-26 10:04:29 UTC (rev 9309) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlParam.java 2016-03-03 09:20:09 UTC (rev 9310) @@ -17,6 +17,10 @@ public double ty; /** Translation Z */ public double tz; + /** Le coordonn\xE9e X du point centre de la rotation suivant Z */ + public double xcenter; + /** Le coordonn\xE9e Y du point centre de la rotation suivant Z */ + public double ycenter; /** Rotation Z */ public double rz; } \ No newline at end of file Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlReader.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlReader.java 2016-02-26 10:04:29 UTC (rev 9309) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlReader.java 2016-03-03 09:20:09 UTC (rev 9310) @@ -87,6 +87,13 @@ params.ty=Double.parseDouble(elMat.getAttribute("ty")); params.tz=Double.parseDouble(elMat.getAttribute("tz")); params.rz=Double.parseDouble(elMat.getAttribute("rz")); + String xcenter = elMat.getAttribute("xcenter"); + String ycenter = elMat.getAttribute("ycenter"); + // Formats sup\xE9rieurs \xE0 1.4.5 + if (!xcenter.isEmpty() && !ycenter.isEmpty()) { + params.xcenter=Double.parseDouble(xcenter); + params.ycenter=Double.parseDouble(ycenter); + } } Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlWriter.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlWriter.java 2016-02-26 10:04:29 UTC (rev 9309) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivGlobalXmlWriter.java 2016-03-03 09:20:09 UTC (rev 9310) @@ -39,7 +39,8 @@ writer.endTag("srcImages"); // La rotation/translation appliqu\xE9s \xE0 l'espace r\xE9el. - writer.startTagWithAttrs("transfMatrix", new String[]{"tx","ty","tz","rz"}, new String[]{ "" + _param.tx,"" + _param.ty,"" + _param.tz,"" + _param.rz}); + writer.startTagWithAttrs("transfMatrix", new String[]{"tx","ty","tz","rz","xcenter","ycenter"}, + new String[]{ "" + _param.tx,"" + _param.ty,"" + _param.tz,"" + _param.rz,"" + _param.xcenter,"" + _param.ycenter}); writer.endTag("transfMatrix"); // writeTransects(writer, _param.transects); Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProjectPersistence.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProjectPersistence.java 2016-02-26 10:04:29 UTC (rev 9309) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProjectPersistence.java 2016-03-03 09:20:09 UTC (rev 9310) @@ -450,7 +450,7 @@ }); // Affectation des param\xE8tres de transformation. - PivTransformationParameters params=new PivTransformationParameters(paramXml.tx,paramXml.ty,paramXml.tz,paramXml.rz); + PivTransformationParameters params=new PivTransformationParameters(paramXml.tx, paramXml.ty, paramXml.tz, paramXml.rz, paramXml.xcenter, paramXml.ycenter); prj_.setTransformationParameters(params); prj_.srcFiles_.clear(); @@ -477,6 +477,8 @@ params.ty=prj_.getTransformationParameters().getTranslationY(); params.tz=prj_.getTransformationParameters().getTranslationZ(); params.rz=prj_.getTransformationParameters().getRotationZ(); + params.xcenter = prj_.getTransformationParameters().getXCenter(); + params.ycenter = prj_.getTransformationParameters().getYCenter(); File globalFile = new File(prj_.getOutputDir(), "global.xml"); new PivGlobalXmlWriter().write(params, globalFile, _prog); Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransformationParameters.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransformationParameters.java 2016-02-26 10:04:29 UTC (rev 9309) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivTransformationParameters.java 2016-03-03 09:20:09 UTC (rev 9310) @@ -4,7 +4,7 @@ /** * Les param\xE8tres de transformation du rep\xE8re d'origine vers le rep\xE8re de calcul. On stocke ces param\xE8tres, - * car ils sont dfifficiles a retrouver depuis les matrices de transformation. + * car ils sont difficiles a retrouver depuis les matrices de transformation. * @author Bertrand Marchand (mar...@de...) */ public class PivTransformationParameters { @@ -16,6 +16,10 @@ private double translationZ; /** La rotation suivant z, en degr\xE9s */ private double rotationZ; + /** La coordonn\xE9e X du point de rotation Z */ + private double xcenter; + /** La coordonn\xE9e Y du point de rotation Z */ + private double ycenter; /** Morphisme de original -> calcul */ private GrMorphisme toComputing; /** Morphisme de calcul -> original */ @@ -26,14 +30,16 @@ private GrMorphisme identite=GrMorphisme.identite(); public PivTransformationParameters() { - this(0,0,0,0); + this(0, 0, 0, 0, 0, 0); } - public PivTransformationParameters(double _tx, double _ty, double _tz, double _rz) { + public PivTransformationParameters(double _tx, double _ty, double _tz, double _rz, double _xpt, double _ypt) { translationX=_tx; translationY=_ty; translationZ=_tz; rotationZ=_rz; + xcenter = _xpt; + ycenter = _ypt; } /** @@ -108,6 +114,42 @@ } } + /** + * @return the X rotation + */ + public double getXCenter() { + return xcenter; + } + + /** + * @param _xRotation the X rotation to set + */ + public void setXCenter(double _xRotation) { + if (xcenter != _xRotation) { + this.xcenter=_xRotation; + toComputing=null; + toOriginal=null; + } + } + + /** + * @return the Y rotation + */ + public double getYCenter() { + return ycenter; + } + + /** + * @param _yRotation the Y rotation to set + */ + public void setYCenter(double _yRotation) { + if (ycenter != _yRotation) { + this.ycenter=_yRotation; + toComputing=null; + toOriginal=null; + } + } + public GrMorphisme getToComputing() { if (toComputing==null) toComputing=GrMorphisme.translation(translationX, translationY, translationZ).composition(GrMorphisme.rotationZ(Math.toRadians(rotationZ))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-02-25 22:02:19
|
Revision: 9307 http://sourceforge.net/p/fudaa/svn/9307 Author: deniger Date: 2016-02-25 22:02:16 +0000 (Thu, 25 Feb 2016) Log Message: ----------- organisation des imports Modified Paths: -------------- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrPostImplementation.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/Tr3DCalqueTime.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/Tr3DFactory.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/Tr3DInitialiser.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/data/TrVisuPanel.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelAbstract.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelEltDataAdapter.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModelBuilder.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheModel.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostScopCourbeTreeModel.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionCalqueTable.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionChooseCalqueSelectionTable.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionController.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileBuilder.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCoordinatesModel.java trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileFillePanel.java Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrPostImplementation.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrPostImplementation.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrPostImplementation.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -9,9 +9,6 @@ import com.memoire.bu.BuIcon; import com.memoire.bu.BuInformationsSoftware; -import org.fudaa.ebli.courbe.EGGraphe; -import org.fudaa.ebli.courbe.EGGrapheTreeModel; -import org.fudaa.ebli.courbe.EGGroup; import org.fudaa.fudaa.tr.common.TrResource; import org.fudaa.fudaa.tr.post.TrPostCommonImplementation; import org.fudaa.fudaa.tr.post.TrPostLayoutFille; Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/Tr3DCalqueTime.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/Tr3DCalqueTime.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/Tr3DCalqueTime.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -3,7 +3,6 @@ */ package org.fudaa.fudaa.tr.common; -import org.fudaa.fudaa.meshviewer.threedim.Mv3DCalque; import javax.swing.DefaultListSelectionModel; import javax.swing.JComponent; import javax.swing.ListModel; @@ -15,6 +14,7 @@ import org.fudaa.dodico.h2d.type.H2dVariableType; import org.fudaa.ebli.animation.EbliAnimationAdapterInterface; import org.fudaa.ebli.controle.BSelecteurListTarget; +import org.fudaa.fudaa.meshviewer.threedim.Mv3DCalque; import org.fudaa.fudaa.tr.post.TrPostSource; /** Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/Tr3DFactory.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/Tr3DFactory.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/Tr3DFactory.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -11,7 +11,6 @@ */ package org.fudaa.fudaa.tr.common; -import org.fudaa.fudaa.meshviewer.threedim.Mv3DCalque; import com.memoire.bu.BuCheckBox; import com.vividsolutions.jts.geom.Envelope; import java.awt.Color; @@ -47,8 +46,9 @@ import org.fudaa.ebli.volume.controles.BArbreVolume; import org.fudaa.fudaa.meshviewer.MvResource; import org.fudaa.fudaa.meshviewer.layer.MvFrontierLayerAbstract; +import org.fudaa.fudaa.meshviewer.threedim.Mv3DBathy; +import org.fudaa.fudaa.meshviewer.threedim.Mv3DCalque; import org.fudaa.fudaa.meshviewer.threedim.Mv3DFactory; -import org.fudaa.fudaa.meshviewer.threedim.Mv3DBathy; import org.fudaa.fudaa.meshviewer.threedim.Mv3DImage; import org.fudaa.fudaa.tr.post.TrPostSource; import org.fudaa.fudaa.tr.post.TrPostSourceTelemac3D; Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/Tr3DInitialiser.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/Tr3DInitialiser.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/Tr3DInitialiser.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -11,7 +11,6 @@ import org.fudaa.ebli.commun.EbliActionInterface; import org.fudaa.ebli.commun.EbliActionSimple; import org.fudaa.ebli.ressource.EbliResource; -import org.fudaa.fudaa.tr.common.TrAction3D; import org.fudaa.fudaa.tr.data.TrVisuPanel; /** Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/data/TrVisuPanel.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/data/TrVisuPanel.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/data/TrVisuPanel.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -8,8 +8,6 @@ package org.fudaa.fudaa.tr.data; import com.memoire.fu.FuLog; -import java.io.IOException; -import java.text.DecimalFormat; import java.util.List; import javax.swing.Action; import javax.swing.JFrame; @@ -17,7 +15,6 @@ import org.fudaa.ctulu.CtuluExportDataInterface; import org.fudaa.ctulu.CtuluLib; import org.fudaa.ctulu.image.CtuluImageImporter; -import org.fudaa.dodico.ef.EfGridInterface; import org.fudaa.dodico.h2d.type.H2dVariableType; import org.fudaa.ebli.calque.BCalque; import org.fudaa.ebli.calque.BGroupeCalque; @@ -29,18 +26,12 @@ import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation; import org.fudaa.fudaa.meshviewer.layer.MvFrontierPointLayer; import org.fudaa.fudaa.meshviewer.layer.MvIsoPaintersLayer; -import org.fudaa.fudaa.meshviewer.layer.MvNodeNumberLayer; import org.fudaa.fudaa.meshviewer.layer.MvVisuPanel; -import org.fudaa.fudaa.meshviewer.model.MvNodeModelDefault; import org.fudaa.fudaa.sig.FSigLib; import org.fudaa.fudaa.sig.layer.FSigImageImportAction; import org.fudaa.fudaa.sig.layer.FSigVisuPanelController; import org.fudaa.fudaa.tr.common.Tr3DInitialiser; import org.fudaa.fudaa.tr.common.TrResource; -import org.fudaa.fudaa.tr.post.TrIsoModel; -import org.fudaa.fudaa.tr.post.TrPostCommonImplementation; -import org.fudaa.fudaa.tr.post.TrPostSource; -import org.openide.util.Exceptions; /** * @author deniger Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -7,7 +7,6 @@ */ package org.fudaa.fudaa.tr.post; -import org.fudaa.fudaa.meshviewer.layer.MvIsoModelInterface; import com.memoire.bu.BuMenuItem; import com.memoire.bu.BuResource; import com.memoire.fu.FuLog; @@ -76,6 +75,7 @@ import org.fudaa.ebli.trace.TraceLigne; import org.fudaa.ebli.trace.TraceLigneModel; import org.fudaa.ebli.visuallibrary.calque.EbliWidgetVueCalque; +import org.fudaa.fudaa.meshviewer.layer.MvIsoModelInterface; import org.fudaa.fudaa.meshviewer.layer.MvNodeLayer; import org.fudaa.fudaa.tr.common.TrLib; import org.fudaa.fudaa.tr.persistence.TrPostIsoLayerPersistence; Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelAbstract.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelAbstract.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelAbstract.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -7,7 +7,6 @@ */ package org.fudaa.fudaa.tr.post; -import org.fudaa.fudaa.meshviewer.layer.MvIsoModelInterface; import com.memoire.bu.BuTable; import com.memoire.fu.FuLog; import javax.swing.ListModel; @@ -27,6 +26,7 @@ import org.fudaa.ebli.find.EbliFindExpressionContainerInterface; import org.fudaa.ebli.geometrie.GrPoint; import org.fudaa.ebli.palette.BPaletteInfo.InfoData; +import org.fudaa.fudaa.meshviewer.layer.MvIsoModelInterface; import org.fudaa.fudaa.meshviewer.model.MvElementModelDefault; import org.fudaa.fudaa.meshviewer.model.MvExpressionSupplierElement; import org.fudaa.fudaa.meshviewer.model.MvExpressionSupplierNode; Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelEltDataAdapter.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelEltDataAdapter.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoModelEltDataAdapter.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -11,7 +11,6 @@ */ package org.fudaa.fudaa.tr.post; -import org.fudaa.fudaa.meshviewer.layer.MvIsoModelInterface; import com.memoire.bu.BuTable; import com.vividsolutions.jts.geom.Envelope; import org.fudaa.ctulu.CtuluAnalyze; @@ -25,6 +24,7 @@ import org.fudaa.ebli.geometrie.GrPoint; import org.fudaa.ebli.geometrie.GrPolygone; import org.fudaa.ebli.palette.BPaletteInfo.InfoData; +import org.fudaa.fudaa.meshviewer.layer.MvIsoModelInterface; import org.fudaa.fudaa.meshviewer.model.MvElementModelDefault; /** Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -13,29 +13,24 @@ import com.memoire.bu.BuMenuItem; import com.memoire.bu.BuResource; import com.memoire.bu.BuWizardDialog; - import java.awt.event.ActionEvent; import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.List; - import javax.swing.JInternalFrame; import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; - import org.fudaa.ctulu.CtuluLibString; import org.fudaa.ctulu.ProgressionInterface; import org.fudaa.ctulu.gui.CtuluLibDialog; import org.fudaa.ctulu.gui.CtuluTaskOperationGUI; import org.fudaa.ebli.calque.BCalque; -import org.fudaa.ebli.courbe.EGGroup; import org.fudaa.ebli.courbe.PaletteCourbes; import org.fudaa.ebli.visuallibrary.calque.CalqueLegendeWidgetAdapter; import org.fudaa.fudaa.tr.common.TrCommonImplementation; import org.fudaa.fudaa.tr.common.TrLib; -import org.fudaa.fudaa.tr.common.TrPaletteCourbe; import org.fudaa.fudaa.tr.common.TrResource; import org.fudaa.fudaa.tr.post.actions.TrPostActionChooseAndCreateCalque; import org.fudaa.fudaa.tr.post.dialogSpec.TrPostWizardCreateScope; Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModelBuilder.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModelBuilder.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModelBuilder.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -4,16 +4,13 @@ package org.fudaa.fudaa.tr.post; import com.memoire.fu.FuEmptyArrays; - import gnu.trove.TIntHashSet; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; - import org.fudaa.ctulu.CtuluCommandContainer; import org.fudaa.ctulu.CtuluLibArray; import org.fudaa.ctulu.ProgressionInterface; Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheModel.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheModel.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheModel.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -4,7 +4,6 @@ */ package org.fudaa.fudaa.tr.post; -import org.fudaa.fudaa.meshviewer.layer.MvIsoModelInterface; import com.memoire.bu.BuTable; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Envelope; @@ -30,6 +29,7 @@ import org.fudaa.ebli.palette.BPaletteInfo.InfoData; import org.fudaa.fudaa.meshviewer.MvResource; import org.fudaa.fudaa.meshviewer.layer.MvGridLayerGroup; +import org.fudaa.fudaa.meshviewer.layer.MvIsoModelInterface; import org.fudaa.fudaa.meshviewer.model.MvElementModelDefault; import org.fudaa.fudaa.meshviewer.model.MvInfoDelegateAbstract; import org.fudaa.fudaa.tr.common.TrResource; Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostScopCourbeTreeModel.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostScopCourbeTreeModel.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostScopCourbeTreeModel.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; - import org.fudaa.ctulu.CtuluCommandManager; import org.fudaa.ctulu.CtuluLibArray; import org.fudaa.ctulu.CtuluNumberFormatI; Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionCalqueTable.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionCalqueTable.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionCalqueTable.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -1,7 +1,8 @@ package org.fudaa.fudaa.tr.post.actions; +import com.memoire.bu.BuTask; +import com.vividsolutions.jts.geom.LineString; import java.awt.event.ActionEvent; - import org.fudaa.ctulu.CtuluUI; import org.fudaa.ctulu.ProgressionBuAdapter; import org.fudaa.ctulu.ProgressionInterface; @@ -15,9 +16,6 @@ import org.fudaa.fudaa.tr.post.profile.MvProfileCoteTester; import org.fudaa.fudaa.tr.post.profile.MvProfileFillePanel; -import com.memoire.bu.BuTask; -import com.vividsolutions.jts.geom.LineString; - /** * Surcharge de l'action calque Action Table qui propose 2 modes: * - affiche dans le cas 'classique' les noeuds s\xE9lectionn\xE9es Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionChooseCalqueSelectionTable.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionChooseCalqueSelectionTable.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionChooseCalqueSelectionTable.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -1,61 +1,45 @@ package org.fudaa.fudaa.tr.post.actions; -import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuButton; import com.memoire.bu.BuPanel; import com.memoire.bu.BuResource; import com.memoire.bu.BuTable; -import java.awt.event.ActionEvent; - -import org.fudaa.ctulu.CtuluUI; -import org.fudaa.ctulu.ProgressionBuAdapter; -import org.fudaa.ctulu.ProgressionInterface; -import org.fudaa.dodico.h2d.type.H2dVariableType; -import org.fudaa.ebli.calque.BArbreCalqueModel; -import org.fudaa.ebli.calque.ZEbliCalquesPanel; -import org.fudaa.ebli.calque.action.CalqueActionTable; -import org.fudaa.ebli.courbe.EGTableAction; -import org.fudaa.fudaa.tr.post.TrPostVisuPanel; -import org.fudaa.fudaa.tr.post.profile.MvProfileBuilderFromTree; -import org.fudaa.fudaa.tr.post.profile.MvProfileCoteTester; -import org.fudaa.fudaa.tr.post.profile.MvProfileFillePanel; - -import com.memoire.bu.BuTask; import com.vividsolutions.jts.geom.LineString; import com.vividsolutions.jts.geom.Point; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Frame; +import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; import java.io.IOException; import java.util.ArrayList; import java.util.List; import javax.swing.Action; import javax.swing.JDialog; -import javax.swing.JLabel; import javax.swing.JScrollPane; import javax.swing.JTree; import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; import javax.swing.tree.TreePath; +import org.fudaa.ctulu.CtuluUI; import org.fudaa.ctulu.gis.GISLib; import org.fudaa.ctulu.gui.CtuluLibSwing; -import org.fudaa.ebli.calque.BArbreCalque; +import org.fudaa.dodico.h2d.type.H2dVariableType; +import org.fudaa.ebli.calque.BArbreCalqueModel; import org.fudaa.ebli.calque.BCalque; import org.fudaa.ebli.calque.BGroupeCalque; import org.fudaa.ebli.calque.CalqueGISTreeModel; import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface; -import org.fudaa.ebli.calque.ZModeleDonnees; +import org.fudaa.ebli.calque.ZEbliCalquesPanel; import org.fudaa.ebli.calque.ZModelePoint; -import org.fudaa.ebli.commun.EbliLib; +import org.fudaa.ebli.calque.action.CalqueActionTable; import org.fudaa.ebli.commun.EbliTableInfoPanel; import org.fudaa.ebli.commun.EbliTableInfoTarget; import org.fudaa.ebli.geometrie.GrPoint; import org.fudaa.fudaa.tr.common.TrResource; import org.fudaa.fudaa.tr.post.TrIsoLayerDefault; +import org.fudaa.fudaa.tr.post.TrPostVisuPanel; import org.openide.util.Exceptions; /** Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionController.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionController.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionController.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -9,12 +9,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.swing.Action; import javax.swing.JComponent; import javax.swing.JTabbedPane; import javax.swing.SwingUtilities; - import org.fudaa.ctulu.CtuluUI; import org.fudaa.ebli.calque.action.CalqueActionTable; import org.fudaa.ebli.commun.EbliActionInterface; Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -10,7 +10,6 @@ import com.memoire.bu.BuValueValidator; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.LineString; - import java.awt.BorderLayout; import java.awt.FlowLayout; import java.awt.Frame; @@ -18,7 +17,6 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.List; - import javax.swing.AbstractAction; import javax.swing.AbstractListModel; import javax.swing.BorderFactory; @@ -32,7 +30,6 @@ import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JTextField; - import org.apache.commons.lang.StringUtils; import org.fudaa.ctulu.CtuluLib; import org.fudaa.ctulu.CtuluLibString; Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileBuilder.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileBuilder.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileBuilder.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -9,14 +9,11 @@ import com.memoire.bu.BuLib; import com.vividsolutions.jts.geom.LineString; - import java.awt.Color; import java.text.DecimalFormat; import java.util.HashMap; import java.util.Map; - import javax.swing.ListModel; - import org.fudaa.ctulu.CtuluActivity; import org.fudaa.ctulu.CtuluLib; import org.fudaa.ctulu.CtuluLibString; Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCoordinatesModel.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCoordinatesModel.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileCoordinatesModel.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -13,15 +13,12 @@ import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.LineString; - import java.util.Map; - import org.fudaa.ctulu.CtuluLib; import org.fudaa.ctulu.CtuluListSelectionInterface; import org.fudaa.ctulu.CtuluUI; import org.fudaa.ctulu.ProgressionInterface; import org.fudaa.ctulu.gis.CtuluLibGeometrie; -import org.fudaa.ctulu.gis.GISPrecision; import org.fudaa.dodico.ef.EfGridData; import org.fudaa.dodico.ef.operation.EfLineIntersectionsResultsBuilder; import org.fudaa.dodico.ef.operation.EfLineIntersectionsResultsI; Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileFillePanel.java =================================================================== --- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileFillePanel.java 2016-02-25 22:01:59 UTC (rev 9306) +++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileFillePanel.java 2016-02-25 22:02:16 UTC (rev 9307) @@ -25,9 +25,7 @@ import org.fudaa.ctulu.ProgressionInterface; import org.fudaa.dodico.h2d.type.H2dVariableType; import org.fudaa.ebli.calque.action.EbliCalqueActionTimeChooser; -import org.fudaa.ebli.commun.BPalettePanelInterface; import org.fudaa.ebli.commun.EbliActionInterface; -import org.fudaa.ebli.commun.EbliActionPaletteTreeModel; import org.fudaa.ebli.commun.EbliLib; import org.fudaa.ebli.courbe.EGAxeHorizontal; import org.fudaa.ebli.courbe.EGAxeVertical; @@ -36,7 +34,6 @@ import org.fudaa.ebli.palette.BPalettePlageDefault; import org.fudaa.fudaa.commun.courbe.FudaaGrapheTimeAnimatedVisuPanel; import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation; -import org.fudaa.fudaa.meshviewer.MvResource; import org.fudaa.fudaa.tr.common.TrLib; /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-02-25 21:58:58
|
Revision: 9304 http://sourceforge.net/p/fudaa/svn/9304 Author: deniger Date: 2016-02-25 21:58:56 +0000 (Thu, 25 Feb 2016) Log Message: ----------- organisation des imports Modified Paths: -------------- trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestCrueValidationConnexite.java trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidationCrueRPTGBinaire.java trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidationHelperLoi.java trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidateAndRebuildProfilSectionTest.java trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorAndLoaderResultatCrue9Test.java trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorForValuesAndContentsTest.java Modified: trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestCrueValidationConnexite.java =================================================================== --- trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestCrueValidationConnexite.java 2016-02-25 21:52:55 UTC (rev 9303) +++ trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestCrueValidationConnexite.java 2016-02-25 21:58:56 UTC (rev 9304) @@ -5,8 +5,8 @@ import org.fudaa.dodico.crue.common.io.CrueIOResu; import org.fudaa.dodico.crue.config.coeur.TestCoeurConfig; import org.fudaa.dodico.crue.io.Crue10FileFormatFactory; +import org.fudaa.dodico.crue.io.ReadHelper; import org.fudaa.dodico.crue.io.drso.CrueDRSOFileTest; -import org.fudaa.dodico.crue.io.ReadHelper; import org.fudaa.dodico.crue.metier.CrueData; import org.fudaa.dodico.crue.metier.CrueFileType; import org.fudaa.dodico.crue.test.AbstractTestCase; Modified: trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidationCrueRPTGBinaire.java =================================================================== --- trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidationCrueRPTGBinaire.java 2016-02-25 21:52:55 UTC (rev 9303) +++ trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidationCrueRPTGBinaire.java 2016-02-25 21:58:56 UTC (rev 9304) @@ -11,20 +11,20 @@ import org.fudaa.ctulu.CtuluLibFile; import org.fudaa.ctulu.CtuluLog; import org.fudaa.dodico.crue.common.Pair; +import org.fudaa.dodico.crue.common.io.CrueIOResu; +import org.fudaa.dodico.crue.config.coeur.TestCoeurConfig; import org.fudaa.dodico.crue.io.AbstractIOTestCase; import org.fudaa.dodico.crue.io.Crue10FileFormat; import org.fudaa.dodico.crue.io.Crue10FileFormatFactory; -import org.fudaa.dodico.crue.metier.CrueFileType; -import org.fudaa.dodico.crue.common.io.CrueIOResu; import org.fudaa.dodico.crue.io.rdao.CommonResDao.ItemResDao; -import org.fudaa.dodico.crue.io.rptg.CrueDaoRPTG; -import org.fudaa.dodico.crue.io.rptg.ResPrtGeoDao; -import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey; -import org.fudaa.dodico.crue.config.coeur.TestCoeurConfig; import org.fudaa.dodico.crue.io.res.ResCatEMHContent; import org.fudaa.dodico.crue.io.res.ResTypeEMHBuilder; import org.fudaa.dodico.crue.io.res.ResTypeEMHContent; import org.fudaa.dodico.crue.io.res.ResultatEntry; +import org.fudaa.dodico.crue.io.rptg.CrueDaoRPTG; +import org.fudaa.dodico.crue.io.rptg.ResPrtGeoDao; +import org.fudaa.dodico.crue.metier.CrueFileType; +import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey; import org.junit.After; import static org.junit.Assert.*; import org.junit.Test; Modified: trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidationHelperLoi.java =================================================================== --- trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidationHelperLoi.java 2016-02-25 21:52:55 UTC (rev 9303) +++ trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidationHelperLoi.java 2016-02-25 21:58:56 UTC (rev 9304) @@ -9,12 +9,12 @@ import org.fudaa.ctulu.CtuluLog; import org.fudaa.ctulu.CtuluLogRecord; import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier; +import org.fudaa.dodico.crue.config.coeur.TestCoeurConfig; import org.fudaa.dodico.crue.config.loi.EnumTypeLoi; import org.fudaa.dodico.crue.metier.emh.EvolutionFF; import org.fudaa.dodico.crue.metier.emh.Loi; import org.fudaa.dodico.crue.metier.emh.LoiFF; import org.fudaa.dodico.crue.metier.emh.PtEvolutionFF; -import org.fudaa.dodico.crue.config.coeur.TestCoeurConfig; import static org.junit.Assert.*; import org.junit.Test; Modified: trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java =================================================================== --- trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java 2016-02-25 21:52:55 UTC (rev 9303) +++ trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java 2016-02-25 21:58:56 UTC (rev 9304) @@ -15,8 +15,8 @@ import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierLoaderDefaultTest; import org.fudaa.dodico.crue.config.coeur.TestCoeurConfig; import org.fudaa.dodico.crue.io.Crue10FileFormatFactory; +import org.fudaa.dodico.crue.io.ReadHelper; import org.fudaa.dodico.crue.io.drso.CrueDRSOFileTest; -import org.fudaa.dodico.crue.io.ReadHelper; import org.fudaa.dodico.crue.metier.CrueData; import org.fudaa.dodico.crue.metier.CrueFileType; import org.fudaa.dodico.crue.metier.emh.CatEMHSection; @@ -25,7 +25,6 @@ import org.fudaa.dodico.crue.metier.emh.DonPrtCIniSection; import org.fudaa.dodico.crue.metier.emh.EMHBranchePdc; import org.fudaa.dodico.crue.metier.emh.EMHModeleBase; -import org.fudaa.dodico.crue.metier.factory.EMHNoeudFactory; import org.fudaa.dodico.crue.metier.emh.EMHNoeudNiveauContinu; import org.fudaa.dodico.crue.metier.emh.EMHScenario; import org.fudaa.dodico.crue.metier.emh.EMHSectionIdem; @@ -35,6 +34,7 @@ import org.fudaa.dodico.crue.metier.emh.EnumPosSection; import org.fudaa.dodico.crue.metier.emh.Loi; import org.fudaa.dodico.crue.metier.emh.OrdPrtCIniModeleBase; +import org.fudaa.dodico.crue.metier.factory.EMHNoeudFactory; import org.fudaa.dodico.crue.metier.factory.EMHRelationFactory; import org.fudaa.dodico.crue.validation.util.DelegateValidatorNoeud; import org.fudaa.dodico.crue.validation.util.DelegateValidatorSection; Modified: trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidateAndRebuildProfilSectionTest.java =================================================================== --- trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidateAndRebuildProfilSectionTest.java 2016-02-25 21:52:55 UTC (rev 9303) +++ trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidateAndRebuildProfilSectionTest.java 2016-02-25 21:58:56 UTC (rev 9304) @@ -25,7 +25,6 @@ import org.fudaa.dodico.crue.metier.helper.DonPrtHelper; import org.fudaa.dodico.crue.metier.helper.EtiquetteIndexed; import org.fudaa.dodico.crue.metier.helper.LitNommeIndexed; -import org.fudaa.dodico.crue.metier.helper.LitNumeroteIndex; import org.fudaa.dodico.crue.test.AbstractTestCase; /** Modified: trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorAndLoaderResultatCrue9Test.java =================================================================== --- trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorAndLoaderResultatCrue9Test.java 2016-02-25 21:52:55 UTC (rev 9303) +++ trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorAndLoaderResultatCrue9Test.java 2016-02-25 21:58:56 UTC (rev 9304) @@ -13,7 +13,6 @@ import org.fudaa.dodico.crue.io.neuf.ResultatCalculCrue9; import org.fudaa.dodico.crue.metier.CrueData; import org.junit.Test; -import static org.junit.Assert.*; /** * Modified: trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorForValuesAndContentsTest.java =================================================================== --- trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorForValuesAndContentsTest.java 2016-02-25 21:52:55 UTC (rev 9303) +++ trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/ValidatorForValuesAndContentsTest.java 2016-02-25 21:58:56 UTC (rev 9304) @@ -12,8 +12,8 @@ import org.fudaa.dodico.crue.io.ReadHelper; import org.fudaa.dodico.crue.metier.CrueData; import org.fudaa.dodico.crue.test.AbstractTestCase; +import static org.junit.Assert.*; import org.junit.Test; -import static org.junit.Assert.*; /** * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-02-25 21:48:28
|
Revision: 9302 http://sourceforge.net/p/fudaa/svn/9302 Author: deniger Date: 2016-02-25 21:48:25 +0000 (Thu, 25 Feb 2016) Log Message: ----------- organisation des imports Modified Paths: -------------- trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/Sysdoc.java trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocLoader.java trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexer.java trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilderTest.java trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocLoaderTest.java trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/common/DocEntryBuilderTest.java trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexerTest.java trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessorTest.java trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkAndSourceProcessorTest.java trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefCheckerTest.java trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/TitleProcessorTest.java Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/Sysdoc.java =================================================================== --- trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/Sysdoc.java 2016-02-25 21:39:12 UTC (rev 9301) +++ trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/Sysdoc.java 2016-02-25 21:48:25 UTC (rev 9302) @@ -3,8 +3,8 @@ */ package org.fudaa.dodico.crue.sysdoc; +import org.fudaa.dodico.crue.sysdoc.common.DocEntry; import org.fudaa.dodico.crue.sysdoc.common.SysdocFolder; -import org.fudaa.dodico.crue.sysdoc.common.DocEntry; /** * Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocLoader.java =================================================================== --- trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocLoader.java 2016-02-25 21:39:12 UTC (rev 9301) +++ trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/SysdocLoader.java 2016-02-25 21:48:25 UTC (rev 9302) @@ -3,10 +3,10 @@ */ package org.fudaa.dodico.crue.sysdoc; -import org.fudaa.dodico.crue.sysdoc.common.SysdocFolder; import java.io.File; import org.fudaa.ctulu.CtuluIOResult; import org.fudaa.ctulu.CtuluLog; +import org.fudaa.dodico.crue.sysdoc.common.SysdocFolder; import org.fudaa.dodico.crue.sysdoc.common.SysdocMessages; import org.fudaa.dodico.crue.sysdoc.persist.PersistContent; import org.fudaa.dodico.crue.sysdoc.persist.PersistProcessor; Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexer.java =================================================================== --- trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexer.java 2016-02-25 21:39:12 UTC (rev 9301) +++ trunk/soft/fudaa-crue/crue-sysdoc/src/main/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexer.java 2016-02-25 21:48:25 UTC (rev 9302) @@ -12,9 +12,6 @@ import java.util.logging.Logger; import org.apache.commons.lang.StringUtils; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.index.IndexWriterConfig; -import org.fudaa.ctulu.CtuluLog; -import org.fudaa.dodico.crue.sysdoc.common.SysdocFolder; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; @@ -22,11 +19,14 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.util.Version; import org.ccil.cowan.tagsoup.Parser; import org.fudaa.ctulu.CtuluLibFile; +import org.fudaa.ctulu.CtuluLog; +import org.fudaa.dodico.crue.sysdoc.common.SysdocFolder; import org.fudaa.dodico.crue.sysdoc.common.SysdocMessages; import org.fudaa.dodico.crue.sysdoc.scan.EncodingProcessor; import org.xml.sax.InputSource; Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilderTest.java =================================================================== --- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilderTest.java 2016-02-25 21:39:12 UTC (rev 9301) +++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocBuilderTest.java 2016-02-25 21:48:25 UTC (rev 9302) @@ -11,8 +11,8 @@ import org.fudaa.ctulu.CtuluLogGroup; import org.fudaa.dodico.crue.sysdoc.common.DocEntry; import org.fudaa.dodico.crue.sysdoc.common.SysdocFolder; +import static org.junit.Assert.*; import org.junit.Test; -import static org.junit.Assert.*; /** * Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocLoaderTest.java =================================================================== --- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocLoaderTest.java 2016-02-25 21:39:12 UTC (rev 9301) +++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/SysdocLoaderTest.java 2016-02-25 21:48:25 UTC (rev 9302) @@ -8,8 +8,8 @@ import org.fudaa.ctulu.CtuluIOResult; import org.fudaa.ctulu.CtuluLibFile; import org.fudaa.ctulu.CtuluLog; +import static org.junit.Assert.*; import org.junit.Test; -import static org.junit.Assert.*; /** * Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/common/DocEntryBuilderTest.java =================================================================== --- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/common/DocEntryBuilderTest.java 2016-02-25 21:39:12 UTC (rev 9301) +++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/common/DocEntryBuilderTest.java 2016-02-25 21:48:25 UTC (rev 9302) @@ -6,8 +6,8 @@ import java.util.ArrayList; import java.util.List; import org.fudaa.dodico.crue.sysdoc.scan.DocScanEntry; +import static org.junit.Assert.*; import org.junit.Test; -import static org.junit.Assert.*; /** * Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexerTest.java =================================================================== --- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexerTest.java 2016-02-25 21:39:12 UTC (rev 9301) +++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/index/FileIndexerTest.java 2016-02-25 21:48:25 UTC (rev 9302) @@ -7,8 +7,8 @@ import java.io.IOException; import org.fudaa.ctulu.CtuluLibFile; import org.fudaa.ctulu.CtuluLog; +import static org.junit.Assert.*; import org.junit.Test; -import static org.junit.Assert.*; /** * Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessorTest.java =================================================================== --- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessorTest.java 2016-02-25 21:39:12 UTC (rev 9301) +++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/persist/PersistProcessorTest.java 2016-02-25 21:48:25 UTC (rev 9302) @@ -9,8 +9,8 @@ import org.fudaa.ctulu.CtuluIOResult; import org.fudaa.ctulu.CtuluLibFile; import org.fudaa.dodico.crue.sysdoc.common.DocEntry; +import static org.junit.Assert.*; import org.junit.Test; -import static org.junit.Assert.*; /** * Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkAndSourceProcessorTest.java =================================================================== --- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkAndSourceProcessorTest.java 2016-02-25 21:39:12 UTC (rev 9301) +++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkAndSourceProcessorTest.java 2016-02-25 21:48:25 UTC (rev 9302) @@ -15,8 +15,8 @@ import org.fudaa.ctulu.CtuluLog; import org.fudaa.dodico.crue.sysdoc.chunck.WriterContentHandler; import org.fudaa.dodico.crue.sysdoc.scan.LinkAndSourceProcessor.Result; +import static org.junit.Assert.*; import org.junit.Test; -import static org.junit.Assert.*; import org.xml.sax.InputSource; /** Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefCheckerTest.java =================================================================== --- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefCheckerTest.java 2016-02-25 21:39:12 UTC (rev 9301) +++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/LinkRefCheckerTest.java 2016-02-25 21:48:25 UTC (rev 9302) @@ -12,9 +12,9 @@ import org.fudaa.ctulu.CtuluLogGroup; import org.fudaa.ctulu.CtuluLogResult; import org.junit.AfterClass; +import static org.junit.Assert.*; +import org.junit.BeforeClass; import org.junit.Test; -import org.junit.BeforeClass; -import static org.junit.Assert.*; /** * Modified: trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/TitleProcessorTest.java =================================================================== --- trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/TitleProcessorTest.java 2016-02-25 21:39:12 UTC (rev 9301) +++ trunk/soft/fudaa-crue/crue-sysdoc/src/test/java/org/fudaa/dodico/crue/sysdoc/scan/TitleProcessorTest.java 2016-02-25 21:48:25 UTC (rev 9302) @@ -7,8 +7,8 @@ import java.io.IOException; import java.util.List; import org.fudaa.ctulu.CtuluLibFile; +import static org.junit.Assert.*; import org.junit.Test; -import static org.junit.Assert.*; /** * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 9298 http://sourceforge.net/p/fudaa/svn/9298 Author: deniger Date: 2016-02-24 23:46:42 +0000 (Wed, 24 Feb 2016) Log Message: ----------- CRUE-644 Modified Paths: -------------- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java 2016-02-24 23:42:46 UTC (rev 9297) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java 2016-02-24 23:46:42 UTC (rev 9298) @@ -58,7 +58,7 @@ if (i < 0 || i >= values.size()) { return null; } - return values.size(); + return values.get(i); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 9297 http://sourceforge.net/p/fudaa/svn/9297 Author: deniger Date: 2016-02-24 23:42:46 +0000 (Wed, 24 Feb 2016) Log Message: ----------- CRUE-644 Modified Paths: -------------- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java 2016-02-24 23:34:40 UTC (rev 9296) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java 2016-02-24 23:42:46 UTC (rev 9297) @@ -53,6 +53,13 @@ Class type; String columnName; List values = new ArrayList(); + + public Object getValue(int i) { + if (i < 0 || i >= values.size()) { + return null; + } + return values.size(); + } } static class Data { @@ -64,6 +71,14 @@ columns.add(res); return res; } + + int getMaxLine() { + int res = 0; + for (ColumnData column : columns) { + res = Math.max(column.values.size(), res); + } + return res; + } } LongitudinalExportData(final EGCourbe[] _cs, final EGGraphe _g, boolean showLabel) { @@ -104,6 +119,7 @@ } } maxCol_ = data.columns.size(); + maxLine_ = data.getMaxLine(); } } @@ -159,7 +175,7 @@ @Override public Object getValue(int _row, int _col) { - return data.columns.get(_col).values.get(_row); + return data.columns.get(_col).getValue(_row); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 9296 http://sourceforge.net/p/fudaa/svn/9296 Author: deniger Date: 2016-02-24 23:34:40 +0000 (Wed, 24 Feb 2016) Log Message: ----------- CRUE-644 Modified Paths: -------------- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java 2016-02-24 23:33:36 UTC (rev 9295) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java 2016-02-24 23:34:40 UTC (rev 9296) @@ -6,7 +6,6 @@ import com.memoire.fu.FuEmptyArrays; import gnu.trove.TIntObjectHashMap; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.LinkedHashMap; @@ -77,7 +76,7 @@ for (Map.Entry<ReportRunKey, List<EGCourbe>> entry : courbesByRun.entrySet()) { List<EGCourbe> listOfCourbes = entry.getValue(); - List<EGTimeLabel> values = getXValues(listOfCourbes); + List<EGTimeLabel> values = buildAbscisses(listOfCourbes); final ColumnData brancheColumn = data.addColumn(); final ColumnData sectionColumn = data.addColumn(); final ColumnData xColumn = data.addColumn(); @@ -108,7 +107,7 @@ } } - protected List<EGTimeLabel> getXValues(List<EGCourbe> value) { + protected List<EGTimeLabel> buildAbscisses(List<EGCourbe> value) { Set<EGTimeLabel> set = new HashSet<>(); for (EGCourbe c : value) { final LoiConstanteCourbeModel model = (LoiConstanteCourbeModel) c.getModel(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 9295 http://sourceforge.net/p/fudaa/svn/9295 Author: deniger Date: 2016-02-24 23:33:36 +0000 (Wed, 24 Feb 2016) Log Message: ----------- CRUE-644 Modified Paths: -------------- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java 2016-02-24 22:28:54 UTC (rev 9294) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalExportDataBuilder.java 2016-02-24 23:33:36 UTC (rev 9295) @@ -5,24 +5,25 @@ import com.memoire.fu.FuEmptyArrays; import gnu.trove.TIntObjectHashMap; -import java.awt.color.ColorSpace; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; import org.fudaa.dodico.crue.metier.factory.CruePrefix; import org.fudaa.ebli.courbe.EGAxeHorizontal; import org.fudaa.ebli.courbe.EGCourbe; import org.fudaa.ebli.courbe.EGExportData; import org.fudaa.ebli.courbe.EGExportDataBuilder; import org.fudaa.ctulu.table.CtuluTableCellDoubleValue; +import org.fudaa.dodico.crue.common.BusinessMessages; +import org.fudaa.dodico.crue.projet.report.data.ReportRunKey; +import org.fudaa.dodico.crue.projet.report.data.ReportRunVariableTimeKey; import org.fudaa.ebli.courbe.EGGraphe; -import org.fudaa.ebli.courbe.EGModel; import org.fudaa.ebli.courbe.EGTimeLabel; -import org.fudaa.ebli.courbe.EgModelLabelNamed; import org.fudaa.fudaa.crue.loi.common.LoiConstanteCourbeModel; import org.openide.util.NbBundle; @@ -43,85 +44,123 @@ protected static final int COLUMN_SECTION = 1; protected static final int COLUMN_BRANCHE = 0; - private double[] time_; - private List<String> branches; - private List<String> sections; +// private double[] time_; +// private List<String> branches; +// private List<String> sections; + Data data = new Data(); + static class ColumnData { + + Class type; + String columnName; + List values = new ArrayList(); + } + + static class Data { + + List<ColumnData> columns = new ArrayList<>(); + + ColumnData addColumn() { + ColumnData res = new ColumnData(); + columns.add(res); + return res; + } + } + LongitudinalExportData(final EGCourbe[] _cs, final EGGraphe _g, boolean showLabel) { super(_cs, _g, showLabel); //nombre de courbe + branche+ section + x if (cs_.length > 0) { - maxCol_ = cs_.length + 3; - Set<EGTimeLabel> set = new HashSet<>(); final EGAxeHorizontal h = g_.getTransformer().getXAxe(); - for (int i = cs_.length - 1; i >= 0; i--) { - final EGCourbe c = cs_[i]; - final LoiConstanteCourbeModel model = (LoiConstanteCourbeModel) c.getModel(); - final TIntObjectHashMap<String> subLabelsBranches = model.getSubLabels(CruePrefix.P_BRANCHE); - final TIntObjectHashMap<String> subLabelsSection = model.getSubLabels(CruePrefix.P_SECTION); - for (int j = model.getNbValues() - 1; j >= 0; j--) { - final double x = model.getX(j); - EGTimeLabel value = new EGTimeLabel(x); - set.add(value); - value.setLabel(subLabelsBranches.get(j)); - value.setSubLabel(subLabelsSection.get(j)); + //on arrange par run + Map<ReportRunKey, List<EGCourbe>> courbesByRun = getCourbesByRun(_cs); + for (Map.Entry<ReportRunKey, List<EGCourbe>> entry : courbesByRun.entrySet()) { + + List<EGCourbe> listOfCourbes = entry.getValue(); + List<EGTimeLabel> values = getXValues(listOfCourbes); + final ColumnData brancheColumn = data.addColumn(); + final ColumnData sectionColumn = data.addColumn(); + final ColumnData xColumn = data.addColumn(); + brancheColumn.type = String.class; + ReportRunKey key = entry.getKey(); + brancheColumn.columnName = NbBundle.getMessage(ReportLongitudinalExportDataBuilder.class, "BrancheColumn.Name") + BusinessMessages.ENTITY_SEPARATOR + key. + getDisplayName(); + sectionColumn.type = String.class; + sectionColumn.columnName = NbBundle.getMessage(ReportLongitudinalExportDataBuilder.class, "SectionColumn.Name") + BusinessMessages.ENTITY_SEPARATOR + key. + getDisplayName(); + xColumn.type = CtuluTableCellDoubleValue.class; + xColumn.columnName = h.getTitre() + BusinessMessages.ENTITY_SEPARATOR + key.getDisplayName(); + for (EGTimeLabel line : values) { + brancheColumn.values.add(line.getLabel()); + sectionColumn.values.add(line.getSubLabel()); + xColumn.values.add(getXValueFor(line.getX())); } + for (EGCourbe c : listOfCourbes) { + ColumnData valueColumn = data.addColumn(); + valueColumn.type = CtuluTableCellDoubleValue.class; + valueColumn.columnName = c.getTitle(); + for (EGTimeLabel line : values) { + valueColumn.values.add(getYValueFor(c, c.interpol(line.getX()))); + } + } } - List<EGTimeLabel> values = new ArrayList<>(set); - Collections.sort(values); - time_ = new double[values.size()]; - for (int i = 0; i < time_.length; i++) { - time_[i] = values.get(i).getX(); + maxCol_ = data.columns.size(); + } + } + + protected List<EGTimeLabel> getXValues(List<EGCourbe> value) { + Set<EGTimeLabel> set = new HashSet<>(); + for (EGCourbe c : value) { + final LoiConstanteCourbeModel model = (LoiConstanteCourbeModel) c.getModel(); + final TIntObjectHashMap<String> subLabelsBranches = model.getSubLabels(CruePrefix.P_BRANCHE); + final TIntObjectHashMap<String> subLabelsSection = model.getSubLabels(CruePrefix.P_SECTION); + for (int j = model.getNbValues() - 1; j >= 0; j--) { + final double x = model.getX(j); + EGTimeLabel timeValue = new EGTimeLabel(x); + set.add(timeValue); + timeValue.setLabel(subLabelsBranches.get(j)); + timeValue.setSubLabel(subLabelsSection.get(j)); } - Arrays.sort(time_); - maxLine_ = time_.length; - column_ = new String[maxCol_]; - column_[COLUMN_BRANCHE] = NbBundle.getMessage(ReportLongitudinalExportDataBuilder.class, "BrancheColumn.Name"); - column_[COLUMN_SECTION] = NbBundle.getMessage(ReportLongitudinalExportDataBuilder.class, "SectionColumn.Name"); - column_[COLUMN_X] = h.getTitre(); - branches = new ArrayList<>(); - sections = new ArrayList<>(); - for (EGTimeLabel value : values) { - branches.add(value.getLabel()); - sections.add(value.getSubLabel()); + } + List<EGTimeLabel> values = new ArrayList<>(set); + Collections.sort(values); + return values; + } + + protected Map<ReportRunKey, List<EGCourbe>> getCourbesByRun(final EGCourbe[] _cs) { + Map<ReportRunKey, List<EGCourbe>> courbesByRun = new LinkedHashMap<>(); + for (int i = 0; i < _cs.length; i++) { + EGCourbe c = _cs[i]; + final LoiConstanteCourbeModel model = (LoiConstanteCourbeModel) c.getModel(); + ReportRunVariableTimeKey key = (ReportRunVariableTimeKey) model.getKey(); + List<EGCourbe> courbes = courbesByRun.get(key.getReportRunKey()); + if (courbes == null) { + courbes = new ArrayList<>(); + courbesByRun.put(key.getReportRunKey(), courbes); } - int offset = 3; - for (int i = 0; i < _cs.length; i++) { - column_[i + offset] = _cs[i].getTitle(); - } + courbes.add(c); } + return courbesByRun; } @Override public Class getColumnClass(int _i) { - if (_i == COLUMN_BRANCHE || _i == COLUMN_SECTION) { - return String.class; - } - return CtuluTableCellDoubleValue.class; + return data.columns.get(_i).type; } @Override + public String getColumnName(int _i) { + return data.columns.get(_i).columnName; + } + + @Override public int[] getSelectedRows() { return FuEmptyArrays.INT0; } @Override public Object getValue(int _row, int _col) { - if (_col == COLUMN_BRANCHE) { - return branches.get(_row); - } - if (_col == COLUMN_SECTION) { - return sections.get(_row); - } - final double x = time_[_row]; - if (_col == COLUMN_X) { - return getXValueFor(x); - } - if (cs_.length > 0) { - EGCourbe c = cs_[_col - 3]; - return getYValueFor(c, c.interpol(x)); - } - return StringUtils.EMPTY; + return data.columns.get(_col).values.get(_row); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-02-24 22:28:57
|
Revision: 9294 http://sourceforge.net/p/fudaa/svn/9294 Author: deniger Date: 2016-02-24 22:28:54 +0000 (Wed, 24 Feb 2016) Log Message: ----------- CRUE-644 Modified Paths: -------------- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/export/ReportExportProfilLongitudinal.java trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportLongitudinalExportAction.java Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/export/ReportExportProfilLongitudinal.java =================================================================== --- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/export/ReportExportProfilLongitudinal.java 2016-02-24 20:28:54 UTC (rev 9293) +++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/export/ReportExportProfilLongitudinal.java 2016-02-24 22:28:54 UTC (rev 9294) @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -36,6 +37,7 @@ import org.fudaa.dodico.crue.projet.report.data.ReportRunKey; import org.fudaa.dodico.crue.projet.report.data.ReportRunVariableHelper; import org.fudaa.dodico.crue.projet.report.data.ReportRunVariableKey; +import org.fudaa.dodico.crue.projet.report.data.ReportVariableKey; import org.fudaa.dodico.crue.projet.report.data.ReportVariableTypeEnum; import org.fudaa.dodico.crue.projet.report.excel.ReportExcelFormatData; import org.fudaa.dodico.crue.projet.report.longitudinal.ReportLongitudinalBrancheCartouche; @@ -51,14 +53,49 @@ * @author Frederic Deniger */ public class ReportExportProfilLongitudinal extends ReportExportAbstract<ReportLongitudinalConfig, ReportRunVariableKey> { - + public ReportExportProfilLongitudinal(ReportLongitudinalConfig config, ReportResultProviderServiceContrat resultService) { super(config, resultService); } - + + private static class RowCreator { + + int rowIdx = 0; + int colOffset = 0; + int colIdx = 0; + int maxCol = 0; + final Sheet currentSheet; + Row currentRow; + + public RowCreator(Sheet currentSheet) { + this.currentSheet = currentSheet; + } + + public void getRowAndIncrement() { + currentRow = currentSheet.getRow(rowIdx); + if (currentRow == null) { + currentRow = currentSheet.createRow(rowIdx); + } + colIdx = colOffset; + rowIdx++; + } + + public Cell createNextCell() { + Cell res = currentRow.createCell(colIdx++); + maxCol = Math.max(maxCol, colIdx); + return res; + } + + public void nextBlock() { + rowIdx = 0; + colOffset = maxCol; + } + + } + @Override protected void writeInBook(Workbook wb, List<ReportRunVariableKey> variablesToExportInit, List<ResultatTimeKey> times) { - + String sheetName = CtuluResource.CTULU.getString("Feuille {0}", CtuluLibString.getString(1)); ReportExcelFormatData formater = new ReportExcelFormatData(wb); Sheet currentSheet = wb.createSheet(sheetName); @@ -68,138 +105,142 @@ ReportLongitudinalLimitHelper limitHelper = new ReportLongitudinalLimitHelper(ccm); final Map<String, String> displayNameById = limitHelper.getDisplayNameById(); final ItemVariable propertyXp = ccm.getProperty(CrueConfigMetierConstants.PROP_XP); - - //ecriture des titres - int rowIdx = 0; - Row row = currentSheet.createRow(rowIdx++); - int idx = 0; - row.createCell(idx++).setCellValue(BusinessMessages.getString("prefix.branches")); - row.createCell(idx++).setCellValue(BusinessMessages.getString("prefix.sections")); - String currentRunName = this.resultService.getRunCourant().getRunKey().getDisplayName(); - row.createCell(idx++).setCellValue(propertyXp.getDisplayNom() + BusinessMessages.ENTITY_SEPARATOR + currentRunName); - final List<ReportRunVariableKey> profilVariables = content.getProfilVariables(); - //les titres des limites de profils - for (ReportRunVariableKey variable : profilVariables) { - if (ReportVariableTypeEnum.LIMIT_PROFIL.equals(variable.getVariable().getVariableType())) { - String displayName = displayNameById.get(variable.getVariableName()); - if (StringUtils.isEmpty(displayName)) { - displayName = variable.getVariableName(); + Set<ReportRunKey> runs = new LinkedHashSet<>(); + for (ReportRunVariableKey reportRunVariableKey : variablesToExportInit) { + runs.add(reportRunVariableKey.getReportRunKey()); + } + RowCreator rowCreator = new RowCreator(currentSheet); + for (ReportRunKey runKey : runs) { + //ecriture des titres + rowCreator.getRowAndIncrement(); + String runName = runKey.getDisplayName(); + rowCreator.createNextCell().setCellValue(BusinessMessages.getString("prefix.branches") + BusinessMessages.ENTITY_SEPARATOR + runName); + rowCreator.createNextCell().setCellValue(BusinessMessages.getString("prefix.sections") + BusinessMessages.ENTITY_SEPARATOR + runName); + rowCreator.createNextCell().setCellValue(propertyXp.getDisplayNom() + BusinessMessages.ENTITY_SEPARATOR + runName); + final List<ReportRunVariableKey> profilVariables = content.getProfilVariables(); + //les titres des limites de profils + for (ReportRunVariableKey variable : profilVariables) { + if (ReportVariableTypeEnum.LIMIT_PROFIL.equals(variable.getVariable().getVariableType())) { + String displayName = displayNameById.get(variable.getVariableName()); + if (StringUtils.isEmpty(displayName)) { + displayName = variable.getVariableName(); + } + rowCreator.createNextCell().setCellValue(displayName + BusinessMessages.ENTITY_SEPARATOR + runName); } - row.createCell(idx++).setCellValue(displayName + BusinessMessages.ENTITY_SEPARATOR + currentRunName); } - } + + List<ReportRunVariableKey> variablesToExport = new ArrayList<>(); + List<ReportRunVariableKey> variablesRPIToExport = new ArrayList<>(); - List<ReportRunVariableKey> variablesToExport = new ArrayList<>(); - List<ReportRunVariableKey> variablesRPIToExport = new ArrayList<>(); - - //pour les valeur RPTI, il ne faut exporter qu'une seul fois par run. - for (ReportRunVariableKey variable : variablesToExportInit) { - if (variable.isRPTIVariable()) { - variablesRPIToExport.add(variable); - } else { - variablesToExport.add(variable); + //pour les valeur RPTI, il ne faut exporter qu'une seul fois par runKey. + for (ReportRunVariableKey variable : variablesToExportInit) { + if (variable.getRunKey().equals(runKey)) { + if (variable.isRPTIVariable()) { + variablesRPIToExport.add(variable); + } else { + variablesToExport.add(variable); + } + } } - } - for (ReportRunVariableKey variable : variablesRPIToExport) { - row.createCell(idx++).setCellValue( - variable.getVariable().getVariableDisplayName() + BusinessMessages.ENTITY_SEPARATOR + variable.getReportRunKey().getDisplayName()); - } - for (ResultatTimeKey time : times) { - for (ReportRunVariableKey variable : variablesToExport) { - row.createCell(idx++).setCellValue( - variable.getVariable().getVariableDisplayName() + BusinessMessages.ENTITY_SEPARATOR + ResultatTimeKey.timeToString(time) + BusinessMessages.ENTITY_SEPARATOR + variable. - getReportRunKey(). - getDisplayName()); + for (ReportRunVariableKey variable : variablesRPIToExport) { + rowCreator.createNextCell().setCellValue(variable.getVariable().getVariableDisplayName() + BusinessMessages.ENTITY_SEPARATOR + runName); } - } - final List<ReportLongitudinalBrancheConfig> branchesConfig = content.getBranchesConfig(); - ReportLongitudinalPositionBuilder positionBuilder = new ReportLongitudinalPositionBuilder(this.resultService, ccm); - final ReportRunKey runCourant = this.resultService.getRunCourant().getRunKey(); - Set<ReportRunKey> keys = Collections.singleton(runCourant); + for (ResultatTimeKey time : times) { + for (ReportRunVariableKey variable : variablesToExport) { + rowCreator.createNextCell().setCellValue( + variable.getVariable().getVariableDisplayName() + BusinessMessages.ENTITY_SEPARATOR + ResultatTimeKey.timeToString(time) + BusinessMessages.ENTITY_SEPARATOR + runName); + } + } + final List<ReportLongitudinalBrancheConfig> branchesConfig = content.getBranchesConfig(); + ReportLongitudinalPositionBuilder positionBuilder = new ReportLongitudinalPositionBuilder(this.resultService, ccm); + Set<ReportRunKey> keys = Collections.singleton(runKey); - //construction des cartouches - double xpInit = 0; - ReportLongitudinalPositionBrancheContent result = new ReportLongitudinalPositionBrancheContent(); - for (ReportLongitudinalBrancheConfig brancheConfig : branchesConfig) { - xpInit = xpInit + brancheConfig.getDecalXp(); - positionBuilder.buildPositions(xpInit, brancheConfig, result, keys); - xpInit = xpInit + brancheConfig.getLength(); - } + //construction des cartouches + double xpInit = 0; + ReportLongitudinalPositionBrancheContent result = new ReportLongitudinalPositionBrancheContent(); + for (ReportLongitudinalBrancheConfig brancheConfig : branchesConfig) { + xpInit = xpInit + brancheConfig.getDecalXp(); + positionBuilder.buildPositions(xpInit, brancheConfig, result, keys); + xpInit = xpInit + brancheConfig.getLength(); + } - //ecritures des valeurs - final List<ReportLongitudinalBrancheCartouche> cartouches = result.getCartouches(); - //les styles commun - final CellStyle xpStyle = formater.getStyle(propertyXp.getNature(), DecimalFormatEpsilonEnum.COMPARISON); - final PropertyNature natureForZ = resultService.getCcm().getProperty(CrueConfigMetierConstants.PROP_Z).getNature(); - final CellStyle zStyle = formater. - getStyle(natureForZ, DecimalFormatEpsilonEnum.COMPARISON); - for (ReportLongitudinalBrancheCartouche cartouche : cartouches) { - final ReportLongitudinalPositionSectionByRun sectionPositions = cartouche.getSectionPositions(runCourant); - final List<ReportLongitudinalPositionSection> sectionDisplayPositions = sectionPositions.getSectionDisplayPositions(); - for (ReportLongitudinalPositionSection reportLongitudinalPositionSection : sectionDisplayPositions) { - idx = 0; - row = currentSheet.createRow(rowIdx++); - final CatEMHSection section = reportLongitudinalPositionSection.getName(); - row.createCell(idx++).setCellValue(section.getBranche().getNom()); - row.createCell(idx++).setCellValue(section.getNom()); - Cell cell = row.createCell(idx++); - cell.setCellValue(reportLongitudinalPositionSection.getXpDisplay()); - cell.setCellStyle(xpStyle); - for (ReportRunVariableKey variable : profilVariables) { - if (ReportVariableTypeEnum.LIMIT_PROFIL.equals(variable.getVariable().getVariableType())) { - ItemEnum etiquette = limitHelper.getEtiquette(variable.getVariable().getVariableName()); - LitNommeLimite limite = limitHelper.getLimite(variable.getVariable().getVariableName()); - cell = row.createCell(idx++); - if (etiquette != null || limite != null) { - EMHSectionProfil retrieveProfil = ReportProfilHelper.retrieveProfil(section); - if (retrieveProfil != null) { - DonPrtGeoProfilSection profil = DonPrtHelper.getProfilSection(retrieveProfil); - Double z = ReportExportUtils.computeZ(etiquette, limite, profil, ccm); - if (z != null) { - cell.setCellValue(z.doubleValue()); - cell.setCellStyle(zStyle); - + //ecritures des valeurs + final List<ReportLongitudinalBrancheCartouche> cartouches = result.getCartouches(); + //les styles commun + final CellStyle xpStyle = formater.getStyle(propertyXp.getNature(), DecimalFormatEpsilonEnum.COMPARISON); + final PropertyNature natureForZ = resultService.getCcm().getProperty(CrueConfigMetierConstants.PROP_Z).getNature(); + final CellStyle zStyle = formater. + getStyle(natureForZ, DecimalFormatEpsilonEnum.COMPARISON); + for (ReportLongitudinalBrancheCartouche cartouche : cartouches) { + final ReportLongitudinalPositionSectionByRun sectionPositions = cartouche.getSectionPositions(runKey); + final List<ReportLongitudinalPositionSection> sectionDisplayPositions = sectionPositions.getSectionDisplayPositions(); + for (ReportLongitudinalPositionSection reportLongitudinalPositionSection : sectionDisplayPositions) { + rowCreator.getRowAndIncrement(); + final CatEMHSection section = reportLongitudinalPositionSection.getName(); + rowCreator.createNextCell().setCellValue(section.getBranche().getNom()); + rowCreator.createNextCell().setCellValue(section.getNom()); + Cell cell = rowCreator.createNextCell(); + cell.setCellValue(reportLongitudinalPositionSection.getXpDisplay()); + cell.setCellStyle(xpStyle); + for (ReportRunVariableKey variable : profilVariables) { + if (ReportVariableTypeEnum.LIMIT_PROFIL.equals(variable.getVariable().getVariableType())) { + ItemEnum etiquette = limitHelper.getEtiquette(variable.getVariable().getVariableName()); + LitNommeLimite limite = limitHelper.getLimite(variable.getVariable().getVariableName()); + cell = rowCreator.createNextCell(); + if (etiquette != null || limite != null) { + EMHSectionProfil retrieveProfil = ReportProfilHelper.retrieveProfil(section); + if (retrieveProfil != null) { + DonPrtGeoProfilSection profil = DonPrtHelper.getProfilSection(retrieveProfil); + Double z = ReportExportUtils.computeZ(etiquette, limite, profil, ccm); + if (z != null) { + cell.setCellValue(z.doubleValue()); + cell.setCellStyle(zStyle); + + } } } } } - } - - for (ReportRunVariableKey variable : variablesRPIToExport) { - Double value = resultService.getValue(variable, section.getNom()); - cell = row.createCell(idx++); - if (value != null) { - cell.setCellValue(value.doubleValue()); - final CellStyle style = formater.getStyle(resultService.getPropertyNature(variable.getVariableName()), - DecimalFormatEpsilonEnum.COMPARISON); - cell.setCellStyle(style); - - } - } - for (ResultatTimeKey time : times) { - for (ReportRunVariableKey variable : variablesToExport) { - boolean isDz = ReportRunVariableHelper.isNatDzVar(variable.getVariable(), resultService); - Double value = resultService.getValue(time, variable, section.getNom()); - if (isDz && value != null) { - Double valueZf = ReportProfilHelper.getRPTGZf(section); - if (valueZf == null) { - value = null; - } else { - value = Double.valueOf(value.doubleValue() + valueZf.doubleValue()); - } - } - cell = row.createCell(idx++); + + for (ReportRunVariableKey variableInit : variablesRPIToExport) { + ReportRunVariableKey variable = new ReportRunVariableKey(runKey, variableInit.getVariable()); + Double value = resultService.getValue(variable, section.getNom()); + cell = rowCreator.createNextCell(); if (value != null) { cell.setCellValue(value.doubleValue()); final CellStyle style = formater.getStyle(resultService.getPropertyNature(variable.getVariableName()), DecimalFormatEpsilonEnum.COMPARISON); cell.setCellStyle(style); - + } } + for (ResultatTimeKey time : times) { + for (ReportRunVariableKey variableInit : variablesToExport) { + ReportRunVariableKey variable = new ReportRunVariableKey(runKey, variableInit.getVariable()); + boolean isDz = ReportRunVariableHelper.isNatDzVar(variable.getVariable(), resultService); + Double value = resultService.getValue(time, variable, section.getNom()); + if (isDz && value != null) { + Double valueZf = ReportProfilHelper.getRPTGZf(section); + if (valueZf == null) { + value = null; + } else { + value = Double.valueOf(value.doubleValue() + valueZf.doubleValue()); + } + } + cell = rowCreator.createNextCell(); + if (value != null) { + cell.setCellValue(value.doubleValue()); + final CellStyle style = formater.getStyle(resultService.getPropertyNature(variable.getVariableName()), + DecimalFormatEpsilonEnum.COMPARISON); + cell.setCellStyle(style); + + } + } + } } } + rowCreator.nextBlock(); } } - + } Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportLongitudinalExportAction.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportLongitudinalExportAction.java 2016-02-24 20:28:54 UTC (rev 9293) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/export/ReportLongitudinalExportAction.java 2016-02-24 22:28:54 UTC (rev 9294) @@ -84,7 +84,9 @@ keys.addAll(runKey); Collections.sort(keys, ObjetNommeByNameComparator.INSTANCE); final Set<ResultatTimeKey> selectedTimeKeys = new TreeSet<>(); - selectedTimeKeys.add(reportResultProviderService.getReportService().getSelectedTime()); + if (reportResultProviderService.getReportService().getSelectedTime() != null) { + selectedTimeKeys.add(reportResultProviderService.getReportService().getSelectedTime()); + } selectedTimeKeys.addAll(topComponent.getReportConfig().getTimes()); final List<ReportRunVariableKey> variablesKeys = variableChooser.getKeysForRuns(reportResultProviderService, toExport, keys); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bma...@us...> - 2016-02-24 15:56:10
|
Revision: 9292 http://sourceforge.net/p/fudaa/svn/9292 Author: bmarchan Date: 2016-02-24 15:56:08 +0000 (Wed, 24 Feb 2016) Log Message: ----------- - Add show flow results action - Signe +/- pour l'ecart sur fenetre de resultats de calcul de debit Modified Paths: -------------- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowInfoPanel.java trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java Added Paths: ----------- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowResultsAction.java Removed Paths: ------------- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowAction.java Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowInfoPanel.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowInfoPanel.java 2016-02-24 12:58:11 UTC (rev 9291) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowInfoPanel.java 2016-02-24 15:56:08 UTC (rev 9292) @@ -10,6 +10,7 @@ import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; +import java.text.DecimalFormat; import java.text.NumberFormat; import javax.swing.JLabel; @@ -88,17 +89,17 @@ return rowIndex==res_.length? meanDisch_:res_[rowIndex].getDischarge(); case 2: val=rowIndex==res_.length? meanDisch_:res_[rowIndex].getDischarge(); - return Math.abs((val-meanDisch_)/meanDisch_*100); + return (val-meanDisch_)/meanDisch_*100; case 3: return rowIndex==res_.length? meanArea_:res_[rowIndex].getWettedArea(); case 4: val=rowIndex==res_.length? meanArea_:res_[rowIndex].getWettedArea(); - return Math.abs((val-meanArea_)/meanArea_*100); + return (val-meanArea_)/meanArea_*100; case 5: return rowIndex==res_.length? meanMeanV_:res_[rowIndex].getMeanVelocity(); case 6: val=rowIndex==res_.length? meanMeanV_:res_[rowIndex].getMeanVelocity(); - return Math.abs((val-meanMeanV_)/meanMeanV_*100); + return (val-meanMeanV_)/meanMeanV_*100; } } @@ -111,19 +112,26 @@ * Une classe pour une repr\xE9sentation des doubles. */ private class DischargeCellRenderer extends DefaultTableCellRenderer { - NumberFormat fmt = CtuluLib.getDecimalFormat(3); + DecimalFormat fmt = CtuluLib.getDecimalFormat(3); + DecimalFormat fmtEcart = CtuluLib.getNoEffectDecimalFormat(); public DischargeCellRenderer() { this.setHorizontalAlignment(SwingConstants.RIGHT); fmt.setMaximumFractionDigits(3); fmt.setMinimumFractionDigits(3); + fmtEcart.setMaximumFractionDigits(1); + fmtEcart.setMinimumFractionDigits(1); + fmtEcart.setPositivePrefix("+"); } public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { super.getTableCellRendererComponent(table,value,isSelected,hasFocus,row,column); if (value instanceof Double) { - this.setText(fmt.format((Double)value)); + if (column==2 || column==4 || column==6) + this.setText(fmtEcart.format((Double)value)); + else + this.setText(fmt.format((Double)value)); } return this; } Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2016-02-24 12:58:11 UTC (rev 9291) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2016-02-24 15:56:08 UTC (rev 9292) @@ -57,6 +57,7 @@ import org.fudaa.fudaa.piv.action.PivOrthoVerifyGRPAction; import org.fudaa.fudaa.piv.action.PivSelectImagesAction; import org.fudaa.fudaa.piv.action.PivShow3DTransectAction; +import org.fudaa.fudaa.piv.action.PivShowFlowResultsAction; import org.fudaa.fudaa.piv.metier.PivProject; import org.fudaa.fudaa.piv.metier.PivProjectStateListener; @@ -820,7 +821,7 @@ mn.add(sm); mn.add(get2dFrame().getVisuPanel().getRealView().getParamsTransectAction().buildMenuItem(EbliComponentFactory.INSTANCE)); mn.add(new PivComputeFlowAction(this)); -// mn.add(get2dFrame().getVisuPanel().getShowFlowAction().buildMenuItem(EbliComponentFactory.INSTANCE)); + mn.add(new PivShowFlowResultsAction(this)); mn.add(new PivShow3DTransectAction(this)); mn.addSeparator(PivResource.getS("Vue")); Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java 2016-02-24 12:58:11 UTC (rev 9291) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java 2016-02-24 15:56:08 UTC (rev 9292) @@ -311,13 +311,6 @@ cqFlowResults.setName("cqRealFlow"); // Donne la couleur des fl\xE8ches si pas de palette de couleurs. cqFlowResults.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1, Color.ORANGE)); - cqFlowResults.addPropertyChangeListener(new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - if ("visible".equals(evt.getPropertyName())) { - pnLayers_.getShowFlowAction().setSelected((Boolean)evt.getNewValue()); - } - } - }); // Layer des transect cqTransect_= new PivTransectLayer(); Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java 2016-02-24 12:58:11 UTC (rev 9291) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivVisuPanel.java 2016-02-24 15:56:08 UTC (rev 9292) @@ -45,7 +45,6 @@ import org.fudaa.fudaa.piv.action.PivEditAction; import org.fudaa.fudaa.piv.action.PivNewTransectAction; import org.fudaa.fudaa.piv.action.PivOrthoGRPAction; -import org.fudaa.fudaa.piv.action.PivShowFlowAction; import org.fudaa.fudaa.piv.action.PivShowVelocityAction; import org.fudaa.fudaa.piv.layer.PivEditableModel; import org.fudaa.fudaa.piv.metier.PivProject; @@ -129,7 +128,6 @@ private PivComputeGridDefinitionAction actComputeGrid_; private PivShowVelocityAction actShowVelocities_; - private PivShowFlowAction actShowFlow_; private PivEditAction actEdit_; private SceneRotationAction actRotation_; private SceneDeplacementAction actDeplacement_; @@ -290,7 +288,6 @@ protected void buildActions() { actComputeGrid_=new PivComputeGridDefinitionAction(this); actShowVelocities_=new PivShowVelocityAction((PivImplementation)getCtuluUI()); - actShowFlow_=new PivShowFlowAction((PivImplementation)getCtuluUI()); actEdit_=new PivEditAction(this); actTransfMatrix_=new PivChangeCoordinatesSystemAction((PivImplementation)getCtuluUI()); getScene().addSelectionListener(actEdit_); @@ -377,14 +374,6 @@ } /** - * Retourne l'action pour voir les d\xE9bits. - * @return L'action. - */ - public PivShowFlowAction getShowFlowAction() { - return actShowFlow_; - } - - /** * Retourne l'action pour \xE9diter une g\xE9om\xE9trie. * @return L'action. */ Deleted: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowAction.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowAction.java 2016-02-24 12:58:11 UTC (rev 9291) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowAction.java 2016-02-24 15:56:08 UTC (rev 9292) @@ -1,50 +0,0 @@ -/* - * @creation 3 juil. 2008 - * @modification $Date:$ - * @license GNU General Public License 2 - * @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne - * @mail fud...@li... - */ -package org.fudaa.fudaa.piv.action; - -import org.fudaa.ebli.commun.EbliActionChangeState; -import org.fudaa.fudaa.piv.PivImplementation; -import org.fudaa.fudaa.piv.PivResource; -import org.fudaa.fudaa.piv.PivVisuPanel; - -/** - * Une action pour voir les d\xE9bits apr\xE8s calcul en espace r\xE9el. - * - * @author Bertrand Marchand (mar...@de...) - * @version $Id$ - */ -public class PivShowFlowAction extends EbliActionChangeState { - PivImplementation impl; - - /** - * Constructeur. - * @param _impl L'implementation. - */ - public PivShowFlowAction(PivImplementation _impl) { - super(PivResource.getS("Voir les vitesses moyennes sur la verticale"), null, "SHOW_FLOW_RESULTS"); - - impl=_impl; - setEnabled(false); - } - - - @Override - public String getEnableCondition() { - return PivResource.getS("Il doit exister des r\xE9sultats de calcul de d\xE9bit"); - } - - - @Override - public void changeAction() { - // On bascule dans la bonne vue. - if (isSelected()) { - impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW); - } - impl.get2dFrame().getVisuPanel().setFlowLayerVisible(isSelected()); - } -} Added: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowResultsAction.java =================================================================== --- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowResultsAction.java (rev 0) +++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowResultsAction.java 2016-02-24 15:56:08 UTC (rev 9292) @@ -0,0 +1,69 @@ +/* + * @creation 3 juil. 2008 + * @modification $Date:$ + * @license GNU General Public License 2 + * @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne + * @mail fud...@li... + */ +package org.fudaa.fudaa.piv.action; + +import java.awt.event.ActionEvent; + +import org.fudaa.ctulu.gui.CtuluDialog; +import org.fudaa.ebli.commun.EbliActionSimple; +import org.fudaa.fudaa.piv.PivFlowInfoPanel; +import org.fudaa.fudaa.piv.PivImplementation; +import org.fudaa.fudaa.piv.PivResource; + +/** + * Une action pour afficher les resultats de calcul de d\xE9bit (sans refaire le calcul). + * + * @author Bertrand Marchand (mar...@de...) + * @version $Id: PivComputeFlowAction.java 9133 2015-06-16 16:36:57Z bmarchan $ + */ +public class PivShowFlowResultsAction extends EbliActionSimple { + PivImplementation impl; + CtuluDialog diProgress_; + + /** + * Constructeur. + * @param _impl L'implementation. + */ + public PivShowFlowResultsAction(PivImplementation _impl) { + super(PivResource.getS("Afficher les r\xE9sultats du calcul..."), null, "SHOW_FLOW_RESULTS"); + + impl=_impl; + setEnabled(false); + } + + /** + * Affiche la fenetre resultats. + * @param _e L'evenement pour l'action. + */ + @Override + public void actionPerformed(final ActionEvent _e) { + if (!isValide()) { + return; + } + + PivFlowInfoPanel pnInfo=new PivFlowInfoPanel(impl.getCurrentProject().getFlowResults()); + pnInfo.afficheModale(impl.getFrame(), PivResource.getS("R\xE9sultats du calcul"), CtuluDialog.OK_OPTION); + } + + /** + * @return true Si toutes les donn\xE9es sont pr\xE9sentes pour un lancement. + */ + public boolean isValide() { + if (impl.getCurrentProject().getFlowResults()==null) { + impl.error(PivResource.getS("Erreur"), PivResource.getS("Il n'existe pas de r\xE9sultats de calcul de d\xE9bit")); + return false; + } + + return true; + } + + @Override + public String getEnableCondition() { + return PivResource.getS("Les r\xE9sultats de calcul de d\xE9bit doivent exister"); + } +} Property changes on: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivShowFlowResultsAction.java ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-02-24 12:58:14
|
Revision: 9291 http://sourceforge.net/p/fudaa/svn/9291 Author: deniger Date: 2016-02-24 12:58:11 +0000 (Wed, 24 Feb 2016) Log Message: ----------- CRUE-667 Modified Paths: -------------- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/factory/DclmFactory.java trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculNodeFactory.java trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/importer/CLimMsImporter.java Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/factory/DclmFactory.java =================================================================== --- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/factory/DclmFactory.java 2016-02-24 12:20:58 UTC (rev 9290) +++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/factory/DclmFactory.java 2016-02-24 12:58:11 UTC (rev 9291) @@ -232,6 +232,10 @@ return shortNom; } + public String getShortName() { + return shortNom; + } + @Override public String geti18nLongName() { return getNom(); Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculNodeFactory.java =================================================================== --- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculNodeFactory.java 2016-02-24 12:20:58 UTC (rev 9290) +++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/CalculNodeFactory.java 2016-02-24 12:58:11 UTC (rev 9291) @@ -25,7 +25,6 @@ import org.fudaa.dodico.crue.metier.helper.CalcHelper; import org.fudaa.dodico.crue.metier.helper.OrdCalcCloner; import org.fudaa.dodico.crue.metier.helper.OrdCalcCloner.Result; -import org.fudaa.dodico.crue.metier.transformer.TransformerEMHHelper; import org.fudaa.fudaa.crue.common.node.NodeHelper; import org.fudaa.fudaa.crue.common.services.ModellingScenarioService; import org.fudaa.fudaa.crue.modelling.perspective.PerspectiveServiceModelling; @@ -114,7 +113,9 @@ public CalculDclmNode createDclmNode(DonCLimM donCLimM) { if (donCLimM.getCalculParent().isTransitoire()) { CalcTransItem asTrans = (CalcTransItem) donCLimM; - asTrans.setLoi(clonedLoisByName.get(asTrans.getLoi().getNom())); + if (asTrans.getLoi() != null) { + asTrans.setLoi(clonedLoisByName.get(asTrans.getLoi().getNom())); + } return new CalculDclmTransNode(Children.LEAF, (CalcTransItem) donCLimM, modellingScenarioService.getSelectedProjet().getPropDefinition(), perspectiveServiceModelling, donLoiHYConteneurCloned); } Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/importer/CLimMsImporter.java =================================================================== --- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/importer/CLimMsImporter.java 2016-02-24 12:20:58 UTC (rev 9290) +++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/importer/CLimMsImporter.java 2016-02-24 12:58:11 UTC (rev 9291) @@ -5,6 +5,7 @@ import gnu.trove.TLongObjectHashMap; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -190,7 +191,10 @@ it.remove(); } } - Map<String, DclmFactory.CalcBuilder> toMapOfNom = TransformerHelper.toMapOfNom(creators); + Map<String, DclmFactory.CalcBuilder> toMapOfNom = new HashMap<>(); + for (DclmFactory.CalcBuilder creator : creators) { + toMapOfNom.put(creator.getShortName(), creator); + } return toMapOfNom; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-02-24 12:21:00
|
Revision: 9290 http://sourceforge.net/p/fudaa/svn/9290 Author: deniger Date: 2016-02-24 12:20:58 +0000 (Wed, 24 Feb 2016) Log Message: ----------- CRUE-667 Modified Paths: -------------- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnable.java trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/calcul/importer/Bundle.properties Added Paths: ----------- trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnableTest.java trunk/soft/fudaa-crue/ui-modelling/src/test/resources/ trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/ trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/fudaa/ trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/fudaa/fudaa/ trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/fudaa/fudaa/crue/ trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/fudaa/fudaa/crue/modelling/ trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/fudaa/fudaa/crue/modelling/calcul/ trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/fudaa/fudaa/crue/modelling/calcul/example.csv trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/fudaa/fudaa/crue/modelling/calcul/example.xlsx Property Changed: ---------------- trunk/soft/fudaa-crue/ui-modelling/ Index: trunk/soft/fudaa-crue/ui-modelling =================================================================== --- trunk/soft/fudaa-crue/ui-modelling 2016-02-24 11:06:45 UTC (rev 9289) +++ trunk/soft/fudaa-crue/ui-modelling 2016-02-24 12:20:58 UTC (rev 9290) Property changes on: trunk/soft/fudaa-crue/ui-modelling ___________________________________________________________________ Modified: svn:ignore ## -3,3 +3,4 ## .settings nbactions.xml target +nbproject Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnable.java =================================================================== --- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnable.java 2016-02-24 11:06:45 UTC (rev 9289) +++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnable.java 2016-02-24 12:20:58 UTC (rev 9290) @@ -57,7 +57,7 @@ } values = CSVParser.parse(initValues, sep); } else if (file != null) { - values = readFile(values); + values = readFile(); } if (values == null) { return null; @@ -71,6 +71,8 @@ protected String getValue(Cell cell) { switch (cell.getCellType()) { + case Cell.CELL_TYPE_BLANK: + return ""; case Cell.CELL_TYPE_NUMERIC: return Double.toString(cell.getNumericCellValue()); case Cell.CELL_TYPE_STRING: @@ -91,7 +93,7 @@ return StringUtils.EMPTY; } - protected String[][] readFile(String[][] values) { + protected String[][] readFile() { final String nameToLowerCase = file.getName().toLowerCase(); if (nameToLowerCase.endsWith("xlsx") || nameToLowerCase.endsWith("xls")) { List<String[]> rows = new ArrayList<String[]>(); @@ -100,10 +102,14 @@ is = new FileInputStream(file); Workbook wb = WorkbookFactory.create(is); Sheet sheetAt = wb.getSheetAt(0); + int maxCol = 0; for (Row row : sheetAt) { + maxCol = Math.max(maxCol, row.getLastCellNum()); + } + for (Row row : sheetAt) { List<String> cols = new ArrayList<String>(); - for (Cell cell : row) { - cols.add(getValue(cell)); + for (int i = 0; i < maxCol; i++) { + cols.add(getValue(row.getCell(i, Row.CREATE_NULL_AS_BLANK))); } rows.add(cols.toArray(new String[cols.size()])); } @@ -116,12 +122,13 @@ return toArray; } else { - return readCsv(values); + return readCsv(); } } - protected String[][] readCsv(String[][] values) { + protected String[][] readCsv() { Reader reader = null; + String[][] values = null; try { reader = new FileReader(file); values = new CSVParser(new BufferedReader(reader), ';').getAllValues(); Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/calcul/importer/Bundle.properties =================================================================== --- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/calcul/importer/Bundle.properties 2016-02-24 11:06:45 UTC (rev 9289) +++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/calcul/importer/Bundle.properties 2016-02-24 12:20:58 UTC (rev 9290) @@ -2,9 +2,9 @@ import.cini.wrongValue=La ligne n\u00b0{0} a \u00e9t\u00e9 ignor\u00e9 car la valeur n''est pas lisible. Le format attendu est <nom EMH>;<Type>;<Valeur> import.cini.doublons=Le couple {0} est d\u00e9fini plusieurs fois. La derni\u00e8re valeur est prise en compte. import.cini.nbModifiedValue={0} valeurs modifi\u00e9es -climImport.wrongColumnsNumber=Le nombre de colonnes du fichier d'import doit \u00eatre impair. Ent\u00eate attendue: colonne 1=nom calcul; colonne 2=emh 1 (type);emh 1 (valeur) -climImport.wrongColumnsOrganization=Dans la ligne d'ent\u00eate, il doit y avoir 2 colonnes par EMH: type et valeur. Ent\u00eate attendue: colonne 1=nom calcul; colonne 2=emh 1 (type);emh 1 (valeur) -climImport.ligneWithWrongColumnsNumber=La ligne {0} doit contenir au maximum {1} colonnes +climImport.wrongColumnsNumber=Le tableau import\u00e9 doit avoir la structure suivante : Colonne 1 = Nom du Calcul ; Puis 2 colonnes pour chaque EMH (i) portant une Clim : Colonne i1 = emh i (type); colonne i2 = emh i (valeur);\nValeur attendue dans la colonne i2 : valeur num\u00e9rique pour un calcul permanent, nom de loi existante pour un calcul transitoire +climImport.wrongColumnsOrganization=Le tableau import\u00e9 doit avoir la structure suivante : Colonne 1 = Nom du Calcul ; Puis 2 colonnes pour chaque EMH (i) portant une Clim : Colonne i1 = emh i (type); colonne i2 = emh i (valeur);\nValeur attendue dans la colonne i2 : valeur num\u00e9rique pour un calcul permanent, nom de loi existante pour un calcul transitoire +climImport.ligneWithWrongColumnsNumber=Le tableau import\u00e9 doit avoir la structure suivante : Colonne 1 = Nom du Calcul ; Puis 2 colonnes pour chaque EMH (i) portant une Clim : Colonne i1 = emh i (type); colonne i2 = emh i (valeur);\nValeur attendue dans la colonne i2 : valeur num\u00e9rique pour un calcul permanent, nom de loi existante pour un calcul transitoire climImport.doublonCalcul=Le calcul {0} est d\u00e9fini plusieurs fois climImport.doublonEMH=L''EMH {0} est d\u00e9finie plusieurs fois dans les DCLM importCLimMs.bilan=Import des CLimMs @@ -14,6 +14,6 @@ importClimMs.skipLine=La ligne {0} du fichier d''import a \u00e9t\u00e9 ignor\u00e9e climImport.unknownEMH=L''EMH {0} n''existe pas climImport.nameCalculUnknown=Le calcul {0} ne suit pas la convention de nommage: le pr\u00e9fixe doit \u00eatre CC_P pour pseudo-permanent et CC_T pour transitoire. -climImport.NonConsistentDclimValue=Les valeurs du calcul {0} ne sont pas consistentes ( permanentes et transitoire) +climImport.NonConsistentDclimValue=Les valeurs du calcul {0} ne sont pas consistentes ( permanentes et transitoires) climImport.calculPermanentNoPermanentValue=Le calcul {0} de type pseudo-permanent contient une valeur non coh\u00e9rente pour l''EMH {0} climImport.calculTransitoireNoTransitoireValue=Le calcul {0} de type transitoire contient une valeur non coh\u00e9rente pour l''EMH {0} Added: trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnableTest.java =================================================================== --- trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnableTest.java (rev 0) +++ trunk/soft/fudaa-crue/ui-modelling/src/test/java/org/fudaa/fudaa/crue/modelling/calcul/ModellingListCLimMsProgressRunnableTest.java 2016-02-24 12:20:58 UTC (rev 9290) @@ -0,0 +1,45 @@ +/* +GPL 2 + */ +package org.fudaa.fudaa.crue.modelling.calcul; + +import java.io.File; +import java.io.IOException; +import org.fudaa.ctulu.CtuluLibFile; +import org.junit.Test; +import static org.junit.Assert.*; + +/** + * + * @author Frederic Deniger + */ +public class ModellingListCLimMsProgressRunnableTest { + + public ModellingListCLimMsProgressRunnableTest() { + } + + @Test + public void testReadXls() throws IOException { + File f = CtuluLibFile.getFileFromJar("/org/fudaa/fudaa/crue/modelling/calcul/example.xlsx", File.createTempFile("example", ".xlsx")); + testContent(f); + + } + + protected void testContent(File f) { + assertNotNull(f); + ModellingListCLimMsProgressRunnable runnable = new ModellingListCLimMsProgressRunnable(f, null); + String[][] values = runnable.readFile(); + assertEquals(2, values.length); + assertEquals(5, values[0].length); + assertArrayEquals(new String[]{"A", "", "B", "C", "D"}, values[0]); + assertEquals(5, values[1].length); + assertArrayEquals(new String[]{"E", "F", "", "G", "H"}, values[1]); + } + @Test + public void testReadCsv() throws IOException { + File f = CtuluLibFile.getFileFromJar("/org/fudaa/fudaa/crue/modelling/calcul/example.csv", File.createTempFile("example", ".csv")); + testContent(f); + + } + +} Added: trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/fudaa/fudaa/crue/modelling/calcul/example.csv =================================================================== --- trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/fudaa/fudaa/crue/modelling/calcul/example.csv (rev 0) +++ trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/fudaa/fudaa/crue/modelling/calcul/example.csv 2016-02-24 12:20:58 UTC (rev 9290) @@ -0,0 +1,2 @@ +A;;B;C;D +E;F;;G;H Added: trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/fudaa/fudaa/crue/modelling/calcul/example.xlsx =================================================================== (Binary files differ) Index: trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/fudaa/fudaa/crue/modelling/calcul/example.xlsx =================================================================== --- trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/fudaa/fudaa/crue/modelling/calcul/example.xlsx 2016-02-24 11:06:45 UTC (rev 9289) +++ trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/fudaa/fudaa/crue/modelling/calcul/example.xlsx 2016-02-24 12:20:58 UTC (rev 9290) Property changes on: trunk/soft/fudaa-crue/ui-modelling/src/test/resources/org/fudaa/fudaa/crue/modelling/calcul/example.xlsx ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-02-24 11:06:48
|
Revision: 9289 http://sourceforge.net/p/fudaa/svn/9289 Author: deniger Date: 2016-02-24 11:06:45 +0000 (Wed, 24 Feb 2016) Log Message: ----------- CRUE-644 Modified Paths: -------------- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java =================================================================== --- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java 2016-02-24 10:49:20 UTC (rev 9288) +++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java 2016-02-24 11:06:45 UTC (rev 9289) @@ -108,7 +108,7 @@ boolean ok = writeToFile(wb); if (!ok) { throw new IllegalStateException(CtuluResource.CTULU.getString( - "Impossible d'\xE9crire dans le fichier '{0}'.\n Il est probablement ouvert par un autre processus (Excel).", dest_. + "Impossible d'\xE9crire dans le fichier '{0}'.\nIl est probablement ouvert par un autre processus (Excel).", dest_. getName())); } } finally { Modified: trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt =================================================================== --- trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt 2016-02-24 10:49:20 UTC (rev 9288) +++ trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt 2016-02-24 11:06:45 UTC (rev 9289) @@ -340,4 +340,4 @@ Export termin\xE9=Export finished Donn\xE9es export\xE9es dans le fichier\n {0}=Data exported in the file\n {0} Enregistrer sous=Save as -Impossible d'\xE9crire dans le fichier '{0}'.\n Il est probablement ouvert par un autre processus (Excel).=The file {0} can't be written.\n It should be opened by another process (Excel). \ No newline at end of file +Impossible d'\xE9crire dans le fichier '{0}'.\nIl est probablement ouvert par un autre processus (Excel).=The file {0} can't be written.\n It should be opened by another process (Excel). \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-02-24 10:49:23
|
Revision: 9288 http://sourceforge.net/p/fudaa/svn/9288 Author: deniger Date: 2016-02-24 10:49:20 +0000 (Wed, 24 Feb 2016) Log Message: ----------- CRUE-644 Modified Paths: -------------- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java =================================================================== --- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java 2016-02-24 10:26:38 UTC (rev 9287) +++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableSimpleExporter.java 2016-02-24 10:49:20 UTC (rev 9288) @@ -11,12 +11,14 @@ */ package org.fudaa.ctulu.gui; +import com.memoire.bu.BuLib; import com.memoire.bu.BuPreferences; import java.awt.Window; import java.io.File; import java.text.DecimalFormat; import org.fudaa.ctulu.CsvWriter; import org.fudaa.ctulu.CtuluLib; +import org.fudaa.ctulu.CtuluResource; import org.fudaa.ctulu.CtuluTaskDelegate; import org.fudaa.ctulu.CtuluUI; import org.fudaa.ctulu.gui.CtuluFileChooserCsvExcel.TypeChoosen; @@ -81,6 +83,7 @@ @Override public void run() { final CtuluTableModelInterface m = model; + boolean ok = true; try { if (TypeChoosen.XLSX.equals(typeChoosen)) { final CtuluTableXlsxWriter w = new CtuluTableXlsxWriter(m, dest_); @@ -101,8 +104,19 @@ w.write(task.getStateReceiver()); } } catch (final Exception e) { + ok = false; ui_.error(dest_.getName(), e.getMessage(), false); } + if (ok) { + BuLib.invokeLater(new Runnable() { + @Override + public void run() { + ui_.message(CtuluResource.CTULU.getString("Export termin\xE9"), CtuluResource.CTULU.getString("Donn\xE9es export\xE9es dans le fichier\n {0}", + dest_. + getAbsolutePath()), true); + } + }); + } } }); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-02-24 10:26:40
|
Revision: 9287 http://sourceforge.net/p/fudaa/svn/9287 Author: deniger Date: 2016-02-24 10:26:38 +0000 (Wed, 24 Feb 2016) Log Message: ----------- CRUE-644 Modified Paths: -------------- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/ResPrtHelper.java trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/data/ReportRunVariableKey.java trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/data/ReportRunVariableTimeKey.java trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/export/ReportExportProfilLongitudinal.java trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.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/service/ReportResultProviderService.java Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/ResPrtHelper.java =================================================================== --- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/ResPrtHelper.java 2016-02-24 10:25:04 UTC (rev 9286) +++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/ResPrtHelper.java 2016-02-24 10:26:38 UTC (rev 9287) @@ -2,7 +2,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.commons.lang.StringUtils; import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierConstants; /** @@ -10,13 +9,17 @@ * @author GRESSIER */ public class ResPrtHelper { - + public static List<String> getZiniVar() { return Arrays.asList(CrueConfigMetierConstants.ZINI); } - + public static List<String> getQiniVar() { return Arrays.asList(CrueConfigMetierConstants.QINI); } - + + public static boolean isRPTIVariable(String varName) { + return CrueConfigMetierConstants.ZINI.equals(varName) || CrueConfigMetierConstants.QINI.equals(varName); + } + } Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/data/ReportRunVariableKey.java =================================================================== --- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/data/ReportRunVariableKey.java 2016-02-24 10:25:04 UTC (rev 9286) +++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/data/ReportRunVariableKey.java 2016-02-24 10:26:38 UTC (rev 9287) @@ -70,6 +70,9 @@ public boolean isReadVariable() { return ReportVariableTypeEnum.READ.equals(variable.getVariableType()); } + public boolean isRPTIVariable() { + return ReportVariableTypeEnum.RESULTAT_RPTI.equals(variable.getVariableType()); + } public boolean isReadOrVariable() { return isReadVariable() || ReportVariableTypeEnum.FORMULE.equals(variable.getVariableType()); Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/data/ReportRunVariableTimeKey.java =================================================================== --- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/data/ReportRunVariableTimeKey.java 2016-02-24 10:25:04 UTC (rev 9286) +++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/data/ReportRunVariableTimeKey.java 2016-02-24 10:26:38 UTC (rev 9287) @@ -51,6 +51,9 @@ public boolean isLimitProfilVariable() { return ReportVariableTypeEnum.LIMIT_PROFIL.equals(runVariableKey.getVariable().getVariableType()); } + public boolean isRPTIVariable() { + return ReportVariableTypeEnum.RESULTAT_RPTI.equals(runVariableKey.getVariable().getVariableType()); + } public boolean isReadVariable() { return ReportVariableTypeEnum.READ.equals(runVariableKey.getVariable().getVariableType()); Modified: trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/export/ReportExportProfilLongitudinal.java =================================================================== --- trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/export/ReportExportProfilLongitudinal.java 2016-02-24 10:25:04 UTC (rev 9286) +++ trunk/soft/fudaa-crue/crue-project/src/main/java/org/fudaa/dodico/crue/projet/report/export/ReportExportProfilLongitudinal.java 2016-02-24 10:26:38 UTC (rev 9287) @@ -3,7 +3,9 @@ */ package org.fudaa.dodico.crue.projet.report.export; +import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -55,7 +57,7 @@ } @Override - protected void writeInBook(Workbook wb, List<ReportRunVariableKey> variablesToExport, List<ResultatTimeKey> times) { + protected void writeInBook(Workbook wb, List<ReportRunVariableKey> variablesToExportInit, List<ResultatTimeKey> times) { String sheetName = CtuluResource.CTULU.getString("Feuille {0}", CtuluLibString.getString(1)); ReportExcelFormatData formater = new ReportExcelFormatData(wb); @@ -75,9 +77,9 @@ row.createCell(idx++).setCellValue(BusinessMessages.getString("prefix.sections")); String currentRunName = this.resultService.getRunCourant().getRunKey().getDisplayName(); row.createCell(idx++).setCellValue(propertyXp.getDisplayNom() + BusinessMessages.ENTITY_SEPARATOR + currentRunName); - final List<ReportRunVariableKey> variables = content.getProfilVariables(); + final List<ReportRunVariableKey> profilVariables = content.getProfilVariables(); //les titres des limites de profils - for (ReportRunVariableKey variable : variables) { + for (ReportRunVariableKey variable : profilVariables) { if (ReportVariableTypeEnum.LIMIT_PROFIL.equals(variable.getVariable().getVariableType())) { String displayName = displayNameById.get(variable.getVariableName()); if (StringUtils.isEmpty(displayName)) { @@ -86,7 +88,22 @@ row.createCell(idx++).setCellValue(displayName + BusinessMessages.ENTITY_SEPARATOR + currentRunName); } } - //les titres des variables + + List<ReportRunVariableKey> variablesToExport = new ArrayList<>(); + List<ReportRunVariableKey> variablesRPIToExport = new ArrayList<>(); + + //pour les valeur RPTI, il ne faut exporter qu'une seul fois par run. + for (ReportRunVariableKey variable : variablesToExportInit) { + if (variable.isRPTIVariable()) { + variablesRPIToExport.add(variable); + } else { + variablesToExport.add(variable); + } + } + for (ReportRunVariableKey variable : variablesRPIToExport) { + row.createCell(idx++).setCellValue( + variable.getVariable().getVariableDisplayName() + BusinessMessages.ENTITY_SEPARATOR + variable.getReportRunKey().getDisplayName()); + } for (ResultatTimeKey time : times) { for (ReportRunVariableKey variable : variablesToExport) { row.createCell(idx++).setCellValue( @@ -128,7 +145,7 @@ Cell cell = row.createCell(idx++); cell.setCellValue(reportLongitudinalPositionSection.getXpDisplay()); cell.setCellStyle(xpStyle); - for (ReportRunVariableKey variable : variables) { + for (ReportRunVariableKey variable : profilVariables) { if (ReportVariableTypeEnum.LIMIT_PROFIL.equals(variable.getVariable().getVariableType())) { ItemEnum etiquette = limitHelper.getEtiquette(variable.getVariable().getVariableName()); LitNommeLimite limite = limitHelper.getLimite(variable.getVariable().getVariableName()); @@ -147,6 +164,18 @@ } } } + + for (ReportRunVariableKey variable : variablesRPIToExport) { + Double value = resultService.getValue(variable, section.getNom()); + cell = row.createCell(idx++); + if (value != null) { + cell.setCellValue(value.doubleValue()); + final CellStyle style = formater.getStyle(resultService.getPropertyNature(variable.getVariableName()), + DecimalFormatEpsilonEnum.COMPARISON); + cell.setCellStyle(style); + + } + } for (ResultatTimeKey time : times) { for (ReportRunVariableKey variable : variablesToExport) { boolean isDz = ReportRunVariableHelper.isNatDzVar(variable.getVariable(), resultService); Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java 2016-02-24 10:25:04 UTC (rev 9286) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java 2016-02-24 10:26:38 UTC (rev 9287) @@ -385,9 +385,13 @@ Object selectedKey = getSelectedKey(); CourbeComparator comparator = new CourbeComparator(); Collections.sort(externe, comparator); - Collections.sort(internCourbes, comparator); + if (internCourbes != null) { + Collections.sort(internCourbes, comparator); + } List<EGCourbeSimple> courbes = new ArrayList<EGCourbeSimple>(); - courbes.addAll(internCourbes); + if (internCourbes != null) { + courbes.addAll(internCourbes); + } courbes.addAll(externe); uiController.getEGGrapheSimpleModel().removeAllCurves(null); uiController.getEGGrapheSimpleModel().addCourbes((EGCourbeSimple[]) courbes.toArray(new EGCourbeSimple[courbes.size()]), null); 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 2016-02-24 10:25:04 UTC (rev 9286) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalGrapheBuilder.java 2016-02-24 10:26:38 UTC (rev 9287) @@ -113,7 +113,7 @@ Object key = ((CourbeModelWithKey) courbe.getModel()).getKey(); if (key != null && ReportRunVariableTimeKey.class.equals(key.getClass())) { ReportRunVariableTimeKey reportKey = (ReportRunVariableTimeKey) key; - if (!reportKey.isDefinedOnSelectedTimeStep() || reportKey.isLimitProfilVariable()) { + if (!reportKey.isDefinedOnSelectedTimeStep() || reportKey.isLimitProfilVariable() || reportKey.isRPTIVariable()) { res.add(courbe); } } 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 2016-02-24 10:25:04 UTC (rev 9286) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportProfilLongitudinalTopComponent.java 2016-02-24 10:26:38 UTC (rev 9287) @@ -172,8 +172,8 @@ } } // ajout Zini issu du RPTI - List<String> varZIni = ResPrtHelper.getZiniVar(); - choosableVariables.addAll(varZIni); + choosableVariables.addAll(ResPrtHelper.getZiniVar()); + choosableVariables.addAll(ResPrtHelper.getQiniVar()); return choosableVariables; } Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportResultProviderService.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportResultProviderService.java 2016-02-24 10:25:04 UTC (rev 9286) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/service/ReportResultProviderService.java 2016-02-24 10:26:38 UTC (rev 9287) @@ -18,6 +18,7 @@ import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey; import org.fudaa.dodico.crue.metier.helper.DonPrtHelper; import org.fudaa.dodico.crue.metier.helper.EMHHelper; +import org.fudaa.dodico.crue.metier.helper.ResPrtHelper; import org.fudaa.dodico.crue.metier.transformer.TransformerEMHHelper; import org.fudaa.dodico.crue.projet.report.ReportResultProviderServiceContrat; import org.fudaa.dodico.crue.projet.report.data.ReportExpressionHelper; @@ -140,6 +141,9 @@ @Override public ReportVariableKey createVariableKey(String varName) { + if (ResPrtHelper.isRPTIVariable(varName)) { + return new ReportVariableKey(ReportVariableTypeEnum.RESULTAT_RPTI, varName); + } if (reportFormuleService.isFormule(varName)) { return new ReportVariableKey(ReportVariableTypeEnum.FORMULE, varName); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-02-24 10:25:06
|
Revision: 9286 http://sourceforge.net/p/fudaa/svn/9286 Author: deniger Date: 2016-02-24 10:25:04 +0000 (Wed, 24 Feb 2016) Log Message: ----------- CRUE-651 Modified Paths: -------------- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java =================================================================== --- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java 2016-02-24 07:49:02 UTC (rev 9285) +++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java 2016-02-24 10:25:04 UTC (rev 9286) @@ -107,7 +107,8 @@ } boolean ok = writeToFile(wb); if (!ok) { - throw new IllegalStateException(CtuluResource.CTULU.getString("Impossible d'\xE9crire dans le fichier '{0}'. Il est probablement ouvert.", dest_. + throw new IllegalStateException(CtuluResource.CTULU.getString( + "Impossible d'\xE9crire dans le fichier '{0}'.\n Il est probablement ouvert par un autre processus (Excel).", dest_. getName())); } } finally { Modified: trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt =================================================================== --- trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt 2016-02-24 07:49:02 UTC (rev 9285) +++ trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt 2016-02-24 10:25:04 UTC (rev 9286) @@ -340,4 +340,4 @@ Export termin\xE9=Export finished Donn\xE9es export\xE9es dans le fichier\n {0}=Data exported in the file\n {0} Enregistrer sous=Save as -Impossible d'\xE9crire dans le fichier '{0}'. Il est probablement ouvert.=The file {0} can't be written. It should be opened by another process. \ No newline at end of file +Impossible d'\xE9crire dans le fichier '{0}'.\n Il est probablement ouvert par un autre processus (Excel).=The file {0} can't be written.\n It should be opened by another process (Excel). \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-02-24 07:49:05
|
Revision: 9285 http://sourceforge.net/p/fudaa/svn/9285 Author: deniger Date: 2016-02-24 07:49:02 +0000 (Wed, 24 Feb 2016) Log Message: ----------- CRUE-651 Modified Paths: -------------- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/Bundle.properties trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/layer.xml trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/ActiveModelisation.java trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/perspective/ActiveOtfa.java trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/layer.xml trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/perspective/ActivePost.java trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/layer.xml trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/perspective/ActiveReport.java trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/export/Bundle.properties trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/layer.xml trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/perspective/ActiveStudy.java trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/layer.xml Modified: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/Bundle.properties =================================================================== --- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/Bundle.properties 2016-02-23 14:51:25 UTC (rev 9284) +++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/Bundle.properties 2016-02-24 07:49:02 UTC (rev 9285) @@ -1 +1,2 @@ WinSys.Show.Hide.MainWindow.While.Switching.Role=false +Editor.TopComponent.Closing.Enabled=false Modified: trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/layer.xml =================================================================== --- trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/layer.xml 2016-02-23 14:51:25 UTC (rev 9284) +++ trunk/soft/fudaa-crue/ui-common/src/main/resources/org/fudaa/fudaa/crue/common/layer.xml 2016-02-24 07:49:02 UTC (rev 9285) @@ -7,6 +7,8 @@ <file name="Separator4.instance"> <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/> </file> + <file name="org-netbeans-core-windows-actions-CloseAllButThisAction.instance_hidden"/> + <file name="org-netbeans-core-windows-actions-CloseAllDocumentsAction.instance_hidden"/> </folder> </folder> <folder name="Menu"> Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/ActiveModelisation.java =================================================================== --- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/ActiveModelisation.java 2016-02-23 14:51:25 UTC (rev 9284) +++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/perspective/ActiveModelisation.java 2016-02-24 07:49:02 UTC (rev 9285) @@ -1,7 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package org.fudaa.fudaa.crue.modelling.perspective; import java.util.Collection; @@ -16,7 +12,10 @@ import org.openide.awt.ActionRegistration; import org.openide.util.NbBundle; import org.openide.util.lookup.Lookups; - +/** + * Permet d'activer une perspective. Action utilisée dans la toobar pour changer de perspective. Pour la gestion des ordres des menus, voir le fichier + * layer.xml + */ @ActionID(category = "File", id = "org.fudaa.fudaa.crue.modelling.perspective.ActiveModelisation") @ActionRegistration(displayName = "#CTL_ActiveModelisation") @ActionReference(path = "Menu/Window", position = 3) Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml =================================================================== --- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml 2016-02-23 14:51:25 UTC (rev 9284) +++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/layer.xml 2016-02-24 07:49:02 UTC (rev 9285) @@ -4,6 +4,10 @@ <folder name="Actions"> + <folder name="Window"> + <file name="org-netbeans-core-windows-actions-CloseAllButThisAction.instance_hidden"/> + <file name="org-netbeans-core-windows-actions-CloseAllDocumentsAction.instance_hidden"/> + </folder> </folder> <folder name="Menu"> <folder name="Window"> Modified: trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml =================================================================== --- trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml 2016-02-23 14:51:25 UTC (rev 9284) +++ trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml 2016-02-24 07:49:02 UTC (rev 9285) @@ -1,7 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd"> <filesystem> - <folder name="DefaultConfig"> + <folder name="Actions"> + <folder name="Window"> + <file name="org-netbeans-core-windows-actions-CloseAllButThisAction.instance_hidden"/> + <file name="org-netbeans-core-windows-actions-CloseAllDocumentsAction.instance_hidden"/> + </folder> + </folder> + <folder name="DefaultConfig"> <file name="FudaaCrue_Site.xml" url="/FudaaCrue_Site.xml"/> <file name="FudaaCrue_Etude.xml" url="/FudaaCrue_Etude.xml"/> <file name="FudaaCrue_Aide.xml" url="/FudaaCrue_Aide.xml"/> Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/perspective/ActiveOtfa.java =================================================================== --- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/perspective/ActiveOtfa.java 2016-02-23 14:51:25 UTC (rev 9284) +++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/perspective/ActiveOtfa.java 2016-02-24 07:49:02 UTC (rev 9285) @@ -6,6 +6,10 @@ import org.openide.awt.ActionReference; import org.openide.awt.ActionRegistration; +/** + * Permet d'activer une perspective. Action utilisée dans la toobar pour changer de perspective. Pour la gestion des ordres des menus, voir le fichier + * layer.xml + */ @ActionID(category = "File", id = "org.fudaa.fudaa.crue.otfa.perspective.ActiveOtfa") @ActionRegistration(displayName = "#CTL_ActiveOtfa") @ActionReference(path = "Menu/Window", position = 6) Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/layer.xml =================================================================== --- trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/layer.xml 2016-02-23 14:51:25 UTC (rev 9284) +++ trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/layer.xml 2016-02-24 07:49:02 UTC (rev 9285) @@ -31,7 +31,7 @@ <folder name="Window"> <folder name="OTFA"> <attr name="displayName" bundlevalue="org.fudaa.fudaa.crue.otfa.Bundle#Menu/OTFA"/> - <attr name="position" intvalue="15"/> + <attr name="position" intvalue="18"/> </folder> </folder> </folder> Modified: trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/perspective/ActivePost.java =================================================================== --- trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/perspective/ActivePost.java 2016-02-23 14:51:25 UTC (rev 9284) +++ trunk/soft/fudaa-crue/ui-post/src/main/java/org/fudaa/fudaa/crue/post/perspective/ActivePost.java 2016-02-24 07:49:02 UTC (rev 9285) @@ -1,7 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package org.fudaa.fudaa.crue.post.perspective; import org.fudaa.fudaa.crue.common.PerspectiveEnum; @@ -9,7 +5,10 @@ import org.openide.awt.ActionID; import org.openide.awt.ActionReference; import org.openide.awt.ActionRegistration; - +/** + * Permet d'activer une perspective. Action utilisée dans la toobar pour changer de perspective. Pour la gestion des ordres des menus, voir le fichier + * layer.xml + */ @ActionID(category = "File", id = "org.fudaa.fudaa.crue.post.perspective.ActivePost") @ActionRegistration(displayName = "#CTL_ActivePost") @ActionReference(path = "Menu/Window" , position = 4) Modified: trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/layer.xml =================================================================== --- trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/layer.xml 2016-02-23 14:51:25 UTC (rev 9284) +++ trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/layer.xml 2016-02-24 07:49:02 UTC (rev 9285) @@ -16,6 +16,8 @@ <attr name="preferredID" stringvalue="PostEmhExplorerTopComponent"/> </file> <!--<file name="org-fudaa-fudaa-crue-post-PostMainTopComponent.instance_hidden"/>--> + <file name="org-netbeans-core-windows-actions-CloseAllButThisAction.instance_hidden"/> + <file name="org-netbeans-core-windows-actions-CloseAllDocumentsAction.instance_hidden"/> </folder> </folder> <folder name="Menu"> Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/perspective/ActiveReport.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/perspective/ActiveReport.java 2016-02-23 14:51:25 UTC (rev 9284) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/perspective/ActiveReport.java 2016-02-24 07:49:02 UTC (rev 9285) @@ -1,7 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package org.fudaa.fudaa.crue.report.perspective; import java.util.Collection; @@ -16,7 +12,10 @@ import org.openide.awt.ActionRegistration; import org.openide.util.NbBundle; import org.openide.util.lookup.Lookups; - +/** + * Permet d'activer une perspective. Action utilisée dans la toobar pour changer de perspective. Pour la gestion des ordres des menus, voir le fichier + * layer.xml + */ @ActionID(category = "File", id = "org.fudaa.fudaa.crue.report.perspective.ActiveReport") @ActionRegistration(displayName = "#CTL_ActiveReport") @ActionReference(path = "Menu/Window", position = 5) Modified: trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/export/Bundle.properties =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/export/Bundle.properties 2016-02-23 14:51:25 UTC (rev 9284) +++ trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/export/Bundle.properties 2016-02-24 07:49:02 UTC (rev 9285) @@ -16,5 +16,5 @@ ExportAll.Action=Exporter\n ExportAll.Tootltip=Export en masse ExportEnded=Export termin\u00e9 vers le fichier {0} -cantWriteToFile.error=Il est impossible d'\u00e9crire dans le fichier {0}.\nRaison: {1} +cantWriteToFile.error=Il est impossible d''\u00e9crire dans le fichier {0}.\nRaison: {1} cantWriteToFileUsedByAnotherProcess.error=il est probablement ouvert par une autre application (Excel) Modified: trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/layer.xml =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/layer.xml 2016-02-23 14:51:25 UTC (rev 9284) +++ trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/layer.xml 2016-02-24 07:49:02 UTC (rev 9285) @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd"> <filesystem> - <folder name="Menu"> + <folder name="Actions"> + <folder name="Window"> + <file name="org-netbeans-core-windows-actions-CloneDocumentAction.instance_hidden"/> + <file name="org-netbeans-core-windows-actions-CloseAllButThisAction.instance_hidden"/> + <file name="org-netbeans-core-windows-actions-CloseAllDocumentsAction.instance_hidden"/> + </folder> + </folder> + <folder name="Menu"> <!-- <folder name="Report"> <attr name="displayName" bundlevalue="org.fudaa.fudaa.crue.report.Bundle#Menu/Report"/> <attr name="position" intvalue="8"/> Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/perspective/ActiveStudy.java =================================================================== --- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/perspective/ActiveStudy.java 2016-02-23 14:51:25 UTC (rev 9284) +++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/perspective/ActiveStudy.java 2016-02-24 07:49:02 UTC (rev 9285) @@ -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 org.fudaa.fudaa.crue.common.PerspectiveEnum; @@ -9,7 +5,10 @@ import org.openide.awt.ActionID; import org.openide.awt.ActionReference; import org.openide.awt.ActionRegistration; - +/** + * Permet d'activer une perspective. Action utilisée dans la toobar pour changer de perspective. Pour la gestion des ordres des menus, voir le fichier + * layer.xml + */ @ActionID(category = "File", id = "org.fudaa.fudaa.crue.study.perspective.ActiveStudy") @ActionRegistration(displayName = "#CTL_ActiveStudy") Modified: trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml =================================================================== --- trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml 2016-02-23 14:51:25 UTC (rev 9284) +++ trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/layer.xml 2016-02-24 07:49:02 UTC (rev 9285) @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd"> <filesystem> - <folder name="Loaders"> + <folder name="Actions"> + <folder name="Window"> + <file name="org-netbeans-core-windows-actions-CloneDocumentAction.instance_hidden"/> + <file name="org-netbeans-core-windows-actions-CloseAllButThisAction.instance_hidden"/> + <file name="org-netbeans-core-windows-actions-CloseAllDocumentsAction.instance_hidden"/> + </folder> + </folder> + <folder name="Loaders"> <folder name="content"> <folder name="unknown"> <folder name="Actions"> Modified: trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/layer.xml =================================================================== --- trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/layer.xml 2016-02-23 14:51:25 UTC (rev 9284) +++ trunk/soft/fudaa-crue/ui-sysdoc/src/main/resources/org/fudaa/fudaa/crue/sysdoc/layer.xml 2016-02-24 07:49:02 UTC (rev 9285) @@ -2,7 +2,11 @@ <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd"> <filesystem> <folder name="Actions"> - <folder name="Window"/> + <folder name="Window"> + <file name="org-netbeans-core-windows-actions-CloneDocumentAction.instance_hidden"/> + <file name="org-netbeans-core-windows-actions-CloseAllButThisAction.instance_hidden"/> + <file name="org-netbeans-core-windows-actions-CloseAllDocumentsAction.instance_hidden"/> + </folder> </folder> <folder name="Menu"> <folder name="Window"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-02-19 19:23:06
|
Revision: 9280 http://sourceforge.net/p/fudaa/svn/9280 Author: deniger Date: 2016-02-19 19:23:04 +0000 (Fri, 19 Feb 2016) Log Message: ----------- CRUE-657 Modified Paths: -------------- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java =================================================================== --- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java 2016-02-19 19:22:47 UTC (rev 9279) +++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGGraphe.java 2016-02-19 19:23:04 UTC (rev 9280) @@ -18,6 +18,7 @@ import java.awt.Color; import java.awt.Cursor; import java.awt.Dimension; +import java.awt.EventQueue; import java.awt.Font; import java.awt.Graphics; import java.awt.Graphics2D; @@ -120,7 +121,6 @@ this.exportDataBuilder = exportDataBuilder; } - public void setExportTableCommentSupplier(ExportTableCommentSupplier exportTableCommentSupplier) { this.exportTableCommentSupplier = exportTableCommentSupplier; } @@ -495,6 +495,15 @@ } public void fullRepaint() { + if (!EventQueue.isDispatchThread()) { + EventQueue.invokeLater(new Runnable() { + @Override + public void run() { + fullRepaint(); + } + }); + return; + } cache_ = null; if (isVisible()) { repaint(); @@ -623,6 +632,15 @@ } public void restore() { + if (!EventQueue.isDispatchThread()) { + EventQueue.invokeLater(new Runnable() { + @Override + public void run() { + restore(); + } + }); + return; + } updateRepere(); if (transformer_.getXAxe() == null) { return; @@ -791,6 +809,15 @@ boolean restoring; public void structureChanged(final boolean _restore) { + if (!EventQueue.isDispatchThread()) { + EventQueue.invokeLater(new Runnable() { + @Override + public void run() { + structureChanged(_restore); + } + }); + return; + } setXRangeIsModified(); if (autoRestore_ || _restore) { if (restoring) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-02-19 19:22:50
|
Revision: 9279 http://sourceforge.net/p/fudaa/svn/9279 Author: deniger Date: 2016-02-19 19:22:47 +0000 (Fri, 19 Feb 2016) Log Message: ----------- CRUE-657 Modified Paths: -------------- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserTestWritable.java trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserWriter.java trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportTask.java Modified: trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java =================================================================== --- trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java 2016-02-19 18:33:17 UTC (rev 9278) +++ trunk/framework/ctulu-common/src/main/java/org/fudaa/ctulu/table/CtuluTableXlsxWriter.java 2016-02-19 19:22:47 UTC (rev 9279) @@ -33,9 +33,9 @@ * @version $Id: CtuluTableExcelWriter.java,v 1.7 2007-04-16 16:33:53 deniger Exp $ */ public class CtuluTableXlsxWriter implements CtuluWriter { - + CtuluTableModelInterface table_; - + File dest_; /** @@ -47,13 +47,14 @@ table_ = _table; dest_ = _dest; } - + public CtuluTableXlsxWriter() { super(); } /** * @param _p le receveur de l'avancement + * @throws IllegalStateException si erreur d'ecriture du fichier. */ @Override public void write(final ProgressionInterface _p) { @@ -104,52 +105,57 @@ if (_p != null) { _p.setProgression(80); } - writeToFile(wb); + boolean ok = writeToFile(wb); + if (!ok) { + throw new IllegalStateException(CtuluResource.CTULU.getString("Impossible d'\xE9crire dans le fichier '{0}'. Il est probablement ouvert.", dest_. + getName())); + } } finally { } - + } - - protected void writeToFile(Workbook wb) { + + protected boolean writeToFile(Workbook wb) { FileOutputStream fileOut = null; try { fileOut = new FileOutputStream(dest_); wb.write(fileOut); fileOut.close(); - } catch (IOException ex) { - Logger.getLogger(CtuluTableXlsxWriter.class.getName()).log(Level.SEVERE, null, ex); + } catch (Exception ex) { + return false; } finally { CtuluLibFile.close(fileOut); } + return true; } - + BuFileFilter ftXsl_ = new BuFileFilter(new String[]{"xlsx"}, CtuluResource.CTULU.getString("Fichier Excel")); - + @Override public BuFileFilter getFilter() { return ftXsl_; } - + @Override public void setFile(File f) { dest_ = f; } - + @Override public void setModel(CtuluTableModelInterface _model) { table_ = _model; } - + String extension_ = ".xlsx"; - + @Override public String getMostPopularExtension() { return extension_; } - + @Override public boolean allowFormatData() { return true; } - + } Modified: trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt =================================================================== --- trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt 2016-02-19 18:33:17 UTC (rev 9278) +++ trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt 2016-02-19 19:22:47 UTC (rev 9279) @@ -339,4 +339,5 @@ S\xE9lection des donn\xE9es \xE0 exporter=Select data to export Export termin\xE9=Export finished Donn\xE9es export\xE9es dans le fichier\n {0}=Data exported in the file\n {0} -Enregistrer sous=Save as \ No newline at end of file +Enregistrer sous=Save as +Impossible d'\xE9crire dans le fichier '{0}'. Il est probablement ouvert.=The file {0} can't be written. It should be opened by another process. \ No newline at end of file Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java =================================================================== --- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java 2016-02-19 18:33:17 UTC (rev 9278) +++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserCsvExcel.java 2016-02-19 19:22:47 UTC (rev 9279) @@ -51,7 +51,6 @@ return ftXslx_; } - public CtuluFileChooserCsvExcel(Component parentComponent) { this.parentComponent = parentComponent; ftCsv_ = new BuFileFilter(new String[]{"csv", "txt"}, CtuluResource.CTULU.getString("Texte CSV")); @@ -69,6 +68,7 @@ setApproveButtonToolTipText(CtuluLib.getS("L'extension du fichier sera automatiquement compl\xE9t\xE9e")); CtuluFileChooserTestWritable tester = new CtuluFileChooserTestWritable(parentComponent); tester.setAppendExtension(true, null); + tester.setAppendStrictExtension(true); setFileFilter(ftXslx_); setDialogTitle(CtuluLib.getS("Enregistrer sous")); setTester(tester); @@ -94,6 +94,9 @@ return null; } File f = getSelectedFile(); + if (tester_ instanceof CtuluFileChooserTestWritable) { + return ((CtuluFileChooserTestWritable) tester_).getDestFile(f, this); + } return completeExtension(f); } Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserTestWritable.java =================================================================== --- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserTestWritable.java 2016-02-19 18:33:17 UTC (rev 9278) +++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserTestWritable.java 2016-02-19 19:22:47 UTC (rev 9279) @@ -55,7 +55,7 @@ } else if (appendStrictExt_ && ext!=null) { - return CtuluLibFile.appendStrictExtensionIfNeeded(_initFile, ext); + return CtuluLibFile.changeExtension(_initFile, ext); } return _initFile; } Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserWriter.java =================================================================== --- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserWriter.java 2016-02-19 18:33:17 UTC (rev 9278) +++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooserWriter.java 2016-02-19 19:22:47 UTC (rev 9279) @@ -19,14 +19,14 @@ * */ public class CtuluFileChooserWriter extends CtuluFileChooser { - + final List<CtuluWriter> listWriter_; final CtuluUI ui_; - + public CtuluFileChooserWriter(CtuluUI _ui, final List<CtuluWriter> _listWriter) { - + ui_ = _ui; - + if (_listWriter != null) { listWriter_ = _listWriter; } else { @@ -44,8 +44,9 @@ setApproveButtonToolTipText(CtuluLib.getS("L'extension du fichier sera automatiquement compl\xE9t\xE9e")); CtuluFileChooserTestWritable tester = new CtuluFileChooserTestWritable(_ui); tester.setAppendExtension(true, null); + tester.setAppendStrictExtension(true); setTester(tester); - + } /** @@ -61,17 +62,17 @@ } return null; } - + public File getDestFile() { final int res = showDialog(ui_.getParentComponent(), BuResource.BU.getString("Continuer")); if (res != JFileChooser.APPROVE_OPTION) { return null; } File f = getSelectedFile(); - + return completeExtension(f); } - + private File completeExtension(File f) { if (f == null) { return null; @@ -79,5 +80,5 @@ f = new File(f.getAbsolutePath() + getSelectedWriter().getMostPopularExtension()); return f; } - + } Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportTask.java =================================================================== --- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportTask.java 2016-02-19 18:33:17 UTC (rev 9278) +++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluTableExportTask.java 2016-02-19 19:22:47 UTC (rev 9279) @@ -124,6 +124,7 @@ @Override public void run() { final CtuluTableModelInterface m = createDefaultModele(colToWrite, rowToWrite); + boolean ok = true; try { if (CtuluFileChooserCsvExcel.TypeChoosen.XLS.equals(choosenType_)) { final CtuluTableExcelWriter w = new CtuluTableExcelWriter(m, dest_); @@ -144,21 +145,24 @@ w.write(task.getStateReceiver()); } } catch (final Exception e) { + ok = false; ui_.error(dest_.getName(), e.getLocalizedMessage(), false); } - BuLib.invokeLater(new Runnable() { - @Override - public void run() { - s.setVisible(false); - if (parentDial_ != null) { - parentDial_.getRootPane().remove(s); - parentDial_.setCursor(Cursor.getDefaultCursor()); + if (ok) { + BuLib.invokeLater(new Runnable() { + @Override + public void run() { + s.setVisible(false); + if (parentDial_ != null) { + parentDial_.getRootPane().remove(s); + parentDial_.setCursor(Cursor.getDefaultCursor()); + } + ui_.message(CtuluResource.CTULU.getString("Export termin\xE9"), CtuluResource.CTULU.getString("Donn\xE9es export\xE9es dans le fichier\n {0}", + dest_. + getAbsolutePath()), true); } - ui_.message(CtuluResource.CTULU.getString("Export termin\xE9"), CtuluResource.CTULU.getString("Donn\xE9es export\xE9es dans le fichier\n {0}", - dest_. - getAbsolutePath()), true); - } - }); + }); + } } }); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2016-02-19 18:33:20
|
Revision: 9278 http://sourceforge.net/p/fudaa/svn/9278 Author: deniger Date: 2016-02-19 18:33:17 +0000 (Fri, 19 Feb 2016) Log Message: ----------- CRUE-657 Modified Paths: -------------- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java =================================================================== --- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java 2016-02-19 15:13:02 UTC (rev 9277) +++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java 2016-02-19 18:33:17 UTC (rev 9278) @@ -251,6 +251,9 @@ applyTitleConfigChanged(content); applyAxesConfigAndZoom(content, horizontalPersist, fromTemplate); uiController.getGraphe().fullRepaint(); + if (uiController.getGraphe().isAutoRestore()) { + uiController.getGraphe().restore(); + } } protected void cleanUnusedConfigs(Z content) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |