Menu
▾
▴
fudaa-svn-commit — svn commit with diffs
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...> - 2013-03-20 12:47:50
|
Revision: 8350
http://fudaa.svn.sourceforge.net/fudaa/?rev=8350&view=rev
Author: deniger
Date: 2013-03-20 12:47:42 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/EqualsTesterResultTest.java
trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLoiTest.java
Modified: trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/EqualsTesterResultTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/EqualsTesterResultTest.java 2013-03-20 12:43:21 UTC (rev 8349)
+++ trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/EqualsTesterResultTest.java 2013-03-20 12:47:42 UTC (rev 8350)
@@ -17,7 +17,6 @@
import org.fudaa.dodico.crue.comparaison.tester.TestOption;
import org.fudaa.dodico.crue.comparaison.tester.TesterContextImpl;
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierLoaderDefaultTest;
-import org.fudaa.dodico.crue.config.ccm.PropertyEpsilon;
import org.fudaa.dodico.crue.metier.result.ResCalBrancheSaintVenant;
import static org.junit.Assert.*;
import org.junit.Test;
@@ -70,7 +69,6 @@
test2.setSplanAct(value + 101d);
test2.setSplanSto(101);
test2.setSplanTot(102);
- PropertyEpsilon epsilon = CrueConfigMetierLoaderDefaultTest.DEFAULT.getEpsilon("splanAct");
final LazyDynaMap map1 = new LazyDynaMap(test.getRes());
final LazyDynaMap map2 = new LazyDynaMap(test2.getRes());
final TesterContextImpl context = new TesterContextImpl(null);
Modified: trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLoiTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLoiTest.java 2013-03-20 12:43:21 UTC (rev 8349)
+++ trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/tester/EqualsTesterLoiTest.java 2013-03-20 12:47:42 UTC (rev 8350)
@@ -44,8 +44,8 @@
final LoiFF loi1 = createLoi();
final LoiFF loi2 = createLoi();
//le delta relatif est <1.e-6
- loi1.getEvolutionFF().getPtEvolutionFF().get(0).setAbscisse(2000.1234);
- loi2.getEvolutionFF().getPtEvolutionFF().get(0).setAbscisse(2000.1235);
+ loi1.getEvolutionFF().getPtEvolutionFF().get(0).setAbscisse(2000000.12);
+ loi2.getEvolutionFF().getPtEvolutionFF().get(0).setAbscisse(2000000.13);
final EqualsTesterLoi tester = new EqualsTesterLoi(new FactoryEqualsTester(CrueConfigMetierLoaderDefaultTest.DEFAULT, -1));
final ResultatTest resTest = new ResultatTest();
final TesterContextImpl ctx = new TesterContextImpl(null);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-20 12:43:28
|
Revision: 8349
http://fudaa.svn.sourceforge.net/fudaa/?rev=8349&view=rev
Author: deniger
Date: 2013-03-20 12:43:21 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/EqualsTesterResultTest.java
Modified: trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/EqualsTesterResultTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/EqualsTesterResultTest.java 2013-03-20 10:51:47 UTC (rev 8348)
+++ trunk/soft/fudaa-crue/crue-compare/src/test/java/org/fudaa/dodico/crue/comparaison/EqualsTesterResultTest.java 2013-03-20 12:43:21 UTC (rev 8349)
@@ -17,6 +17,7 @@
import org.fudaa.dodico.crue.comparaison.tester.TestOption;
import org.fudaa.dodico.crue.comparaison.tester.TesterContextImpl;
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierLoaderDefaultTest;
+import org.fudaa.dodico.crue.config.ccm.PropertyEpsilon;
import org.fudaa.dodico.crue.metier.result.ResCalBrancheSaintVenant;
import static org.junit.Assert.*;
import org.junit.Test;
@@ -61,14 +62,15 @@
EqualsTesterBean equalsTester = new EqualsTesterBean(factoryEqualsTester);
ResCalBrancheSaintVenant test = new ResCalBrancheSaintVenant();
- double value = 1e7;
+ double value = 1e10;
test.setSplanAct(value);
test.setSplanSto(101);
test.setSplanTot(102);
ResCalBrancheSaintVenant test2 = new ResCalBrancheSaintVenant();
- test2.setSplanAct(value + 1d);
+ test2.setSplanAct(value + 101d);
test2.setSplanSto(101);
test2.setSplanTot(102);
+ PropertyEpsilon epsilon = CrueConfigMetierLoaderDefaultTest.DEFAULT.getEpsilon("splanAct");
final LazyDynaMap map1 = new LazyDynaMap(test.getRes());
final LazyDynaMap map2 = new LazyDynaMap(test2.getRes());
final TesterContextImpl context = new TesterContextImpl(null);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-20 10:05:49
|
Revision: 8347
http://fudaa.svn.sourceforge.net/fudaa/?rev=8347&view=rev
Author: deniger
Date: 2013-03-20 10:05:42 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java 2013-03-20 08:31:57 UTC (rev 8346)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigLayerGroup.java 2013-03-20 10:05:42 UTC (rev 8347)
@@ -7,17 +7,15 @@
*/
package org.fudaa.fudaa.sig.layer;
+import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuResource;
+import com.memoire.bu.BuTextField;
import java.awt.Frame;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-
-import com.memoire.bu.BuBorderLayout;
-import com.memoire.bu.BuLabel;
-import com.memoire.bu.BuResource;
-import com.memoire.bu.BuTextField;
-
import org.fudaa.ctulu.CtuluCommand;
import org.fudaa.ctulu.CtuluCommandComposite;
import org.fudaa.ctulu.CtuluCommandContainer;
@@ -31,7 +29,6 @@
import org.fudaa.ctulu.gui.CtuluDialogPanel;
import org.fudaa.ctulu.gui.CtuluLibSwing;
import org.fudaa.ctulu.gui.CtuluListEditorPanel;
-
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.BCalquePersistenceInterface;
import org.fudaa.ebli.calque.BGroupeCalque;
@@ -45,7 +42,6 @@
import org.fudaa.ebli.calque.edition.ZModeleLigneBriseeEditable;
import org.fudaa.ebli.calque.edition.ZModelePointEditable;
import org.fudaa.ebli.commun.EbliActionInterface;
-
import org.fudaa.fudaa.sig.FSigAttibuteTypeManager;
import org.fudaa.fudaa.sig.FSigAttributeTableModel;
import org.fudaa.fudaa.sig.FSigLib;
@@ -135,7 +131,7 @@
actionAddPoint_ = _actPoint;
actionModifyAtt_ = _modifyAttributes;
setActions(new EbliActionInterface[]{actionAddPoly_, actionAddPoint_, null, actionModifyAtt_, null,
- visu_.getEditor().getExportAction(), visu_.getEditor().getImportAction()});
+ visu_.getEditor().getExportAction(), visu_.getEditor().getImportAction()});
}
/**
@@ -331,7 +327,7 @@
public void detruire(final BCalque _c) {
final int idx = CtuluLibArray.findObjectEgalEgal(getComponents(), _c);
basicDetruire(_c);
- if (idx >= 0) {
+ if (idx >= 0 && getCmdMng() != null) {
getCmdMng().addCmd(new CtuluCommand() {
@Override
public void redo() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-20 07:46:35
|
Revision: 8344
http://fudaa.svn.sourceforge.net/fudaa/?rev=8344&view=rev
Author: deniger
Date: 2013-03-20 07:46:29 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLinesLoader.java
Deleted: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLinesLoader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLinesLoader.java 2013-03-20 07:45:46 UTC (rev 8343)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLinesLoader.java 2013-03-20 07:46:29 UTC (rev 8344)
@@ -1,85 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.dodico.crue.io.rtfa;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import org.fudaa.ctulu.CtuluLog;
-import org.fudaa.ctulu.CtuluLogGroup;
-import org.fudaa.dodico.crue.common.BusinessMessages;
-import org.fudaa.dodico.crue.common.io.CrueIOResu;
-import org.fudaa.dodico.crue.io.line.CrueLineLogReaderWriter;
-import org.fudaa.dodico.crue.io.line.CrueLineResultReaderWriter;
-import org.fudaa.dodico.crue.io.otfa.OtfaFileUtils;
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResultComparaisons;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class RTFALinesLoader {
-
- private final File rtfaZipFile;
-
- public RTFALinesLoader(File rtfaZipFile) {
- this.rtfaZipFile = OtfaFileUtils.getRtfaZipFile(rtfaZipFile);
- }
-
- public CrueIOResu<CtuluLogGroup> loadLogs(OtfaCampagneLine line) {
- CrueIOResu<CtuluLogGroup> res = null;
- CrueLineLogReaderWriter reader = new CrueLineLogReaderWriter(CrueRTFAReaderWriter.LAST_VERSION);
- ZipFile file = null;
- InputStream inputStream = null;
- try {
- file = new ZipFile(rtfaZipFile);
- inputStream = file.getInputStream(new ZipEntry(RTFALines.getCtfaFileName(line)));
- CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
- res = reader.readXML(inputStream, log, null);
- } catch (Exception e) {
- Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.INFO, "message {0}", e);
- } finally {
- if (file != null) {
- try {
- file.close();
- } catch (IOException ex) {
- Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.SEVERE, null, ex);
- }
- }
- }
-
- return res;
-
- }
-
- public CrueIOResu<OtfaCampagneLineResultComparaisons> loadResults(OtfaCampagneLine line) {
- CrueLineResultReaderWriter reader = new CrueLineResultReaderWriter(CrueRTFAReaderWriter.LAST_VERSION);
- CrueIOResu<OtfaCampagneLineResultComparaisons> res = null;
- ZipFile file = null;
- InputStream inputStream = null;
- try {
- file = new ZipFile(rtfaZipFile);
- inputStream = file.getInputStream(new ZipEntry(RTFALines.getRtfaFileName(line)));
- CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
- res = reader.readXML(inputStream, log, null);
- } catch (Exception e) {
- Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.INFO, "message {0}", e);
- } finally {
- if (file != null) {
- try {
- file.close();
- } catch (IOException ex) {
- Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.SEVERE, null, ex);
- }
- }
- }
-
- return res;
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-20 07:45:54
|
Revision: 8343
http://fudaa.svn.sourceforge.net/fudaa/?rev=8343&view=rev
Author: deniger
Date: 2013-03-20 07:45:46 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoaderTest.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLinesLoader.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java
Deleted: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java 2013-03-20 07:43:51 UTC (rev 8342)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java 2013-03-20 07:45:46 UTC (rev 8343)
@@ -1,85 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.dodico.crue.io.rtfa;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import org.fudaa.ctulu.CtuluLog;
-import org.fudaa.ctulu.CtuluLogGroup;
-import org.fudaa.dodico.crue.common.BusinessMessages;
-import org.fudaa.dodico.crue.common.io.CrueIOResu;
-import org.fudaa.dodico.crue.io.line.CrueLineLogReaderWriter;
-import org.fudaa.dodico.crue.io.line.CrueLineResultReaderWriter;
-import org.fudaa.dodico.crue.io.otfa.OtfaFileUtils;
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResultComparaisons;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class RTFALinesLoader {
-
- private final File rtfaZipFile;
-
- public RTFALinesLoader(File rtfaZipFile) {
- this.rtfaZipFile = OtfaFileUtils.getRtfaZipFile(rtfaZipFile);
- }
-
- public CrueIOResu<CtuluLogGroup> loadLogs(OtfaCampagneLine line) {
- CrueIOResu<CtuluLogGroup> res = null;
- CrueLineLogReaderWriter reader = new CrueLineLogReaderWriter(CrueRTFAReaderWriter.LAST_VERSION);
- ZipFile file = null;
- InputStream inputStream = null;
- try {
- file = new ZipFile(rtfaZipFile);
- inputStream = file.getInputStream(new ZipEntry(RTFALines.getCtfaFileName(line)));
- CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
- res = reader.readXML(inputStream, log, null);
- } catch (Exception e) {
- Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.INFO, "message {0}", e);
- } finally {
- if (file != null) {
- try {
- file.close();
- } catch (IOException ex) {
- Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.SEVERE, null, ex);
- }
- }
- }
-
- return res;
-
- }
-
- public CrueIOResu<OtfaCampagneLineResultComparaisons> loadResults(OtfaCampagneLine line) {
- CrueLineResultReaderWriter reader = new CrueLineResultReaderWriter(CrueRTFAReaderWriter.LAST_VERSION);
- CrueIOResu<OtfaCampagneLineResultComparaisons> res = null;
- ZipFile file = null;
- InputStream inputStream = null;
- try {
- file = new ZipFile(rtfaZipFile);
- inputStream = file.getInputStream(new ZipEntry(RTFALines.getRtfaFileName(line)));
- CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
- res = reader.readXML(inputStream, log, null);
- } catch (Exception e) {
- Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.INFO, "message {0}", e);
- } finally {
- if (file != null) {
- try {
- file.close();
- } catch (IOException ex) {
- Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.SEVERE, null, ex);
- }
- }
- }
-
- return res;
- }
-}
Copied: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLinesLoader.java (from rev 8341, trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLinesLoader.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLinesLoader.java 2013-03-20 07:45:46 UTC (rev 8343)
@@ -0,0 +1,85 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.io.rtfa;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.ctulu.CtuluLogGroup;
+import org.fudaa.dodico.crue.common.BusinessMessages;
+import org.fudaa.dodico.crue.common.io.CrueIOResu;
+import org.fudaa.dodico.crue.io.line.CrueLineLogReaderWriter;
+import org.fudaa.dodico.crue.io.line.CrueLineResultReaderWriter;
+import org.fudaa.dodico.crue.io.otfa.OtfaFileUtils;
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResultComparaisons;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class RTFAResultLinesLoader {
+
+ private final File rtfaZipFile;
+
+ public RTFAResultLinesLoader(File rtfaZipFile) {
+ this.rtfaZipFile = OtfaFileUtils.getRtfaZipFile(rtfaZipFile);
+ }
+
+ public CrueIOResu<CtuluLogGroup> loadLogs(OtfaCampagneLine line) {
+ CrueIOResu<CtuluLogGroup> res = null;
+ CrueLineLogReaderWriter reader = new CrueLineLogReaderWriter(CrueRTFAReaderWriter.LAST_VERSION);
+ ZipFile file = null;
+ InputStream inputStream = null;
+ try {
+ file = new ZipFile(rtfaZipFile);
+ inputStream = file.getInputStream(new ZipEntry(RTFALines.getCtfaFileName(line)));
+ CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
+ res = reader.readXML(inputStream, log, null);
+ } catch (Exception e) {
+ Logger.getLogger(RTFAResultLinesLoader.class.getName()).log(Level.INFO, "message {0}", e);
+ } finally {
+ if (file != null) {
+ try {
+ file.close();
+ } catch (IOException ex) {
+ Logger.getLogger(RTFAResultLinesLoader.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+ }
+
+ return res;
+
+ }
+
+ public CrueIOResu<OtfaCampagneLineResultComparaisons> loadResults(OtfaCampagneLine line) {
+ CrueLineResultReaderWriter reader = new CrueLineResultReaderWriter(CrueRTFAReaderWriter.LAST_VERSION);
+ CrueIOResu<OtfaCampagneLineResultComparaisons> res = null;
+ ZipFile file = null;
+ InputStream inputStream = null;
+ try {
+ file = new ZipFile(rtfaZipFile);
+ inputStream = file.getInputStream(new ZipEntry(RTFALines.getRtfaFileName(line)));
+ CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
+ res = reader.readXML(inputStream, log, null);
+ } catch (Exception e) {
+ Logger.getLogger(RTFAResultLinesLoader.class.getName()).log(Level.INFO, "message {0}", e);
+ } finally {
+ if (file != null) {
+ try {
+ file.close();
+ } catch (IOException ex) {
+ Logger.getLogger(RTFAResultLinesLoader.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+ }
+
+ return res;
+ }
+}
Deleted: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java 2013-03-20 07:43:51 UTC (rev 8342)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java 2013-03-20 07:45:46 UTC (rev 8343)
@@ -1,122 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.dodico.crue.io.rtfa;
-
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class RTFALine {
-
- private OtfaCampagneLine initialLine;
- private int nbDifferences = -1;
- private int nbSevereError;
- private int nbError;
- private int nbWarn;
- private int nbInfo;
-
- public RTFALine() {
- }
-
- public RTFALine(OtfaCampagneLine initialLine) {
- this.initialLine = initialLine;
- }
-
- public OtfaCampagneLine getInitialLine() {
- return initialLine;
- }
-
- public void setInitialLine(OtfaCampagneLine initialLine) {
- this.initialLine = initialLine;
- }
-
- public int getNbDifferences() {
- return nbDifferences;
- }
-
- public void setNbDifferences(int nbDifferences) {
- this.nbDifferences = nbDifferences;
- }
-
- public int getNbSevereError() {
- return nbSevereError;
- }
-
- public boolean isSameCount(RTFALine other) {
- if (other == null) {
- return false;
- }
- return nbDifferences == other.nbDifferences
- && nbSevereError == other.nbSevereError
- && nbError == other.nbError
- && nbWarn == other.nbWarn
- && nbInfo == other.nbInfo;
- }
-
- public void setNbSevereError(int nbSevereError) {
- this.nbSevereError = nbSevereError;
- }
-
- public int getNbError() {
- return nbError;
- }
-
- public void setNbError(int nbError) {
- this.nbError = nbError;
- }
-
- public boolean containsErrorOrSevereError() {
- return nbError > 0 || nbSevereError > 0;
- }
-
- public boolean containsWarning() {
- return nbWarn > 0;
- }
-
- public int getNbWarn() {
- return nbWarn;
- }
-
- public void setNbWarn(int nbWarn) {
- this.nbWarn = nbWarn;
- }
-
- public int getNbInfo() {
- return nbInfo;
- }
-
- public void setNbInfo(int nbInfo) {
- this.nbInfo = nbInfo;
- }
-
- public boolean hasLog() {
- return nbSevereError > 0 || nbError > 0 || nbWarn > 0 || nbInfo > 0;
- }
-
- public boolean hasDifferences() {
- return nbDifferences > 0;
- }
-
- public void initForm(RTFALine result) {
- if (result == null) {
- return;
- }
- initialLine = new OtfaCampagneLine(result.getInitialLine());
- nbDifferences = result.nbDifferences;
- nbSevereError = result.nbSevereError;
- nbError = result.nbError;
- nbWarn = result.nbWarn;
- nbInfo = result.nbInfo;
- }
-
- public int getNbLogs() {
- return nbSevereError + nbError + nbWarn + nbInfo;
- }
-
- public boolean hasComparaison() {
- return nbDifferences >= 0;
- }
-}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoaderTest.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoaderTest.java 2013-03-20 07:43:51 UTC (rev 8342)
+++ trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoaderTest.java 2013-03-20 07:45:46 UTC (rev 8343)
@@ -31,7 +31,7 @@
CtuluLibFile.getFileFromJar("/rtfa/otfa-conversion.rtfa.zip", targetFile);
assertTrue(targetFile.exists());
assertTrue(targetFile.length() > 0);
- RTFALinesLoader loader = new RTFALinesLoader(targetFile);
+ RTFAResultLinesLoader loader = new RTFAResultLinesLoader(targetFile);
OtfaCampagneLine line = new OtfaCampagneLine();
line.setIndice(1);
CrueIOResu<CtuluLogGroup> loadLogs = loader.loadLogs(line);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-20 07:43:59
|
Revision: 8342
http://fudaa.svn.sourceforge.net/fudaa/?rev=8342&view=rev
Author: deniger
Date: 2013-03-20 07:43:51 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CrueConverterRTFA.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALines.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java
trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueRTFA.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLine.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/log/
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CrueConverterRTFA.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CrueConverterRTFA.java 2013-03-19 17:10:33 UTC (rev 8341)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CrueConverterRTFA.java 2013-03-20 07:43:51 UTC (rev 8342)
@@ -31,8 +31,8 @@
return metier;
}
- private static RTFALine convertDaoToMetierLine(LigneRTFA dao, CtuluLog analyser) {
- RTFALine metier = new RTFALine();
+ private static RTFAResultLine convertDaoToMetierLine(LigneRTFA dao, CtuluLog analyser) {
+ RTFAResultLine metier = new RTFAResultLine();
metier.setInitialLine(CrueConverterCommonParameter.convertCampagneLineDaoToMetier(dao.LigneCampagne));
metier.setNbDifferences(dao.nbDifferences);
@@ -52,7 +52,7 @@
}
}
- private static LigneRTFA convertMetierToDaoLine(RTFALine metier, CtuluLog analyser) {
+ private static LigneRTFA convertMetierToDaoLine(RTFAResultLine metier, CtuluLog analyser) {
LigneRTFA dao = new LigneRTFA();
dao.LigneCampagne = CrueConverterCommonParameter.convertCampagneLineMetierToDao(metier.getInitialLine());
@@ -71,7 +71,7 @@
public RTFALines convertDaoToMetier(CrueDaoRTFA dao, CrueData dataLinked, CtuluLog analyser) {
RTFALines metier = new RTFALines();
metier.setHeader(convertDaoToMetierHeader(dao, analyser));
- final List<RTFALine> lines = new ArrayList<RTFALine>();
+ final List<RTFAResultLine> lines = new ArrayList<RTFAResultLine>();
for (LigneRTFA ligne : dao.Lignes) {
lines.add(convertDaoToMetierLine(ligne, analyser));
@@ -99,7 +99,7 @@
convertMetierToDaoHeader(dao, metier, analyser);
dao.Lignes = new ArrayList<CrueDaoStructureRTFA.LigneRTFA>();
- for (RTFALine line : metier.getLines()) {
+ for (RTFAResultLine line : metier.getLines()) {
dao.Lignes.add(convertMetierToDaoLine(line, analyser));
}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALines.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALines.java 2013-03-19 17:10:33 UTC (rev 8341)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALines.java 2013-03-20 07:43:51 UTC (rev 8342)
@@ -19,7 +19,7 @@
private OtfaCampagneResultHeader header = new OtfaCampagneResultHeader();
private boolean batch;
- private List<RTFALine> lines = new ArrayList<RTFALine>();
+ private List<RTFAResultLine> lines = new ArrayList<RTFAResultLine>();
/**
* @return the globalValidation
@@ -36,17 +36,17 @@
return line.getIndice() + ".ctfa-line.xml";
}
- public List<RTFALine> getLines() {
+ public List<RTFAResultLine> getLines() {
return Collections.unmodifiableList(lines);
}
- public void addLines(Collection<RTFALine> lines) {
+ public void addLines(Collection<RTFAResultLine> lines) {
if (lines != null) {
this.lines.addAll(lines);
}
}
- public void addLine(RTFALine line) {
+ public void addLine(RTFAResultLine line) {
if (line != null) {
this.lines.add(line);
}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java 2013-03-19 17:10:33 UTC (rev 8341)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java 2013-03-20 07:43:51 UTC (rev 8342)
@@ -144,7 +144,7 @@
}
public void addResult(OtfaCampagneLineResult launch) {
- RTFALine line = new RTFALine();
+ RTFAResultLine line = new RTFAResultLine();
line.setInitialLine(launch.getInitialLine());
final CtuluLogGroup logs = launch.getLogs();
line.setNbSevereError(logs.getNbOccurence(CtuluLogLevel.SEVERE));
Copied: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLine.java (from rev 8337, trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLine.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAResultLine.java 2013-03-20 07:43:51 UTC (rev 8342)
@@ -0,0 +1,122 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.io.rtfa;
+
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class RTFAResultLine {
+
+ private OtfaCampagneLine initialLine;
+ private int nbDifferences = -1;
+ private int nbSevereError;
+ private int nbError;
+ private int nbWarn;
+ private int nbInfo;
+
+ public RTFAResultLine() {
+ }
+
+ public RTFAResultLine(OtfaCampagneLine initialLine) {
+ this.initialLine = initialLine;
+ }
+
+ public OtfaCampagneLine getInitialLine() {
+ return initialLine;
+ }
+
+ public void setInitialLine(OtfaCampagneLine initialLine) {
+ this.initialLine = initialLine;
+ }
+
+ public int getNbDifferences() {
+ return nbDifferences;
+ }
+
+ public void setNbDifferences(int nbDifferences) {
+ this.nbDifferences = nbDifferences;
+ }
+
+ public int getNbSevereError() {
+ return nbSevereError;
+ }
+
+ public boolean isSameCount(RTFAResultLine other) {
+ if (other == null) {
+ return false;
+ }
+ return nbDifferences == other.nbDifferences
+ && nbSevereError == other.nbSevereError
+ && nbError == other.nbError
+ && nbWarn == other.nbWarn
+ && nbInfo == other.nbInfo;
+ }
+
+ public void setNbSevereError(int nbSevereError) {
+ this.nbSevereError = nbSevereError;
+ }
+
+ public int getNbError() {
+ return nbError;
+ }
+
+ public void setNbError(int nbError) {
+ this.nbError = nbError;
+ }
+
+ public boolean containsErrorOrSevereError() {
+ return nbError > 0 || nbSevereError > 0;
+ }
+
+ public boolean containsWarning() {
+ return nbWarn > 0;
+ }
+
+ public int getNbWarn() {
+ return nbWarn;
+ }
+
+ public void setNbWarn(int nbWarn) {
+ this.nbWarn = nbWarn;
+ }
+
+ public int getNbInfo() {
+ return nbInfo;
+ }
+
+ public void setNbInfo(int nbInfo) {
+ this.nbInfo = nbInfo;
+ }
+
+ public boolean hasLog() {
+ return nbSevereError > 0 || nbError > 0 || nbWarn > 0 || nbInfo > 0;
+ }
+
+ public boolean hasDifferences() {
+ return nbDifferences > 0;
+ }
+
+ public void initForm(RTFAResultLine result) {
+ if (result == null) {
+ return;
+ }
+ initialLine = new OtfaCampagneLine(result.getInitialLine());
+ nbDifferences = result.nbDifferences;
+ nbSevereError = result.nbSevereError;
+ nbError = result.nbError;
+ nbWarn = result.nbWarn;
+ nbInfo = result.nbInfo;
+ }
+
+ public int getNbLogs() {
+ return nbSevereError + nbError + nbWarn + nbInfo;
+ }
+
+ public boolean hasComparaison() {
+ return nbDifferences >= 0;
+ }
+}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueRTFA.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueRTFA.java 2013-03-19 17:10:33 UTC (rev 8341)
+++ trunk/soft/fudaa-crue/crue-otfa/src/test/java/org/fudaa/dodico/crue/io/otfa/TestCrueRTFA.java 2013-03-20 07:43:51 UTC (rev 8342)
@@ -19,7 +19,7 @@
import org.fudaa.dodico.crue.io.AbstractIOTestCase;
import org.fudaa.dodico.crue.io.log.CrueLOGTest;
import org.fudaa.dodico.crue.io.rtfa.CrueRTFAReaderWriter;
-import org.fudaa.dodico.crue.io.rtfa.RTFALine;
+import org.fudaa.dodico.crue.io.rtfa.RTFAResultLine;
import org.fudaa.dodico.crue.io.rtfa.RTFALines;
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneResultHeader;
import org.joda.time.LocalDateTime;
@@ -42,7 +42,7 @@
}
public static void assertCorrect(RTFALines compPart) {
- final List<RTFALine> lines = compPart.getLines();
+ final List<RTFAResultLine> lines = compPart.getLines();
assertHeaderCorrect(compPart.getHeader());
assertEquals(2, lines.size());
@@ -50,16 +50,16 @@
assertCorrectCompPartLine2(lines.get(1));
}
- public static void assertCorrectCompPartLine1(RTFALine line) {
+ public static void assertCorrectCompPartLine1(RTFAResultLine line) {
- RTFALine initLine1 = createResultCompPartLine1();
+ RTFAResultLine initLine1 = createResultCompPartLine1();
assertTrue(line.getInitialLine().equals(initLine1.getInitialLine()));
assertTrue(initLine1.isSameCount(line));
}
- public static void assertCorrectCompPartLine2(RTFALine line) {
+ public static void assertCorrectCompPartLine2(RTFAResultLine line) {
- RTFALine initLine2 = createResultCompPartLine2();
+ RTFAResultLine initLine2 = createResultCompPartLine2();
assertTrue(line.getInitialLine().equals(initLine2.getInitialLine()));
assertTrue(initLine2.isSameCount(line));
}
@@ -149,8 +149,8 @@
return part;
}
- public static List<RTFALine> createResultLogsCompLines() {
- final List<RTFALine> lines = new ArrayList<RTFALine>();
+ public static List<RTFAResultLine> createResultLogsCompLines() {
+ final List<RTFAResultLine> lines = new ArrayList<RTFAResultLine>();
lines.add(createResultCompPartLine1());
lines.add(createResultCompPartLine2());
@@ -158,8 +158,8 @@
return lines;
}
- public static RTFALine createResultCompPartLine1() {
- final RTFALine line = new RTFALine();
+ public static RTFAResultLine createResultCompPartLine1() {
+ final RTFAResultLine line = new RTFAResultLine();
line.setInitialLine(TestOtfaCampagneLineCreator.createCampagneLine1());
line.setNbDifferences(10);
line.setNbSevereError(9);
@@ -169,8 +169,8 @@
return line;
}
- public static RTFALine createResultCompPartLine2() {
- final RTFALine line = new RTFALine();
+ public static RTFAResultLine createResultCompPartLine2() {
+ final RTFAResultLine line = new RTFAResultLine();
line.setInitialLine(TestOtfaCampagneLineCreator.createCampagneLine2());
line.setNbDifferences(5);
line.setNbSevereError(4);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-19 17:05:12
|
Revision: 8340
http://fudaa.svn.sourceforge.net/fudaa/?rev=8340&view=rev
Author: deniger
Date: 2013-03-19 17:05:04 +0000 (Tue, 19 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-compare/pom.xml
trunk/soft/fudaa-crue/crue-config/pom.xml
trunk/soft/fudaa-crue/crue-core/pom.xml
trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/crue-emh/pom.xml
trunk/soft/fudaa-crue/crue-io/pom.xml
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataXmlReaderWriterImpl.java
Modified: trunk/soft/fudaa-crue/crue-compare/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-compare/pom.xml 2013-03-19 17:05:04 UTC (rev 8340)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.67-SNAPSHOT</version>
</parent>
<artifactId>crue-compare</artifactId>
<name>Crue Compare</name>
Modified: trunk/soft/fudaa-crue/crue-config/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-config/pom.xml 2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-config/pom.xml 2013-03-19 17:05:04 UTC (rev 8340)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.67-SNAPSHOT</version>
</parent>
<artifactId>crue-config</artifactId>
<name>Crue Config</name>
Modified: trunk/soft/fudaa-crue/crue-core/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-core/pom.xml 2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-core/pom.xml 2013-03-19 17:05:04 UTC (rev 8340)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.67-SNAPSHOT</version>
</parent>
<artifactId>crue-core</artifactId>
<name>Crue Core</name>
Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2013-03-19 17:05:04 UTC (rev 8340)
@@ -787,7 +787,7 @@
otfaBatch.noArgument=Pas d'arguments. Commande attendue: java -DSiteConfigDir="C:\\data\\etc" -jar <otfa>.jar "C:\\cheminVersOtfa\\fichier.otfa.xml"
otfaBatch.fileNotExists=Le fichier OTFA n''existe pas: {0}
otfaBatch.fileLoaded=Fichier OTFA pris en compte: {0}
-otfaBatch.ctfaCantBeDeleted=Le fichier CTFA ne peut pas \u00eatre effac\u00e9: {0}
+otfaBatch.rtfaZipCantBeDeleted=Le fichier zip RTFA ne peut pas \u00eatre effac\u00e9: {0}
otfaBatch.rtfaCantBeDeleted=Le fichier RTFA ne peut pas \u00eatre effac\u00e9: {0}
otfaBatch.fileNotValid=Le fichier OTFA n''est pas valide. Le compte-rendu est disponible: {0}
otfaBatch.fileCantBeLoaded=Le fichier OTFA ne peut pas \u00eatre charg\u00e9. Le compte-rendu est disponible: {0}
Modified: trunk/soft/fudaa-crue/crue-emh/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-emh/pom.xml 2013-03-19 17:05:04 UTC (rev 8340)
@@ -5,7 +5,7 @@
<parent>
<artifactId>fudaa-crue</artifactId>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.67-SNAPSHOT</version>
</parent>
<artifactId>crue-emh</artifactId>
<name>Crue EMH</name>
Modified: trunk/soft/fudaa-crue/crue-io/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-io/pom.xml 2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-io/pom.xml 2013-03-19 17:05:04 UTC (rev 8340)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-crue</groupId>
<artifactId>fudaa-crue</artifactId>
- <version>0.66-SNAPSHOT</version>
+ <version>0.67-SNAPSHOT</version>
</parent>
<artifactId>crue-io</artifactId>
<name>Crue IO</name>
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataXmlReaderWriterImpl.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataXmlReaderWriterImpl.java 2013-03-19 17:03:07 UTC (rev 8339)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/common/CrueDataXmlReaderWriterImpl.java 2013-03-19 17:05:04 UTC (rev 8340)
@@ -340,6 +340,18 @@
}
+ public final CrueIOResu<M> readXML(final InputStream f, final CtuluLog analyzer, final CrueData dataLinked) {
+ analyzer.setDefaultResourceBundle(BusinessMessages.RESOURCE_BUNDLE);
+ analyzer.setDesc("read.file");
+// analyzer.setDescriptionArgs(f.getName());
+ final D d = readDao(f, analyzer, dataLinked);
+ if (d != null) {
+ return createResu(d, converter.convertDaoToMetier(d, dataLinked, analyzer), analyzer);
+ }
+ return createResu(null, null, analyzer);
+
+ }
+
public final CrueIOResu<M> readXML(final String pathToResource, final CtuluLog analyzer) {
return readXML(pathToResource, analyzer, null);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-19 17:03:14
|
Revision: 8339
http://fudaa.svn.sourceforge.net/fudaa/?rev=8339&view=rev
Author: deniger
Date: 2013-03-19 17:03:07 +0000 (Tue, 19 Mar 2013)
Log Message:
-----------
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java
Added: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java 2013-03-19 17:03:07 UTC (rev 8339)
@@ -0,0 +1,122 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.io.rtfa;
+
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class RTFALine {
+
+ private OtfaCampagneLine initialLine;
+ private int nbDifferences = -1;
+ private int nbSevereError;
+ private int nbError;
+ private int nbWarn;
+ private int nbInfo;
+
+ public RTFALine() {
+ }
+
+ public RTFALine(OtfaCampagneLine initialLine) {
+ this.initialLine = initialLine;
+ }
+
+ public OtfaCampagneLine getInitialLine() {
+ return initialLine;
+ }
+
+ public void setInitialLine(OtfaCampagneLine initialLine) {
+ this.initialLine = initialLine;
+ }
+
+ public int getNbDifferences() {
+ return nbDifferences;
+ }
+
+ public void setNbDifferences(int nbDifferences) {
+ this.nbDifferences = nbDifferences;
+ }
+
+ public int getNbSevereError() {
+ return nbSevereError;
+ }
+
+ public boolean isSameCount(RTFALine other) {
+ if (other == null) {
+ return false;
+ }
+ return nbDifferences == other.nbDifferences
+ && nbSevereError == other.nbSevereError
+ && nbError == other.nbError
+ && nbWarn == other.nbWarn
+ && nbInfo == other.nbInfo;
+ }
+
+ public void setNbSevereError(int nbSevereError) {
+ this.nbSevereError = nbSevereError;
+ }
+
+ public int getNbError() {
+ return nbError;
+ }
+
+ public void setNbError(int nbError) {
+ this.nbError = nbError;
+ }
+
+ public boolean containsErrorOrSevereError() {
+ return nbError > 0 || nbSevereError > 0;
+ }
+
+ public boolean containsWarning() {
+ return nbWarn > 0;
+ }
+
+ public int getNbWarn() {
+ return nbWarn;
+ }
+
+ public void setNbWarn(int nbWarn) {
+ this.nbWarn = nbWarn;
+ }
+
+ public int getNbInfo() {
+ return nbInfo;
+ }
+
+ public void setNbInfo(int nbInfo) {
+ this.nbInfo = nbInfo;
+ }
+
+ public boolean hasLog() {
+ return nbSevereError > 0 || nbError > 0 || nbWarn > 0 || nbInfo > 0;
+ }
+
+ public boolean hasDifferences() {
+ return nbDifferences > 0;
+ }
+
+ public void initForm(RTFALine result) {
+ if (result == null) {
+ return;
+ }
+ initialLine = new OtfaCampagneLine(result.getInitialLine());
+ nbDifferences = result.nbDifferences;
+ nbSevereError = result.nbSevereError;
+ nbError = result.nbError;
+ nbWarn = result.nbWarn;
+ nbInfo = result.nbInfo;
+ }
+
+ public int getNbLogs() {
+ return nbSevereError + nbError + nbWarn + nbInfo;
+ }
+
+ public boolean hasComparaison() {
+ return nbDifferences >= 0;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-19 17:02:13
|
Revision: 8338
http://fudaa.svn.sourceforge.net/fudaa/?rev=8338&view=rev
Author: deniger
Date: 2013-03-19 17:02:05 +0000 (Tue, 19 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAWriteResultCallable.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CtfaWriteResultCallable1.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLineLoader.java
Deleted: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CtfaWriteResultCallable1.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CtfaWriteResultCallable1.java 2013-03-19 16:55:59 UTC (rev 8337)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/CtfaWriteResultCallable1.java 2013-03-19 17:02:05 UTC (rev 8338)
@@ -1,37 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.dodico.crue.io.rtfa;
-
-import java.io.File;
-import java.util.concurrent.Callable;
-import org.fudaa.ctulu.CtuluLog;
-import org.fudaa.dodico.crue.common.BusinessMessages;
-import org.fudaa.dodico.crue.common.io.CrueIOResu;
-import org.fudaa.dodico.crue.io.line.CrueLineResultReaderWriter;
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResult;
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResultComparaisons;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class CTFAWriteResultCallable implements Callable<Object> {
- private final OtfaCampagneLineResult launch;
- private final File targetDir;
-
- public CTFAWriteResultCallable(OtfaCampagneLineResult launch, File targetDir) {
- this.launch = launch;
- this.targetDir = targetDir;
- }
-
- @Override
- public CtuluLog call() throws Exception {
- final CrueLineResultReaderWriter writer = new CrueLineResultReaderWriter(CrueRTFAReaderWriter.LAST_VERSION);
- final CrueIOResu<OtfaCampagneLineResultComparaisons> resu = new CrueIOResu<OtfaCampagneLineResultComparaisons>(launch.getComparisonResult());
- final CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
- File target = new File(targetDir, RtfaLines.getRtfaFileName(launch.getInitialLine()));
- writer.writeXMLMetier(resu, target, log, null);
- return log;
- }
-}
Copied: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java (from rev 8337, trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLinesLoader.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesLoader.java 2013-03-19 17:02:05 UTC (rev 8338)
@@ -0,0 +1,85 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.io.rtfa;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.ctulu.CtuluLogGroup;
+import org.fudaa.dodico.crue.common.BusinessMessages;
+import org.fudaa.dodico.crue.common.io.CrueIOResu;
+import org.fudaa.dodico.crue.io.line.CrueLineLogReaderWriter;
+import org.fudaa.dodico.crue.io.line.CrueLineResultReaderWriter;
+import org.fudaa.dodico.crue.io.otfa.OtfaFileUtils;
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
+import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResultComparaisons;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class RTFALinesLoader {
+
+ private final File rtfaZipFile;
+
+ public RTFALinesLoader(File rtfaZipFile) {
+ this.rtfaZipFile = OtfaFileUtils.getRtfaZipFile(rtfaZipFile);
+ }
+
+ public CrueIOResu<CtuluLogGroup> loadLogs(OtfaCampagneLine line) {
+ CrueIOResu<CtuluLogGroup> res = null;
+ CrueLineLogReaderWriter reader = new CrueLineLogReaderWriter(CrueRTFAReaderWriter.LAST_VERSION);
+ ZipFile file = null;
+ InputStream inputStream = null;
+ try {
+ file = new ZipFile(rtfaZipFile);
+ inputStream = file.getInputStream(new ZipEntry(RTFALines.getCtfaFileName(line)));
+ CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
+ res = reader.readXML(inputStream, log, null);
+ } catch (Exception e) {
+ Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.INFO, "message {0}", e);
+ } finally {
+ if (file != null) {
+ try {
+ file.close();
+ } catch (IOException ex) {
+ Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+ }
+
+ return res;
+
+ }
+
+ public CrueIOResu<OtfaCampagneLineResultComparaisons> loadResults(OtfaCampagneLine line) {
+ CrueLineResultReaderWriter reader = new CrueLineResultReaderWriter(CrueRTFAReaderWriter.LAST_VERSION);
+ CrueIOResu<OtfaCampagneLineResultComparaisons> res = null;
+ ZipFile file = null;
+ InputStream inputStream = null;
+ try {
+ file = new ZipFile(rtfaZipFile);
+ inputStream = file.getInputStream(new ZipEntry(RTFALines.getRtfaFileName(line)));
+ CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
+ res = reader.readXML(inputStream, log, null);
+ } catch (Exception e) {
+ Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.INFO, "message {0}", e);
+ } finally {
+ if (file != null) {
+ try {
+ file.close();
+ } catch (IOException ex) {
+ Logger.getLogger(RTFALinesLoader.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+ }
+
+ return res;
+ }
+}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java 2013-03-19 16:55:59 UTC (rev 8337)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFALinesSaver.java 2013-03-19 17:02:05 UTC (rev 8338)
@@ -5,9 +5,13 @@
import java.io.File;
import java.io.IOException;
-import java.util.concurrent.Callable;
+import java.util.Arrays;
+import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogGroup;
@@ -15,10 +19,8 @@
import org.fudaa.dodico.crue.common.BusinessMessages;
import org.fudaa.dodico.crue.common.io.CrueIOResu;
import org.fudaa.dodico.crue.comparaison.ExecuteComparaison;
-import org.fudaa.dodico.crue.io.line.CrueLineResultReaderWriter;
import org.fudaa.dodico.crue.io.otfa.OtfaFileUtils;
import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResult;
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResultComparaisons;
import org.joda.time.LocalDateTime;
/**
@@ -112,6 +114,8 @@
final CrueIOResu<RTFALines> resu = new CrueIOResu<RTFALines>(lines);
final CtuluLog log = new CtuluLog(BusinessMessages.RESOURCE_BUNDLE);
writer.writeXMLMetier(resu, rtfaFile, log, null);
+ File[] listFiles = tempDir.listFiles();
+ CtuluLibFile.zip(listFiles, rtfaZipFile);
CtuluLibFile.deleteDir(tempDir);
}
@@ -124,7 +128,19 @@
}
protected void createFiles(OtfaCampagneLineResult launch) {
- executorService.invokeAll(this)
+ CTFAWriteResultCallable ctfaCallable = new CTFAWriteResultCallable(launch, tempDir);
+ RTFAWriteResultCallable rtfaCallable = new RTFAWriteResultCallable(launch, tempDir);
+ try {
+ List<Future<CtuluLog>> invokeAll = executorService.invokeAll(Arrays.asList(ctfaCallable, rtfaCallable));
+ for (Future<CtuluLog> future : invokeAll) {
+ CtuluLog log = future.get();
+ if (log != null && log.isNotEmpty()) {
+ addGlobalMainLog(log);
+ }
+ }
+ } catch (Exception ex) {
+ Logger.getLogger(RTFALinesSaver.class.getName()).log(Level.SEVERE, null, ex);
+ }
}
public void addResult(OtfaCampagneLineResult launch) {
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAWriteResultCallable.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAWriteResultCallable.java 2013-03-19 16:55:59 UTC (rev 8337)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RTFAWriteResultCallable.java 2013-03-19 17:02:05 UTC (rev 8338)
@@ -16,7 +16,8 @@
*
* @author Frederic Deniger
*/
-public class RTFAWriteResultCallable implements Callable<Object> {
+public class RTFAWriteResultCallable implements Callable<CtuluLog> {
+
private final OtfaCampagneLineResult launch;
private final File targetDir;
Deleted: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java 2013-03-19 16:55:59 UTC (rev 8337)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLine.java 2013-03-19 17:02:05 UTC (rev 8338)
@@ -1,122 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.dodico.crue.io.rtfa;
-
-import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLine;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class RTFALine {
-
- private OtfaCampagneLine initialLine;
- private int nbDifferences = -1;
- private int nbSevereError;
- private int nbError;
- private int nbWarn;
- private int nbInfo;
-
- public RTFALine() {
- }
-
- public RTFALine(OtfaCampagneLine initialLine) {
- this.initialLine = initialLine;
- }
-
- public OtfaCampagneLine getInitialLine() {
- return initialLine;
- }
-
- public void setInitialLine(OtfaCampagneLine initialLine) {
- this.initialLine = initialLine;
- }
-
- public int getNbDifferences() {
- return nbDifferences;
- }
-
- public void setNbDifferences(int nbDifferences) {
- this.nbDifferences = nbDifferences;
- }
-
- public int getNbSevereError() {
- return nbSevereError;
- }
-
- public boolean isSameCount(RTFALine other) {
- if (other == null) {
- return false;
- }
- return nbDifferences == other.nbDifferences
- && nbSevereError == other.nbSevereError
- && nbError == other.nbError
- && nbWarn == other.nbWarn
- && nbInfo == other.nbInfo;
- }
-
- public void setNbSevereError(int nbSevereError) {
- this.nbSevereError = nbSevereError;
- }
-
- public int getNbError() {
- return nbError;
- }
-
- public void setNbError(int nbError) {
- this.nbError = nbError;
- }
-
- public boolean containsErrorOrSevereError() {
- return nbError > 0 || nbSevereError > 0;
- }
-
- public boolean containsWarning() {
- return nbWarn > 0;
- }
-
- public int getNbWarn() {
- return nbWarn;
- }
-
- public void setNbWarn(int nbWarn) {
- this.nbWarn = nbWarn;
- }
-
- public int getNbInfo() {
- return nbInfo;
- }
-
- public void setNbInfo(int nbInfo) {
- this.nbInfo = nbInfo;
- }
-
- public boolean hasLog() {
- return nbSevereError > 0 || nbError > 0 || nbWarn > 0 || nbInfo > 0;
- }
-
- public boolean hasDifferences() {
- return nbDifferences > 0;
- }
-
- public void initForm(RTFALine result) {
- if (result == null) {
- return;
- }
- initialLine = new OtfaCampagneLine(result.getInitialLine());
- nbDifferences = result.nbDifferences;
- nbSevereError = result.nbSevereError;
- nbError = result.nbError;
- nbWarn = result.nbWarn;
- nbInfo = result.nbInfo;
- }
-
- public int getNbLogs() {
- return nbSevereError + nbError + nbWarn + nbInfo;
- }
-
- public boolean hasComparaison() {
- return nbDifferences >= 0;
- }
-}
Deleted: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLineLoader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLineLoader.java 2013-03-19 16:55:59 UTC (rev 8337)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/rtfa/RtfaLineLoader.java 2013-03-19 17:02:05 UTC (rev 8338)
@@ -1,11 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.dodico.crue.io.rtfa;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class RtfaLinesLoader {
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-19 16:50:07
|
Revision: 8336
http://fudaa.svn.sourceforge.net/fudaa/?rev=8336&view=rev
Author: deniger
Date: 2013-03-19 16:49:59 +0000 (Tue, 19 Mar 2013)
Log Message:
-----------
Removed Paths:
-------------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/io/ctfa/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-18 20:54:22
|
Revision: 8335
http://fudaa.svn.sourceforge.net/fudaa/?rev=8335&view=rev
Author: deniger
Date: 2013-03-18 20:54:15 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostFileFilter.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeModelDefault.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2013-03-18 20:53:36 UTC (rev 8334)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2013-03-18 20:54:15 UTC (rev 8335)
@@ -72,8 +72,8 @@
infoSoft = new BuInformationsSoftware();
infoSoft.name = "prepro";
- infoSoft.version = "1.2-RC21";
- infoSoft.date = "2013-01-24";
+ infoSoft.version = "1.2-RC22";
+ infoSoft.date = "2013-03-18";
infoSoft.rights = TrResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)2003-2009";
infoSoft.contact = "fre...@fu...";
infoSoft.license = "GPL2";
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java 2013-03-18 20:53:36 UTC (rev 8334)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java 2013-03-18 20:54:15 UTC (rev 8335)
@@ -3,6 +3,7 @@
import com.memoire.bu.*;
import com.vividsolutions.jts.geom.LinearRing;
import java.awt.BorderLayout;
+import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Frame;
import java.awt.GridLayout;
@@ -119,10 +120,12 @@
cbChooseLine_ = new BuCheckBox();
content.add(new BuLabel(TrLib.getString("Sur les objets appartenant \xE0 la ligne")));
content.add(cbChooseLine_);
- JPanel res = new JPanel(new BorderLayout());
- res.add(content, BorderLayout.SOUTH);
+// JPanel res = new JPanel(new BorderLayout());
+// res.add(content, BorderLayout.SOUTH);
treeLignes_ = buildTree();
- res.add(new BuScrollPane(treeLignes_));
+ treeLignes_.setPreferredSize(new Dimension(300, 200));
+// final JScrollPane jScrollPane = new JScrollPane(treeLignes_);
+// res.add(jScrollPane);
treeLignes_.setEnabled(false);
cbChooseLine_.addItemListener(new ItemListener() {
@Override
@@ -144,7 +147,9 @@
} else {
JPanel newPn = new JPanel(new BuBorderLayout());
newPn.add(content, BorderLayout.NORTH);
- newPn.add(new JScrollPane(treeLignes_), BorderLayout.CENTER);
+ final JScrollPane jScrollPane = new JScrollPane(treeLignes_);
+ jScrollPane.setPreferredSize(new Dimension(200, 150));
+ newPn.add(jScrollPane, BorderLayout.CENTER);
content = newPn;
}
ButtonGroup gp = new ButtonGroup();
@@ -392,7 +397,7 @@
EfFilter filter = getFilter();
int nb = source_.getGrid().getEltNb();
for (int i = 0; i < nb; i++) {
- if (filter.isActivatedElt(i)) {
+ if (filter.isActivatedElt(i, EfComputeVolumeSeuil.USE_STRICT_FILTER)) {
set.set(i);
}
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostFileFilter.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostFileFilter.java 2013-03-18 20:53:36 UTC (rev 8334)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostFileFilter.java 2013-03-18 20:54:15 UTC (rev 8335)
@@ -6,123 +6,147 @@
/**
* Filter pour le projet trpost
- *
+ *
* @author Adrien Hadoux
*/
public class TrPostFileFilter extends BuFileFilter {
- /**
- * Utilis\xE9 pour l'extension de tous les fichiers, repertoire et ficheirs inclus.
- */
- public final static String DEFAULT_EXTENSION = "POST";
+ /**
+ * Utilis\xE9 pour l'extension de tous les fichiers, repertoire et ficheirs inclus.
+ */
+ public final static String DEFAULT_EXTENSION = "POST";
- /**
- * Filtre utilis\xE9 pour les chooser de selection de projet .POST.
- * @author Adrien Hadoux
- *
- */
- public static class DirectoryPOSTFilter extends FileFilter{
+ /**
+ * Filtre utilis\xE9 pour les chooser de selection de projet .POST.
+ *
+ * @author Adrien Hadoux
+ *
+ */
+ public static class DirectoryPOSTFilter extends FileFilter {
- @Override
- public boolean accept(File f) {
- // TODO Auto-generated method stub
-
- String s = f.getName();
-
- if(s.contains("."+DEFAULT_EXTENSION))
- return true;
+ @Override
+ public boolean accept(File f) {
+ if (f.isDirectory()) {
+ return true;
+ }
+ // TODO Auto-generated method stub
- return false;
- }
+ String s = f.getName();
- @Override
- public String getDescription() {
- // TODO Auto-generated method stub
- return DEFAULT_EXTENSION;
- }
+ if (s.contains("." + DEFAULT_EXTENSION)) {
+ return true;
+ }
- }
+ return false;
+ }
- public TrPostFileFilter(final TrPostFileFormat _ft) {
- super(new String[] { DEFAULT_EXTENSION }, _ft.getName());
+ @Override
+ public String getDescription() {
+ // TODO Auto-generated method stub
+ return DEFAULT_EXTENSION;
+ }
+ }
- }
+ public TrPostFileFilter(final TrPostFileFormat _ft) {
+ super(new String[]{DEFAULT_EXTENSION}, _ft.getName());
- @Override
- public boolean accept(final File _d, final String _fn) {
- if (_d == null) return accept(_fn);
- return accept(_d.getAbsolutePath());
- }
+ }
- @Override
- public boolean accept(final String _f) {
- if (_f == null) { return false; }
- final String name = _f;
- if (name == null) { return false; }
- if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) return true;
- return false;
- }
+ @Override
+ public boolean accept(final File _d, final String _fn) {
+ if (_d == null) {
+ return accept(_fn);
+ }
+ return accept(_d.getAbsolutePath());
+ }
- @Override
- public boolean accept(final File _f) {
- if (_f == null) { return false; }
- final String name = _f.getName();
- if (name == null) { return false; }
- if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) return true;
- return false;
+ @Override
+ public boolean accept(final String _f) {
+ if (_f == null) {
+ return false;
+ }
+ final String name = _f;
+ if (name == null) {
+ return false;
+ }
+ if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) {
+ return true;
+ }
+ return false;
+ }
- }
+ @Override
+ public boolean accept(final File _f) {
+ if (_f == null) {
+ return false;
+ }
+ final String name = _f.getName();
+ if (name == null) {
+ return false;
+ }
+ if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) {
+ return true;
+ }
+ return false;
- /**
- * Indique si le repertoire concern\xE9 est bien un r\xE9pertoire de type POST
- * @param _f
- * @return
- * @author Adrien Hadoux
- */
- public static boolean acceptDirectoryPOST(final File _f){
-
- if(_f==null)
- return false;
- if(!_f.isDirectory() || !_f.getName().contains("."+DEFAULT_EXTENSION))
- return false;
+ }
- //-- test du contenu si il est bien form\xE9: --//
- File[] children=_f.listFiles();
+ /**
+ * Indique si le repertoire concern\xE9 est bien un r\xE9pertoire de type POST
+ *
+ * @param _f
+ * @return
+ * @author Adrien Hadoux
+ */
+ public static boolean acceptDirectoryPOST(final File _f) {
- boolean setupFound=false;
- for(int i=0;!setupFound && i<children.length;i++){
- if (children[i] == null) { setupFound= false; }
- else{
- final String name = children[i].getName();
- if (name == null) { setupFound= false; }
- else
- if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) setupFound= true;
- }
- }
+ if (_f == null) {
+ return false;
+ }
+ if (!_f.isDirectory() || !_f.getName().contains("." + DEFAULT_EXTENSION)) {
+ return false;
+ }
+ //-- test du contenu si il est bien form\xE9: --//
+ File[] children = _f.listFiles();
- return setupFound;
- }
+ boolean setupFound = false;
+ for (int i = 0; !setupFound && i < children.length; i++) {
+ if (children[i] == null) {
+ setupFound = false;
+ } else {
+ final String name = children[i].getName();
+ if (name == null) {
+ setupFound = false;
+ } else if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) {
+ setupFound = true;
+ }
+ }
+ }
- /**
- * Recupere le fichier setup depuis le un r\xE9pertoire de type POST
- * @param _f
- * @return
- * @author Adrien Hadoux
- */
- public static File getSetupFormDirectoryPOST(final File _f){
- File[] children=_f.listFiles();
- for(int i=0; i<children.length;i++){
- if (children[i] == null) {}
- else{
- final String name = children[i].getName();
- if (name == null) { }
- else
- if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) return children[i];
- }
- }
- return null;
- }
+ return setupFound;
+ }
+ /**
+ * Recupere le fichier setup depuis le un r\xE9pertoire de type POST
+ *
+ * @param _f
+ * @return
+ * @author Adrien Hadoux
+ */
+ public static File getSetupFormDirectoryPOST(final File _f) {
+ File[] children = _f.listFiles();
+ for (int i = 0; i < children.length; i++) {
+ if (children[i] == null) {
+ } else {
+ final String name = children[i].getName();
+ if (name == null) {
+ } else if (name.equals(TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME)) {
+ return children[i];
+ }
+ }
+ }
+ return null;
+ }
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeModelDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeModelDefault.java 2013-03-18 20:53:36 UTC (rev 8334)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MVProfileCourbeModelDefault.java 2013-03-18 20:54:15 UTC (rev 8335)
@@ -39,6 +39,11 @@
}
@Override
+ public boolean useSpecificIcon(int idx) {
+ return false;
+ }
+
+ @Override
public boolean isGenerationSourceVisible() {
return true;
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java 2013-03-18 20:53:36 UTC (rev 8334)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryCourbeModel.java 2013-03-18 20:54:15 UTC (rev 8335)
@@ -54,6 +54,12 @@
return false;
}
+ @Override
+ public boolean useSpecificIcon(int idx) {
+ return false;
+ }
+
+
private void computeMinMax() {
if (isUpdateToDate_) {
return;
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java 2013-03-18 20:53:36 UTC (rev 8334)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacWeirCourbeModel.java 2013-03-18 20:54:15 UTC (rev 8335)
@@ -41,9 +41,14 @@
s_ = mng_.getTelemacSeuil(_i);
cote_ = _cote;
x_ = _x;
+ }
+ @Override
+ public boolean useSpecificIcon(int idx) {
+ return false;
}
+
@Override
public boolean isGenerationSourceVisible() {
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-18 20:53:43
|
Revision: 8334
http://fudaa.svn.sourceforge.net/fudaa/?rev=8334&view=rev
Author: deniger
Date: 2013-03-18 20:53:36 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfComputeVolumeSeuil.java
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfComputeVolumeSeuil.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfComputeVolumeSeuil.java 2013-03-18 16:37:37 UTC (rev 8333)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/cubature/EfComputeVolumeSeuil.java 2013-03-18 20:53:36 UTC (rev 8334)
@@ -1,9 +1,7 @@
package org.fudaa.dodico.ef.cubature;
-import java.io.IOException;
-
import com.memoire.fu.FuLog;
-
+import java.io.IOException;
import org.fudaa.ctulu.CtuluActivity;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluVariable;
@@ -52,6 +50,7 @@
return resi;
}
}
+ public static final boolean USE_STRICT_FILTER = true;
public static class ForNodeData extends ComputeDelegate {
@@ -65,7 +64,7 @@
for (int ielt = 0; ielt < volumeData.data_.getGrid().getEltNb(); ielt++) {
// le calcul du volume se fait:
// Volume=(surface des elements adjacents)* hauteur au point /3
- if (volumeData.filter_.isActivatedElt(ielt, true)) {
+ if (volumeData.filter_.isActivatedElt(ielt, USE_STRICT_FILTER)) {
// liste des elements adjacents.
// s est la surface des elements adjacents.
EfElement elt = volumeData.data_.getGrid().getElement(ielt);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-18 16:37:44
|
Revision: 8333
http://fudaa.svn.sourceforge.net/fudaa/?rev=8333&view=rev
Author: deniger
Date: 2013-03-18 16:37:37 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/trace/TraceImage.java
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/trace/TraceImage.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/trace/TraceImage.java 2013-03-18 16:37:11 UTC (rev 8332)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/trace/TraceImage.java 2013-03-18 16:37:37 UTC (rev 8333)
@@ -12,8 +12,8 @@
import java.awt.Rectangle;
import java.awt.image.ImageObserver;
import javax.swing.Icon;
-
import javax.swing.SwingConstants;
+import org.fudaa.ebli.geometrie.GrBoite;
/**
* Une classe permettant de dessiner un icone externe en le positionnant horizontalement/verticalement
@@ -32,24 +32,8 @@
public void paintIcon(final Graphics2D _g2d, final int _x, final int _y, Icon icon, Rectangle view) {
final int hInner = icon.getIconHeight();
final int wInner = icon.getIconWidth();
- int xTopLeft = _x;
- if (hPosition_ == SwingConstants.CENTER) {
- xTopLeft -= wInner / 2;
- } else if (hPosition_ == SwingConstants.RIGHT) {
- xTopLeft -= wInner;
- }
- int yTopLeft = _y;
- if (vPosition_ == SwingConstants.CENTER) {
- yTopLeft -= hInner / 2;
- } else if (vPosition_ == SwingConstants.BOTTOM) {
- yTopLeft -= hInner;
- }
- if (view != null) {
- xTopLeft = Math.min(view.x + view.width - wInner, xTopLeft);
- yTopLeft = Math.min(view.y + view.height - hInner, yTopLeft);
- xTopLeft = Math.max(xTopLeft, view.x);
- yTopLeft = Math.max(yTopLeft, view.y);
- }
+ int xTopLeft = getXTopLeft(_x, wInner, view);
+ int yTopLeft = getYTopLeft(_y, hInner, view);
icon.paintIcon(null, _g2d, xTopLeft, yTopLeft);
}
@@ -57,12 +41,57 @@
public void paintImage(final Graphics2D _g2d, final int _x, final int _y, Image image, Rectangle view, ImageObserver observer) {
final int hInner = image.getHeight(observer);
final int wInner = image.getWidth(observer);
+ int xTopLeft = getXTopLeft(_x, wInner, view);
+ int yTopLeft = getYTopLeft(_y, hInner, view);
+ _g2d.drawImage(image, xTopLeft, yTopLeft, observer);
+ }
+
+ /**
+ *
+ * @param iconBoite une boite a initialiser. si null, une nouvelle instance est cr\xE9\xE9e
+ * @param icon l'icon pour avoir largeur/hauteur
+ * @param x x dessin\xE9
+ * @param y y dessine
+ * @return la boite dans laquelle l'icone sera dessin\xE9 en coordonn\xE9es \xE9cran
+ */
+ public GrBoite getBoite(GrBoite iconBoite, Icon icon, int x, int y) {
+ GrBoite res = iconBoite;
+ if (res == null) {
+ res = new GrBoite();
+ }
+ res.e_ = null;
+ res.o_ = null;
+ final int hInner = icon.getIconHeight();
+ final int wInner = icon.getIconWidth();
+ int xTopLeft = getXTopLeft(x, wInner, null);
+ int yTopLeft = getYTopLeft(y, hInner, null);
+ res.ajuste(xTopLeft, yTopLeft, 0);
+ res.ajuste(xTopLeft + icon.getIconWidth(), yTopLeft + icon.getIconHeight(), 0);
+ return res;
+ }
+
+ public TraceImage duplicate() {
+ TraceImage duplic = new TraceImage();
+ duplic.hPosition_ = this.hPosition_;
+ duplic.vPosition_ = this.vPosition_;
+ return duplic;
+ }
+
+ public int getXTopLeft(final int _x, final int wInner, Rectangle view) {
int xTopLeft = _x;
if (hPosition_ == SwingConstants.CENTER) {
xTopLeft -= wInner / 2;
} else if (hPosition_ == SwingConstants.RIGHT) {
xTopLeft -= wInner;
}
+ if (view != null) {
+ xTopLeft = Math.min(view.x + view.width - wInner, xTopLeft);
+ xTopLeft = Math.max(xTopLeft, view.x);
+ }
+ return xTopLeft;
+ }
+
+ public int getYTopLeft(final int _y, final int hInner, Rectangle view) {
int yTopLeft = _y;
if (vPosition_ == SwingConstants.CENTER) {
yTopLeft -= hInner / 2;
@@ -70,18 +99,9 @@
yTopLeft -= hInner;
}
if (view != null) {
- xTopLeft = Math.min(view.x + view.width - wInner, xTopLeft);
yTopLeft = Math.min(view.y + view.height - hInner, yTopLeft);
- xTopLeft = Math.max(xTopLeft, view.x);
yTopLeft = Math.max(yTopLeft, view.y);
}
- _g2d.drawImage(image, xTopLeft, yTopLeft, observer);
+ return yTopLeft;
}
-
- public TraceImage duplicate() {
- TraceImage duplic = new TraceImage();
- duplic.hPosition_ = this.hPosition_;
- duplic.vPosition_ = this.vPosition_;
- return duplic;
- }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-15 19:00:09
|
Revision: 8330
http://fudaa.svn.sourceforge.net/fudaa/?rev=8330&view=rev
Author: deniger
Date: 2013-03-15 18:59:58 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-03-14 15:57:13 UTC (rev 8329)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-03-15 18:59:58 UTC (rev 8330)
@@ -626,13 +626,13 @@
ype = yie;
ypeVal = yi;
}
+ _g.setClip(oldClip);
for (Map.Entry<Point, StringBuilder> entry : labels.entrySet()) {
Point point = entry.getKey();
StringBuilder stringBuilder = entry.getValue();
paintLabelBox(_g, point.x, point.y, stringBuilder.toString(), _t, view);
}
- _g.setClip(oldClip);
traceMarks(_g, _t);
traceTitle(_g, _t, rangeDisplayed);
@@ -806,9 +806,9 @@
if (listeMarqueurs_ == null) {
// -- init avec 3 marqueurs --//
listeMarqueurs_ = new ArrayList<EGCourbeMarqueur>(3);
- addMarqueur();
- addMarqueur();
- addMarqueur();
+ listeMarqueurs_.add(createMarqueur());
+ listeMarqueurs_.add(createMarqueur());
+ listeMarqueurs_.add(createMarqueur());
}
return listeMarqueurs_;
@@ -1229,7 +1229,7 @@
* @return
*/
public boolean addMarqueur() {
- EGCourbeMarqueur marqueur = new EGCourbeMarqueur(0, false, new TraceLigneModel(), true);
+ EGCourbeMarqueur marqueur = createMarqueur();
return addMarqueur(marqueur);
}
@@ -1384,4 +1384,9 @@
protected void paintLabelBox(final Graphics2D _g, int xBox, int yBox, String pLabel, final EGRepere _t, Rectangle view) {
tboxLabels_.paintBox(_g, xBox, yBox, pLabel, view);
}
+
+ public EGCourbeMarqueur createMarqueur() {
+ EGCourbeMarqueur marqueur = new EGCourbeMarqueur(0, false, new TraceLigneModel(), true);
+ return marqueur;
+ }
}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java 2013-03-14 15:57:13 UTC (rev 8329)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbePersist.java 2013-03-15 18:59:58 UTC (rev 8330)
@@ -125,7 +125,6 @@
return iconeModelSpecific;
}
-
public void setIconeModel(TraceIconModel iconeModel) {
this.iconeModel = iconeModel;
}
@@ -134,7 +133,6 @@
this.iconeModelSpecific = iconeModelSpecific;
}
-
public List<EGCourbeMarqueur> getListeMarqueurs() {
return listeMarqueurs_;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-14 15:57:24
|
Revision: 8329
http://fudaa.svn.sourceforge.net/fudaa/?rev=8329&view=rev
Author: deniger
Date: 2013-03-14 15:57:13 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java
trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/AbstractTopComponent.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/ItemVariableView.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListAddTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListCasierAddTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListNoeudAddTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListSectionAddTopComponent.java
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/list/Bundle.properties
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/NumberFormatChoice.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -1,5 +1,5 @@
/**
- *
+ *
*/
package org.fudaa.dodico.crue.config.ccm;
@@ -16,9 +16,9 @@
private final NumberFormat base;
private final CtuluNumberFormatFixedFigure scientific;
-
private final double maxValue;
private final double minValue;
+ private final PropertyEpsilon epsilon;
/**
* @param base
@@ -26,16 +26,20 @@
* @param maxValue
* @param minValue
*/
- public NumberFormatChoice(final NumberFormat base, final CtuluNumberFormatFixedFigure scientific,
- final double maxValue, final double minValue) {
+ public NumberFormatChoice(PropertyEpsilon epsilon, final NumberFormat base, final CtuluNumberFormatFixedFigure scientific,
+ final double maxValue, final double minValue) {
super();
this.base = base;
+ this.epsilon = epsilon;
this.scientific = scientific;
this.maxValue = maxValue;
this.minValue = minValue;
}
private boolean useScientific(final double value) {
+ if (epsilon != null && epsilon.isZero(value)) {
+ return false;
+ }
final double absValue = Math.abs(value);
return (absValue > maxValue || absValue < minValue);
}
@@ -51,7 +55,9 @@
@Override
public StringBuffer format(final long number, final StringBuffer toAppendTo, final FieldPosition pos) {
- if (useScientific(number)) { return scientific.format(number, toAppendTo, pos); }
+ if (useScientific(number)) {
+ return scientific.format(number, toAppendTo, pos);
+ }
return base.format(number, toAppendTo, pos);
}
@@ -59,5 +65,4 @@
public Number parse(final String source, final ParsePosition parsePosition) {
return base.parse(source, parsePosition);
}
-
}
Modified: trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/crue-config/src/main/java/org/fudaa/dodico/crue/config/ccm/PropertyFormaterBuilder.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -14,19 +14,21 @@
private NumberFormat nbDecFormatForInteger;
public NumberFormat getFormatter(final PropertyNature nature, DecimalFormatEpsilonEnum presentionOrComparison) {
+ if (nature == null) {
+ return null;
+ }
if (nature.getTypeNumerique().isEntier()) {
if (nbDecFormatForInteger == null) {
DecimalFormat numberFormat = new DecimalFormat();
numberFormat.setGroupingUsed(false);
numberFormat.setMaximumFractionDigits(0);
- NumberFormatChoice fmt = new NumberFormatChoice(numberFormat, new CtuluNumberFormatFixedFigure(10), 1E10, 1E-10);
+ NumberFormatChoice fmt = new NumberFormatChoice(nature.getEpsilon(), numberFormat, new CtuluNumberFormatFixedFigure(10), 1E10, 1E-10);
nbDecFormatForInteger = new NumberFormatInfini(fmt, nature);
}
return nbDecFormatForInteger;
}
-
String natureNom = nature.getNom();
- if (nature == null || "nbr".equalsIgnoreCase(natureNom) || "num".equalsIgnoreCase(natureNom)) {
+ if ("nbr".equalsIgnoreCase(natureNom) || "num".equalsIgnoreCase(natureNom)) {
return null;
}
int nbDec = Math.abs((int) Math.log10(nature.getEpsilon().getEpsilon(presentionOrComparison)));
@@ -37,7 +39,7 @@
numberFormat.setGroupingUsed(false);
numberFormat.setMaximumFractionDigits(nbDec);
// pour ecrire correctement + et - infini
- NumberFormatChoice fmt = new NumberFormatChoice(numberFormat, new CtuluNumberFormatFixedFigure(10), 1E10, 1E-10);
+ NumberFormatChoice fmt = new NumberFormatChoice(nature.getEpsilon(), numberFormat, new CtuluNumberFormatFixedFigure(10), 1E10, 1E-10);
numberFormat = new NumberFormatInfini(fmt, nature);
nbDecFormat.put(nbDec, numberFormat);
}
Modified: trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/helper/EMHHelper.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -907,7 +907,7 @@
* @param distance la distance actuelle
* @return l'entier a utiliser pour diviser la distance afin de créer des profils distancés de moins de distmax.
*/
- public static int getDistDiviseurForDistMax(final float distmax, final float distance) {
+ public static int getDistDiviseurForDistMax(final double distmax, final double distance) {
return (int) Math.ceil(distance / distmax);
}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/AbstractTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/AbstractTopComponent.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/AbstractTopComponent.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -3,6 +3,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import org.fudaa.ctulu.action.ActionsInstaller;
+import org.fudaa.ctulu.action.SwitchMinMaxDialogAction;
+import org.fudaa.ctulu.border.BorderWithIconInstaller;
import org.fudaa.fudaa.crue.common.services.TopComponentOpenCloseHelper;
import org.openide.util.HelpCtx;
import org.openide.windows.TopComponent;
@@ -21,7 +23,8 @@
public AbstractTopComponent() {
setFocusable(true);
- ActionsInstaller.install(this);
+ SwitchMinMaxDialogAction installAndCreateSwitchAction = ActionsInstaller.installAndCreateSwitchAction(this);
+ BorderWithIconInstaller.install(this, installAndCreateSwitchAction, true);
}
protected abstract String getHelpCtxId();
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/ItemVariableView.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/ItemVariableView.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/ItemVariableView.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -174,13 +174,21 @@
}
txt.setToolTipText(property.getValidator().getHtmlDesc(tltip));
setChanged();
+ validateData();
notifyObservers(this);
- validateData();
}
@Override
public Number getValue() {
- Object value = txt.getValue();
+ String txtValue = txt.getText();
+ if (StringUtils.isBlank(txtValue)) {
+ return null;
+ }
+ Object value = null;
+ try {
+ value = Double.valueOf(txtValue);
+ } catch (Exception ex) {
+ }
if (value == null) {
return null;
}
@@ -217,17 +225,19 @@
}
@Override
- protected void validateData() {
+ public void validateData() {
super.validateData();
if (valid) {
Number distance = getValue();
- if (distance != null) {
- if (property.getEpsilon().isZero(distance.doubleValue())) {
- valid = false;
- label.setToolTipText(NbBundle.getMessage(ItemVariableView.class, "Editor.DistanceCantBeNull"));
- label.setIcon(LogIconTranslationProvider.getIcon(CtuluLogLevel.FATAL));
- }
+ boolean isNull = distance == null;
+ if (!isNull) {
+ isNull = property.getEpsilon().isZero(distance.doubleValue());
}
+ if (isNull) {
+ valid = false;
+ label.setToolTipText(NbBundle.getMessage(ItemVariableView.class, "Editor.DistanceCantBeNull"));
+ label.setIcon(LogIconTranslationProvider.getIcon(CtuluLogLevel.FATAL));
+ }
}
}
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListAddTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListAddTopComponent.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListAddTopComponent.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -64,6 +64,10 @@
ExplorerUtils.activateActions(getExplorerManager(), false);
}
+ protected JButton createAdditionnalAddButton() {
+ return null;
+ }
+
protected final void initActionComponents() {
btAddEMH = new JButton(NbBundle.getMessage(AbstractModellingListAddTopComponent.class, "Add.Name"));
btAddEMH.addActionListener(new ActionListener() {
@@ -89,6 +93,10 @@
JPanel addRemove = new JPanel(new BuGridLayout(1));
addRemove.setBorder(BorderFactory.createEmptyBorder(0, 3, 0, 3));
addRemove.add(btAddEMH);
+ JButton createAdditionnalAddButton = createAdditionnalAddButton();
+ if (createAdditionnalAddButton != null) {
+ addRemove.add(createAdditionnalAddButton);
+ }
addRemove.add(new JSeparator());
final JButton jButtonDelete = new JButton(actionDelete);
jButtonDelete.setText(NbBundle.getMessage(AbstractModellingListAddTopComponent.class, "Delete.Name"));
@@ -152,7 +160,7 @@
boolean editable;
@Override
- protected final void setEditable(boolean b) {
+ protected void setEditable(boolean b) {
this.editable = b;
super.setEditable(b);
btAddEMH.setEnabled(b);
Added: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java (rev 0)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AddSectionInBranchePanelContent.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -0,0 +1,120 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.crue.modelling.list;
+
+import com.memoire.bu.BuBorders;
+import com.memoire.bu.BuGridLayout;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Observable;
+import java.util.Observer;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierConstants;
+import org.fudaa.dodico.crue.config.ccm.DecimalFormatEpsilonEnum;
+import org.fudaa.dodico.crue.config.ccm.ItemVariable;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
+import org.fudaa.dodico.crue.metier.emh.EMHBrancheSaintVenant;
+import org.fudaa.dodico.crue.metier.emh.EMHSousModele;
+import org.fudaa.fudaa.crue.common.helper.ComboBoxHelper;
+import org.fudaa.fudaa.crue.common.helper.DialogHelper;
+import org.fudaa.fudaa.crue.common.view.ItemVariableView;
+import org.openide.DialogDescriptor;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class AddSectionInBranchePanelContent implements Observer, ItemListener {
+
+ private JLabel lbDistance;
+ private JComboBox cbBranches;
+ private ItemVariableView.TextFiedDistance tfDistance;
+ private DialogDescriptor dialog;
+ private Map<String, EMHBrancheSaintVenant> branchesByName;
+ private ItemVariable xp;
+ private JPanel pn;
+
+ protected AddSectionInBranchePanelContent(CrueConfigMetier ccm, EMHSousModele sousModele) {
+ List<EMHBrancheSaintVenant> branches = sousModele.getBranchesSaintVenant();
+ List<String> branchesNoms = TransformerHelper.toNom(branches);
+ Collections.sort(branchesNoms);
+ branchesByName = TransformerHelper.toMapOfNom(branches);
+ xp = ccm.getProperty(CrueConfigMetierConstants.PROP_XP);
+ tfDistance = new ItemVariableView.TextFiedDistance(ccm, DecimalFormatEpsilonEnum.COMPARISON);
+
+ cbBranches = new JComboBox();
+ ComboBoxHelper.setDefaultModel(cbBranches, branchesNoms);
+ lbDistance = new JLabel();
+ pn = new JPanel(new BuGridLayout(3, 5, 10, true, true));
+ pn.setBorder(BuBorders.EMPTY3333);
+ pn.add(new JLabel(NbBundle.getMessage(ModellingListSectionAddTopComponent.class, "BrancheName.Name")));
+ pn.add(cbBranches);
+ pn.add(lbDistance);
+ lbDistance.setText(" ");
+ pn.add(new JLabel(NbBundle.getMessage(AddSectionInBranchePanelContent.class, "DistanceMax")));
+ pn.add(tfDistance.getTxt());
+ pn.add(tfDistance.getLabel());
+ //listener
+ cbBranches.addItemListener(this);
+ tfDistance.addObserver(this);
+ }
+
+ CatEMHBranche getSelectedBranche() {
+ return branchesByName.get(cbBranches.getSelectedItem());
+ }
+
+ Double getDistance() {
+ return (Double) tfDistance.getValue();
+ }
+
+ @Override
+ public void update(Observable o, Object arg) {
+ if (dialog != null) {
+ String errorMsg = tfDistance.getErrorMsg();
+ dialog.setValid(errorMsg == null);
+ dialog.getNotificationLineSupport().setErrorMessage(errorMsg);
+ }
+ }
+
+ public boolean show() {
+ dialog = new DialogDescriptor(pn, NbBundle.getMessage(AddSectionInBranchePanelContent.class, "AddSectionsInBanche.ActionName"));
+ dialog.createNotificationLineSupport();
+ tfDistance.validateData();
+ update(null, null);
+ updateBrancheDistance();
+ return DialogHelper.showQuestionAndSaveDialogConf(dialog, getClass());
+ }
+
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ if (e.getStateChange() == ItemEvent.SELECTED) {
+ updateBrancheDistance();
+ }
+ }
+
+ private void updateBrancheDistance() {
+ String brancheNom = (String) cbBranches.getSelectedItem();
+ EMHBrancheSaintVenant branche = branchesByName.get(brancheNom);
+ if (branche == null) {
+ lbDistance.setText(null);
+ lbDistance.setToolTipText(null);
+ return;
+ }
+ double length = branche.getLength();
+ String txt = xp.format(length, DecimalFormatEpsilonEnum.COMPARISON)
+ + xp.getNature().getUniteSuffixe();
+ lbDistance.setText(ListBrancheContentNode.getLongueurDisplayName() + ": "
+ + txt);
+ lbDistance.setToolTipText(NbBundle.getMessage(AddSectionInBranchePanelContent.class, "Branche.InitialLength") + ": "
+ + txt);
+ }
+}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListBrancheContentNode.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -5,6 +5,7 @@
import java.text.NumberFormat;
import java.util.MissingResourceException;
import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetierConstants;
import org.fudaa.dodico.crue.config.ccm.DecimalFormatEpsilonEnum;
import org.fudaa.dodico.crue.edition.bean.ListBrancheContent;
import org.fudaa.dodico.crue.edition.bean.ListCommonProperties;
@@ -106,7 +107,7 @@
CrueConfigMetier propDefinition = modellingScenarioService.getSelectedProjet().getPropDefinition();
- NumberFormat formatter = propDefinition.getFormatter("xp",DecimalFormatEpsilonEnum.COMPARISON);
+ NumberFormat formatter = propDefinition.getFormatter(CrueConfigMetierConstants.PROP_XP, DecimalFormatEpsilonEnum.COMPARISON);
String longeurFormatted = null;
if (formatter != null) {
longeurFormatted = formatter.format(brancheContent.getLongueur());
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListCasierAddTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListCasierAddTopComponent.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListCasierAddTopComponent.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -7,7 +7,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import javax.swing.JButton;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
import org.fudaa.dodico.crue.edition.UniqueNomFinder;
@@ -38,8 +37,6 @@
public static final String TOPCOMPONENT_ID = "ModellingListCasierAddTopComponent";
public static final String TOPCOMPONENT_ACTION = "CTL_" + TOPCOMPONENT_ID;
public static final String TOPCOMPONENT_ACTION_DISPLAYNAME = "#" + TOPCOMPONENT_ACTION;
- JButton btAddCasier;
- JButton btAddNodesFromClipboard;
public ModellingListCasierAddTopComponent() {
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListNoeudAddTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListNoeudAddTopComponent.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListNoeudAddTopComponent.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -5,7 +5,6 @@
package org.fudaa.fudaa.crue.modelling.list;
import java.util.Collection;
-import javax.swing.JButton;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.dodico.crue.common.transformer.TransformerHelper;
@@ -29,8 +28,8 @@
//@ConvertAsProperties(dtd = "-//org.fudaa.fudaa.crue.modelling//ModellingListNoeudTopComponent//EN",
// autostore = false)
@TopComponent.Description(preferredID = ModellingListNoeudAddTopComponent.TOPCOMPONENT_ID,
-iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png",
-persistenceType = TopComponent.PERSISTENCE_ALWAYS)
+ iconBase = "org/fudaa/fudaa/crue/modelling/rond-orange_16.png",
+ persistenceType = TopComponent.PERSISTENCE_ALWAYS)
@TopComponent.Registration(mode = ModellingListNoeudAddTopComponent.MODE, openAtStartup = false, position = 0)
public final class ModellingListNoeudAddTopComponent extends AbstractModellingListAddTopComponent {
//attention le mode modelling-listAddNoeuds doit être déclaré dans le projet branding (layer.xml)
@@ -39,8 +38,6 @@
public static final String TOPCOMPONENT_ID = "ModellingListNoeudAddTopComponent";
public static final String TOPCOMPONENT_ACTION = "CTL_" + TOPCOMPONENT_ID;
public static final String TOPCOMPONENT_ACTION_DISPLAYNAME = "#" + TOPCOMPONENT_ACTION;
- JButton btAddNodes;
- JButton btAddNodesFromClipboard;
public ModellingListNoeudAddTopComponent() {
super();
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListSectionAddTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListSectionAddTopComponent.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ModellingListSectionAddTopComponent.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -4,7 +4,11 @@
*/
package org.fudaa.fudaa.crue.modelling.list;
+import gnu.trove.TDoubleArrayList;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.util.Collection;
+import java.util.List;
import javax.swing.JButton;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
@@ -12,10 +16,14 @@
import org.fudaa.dodico.crue.edition.UniqueNomFinder;
import org.fudaa.dodico.crue.edition.bean.ListCommonProperties;
import org.fudaa.dodico.crue.edition.bean.ListRelationSectionContent;
+import org.fudaa.dodico.crue.metier.emh.CatEMHBranche;
import org.fudaa.dodico.crue.metier.emh.EMHScenario;
import org.fudaa.dodico.crue.metier.emh.EMHSousModele;
import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
+import org.fudaa.dodico.crue.metier.emh.EnumSectionType;
+import org.fudaa.dodico.crue.metier.emh.RelationEMHSectionDansBranche;
import org.fudaa.dodico.crue.metier.factory.CruePrefix;
+import org.fudaa.dodico.crue.metier.helper.EMHHelper;
import org.fudaa.fudaa.crue.common.log.LogsDisplayer;
import org.fudaa.fudaa.crue.modelling.edition.ListAjoutRelationSectionProcess;
import org.openide.nodes.Children;
@@ -37,8 +45,7 @@
public static final String TOPCOMPONENT_ID = "ModellingListSectionAddTopComponent";
public static final String TOPCOMPONENT_ACTION = "CTL_" + TOPCOMPONENT_ID;
public static final String TOPCOMPONENT_ACTION_DISPLAYNAME = "#" + TOPCOMPONENT_ACTION;
- JButton btAddNodes;
- JButton btAddNodesFromClipboard;
+ JButton btAddSectionInBranche;
public ModellingListSectionAddTopComponent() {
super();
@@ -52,18 +59,48 @@
}
@Override
+ protected void setEditable(boolean b) {
+ super.setEditable(b);
+ btAddSectionInBranche.setEnabled(b);
+ }
+
+ protected void addSectionsInBranche() {
+ AddSectionInBranchePanelContent builder = new AddSectionInBranchePanelContent(getCcm(), getSousModele());
+ if (builder.show() && builder.getDistance() != null && builder.getSelectedBranche() != null) {
+ CatEMHBranche branche = builder.getSelectedBranche();
+ double maxDistance = builder.getDistance();
+ TDoubleArrayList newXp = createNewXps(branche, maxDistance);
+ ListRelationSectionContentAddNode[] nodes = createNewNodes(newXp, branche);
+ if (nodes.length > 0) {
+ prepareRootContext();
+ Children children = getExplorerManager().getRootContext().getChildren();
+ children.add(nodes);
+ }
+ }
+ }
+
+ @Override
+ protected JButton createAdditionnalAddButton() {
+ btAddSectionInBranche = new JButton(NbBundle.getMessage(ModellingListSectionAddTopComponent.class, "AddSectionsInBanche.ActionName"));
+ btAddSectionInBranche.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ addSectionsInBranche();
+ }
+ });
+ return btAddSectionInBranche;
+ }
+
+ @Override
protected void addEMHsFromClipboard() {
addNodesFromClipboard(ListAjoutRelationSectionProcess.createNodes(perspectiveServiceModelling, getSousModele()));
}
- @Override
- protected void addEMH() {
+ private Collection<String> getExsistingName() {
EMHScenario scenarioLoaded = getModellingService().getScenarioLoaded();
Children children = getExplorerManager().getRootContext().getChildren();
Collection<String> existingNames = TransformerHelper.toSetNom(scenarioLoaded.getIdRegistry().getEMHs(EnumCatEMH.SECTION));
-// List<String> sectionsNoms = ListAjoutRelationSectionProcess.getAvailableSectionForSectionIdem(getSousModele());
-// List<String> branchesNoms = ListAjoutRelationSectionProcess.getAvailableBranchesForSections(getSousModele());
Node[] nodes = children.getNodes();
for (Node node : nodes) {
ListRelationSectionContent content = node.getLookup().lookup(ListRelationSectionContent.class);
@@ -71,9 +108,15 @@
existingNames.add(content.getNom());
}
}
+ return existingNames;
+ }
+
+ @Override
+ protected void addEMH() {
UniqueNomFinder nomFinder = new UniqueNomFinder();
- String newName = nomFinder.findNewName(existingNames, CruePrefix.P_SECTION);
+ String newName = nomFinder.findNewName(getExsistingName(), CruePrefix.P_SECTION);
ListRelationSectionContentAddNode.NamesContent brancheSectionNames = ListAjoutRelationSectionProcess.getAvailableData(getSousModele());
+ Children children = getExplorerManager().getRootContext().getChildren();
children.add(new Node[]{new ListRelationSectionContentAddNode(new ListRelationSectionContent(newName), perspectiveServiceModelling,
brancheSectionNames)});
}
@@ -122,4 +165,42 @@
}// </editor-fold>//GEN-END:initComponents
// Variables declaration - do not modify//GEN-BEGIN:variables
// End of variables declaration//GEN-END:variables
+
+ public TDoubleArrayList createNewXps(CatEMHBranche branche, double maxDistance) {
+ List<RelationEMHSectionDansBranche> listeSectionsSortedXP = branche.getListeSectionsSortedXP(getCcm());
+ TDoubleArrayList newXp = new TDoubleArrayList();
+ for (int i = 0; i < listeSectionsSortedXP.size() - 1; i++) {
+ double x0 = listeSectionsSortedXP.get(i).getXp();
+ double x1 = listeSectionsSortedXP.get(i + 1).getXp();
+ final double distance = x1 - x0;
+ if (maxDistance < (distance)) {
+ final int nbProfilsToAdd = EMHHelper.getDistDiviseurForDistMax(maxDistance, distance);
+ double distMaxCorrige = distance / nbProfilsToAdd;
+ double xToAdd = x0 + distMaxCorrige;
+ while (xToAdd < x1) {
+ newXp.add(xToAdd);
+ xToAdd += distMaxCorrige;
+ }
+ }
+ }
+ return newXp;
+ }
+
+ public ListRelationSectionContentAddNode[] createNewNodes(TDoubleArrayList newXp, CatEMHBranche branche) {
+ ListRelationSectionContentAddNode.NamesContent brancheSectionNames = ListAjoutRelationSectionProcess.getAvailableData(getSousModele());
+ int nb = newXp.size();
+ ListRelationSectionContentAddNode[] nodes = new ListRelationSectionContentAddNode[nb];
+ UniqueNomFinder nomFinder = new UniqueNomFinder();
+ List<String> newName = nomFinder.findNewNames(getExsistingName(), CruePrefix.P_SECTION, nb);
+ for (int i = 0; i < nb; i++) {
+ ListRelationSectionContent newSection = new ListRelationSectionContent(newName.get(i));
+ newSection.setAbscisseHydraulique(newXp.get(i));
+ newSection.setBrancheNom(branche.getNom());
+ ListRelationSectionContent.SectionData data = new ListRelationSectionContent.SectionData();
+ data.setSectionType(EnumSectionType.EMHSectionProfil);
+ newSection.setSection(data);
+ nodes[i] = new ListRelationSectionContentAddNode(newSection, perspectiveServiceModelling, brancheSectionNames);
+ }
+ return nodes;
+ }
}
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/list/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/list/Bundle.properties 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/list/Bundle.properties 2013-03-14 15:57:13 UTC (rev 8329)
@@ -48,3 +48,6 @@
OpenFrt.Menu=Ouvrir le frottement dans l'\u00e9diteur
OpenFrtImpossibleModificationDone=Modification non valid\u00e9e: impossible d'ouvrir l'\u00e9diteur de frottement
OrderNodesWithBranches.Name=ordonner d'apr\u00e8s l'ordre des branches
+AddSectionsInBanche.ActionName=Peupler une branche
+DistanceMax=Distance maximum entre 2 sections
+Branche.InitialLength=Longueur initiale de la branche
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java 2013-03-14 15:55:16 UTC (rev 8328)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java 2013-03-14 15:57:13 UTC (rev 8329)
@@ -35,8 +35,8 @@
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
import org.fudaa.ebli.calque.ZSelectionEvent;
import org.fudaa.ebli.calque.ZSelectionListener;
-import org.fudaa.ebli.calque.action.AddSommetAction;
-import org.fudaa.ebli.calque.action.CalqueNormalSelectionAction;
+import org.fudaa.ebli.calque.action.AddVertexAction;
+import org.fudaa.ebli.calque.action.CalqueSelectNormalSelectionAction;
import org.fudaa.ebli.calque.action.SceneSelectNextAction;
import org.fudaa.ebli.calque.action.SceneSelectPreviousAction;
import org.fudaa.ebli.calque.edition.ZEditorDefault;
@@ -121,7 +121,7 @@
((FSigEditor) gisEditor_).setDisplayInfo(false);
SceneSelectPreviousAction sceneSelectPreviousAction = new SceneSelectPreviousAction(gisEditor_.getSceneEditor());
SceneSelectNextAction sceneSelectNextAction = new SceneSelectNextAction(gisEditor_.getSceneEditor());
- CalqueNormalSelectionAction normalSelection = new CalqueNormalSelectionAction(gisEditor_.getSupport());
+ CalqueSelectNormalSelectionAction normalSelection = new CalqueSelectNormalSelectionAction(gisEditor_.getSupport());
EbliLib.updateMapKeyStroke(this, new Action[]{sceneSelectPreviousAction, sceneSelectNextAction, normalSelection});
selectNext = (JMenuItem) sceneSelectNextAction.buildMenuItem(EbliComponentFactory.INSTANCE);
selectPrevious = (JMenuItem) sceneSelectPreviousAction.buildMenuItem(EbliComponentFactory.INSTANCE);
@@ -184,10 +184,10 @@
_menu.addMenuItem(BuResource.BU.getString("Rechercher..."), "RECHERCHER", BuResource.BU.getIcon("rechercher"), true, KeyEvent.VK_F).addActionListener(this);
_menu.addSeparator();
if (itemAddAtomic == null) {
- AddSommetAction action = new AddSommetAction(getScene());
+ AddVertexAction action = new AddVertexAction(getScene());
itemAddAtomic = new JMenuItem(action);
}
- AddSommetAction action = (AddSommetAction) itemAddAtomic.getAction();
+ AddVertexAction action = (AddVertexAction) itemAddAtomic.getAction();
if (action.isActivatedFor(cqActif)) {
_menu.add(itemAddAtomic);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-14 15:55:23
|
Revision: 8328
http://fudaa.svn.sourceforge.net/fudaa/?rev=8328&view=rev
Author: deniger
Date: 2013-03-14 15:55:16 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-03-14 15:49:17 UTC (rev 8327)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-03-14 15:55:16 UTC (rev 8328)
@@ -608,9 +608,7 @@
canDraw = range.isValueContained(yi) || range.isValueContained(ypeVal);
}
if (canDraw) {
-// double newyie = getYEcran(yi, _t);
double newyie = yie;
-// double newyie2 = getYEcran(ypeVal, _t);
double newyie2 = ype;
trLigne.dessineTrait(_g, xie, newyie, xpe, newyie2);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-14 15:49:28
|
Revision: 8327
http://fudaa.svn.sourceforge.net/fudaa/?rev=8327&view=rev
Author: deniger
Date: 2013-03-14 15:49:17 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/ActionsInstaller.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/MaximizeDialogAction.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/MinimizeDialogAction.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java
trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliActionAbstract.java
Added Paths:
-----------
trunk/framework/ctulu-bu/src/main/resources/com/memoire/bu/down_left.png
trunk/framework/ctulu-bu/src/main/resources/com/memoire/bu/up_right.png
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/SwitchMinMaxDialogAction.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/border/
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/border/BorderWithIcon.java
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/border/BorderWithIconInstaller.java
Added: trunk/framework/ctulu-bu/src/main/resources/com/memoire/bu/down_left.png
===================================================================
(Binary files differ)
Property changes on: trunk/framework/ctulu-bu/src/main/resources/com/memoire/bu/down_left.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/framework/ctulu-bu/src/main/resources/com/memoire/bu/up_right.png
===================================================================
(Binary files differ)
Property changes on: trunk/framework/ctulu-bu/src/main/resources/com/memoire/bu/up_right.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
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 2013-03-14 08:20:13 UTC (rev 8326)
+++ trunk/framework/ctulu-common/src/main/resources/org/fudaa/ctulu/ctulu_en.fr_txt 2013-03-14 15:49:17 UTC (rev 8327)
@@ -330,4 +330,6 @@
L'URL n'est pas renseign\xE9e=The URL is not defined
Une incoh\xE9rence a \xE9t\xE9 d\xE9tect\xE9e\: le fichier xml est valide mais les balises {0} ne sont pas support\xE9es par l'application=A mismatch has been detected\: the xml file is valid but the application doesn't support the tag {0}
Erreur lors de la validation du fichier xml\: {0}=Error while validating the XML file\: {0}
-Indexation des points=Points indexation
\ No newline at end of file
+Indexation des points=Points indexation
+Restaurer la fen\xEAtre parente=Restore the parent window
+Maximiser la fen\xEAtre parente=Maximize the parent window
\ No newline at end of file
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/ActionsInstaller.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/ActionsInstaller.java 2013-03-14 08:20:13 UTC (rev 8326)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/ActionsInstaller.java 2013-03-14 15:49:17 UTC (rev 8327)
@@ -3,12 +3,14 @@
*/
package org.fudaa.ctulu.action;
+import java.awt.event.KeyEvent;
import javax.swing.Action;
import javax.swing.ActionMap;
import javax.swing.InputMap;
import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.KeyStroke;
+import javax.swing.UIManager;
/**
*
@@ -23,6 +25,45 @@
updateMapKeyStrokeForButton(jc, new MinimizeDialogAction(jc), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
}
+ public static String getAcceleratorText(final KeyStroke _accelerator) {
+ String acceleratorDelimiter = UIManager.getString("MenuItem.acceleratorDelimiter");
+ if (acceleratorDelimiter == null) {
+ acceleratorDelimiter = "+";
+ }
+
+ final StringBuffer acceleratorText = new StringBuffer(50);
+ if (_accelerator != null) {
+ final int modifiers = _accelerator.getModifiers();
+ if (modifiers > 0) {
+ acceleratorText.append(KeyEvent.getKeyModifiersText(modifiers)).append(acceleratorDelimiter);
+ }
+
+ final int keyCode = _accelerator.getKeyCode();
+ if (keyCode == 0) {
+ acceleratorText.append(_accelerator.getKeyChar());
+ } else {
+ acceleratorText.append(KeyEvent.getKeyText(keyCode));
+ }
+ }
+ return acceleratorText.toString();
+ }
+
+ public static SwitchMinMaxDialogAction installAndCreateSwitchAction(JComponent jc) {
+ final MaximizeDialogAction maximizeDialogAction = new MaximizeDialogAction(jc);
+ updateMapKeyStrokeForButton(jc, maximizeDialogAction, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ final MinimizeDialogAction minimizeDialogAction = new MinimizeDialogAction(jc);
+ updateMapKeyStrokeForButton(jc, minimizeDialogAction, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ return new SwitchMinMaxDialogAction(jc, maximizeDialogAction, minimizeDialogAction);
+ }
+
+ public MaximizeDialogAction getRegisteredMaximizeAction(JComponent jc) {
+ return (MaximizeDialogAction) jc.getActionMap().get(MaximizeDialogAction.class);
+ }
+
+ public MinimizeDialogAction getRegisteredMinimizeAction(JComponent jc) {
+ return (MinimizeDialogAction) jc.getActionMap().get(MinimizeDialogAction.class);
+ }
+
public static void install(JDialog dialog) {
install(dialog.getRootPane());
}
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/MaximizeDialogAction.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/MaximizeDialogAction.java 2013-03-14 08:20:13 UTC (rev 8326)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/MaximizeDialogAction.java 2013-03-14 15:49:17 UTC (rev 8327)
@@ -3,6 +3,7 @@
*/
package org.fudaa.ctulu.action;
+import com.memoire.bu.BuResource;
import java.awt.EventQueue;
import java.awt.Frame;
import java.awt.Rectangle;
@@ -11,13 +12,17 @@
import java.awt.event.ComponentListener;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
import javax.swing.AbstractAction;
import javax.swing.Action;
+import static javax.swing.Action.NAME;
import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
+import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.gui.CtuluLibDialog;
/**
@@ -28,55 +33,108 @@
public static final String PROP_OLD_BOUNDS = "OLD_BOUNDS";
private final JComponent jc;
+ private SwitchMinMaxDialogAction switcher;
public MaximizeDialogAction(JComponent jc) {
+ super(CtuluLib.getS("Maximiser la fen\xEAtre parente"));
this.jc = jc;
putValue(Action.ACTION_COMMAND_KEY, getClass().getSimpleName());
- putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.ALT_DOWN_MASK));
+ final KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.ALT_DOWN_MASK);
+ putValue(Action.ACCELERATOR_KEY, keyStroke);
+ putValue(Action.SMALL_ICON, BuResource.BU.getIcon("up_right"));
+ putValue(Action.SHORT_DESCRIPTION, getValue(NAME) + " : " + ActionsInstaller.getAcceleratorText(keyStroke));
}
+ public SwitchMinMaxDialogAction getSwitcher() {
+ return switcher;
+ }
+
+ public void setSwitcher(SwitchMinMaxDialogAction switcher) {
+ this.switcher = switcher;
+ }
+
@Override
public void actionPerformed(ActionEvent e) {
final JDialog dialog = (JDialog) SwingUtilities.getAncestorOfClass(JDialog.class, jc);
if (dialog != null) {
+
Rectangle initBounds = dialog.getBounds();
-
Rectangle maximizedWindowBounds = CtuluLibDialog.getMaximizedWindowBounds(initBounds);
if (!maximizedWindowBounds.equals(initBounds)) {
- dialog.getRootPane().putClientProperty(PROP_OLD_BOUNDS, dialog.getBounds());
- dialog.setLocation(maximizedWindowBounds.getLocation());
- dialog.setSize(maximizedWindowBounds.getSize());
- EventQueue.invokeLater(new Runnable() {
- @Override
- public void run() {
- new DialogListener(dialog);
- }
- });
+ maximizeDialog(dialog, maximizedWindowBounds);
+ if (switcher != null) {
+ switcher.switchedToMax();
+ }
}
} else {
JFrame parent = (JFrame) SwingUtilities.getAncestorOfClass(JFrame.class, jc);
if (parent != null) {
parent.setExtendedState(Frame.MAXIMIZED_BOTH);
+ if (switcher != null) {
+ switcher.switchedToMax();
+ }
}
}
}
- private static class DialogListener implements ComponentListener {
+ public void maximizeDialog(final JDialog dialog, Rectangle maximizedWindowBounds) {
+ dialog.getRootPane().putClientProperty(PROP_OLD_BOUNDS, dialog.getBounds());
+ dialog.setLocation(maximizedWindowBounds.getLocation());
+ dialog.setSize(maximizedWindowBounds.getSize());
+ EventQueue.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ new DialogListener(dialog);
+ }
+ });
+ }
+ private static class DialogListener implements ComponentListener, WindowListener {
+
private final JDialog dialog;
public DialogListener(JDialog dialog) {
this.dialog = dialog;
dialog.addComponentListener(this);
+ dialog.addWindowListener(this);
}
@Override
+ public void windowOpened(WindowEvent e) {
+ }
+
+ @Override
+ public void windowClosing(WindowEvent e) {
+ }
+
+ @Override
+ public void windowClosed(WindowEvent e) {
+ remove();
+ }
+
+ @Override
+ public void windowIconified(WindowEvent e) {
+ }
+
+ @Override
+ public void windowDeiconified(WindowEvent e) {
+ }
+
+ @Override
+ public void windowActivated(WindowEvent e) {
+ }
+
+ @Override
+ public void windowDeactivated(WindowEvent e) {
+ }
+
+ @Override
public void componentResized(ComponentEvent e) {
remove();
}
private void remove() {
- dialog.getRootPane().putClientProperty("OLD_BOUNDS", null);
+ dialog.getRootPane().putClientProperty(PROP_OLD_BOUNDS, null);
dialog.removeComponentListener(this);
}
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/MinimizeDialogAction.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/MinimizeDialogAction.java 2013-03-14 08:20:13 UTC (rev 8326)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/MinimizeDialogAction.java 2013-03-14 15:49:17 UTC (rev 8327)
@@ -3,6 +3,7 @@
*/
package org.fudaa.ctulu.action;
+import com.memoire.bu.BuResource;
import java.awt.Frame;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
@@ -15,6 +16,7 @@
import javax.swing.JFrame;
import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
+import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.gui.CtuluLibDialog;
/**
@@ -24,13 +26,26 @@
public class MinimizeDialogAction extends AbstractAction {
private final JComponent jc;
+ private SwitchMinMaxDialogAction switcher;
public MinimizeDialogAction(JComponent jc) {
+ super(CtuluLib.getS("Restaurer la fen\xEAtre parente"));
this.jc = jc;
putValue(Action.ACTION_COMMAND_KEY, getClass().getSimpleName());
- putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.ALT_DOWN_MASK));
+ final KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.ALT_DOWN_MASK);
+ putValue(Action.ACCELERATOR_KEY, keyStroke);
+ putValue(Action.SMALL_ICON, BuResource.BU.getIcon("down_left"));
+ putValue(Action.SHORT_DESCRIPTION, getValue(NAME) + " : " + ActionsInstaller.getAcceleratorText(keyStroke));
}
+ public SwitchMinMaxDialogAction getSwitcher() {
+ return switcher;
+ }
+
+ public void setSwitcher(SwitchMinMaxDialogAction switcher) {
+ this.switcher = switcher;
+ }
+
@Override
public void actionPerformed(ActionEvent e) {
JDialog dialog = (JDialog) SwingUtilities.getAncestorOfClass(JDialog.class, jc);
@@ -38,24 +53,34 @@
Rectangle initBounds = dialog.getBounds();
Rectangle maximizedWindowBounds = CtuluLibDialog.getMaximizedWindowBounds(initBounds);
if (initBounds.equals(maximizedWindowBounds)) {
- Rectangle old = (Rectangle) dialog.getRootPane().getClientProperty(MaximizeDialogAction.PROP_OLD_BOUNDS);
- if (old != null) {
- dialog.setLocation(old.getLocation());
- dialog.setSize(old.getSize());
- } else {
- initBounds.x = initBounds.x + initBounds.width / 4;
- initBounds.y = initBounds.y + initBounds.height / 4;
- initBounds.height = initBounds.height / 2;
- initBounds.width = initBounds.width / 2;
- dialog.setLocation(initBounds.getLocation());
- dialog.setSize(initBounds.getSize());
+ minimizeDialog(dialog, initBounds);
+ if (switcher != null) {
+ switcher.switchedToMin();
}
}
} else {
JFrame parent = (JFrame) SwingUtilities.getAncestorOfClass(JFrame.class, jc);
if (parent != null) {
parent.setExtendedState(Frame.NORMAL);
+ if (switcher != null) {
+ switcher.switchedToMin();
+ }
}
}
}
+
+ public void minimizeDialog(JDialog dialog, Rectangle initBounds) {
+ Rectangle old = (Rectangle) dialog.getRootPane().getClientProperty(MaximizeDialogAction.PROP_OLD_BOUNDS);
+ if (old != null) {
+ dialog.setLocation(old.getLocation());
+ dialog.setSize(old.getSize());
+ } else {
+ initBounds.x = initBounds.x + initBounds.width / 4;
+ initBounds.y = initBounds.y + initBounds.height / 4;
+ initBounds.height = initBounds.height / 2;
+ initBounds.width = initBounds.width / 2;
+ dialog.setLocation(initBounds.getLocation());
+ dialog.setSize(initBounds.getSize());
+ }
+ }
}
Added: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/SwitchMinMaxDialogAction.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/SwitchMinMaxDialogAction.java (rev 0)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/action/SwitchMinMaxDialogAction.java 2013-03-14 15:49:17 UTC (rev 8327)
@@ -0,0 +1,156 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ctulu.action;
+
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Rectangle;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+import org.fudaa.ctulu.gui.CtuluLibDialog;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class SwitchMinMaxDialogAction extends AbstractAction {
+
+ private final JComponent jc;
+ private final MaximizeDialogAction maxAction;
+ private final MinimizeDialogAction minAction;
+
+ public SwitchMinMaxDialogAction(JComponent jc, MaximizeDialogAction maxAction, MinimizeDialogAction minAction) {
+ this.jc = jc;
+ this.maxAction = maxAction;
+ this.minAction = minAction;
+ maxAction.setSwitcher(this);
+ minAction.setSwitcher(this);
+ putValue(Action.ACTION_COMMAND_KEY, getClass().getSimpleName());
+ putValue(Action.SMALL_ICON, maxAction.getValue(Action.SMALL_ICON));
+ putValue(Action.SHORT_DESCRIPTION, maxAction.getValue(Action.SHORT_DESCRIPTION));
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ final JDialog dialog = (JDialog) SwingUtilities.getAncestorOfClass(JDialog.class, jc);
+ if (dialog != null) {
+
+ Rectangle initBounds = dialog.getBounds();
+ Rectangle maximizedWindowBounds = CtuluLibDialog.getMaximizedWindowBounds(initBounds);
+ if (!maximizedWindowBounds.equals(initBounds)) {
+ maxAction.maximizeDialog(dialog, maximizedWindowBounds);
+ switchedToMax();
+ EventQueue.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ new DialogListener(dialog);
+ }
+ });
+ } else {
+ minAction.minimizeDialog(dialog, initBounds);
+ switchedToMin();
+ }
+ } else {
+ final JFrame parent = (JFrame) SwingUtilities.getAncestorOfClass(JFrame.class, jc);
+ if (parent != null) {
+ if (parent.getExtendedState() == Frame.NORMAL) {
+ parent.setExtendedState(Frame.MAXIMIZED_BOTH);
+ switchedToMax();
+ EventQueue.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ new DialogListener(parent);
+ }
+ });
+ } else {
+ parent.setExtendedState(Frame.NORMAL);
+ switchedToMin();
+ }
+ }
+ }
+ }
+
+ public void switchedToMax() {
+ putValue(Action.SMALL_ICON, minAction.getValue(Action.SMALL_ICON));
+ putValue(Action.SHORT_DESCRIPTION, minAction.getValue(Action.SHORT_DESCRIPTION));
+ }
+
+ public void switchedToMin() {
+ putValue(Action.SMALL_ICON, maxAction.getValue(Action.SMALL_ICON));
+ putValue(Action.SHORT_DESCRIPTION, maxAction.getValue(Action.SHORT_DESCRIPTION));
+ }
+
+ private class DialogListener implements ComponentListener, WindowListener {
+
+ private final Window dialog;
+
+ public DialogListener(Window dialog) {
+ this.dialog = dialog;
+ dialog.addComponentListener(this);
+ dialog.addWindowListener(this);
+ }
+
+ @Override
+ public void windowOpened(WindowEvent e) {
+ }
+
+ @Override
+ public void windowClosing(WindowEvent e) {
+ }
+
+ @Override
+ public void windowClosed(WindowEvent e) {
+ remove();
+ }
+
+ @Override
+ public void windowIconified(WindowEvent e) {
+ }
+
+ @Override
+ public void windowDeiconified(WindowEvent e) {
+ }
+
+ @Override
+ public void windowActivated(WindowEvent e) {
+ }
+
+ @Override
+ public void windowDeactivated(WindowEvent e) {
+ }
+
+ @Override
+ public void componentResized(ComponentEvent e) {
+ remove();
+ }
+
+ private void remove() {
+ switchedToMin();
+ dialog.removeComponentListener(this);
+ }
+
+ @Override
+ public void componentMoved(ComponentEvent e) {
+ remove();
+ }
+
+ @Override
+ public void componentShown(ComponentEvent e) {
+ }
+
+ @Override
+ public void componentHidden(ComponentEvent e) {
+ }
+ }
+}
Added: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/border/BorderWithIcon.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/border/BorderWithIcon.java (rev 0)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/border/BorderWithIcon.java 2013-03-14 15:49:17 UTC (rev 8327)
@@ -0,0 +1,134 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ctulu.border;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Insets;
+import javax.swing.Icon;
+import javax.swing.JDialog;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.border.EmptyBorder;
+
+/**
+ * Border that display an icon and focus if set.
+ *
+ * @author Frederic Deniger
+ */
+public class BorderWithIcon extends EmptyBorder {
+
+ protected Icon icon;
+ protected boolean paintFocus;
+ private boolean paintInDialogOnly;
+ protected Color focus = UIManager.getColor("activeCaptionBorder");
+
+ public BorderWithIcon(int top, int left, int bottom, int right, Icon tileIcon) {
+ super(top, left, bottom, right);
+ this.icon = tileIcon;
+ }
+
+ public boolean isPaintInDialogOnly() {
+ return paintInDialogOnly;
+ }
+
+ public void setPaintInDialogOnly(boolean paintInDialogOnly) {
+ this.paintInDialogOnly = paintInDialogOnly;
+ }
+
+ public BorderWithIcon(Insets borderInsets, Icon tileIcon) {
+ super(borderInsets);
+ this.icon = tileIcon;
+ }
+
+ public BorderWithIcon(Icon tileIcon) {
+ this(-1, -1, -1, -1, tileIcon);
+ }
+
+ public boolean isSelected(Component c, int x, int y) {
+ int width = c.getWidth();
+ int minx = width - icon.getIconWidth() - 1;
+ int maxx = width;
+ if (x >= minx && x <= maxx) {
+ int miny = 0;
+ int maxy = icon.getIconHeight();
+ return y >= miny && y <= maxy;
+ }
+ return false;
+ }
+
+ /**
+ * Paints the matte border.
+ */
+ @Override
+ public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
+ if (paintInDialogOnly) {
+ if (SwingUtilities.getAncestorOfClass(JDialog.class, c) == null) {
+ return;
+ }
+ }
+ if (icon != null) {
+ icon.paintIcon(c, g, x + width - icon.getIconWidth() - 1, y + 1);
+ if (paintFocus) {
+ Color old = g.getColor();
+ g.setColor(focus);
+ g.drawRect(x + width - icon.getIconWidth() - 1, y, icon.getIconWidth(), icon.getIconHeight());
+ g.setColor(old);
+ }
+ }
+ }
+
+ @Override
+ public Insets getBorderInsets(Component c, Insets insets) {
+ if (paintInDialogOnly) {
+ if (SwingUtilities.getAncestorOfClass(JDialog.class, c) == null) {
+ return super.getBorderInsets(c, insets);
+ }
+ }
+ return computeInsets(insets);
+ }
+
+ public void setIcon(Icon icon) {
+ this.icon = icon;
+ }
+
+ /**
+ * Returns the insets of the border.
+ *
+ * @since 1.3
+ */
+ @Override
+ public Insets getBorderInsets() {
+ return computeInsets(new Insets(0, 0, 0, 0));
+ }
+
+ /* should be protected once api changes area allowed */
+ private Insets computeInsets(Insets insets) {
+ int w = icon == null ? 0 : icon.getIconWidth();
+ int h = icon == null ? 0 : icon.getIconHeight();
+ insets.left = left;
+ insets.top = top + h + 2;
+ insets.right = right;
+ insets.bottom = bottom;
+ return insets;
+ }
+
+ /**
+ * Returns the icon used for tiling the border or null if a solid color is being used.
+ *
+ * @since 1.3
+ */
+ public Icon getTileIcon() {
+ return icon;
+ }
+
+ /**
+ * Returns whether or not the border is opaque.
+ */
+ @Override
+ public boolean isBorderOpaque() {
+ return false;
+ }
+}
Added: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/border/BorderWithIconInstaller.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/border/BorderWithIconInstaller.java (rev 0)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/border/BorderWithIconInstaller.java 2013-03-14 15:49:17 UTC (rev 8327)
@@ -0,0 +1,107 @@
+/*
+ GPL 2
+ */
+package org.fudaa.ctulu.border;
+
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import javax.swing.Action;
+import static javax.swing.Action.SHORT_DESCRIPTION;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class BorderWithIconInstaller {
+
+ /**
+ * install a border with the icon of the action. if user clicked on icon, the action is performed.
+ *
+ * @param jc
+ * @param action
+ */
+ public static void install(JComponent jc, Action action, boolean onlyInDialog) {
+ BorderWithIcon border = new BorderWithIcon((Icon) action.getValue(Action.SMALL_ICON));
+ border.setPaintInDialogOnly(onlyInDialog);
+ jc.setBorder(border);
+ jc.addMouseMotionListener(new IconBorderMouseListener(jc, border, action));
+ jc.addMouseListener(new IconBorderMouseListener(jc, border, action));
+ }
+
+ private static class IconBorderMouseListener extends MouseAdapter implements PropertyChangeListener {
+
+ private final JComponent jc;
+ private final Action action;
+ private final BorderWithIcon border;
+ private String oldTooltip;
+ private boolean tooltipChanged;
+
+ public IconBorderMouseListener(JComponent jc, BorderWithIcon border, Action action) {
+ this.jc = jc;
+ this.border = border;
+ this.action = action;
+ action.addPropertyChangeListener(this);
+ }
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ if (Action.SMALL_ICON.equals(evt.getPropertyName())) {
+ border.setIcon((Icon) action.getValue(Action.SMALL_ICON));
+ jc.repaint();
+ }
+ if (Action.SHORT_DESCRIPTION.equals(evt.getPropertyName()) && tooltipChanged) {
+ jc.setToolTipText(getTooltipFromAction());
+ }
+ }
+
+ @Override
+ public void mouseMoved(MouseEvent e) {
+ boolean old = border.paintFocus;
+ boolean isSelected = border.isSelected(jc, e.getX(), e.getY());
+
+ if (old != isSelected) {
+ border.paintFocus = isSelected;
+ jc.repaint();
+ if (isSelected && action.getValue(SHORT_DESCRIPTION) != null) {
+ oldTooltip = jc.getToolTipText();
+ tooltipChanged = true;
+ jc.setToolTipText(getTooltipFromAction());
+ } else if (!isSelected && tooltipChanged) {
+ restoreOldTooltip();
+ }
+ }
+ }
+
+ @Override
+ public void mouseExited(MouseEvent e) {
+ if (border.paintFocus) {
+ border.paintFocus = false;
+ if (tooltipChanged) {
+ restoreOldTooltip();
+ }
+ jc.repaint();
+ }
+ }
+
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ if (border.paintFocus && action != null) {
+ action.actionPerformed(null);
+ }
+ }
+
+ public void restoreOldTooltip() {
+ jc.setToolTipText(oldTooltip);
+ tooltipChanged = false;
+ oldTooltip = null;
+ }
+
+ public String getTooltipFromAction() {
+ return (String) action.getValue(SHORT_DESCRIPTION);
+ }
+ }
+}
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java 2013-03-14 08:20:13 UTC (rev 8326)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGAxeVertical.java 2013-03-14 15:49:17 UTC (rev 8327)
@@ -32,11 +32,8 @@
public static final String PROP_TITLE_VERTICAL_DROITE = "axeTitleVerticalDroite";
public static final String PROP_DROITE = "axeTitleDroite";
public static final String PROP_TITLE_VERTICAL = "axeTitleVertical";
-
boolean droite_;
-
boolean titreVertical_;
-
boolean titreVerticalDroite_;
public EGAxeVertical() {
@@ -60,7 +57,7 @@
/**
* Ajuste les bornes de cet axe pour prendre en compte les valeurs de l'objet _o.
- *
+ *
* @param _o l'objet a prendre en compte
*/
public void ajusteFor(final EGObject _o) {
@@ -84,8 +81,8 @@
}
private int dessineGraduation(final Graphics2D _g2d, final EGRepere _t, final FontMetrics _fm, final int _x,
- final boolean _grille) {
- String t;
+ final boolean _grille) {
+
int maxStringwidth = 0;
if (graduations_ || _grille) {
// java.text.NumberFormat nf = getNumberFormat();
@@ -109,7 +106,7 @@
final TickIterator iterator = buildUpToDateMainTickIterator();
for (final TickIterator it = iterator; it.hasNext(); it.next()) {
final double s = it.currentValue();
-
+ String t;
final int ye = _t.getYEcran(s, this);
if (graduations_) {
if (it.isMajorTick()) {
@@ -169,7 +166,9 @@
if (FuLog.isDebug() && Fu.DEBUG) {
FuLog.debug(getClass().getName() + " axe vertical begin ...");
}
- if (!visible_) { return; }
+ if (!visible_) {
+ return;
+ }
final Font old = _g2d.getFont();
if (font_ != null) {
_g2d.setFont(font_);
@@ -231,23 +230,28 @@
}
}
-
public int getHeightNeeded(final Graphics2D _g) {
int r = 0;
if (isExtremiteDessinee_) {
r += 3;
}
_g.setFont(getFont());
- if ((isTitreVisible() || isUniteVisible()) && !titreVertical_) { return r
- + _g.getFontMetrics(getFont()).getHeight() + _g.getFontMetrics(getFont()).getAscent(); }
+ if ((isTitreVisible() || isUniteVisible()) && !titreVertical_) {
+ return r
+ + _g.getFontMetrics(getFont()).getHeight() + _g.getFontMetrics(getFont()).getAscent();
+ }
return r;
}
public int getWidthNeeded(final Graphics2D _g2d) {
- if (!visible_) { return 0; }
+ if (!visible_) {
+ return 0;
+ }
// epaisseur trait
int r = 3;
- if (_g2d == null) { return r; }
+ if (_g2d == null) {
+ return r;
+ }
if (font_ == null) {
font_ = EGGraphe.DEFAULT_FONT;
}
@@ -278,8 +282,8 @@
r += fm.getHeight() + 6;
} else {
final String axeTexte = getAxeTexte();
- final int wT = (fm.stringWidth(axeTexte) + 4)/2;
- r=wT+Math.max(r, wT);
+ final int wT = (fm.stringWidth(axeTexte) + 4) / 2;
+ r = wT + Math.max(r, wT);
}
}
return r;
@@ -290,18 +294,24 @@
* @return la dimension de la partie dessine dans le graphe: en general la moiti\xE9 de la largeur du titre
*/
public int getWidthDrawnInGraphe(final Graphics2D _g2d) {
- if (!visible_) { return 0; }
+ if (!visible_) {
+ return 0;
+ }
// epaisseur trait
final int r = 0;
- if (_g2d == null) { return r; }
+ if (_g2d == null) {
+ return r;
+ }
if (font_ == null) {
font_ = EGGraphe.DEFAULT_FONT;
}
final FontMetrics fm = _g2d.getFontMetrics(this.font_);
if (isUniteVisible() || isTitreVisible()) {
if (titreVertical_) {
- if ((isTitreVerticalDroite() && !isDroite()) || (!isTitreVerticalDroite() && isDroite())) { return fm
- .getHeight() + 6; }
+ if ((isTitreVerticalDroite() && !isDroite()) || (!isTitreVerticalDroite() && isDroite())) {
+ return fm
+ .getHeight() + 6;
+ }
} else {
final String axeTexte = getAxeTexte();
return (fm.stringWidth(axeTexte) + 4) / 2;
@@ -360,5 +370,4 @@
duplic.nbSousGraduations_ = nbSousGraduations_;
return duplic;
}
-
}
\ No newline at end of file
Modified: trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java
===================================================================
--- trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-03-14 08:20:13 UTC (rev 8326)
+++ trunk/framework/ebli-1d/src/main/java/org/fudaa/ebli/courbe/EGCourbe.java 2013-03-14 15:49:17 UTC (rev 8327)
@@ -511,7 +511,7 @@
final Shape oldClip = _g.getClip();
final int minX = _t.getMinEcranX();
final int adjust = 3;
- _g.setClip(minX - adjust, 0, _t.getMaxEcranX() - minX + adjust * 2, _t.getH());
+ _g.setClip(minX - adjust, _t.getMinEcranY(), _t.getMaxEcranX() - minX + adjust * 2, _t.getMaxEcranY() - _t.getMinEcranY());
final int nbPt = model_.getNbValues();
double xi, yi, xie, yie;
boolean xiVisible;
@@ -550,7 +550,8 @@
yiVisible = true;
} else {
yie = _t.getYEcran(yi, getAxeY());
- yiVisible = getAxeY().containsPoint(yi);
+ yiVisible = true;
+// yiVisible = getAxeY().containsPoint(yi);
}
xiVisible = _t.getXAxe().containsPoint(xi);
@@ -607,8 +608,10 @@
canDraw = range.isValueContained(yi) || range.isValueContained(ypeVal);
}
if (canDraw) {
- double newyie = getYEcran(yi, _t);
- double newyie2 = getYEcran(ypeVal, _t);
+// double newyie = getYEcran(yi, _t);
+ double newyie = yie;
+// double newyie2 = getYEcran(ypeVal, _t);
+ double newyie2 = ype;
trLigne.dessineTrait(_g, xie, newyie, xpe, newyie2);
}
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliActionAbstract.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliActionAbstract.java 2013-03-14 08:20:13 UTC (rev 8326)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliActionAbstract.java 2013-03-14 15:49:17 UTC (rev 8327)
@@ -9,7 +9,6 @@
package org.fudaa.ebli.commun;
import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
import java.beans.PropertyChangeListener;
import java.util.Collection;
@@ -18,9 +17,9 @@
import javax.swing.Action;
import javax.swing.Icon;
import javax.swing.KeyStroke;
-import javax.swing.UIManager;
import org.fudaa.ctulu.CtuluResource;
+import org.fudaa.ctulu.action.ActionsInstaller;
/**
* Une action avec tooltip adapt\xE9 \xE0 l'\xE9tat du bouton. Si le bouton est d\xE9sactiv\xE9, un tooltip expliquant commant le rendre actif est affich\xE9.
@@ -68,26 +67,7 @@
}
public static String getAcceleratorText(final KeyStroke _accelerator) {
- String acceleratorDelimiter = UIManager.getString("MenuItem.acceleratorDelimiter");
- if (acceleratorDelimiter == null) {
- acceleratorDelimiter = "+";
- }
-
- final StringBuffer acceleratorText = new StringBuffer(50);
- if (_accelerator != null) {
- final int modifiers = _accelerator.getModifiers();
- if (modifiers > 0) {
- acceleratorText.append(KeyEvent.getKeyModifiersText(modifiers)).append(acceleratorDelimiter);
- }
-
- final int keyCode = _accelerator.getKeyCode();
- if (keyCode == 0) {
- acceleratorText.append(_accelerator.getKeyChar());
- } else {
- acceleratorText.append(KeyEvent.getKeyText(keyCode));
- }
- }
- return acceleratorText.toString();
+ return ActionsInstaller.getAcceleratorText(_accelerator);
}
public final String getDefaultTooltip() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-14 08:20:20
|
Revision: 8326
http://fudaa.svn.sourceforge.net/fudaa/?rev=8326&view=rev
Author: deniger
Date: 2013-03-14 08:20:13 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZScene.java
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZScene.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZScene.java 2013-03-14 08:13:33 UTC (rev 8325)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZScene.java 2013-03-14 08:20:13 UTC (rev 8326)
@@ -22,7 +22,7 @@
import org.fudaa.ctulu.CtuluListSelection;
import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
-import org.fudaa.ebli.calque.action.CalqueChangeAtomicSelectionAction;
+import org.fudaa.ebli.calque.action.CalqueSwitchAtomicSelectionAction;
import org.fudaa.ebli.calque.edition.ZCalqueEditable;
import org.fudaa.ebli.calque.edition.ZEditorDefault;
import org.fudaa.ebli.commun.EbliListeSelectionMulti;
@@ -1013,11 +1013,11 @@
public boolean isAtomicMode() {
return selectionMode == SelectionMode.ATOMIC;
}
- CalqueChangeAtomicSelectionAction selectionAction;
+ CalqueSwitchAtomicSelectionAction selectionAction;
- public CalqueChangeAtomicSelectionAction getAtomicSelectionAction() {
+ public CalqueSwitchAtomicSelectionAction getAtomicSelectionAction() {
if (selectionAction == null) {
- selectionAction = new CalqueChangeAtomicSelectionAction(this);
+ selectionAction = new CalqueSwitchAtomicSelectionAction(this);
}
return selectionAction;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-14 08:13:46
|
Revision: 8325
http://fudaa.svn.sourceforge.net/fudaa/?rev=8325&view=rev
Author: deniger
Date: 2013-03-14 08:13:33 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Added Paths:
-----------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddVertexAction.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueSelectNormalSelectionAction.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueSwitchAtomicSelectionAction.java
Copied: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddVertexAction.java (from rev 8323, trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java)
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddVertexAction.java (rev 0)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddVertexAction.java 2013-03-14 08:13:33 UTC (rev 8325)
@@ -0,0 +1,89 @@
+package org.fudaa.ebli.calque.action;
+
+import java.awt.event.ActionEvent;
+import javax.swing.JComponent;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+import org.fudaa.ctulu.CtuluCommandComposite;
+import org.fudaa.ebli.calque.BCalque;
+import org.fudaa.ebli.calque.BVueCalque;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.calque.edition.ZCalqueEditable;
+import org.fudaa.ebli.calque.edition.ZEditorDefault;
+import org.fudaa.ebli.calque.edition.ZModeleEditable;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.geometrie.GrPoint;
+import org.fudaa.ebli.ressource.EbliResource;
+
+/**
+ * Permet d'ajouter un sommet sur la ligne editable s\xE9lectionn\xE9e. Action \xE0 utiliser depuis le menu contextuel dans la vue calque.
+ *
+ * @author deniger ( genesis)
+ */
+public class AddVertexAction extends EbliActionSimple {
+
+ private final ZScene scene;
+
+ public AddVertexAction(ZScene scene) {
+ super(EbliLib.getS("Ajouter un sommet"), EbliResource.EBLI.getToolIcon("node-add"), "ADD_SOMMET");
+ assert scene != null;
+ this.scene = scene;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ updateStateBeforeShow();
+ if (isEnabled()) {
+ ZCalqueEditable calqueActif = (ZCalqueEditable) scene.getCalqueActif();
+ ZEditorDefault editor = (ZEditorDefault) calqueActif.getEditor();
+ CtuluCommandComposite cmp = null;
+ if (editor.getMng() != null) {
+ cmp = new CtuluCommandComposite(EbliLib.getS("Ajout d'un sommet"));
+ }
+ Object source = _e.getSource();
+ GrPoint pointReel = null;
+ if (source instanceof JComponent) {
+ JPopupMenu ancestorOfClass = (JPopupMenu) SwingUtilities.getAncestorOfClass(JPopupMenu.class, (JComponent) source);
+ if (ancestorOfClass != null) {
+ pointReel = (GrPoint) ancestorOfClass.getClientProperty(BVueCalque.POPUP_INIT_SCREEN_LOCATION);
+ if (pointReel != null) {
+ pointReel = pointReel.applique(scene.getCalqueActif().getVersReel());
+ }
+ }
+ }
+ if (pointReel == null) {
+ return;
+ }
+ if (calqueActif.addAtomeProjectedOnSelectedGeometry(pointReel, cmp, null)) {
+ scene.repainSelection();
+ if (editor.getMng() != null && cmp != null) {
+ editor.getMng().addCmd(cmp.getSimplify());
+ }
+ }
+ }
+ }
+
+ @Override
+ public void updateStateBeforeShow() {
+ BCalque calqueActif = scene.getCalqueActif();
+ boolean enable = false;
+ if (calqueActif instanceof ZCalqueEditable) {
+ ZCalqueEditable calqueEditable = (ZCalqueEditable) calqueActif;
+ if (!calqueEditable.isSelectionEmpty()) {
+ ZModeleEditable modelEditable = calqueEditable.getModelEditable();
+ if (modelEditable.getGeomData() != null && modelEditable.getGeomData().isGeomModifiable()) {
+ if (scene.canUseAtomicMode(calqueActif)) {
+ enable = calqueActif instanceof ZCalqueAffichageDonnees && ((ZCalqueAffichageDonnees) calqueActif).getNbSelected() == 1;
+ }
+ }
+ }
+ }
+ setEnabled(enable);
+ }
+
+ public boolean isActivatedFor(BCalque cqActif) {
+ return scene.canUseAtomicMode(cqActif);
+ }
+}
Copied: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueSelectNormalSelectionAction.java (from rev 8323, trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java)
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueSelectNormalSelectionAction.java (rev 0)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueSelectNormalSelectionAction.java 2013-03-14 08:13:33 UTC (rev 8325)
@@ -0,0 +1,41 @@
+/*
+ * @creation 11 sept. 06
+ * @modification $Date: 2008-05-13 12:10:48 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.calque.action;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import javax.swing.Action;
+import javax.swing.KeyStroke;
+import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.commun.EbliActionSimple;
+
+/**
+ * Une action de selection atomique.
+ *
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class CalqueSelectNormalSelectionAction extends EbliActionSimple {
+
+ private final transient ZScene scene_;
+
+ /**
+ * Cr\xE9ation de l'action.
+ */
+ public CalqueSelectNormalSelectionAction(final ZScene _scn) {
+ super("MODE_NORMAL", null, "MODE_NORMAL");
+ putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
+ scene_ = _scn;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ scene_.setSelectionMode(SelectionMode.NORMAL);
+ }
+}
\ No newline at end of file
Copied: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueSwitchAtomicSelectionAction.java (from rev 8323, trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java)
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueSwitchAtomicSelectionAction.java (rev 0)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueSwitchAtomicSelectionAction.java 2013-03-14 08:13:33 UTC (rev 8325)
@@ -0,0 +1,51 @@
+/*
+ * @creation 11 sept. 06
+ * @modification $Date: 2008-05-13 12:10:48 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.calque.action;
+
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.commun.EbliActionChangeState;
+import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.ressource.EbliResource;
+
+/**
+ * action used to switch beetween atomic and normal mode.
+ *
+ * @author F.Deniger
+ */
+public class CalqueSwitchAtomicSelectionAction extends EbliActionChangeState implements TreeSelectionListener {
+
+ private final transient ZScene scene_;
+
+ /**
+ * Cr\xE9ation de l'action.
+ */
+ public CalqueSwitchAtomicSelectionAction(final ZScene _scn) {
+ super(EbliLib.getS("S\xE9lection mode sommet"), EbliResource.EBLI.getToolIcon("draw-atom"), "MODE_ATOME");
+ scene_ = _scn;
+ }
+
+ @Override
+ public void changeAction() {
+ scene_.setSelectionMode(scene_.isAtomicMode() ? SelectionMode.NORMAL : SelectionMode.ATOMIC);
+ }
+
+ /**
+ * Changement de calque selectionn\xE9.
+ */
+ @Override
+ public void valueChanged(TreeSelectionEvent e) {
+ updateState();
+ }
+
+ public void updateState() {
+ setSelected(scene_.getSelectionMode() == SelectionMode.ATOMIC);
+ }
+}
\ 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...> - 2013-03-14 08:05:41
|
Revision: 8324
http://fudaa.svn.sourceforge.net/fudaa/?rev=8324&view=rev
Author: deniger
Date: 2013-03-14 08:05:31 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Removed Paths:
-------------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java
Deleted: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java 2013-03-14 07:22:08 UTC (rev 8323)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java 2013-03-14 08:05:31 UTC (rev 8324)
@@ -1,89 +0,0 @@
-package org.fudaa.ebli.calque.action;
-
-import java.awt.event.ActionEvent;
-import javax.swing.JComponent;
-import javax.swing.JPopupMenu;
-import javax.swing.SwingUtilities;
-import org.fudaa.ctulu.CtuluCommandComposite;
-import org.fudaa.ebli.calque.BCalque;
-import org.fudaa.ebli.calque.BVueCalque;
-import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.calque.edition.ZCalqueEditable;
-import org.fudaa.ebli.calque.edition.ZEditorDefault;
-import org.fudaa.ebli.calque.edition.ZModeleEditable;
-import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.commun.EbliLib;
-import org.fudaa.ebli.geometrie.GrPoint;
-import org.fudaa.ebli.ressource.EbliResource;
-
-/**
- * Permet d'ajouter un sommet sur la ligne editable s\xE9lectionn\xE9e. Action \xE0 utiliser depuis le menu contextuel dans la vue calque.
- *
- * @author deniger ( genesis)
- */
-public class AddSommetAction extends EbliActionSimple {
-
- private final ZScene scene;
-
- public AddSommetAction(ZScene scene) {
- super(EbliLib.getS("Ajouter un sommet"), EbliResource.EBLI.getToolIcon("node-add"), "ADD_SOMMET");
- assert scene != null;
- this.scene = scene;
- }
-
- @Override
- public void actionPerformed(ActionEvent _e) {
- updateStateBeforeShow();
- if (isEnabled()) {
- ZCalqueEditable calqueActif = (ZCalqueEditable) scene.getCalqueActif();
- ZEditorDefault editor = (ZEditorDefault) calqueActif.getEditor();
- CtuluCommandComposite cmp = null;
- if (editor.getMng() != null) {
- cmp = new CtuluCommandComposite(EbliLib.getS("Ajout d'un sommet"));
- }
- Object source = _e.getSource();
- GrPoint pointReel = null;
- if (source instanceof JComponent) {
- JPopupMenu ancestorOfClass = (JPopupMenu) SwingUtilities.getAncestorOfClass(JPopupMenu.class, (JComponent) source);
- if (ancestorOfClass != null) {
- pointReel = (GrPoint) ancestorOfClass.getClientProperty(BVueCalque.POPUP_INIT_SCREEN_LOCATION);
- if (pointReel != null) {
- pointReel = pointReel.applique(scene.getCalqueActif().getVersReel());
- }
- }
- }
- if (pointReel == null) {
- return;
- }
- if (calqueActif.addAtomeProjectedOnSelectedGeometry(pointReel, cmp, null)) {
- scene.repainSelection();
- if (editor.getMng() != null && cmp != null) {
- editor.getMng().addCmd(cmp.getSimplify());
- }
- }
- }
- }
-
- @Override
- public void updateStateBeforeShow() {
- BCalque calqueActif = scene.getCalqueActif();
- boolean enable = false;
- if (calqueActif instanceof ZCalqueEditable) {
- ZCalqueEditable calqueEditable = (ZCalqueEditable) calqueActif;
- if (!calqueEditable.isSelectionEmpty()) {
- ZModeleEditable modelEditable = calqueEditable.getModelEditable();
- if (modelEditable.getGeomData() != null && modelEditable.getGeomData().isGeomModifiable()) {
- if (scene.canUseAtomicMode(calqueActif)) {
- enable = calqueActif instanceof ZCalqueAffichageDonnees && ((ZCalqueAffichageDonnees) calqueActif).getNbSelected() == 1;
- }
- }
- }
- }
- setEnabled(enable);
- }
-
- public boolean isActivatedFor(BCalque cqActif) {
- return scene.canUseAtomicMode(cqActif);
- }
-}
Deleted: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java 2013-03-14 07:22:08 UTC (rev 8323)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java 2013-03-14 08:05:31 UTC (rev 8324)
@@ -1,52 +0,0 @@
-/*
- * @creation 11 sept. 06
- * @modification $Date: 2008-05-13 12:10:48 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ebli.calque.action;
-
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.commun.EbliActionChangeState;
-import org.fudaa.ebli.commun.EbliLib;
-import org.fudaa.ebli.ressource.EbliResource;
-
-/**
- * Une action de selection atomique.
- *
- * @author Bertrand Marchand
- * @version $Id$
- */
-public class CalqueChangeAtomicSelectionAction extends EbliActionChangeState implements TreeSelectionListener {
-
- private final transient ZScene scene_;
-
- /**
- * Cr\xE9ation de l'action.
- */
- public CalqueChangeAtomicSelectionAction(final ZScene _scn) {
- super(EbliLib.getS("S\xE9lection mode sommet"), EbliResource.EBLI.getToolIcon("draw-atom"), "MODE_ATOME");
- scene_ = _scn;
- }
-
- @Override
- public void changeAction() {
- scene_.setSelectionMode(scene_.isAtomicMode() ? SelectionMode.NORMAL : SelectionMode.ATOMIC);
- }
-
- /**
- * Changement de calque selectionn\xE9.
- */
- @Override
- public void valueChanged(TreeSelectionEvent e) {
- updateState();
- }
-
- public void updateState() {
- setSelected(scene_.getSelectionMode() == SelectionMode.ATOMIC);
- }
-}
\ No newline at end of file
Deleted: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java 2013-03-14 07:22:08 UTC (rev 8323)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java 2013-03-14 08:05:31 UTC (rev 8324)
@@ -1,41 +0,0 @@
-/*
- * @creation 11 sept. 06
- * @modification $Date: 2008-05-13 12:10:48 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ebli.calque.action;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import javax.swing.Action;
-import javax.swing.KeyStroke;
-import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.commun.EbliActionSimple;
-
-/**
- * Une action de selection atomique.
- *
- * @author Bertrand Marchand
- * @version $Id$
- */
-public class CalqueNormalSelectionAction extends EbliActionSimple {
-
- private final transient ZScene scene_;
-
- /**
- * Cr\xE9ation de l'action.
- */
- public CalqueNormalSelectionAction(final ZScene _scn) {
- super("MODE_NORMAL", null, "MODE_NORMAL");
- putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
- scene_ = _scn;
- }
-
- @Override
- public void actionPerformed(ActionEvent _e) {
- scene_.setSelectionMode(SelectionMode.NORMAL);
- }
-}
\ 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...> - 2013-03-14 07:22:23
|
Revision: 8323
http://fudaa.svn.sourceforge.net/fudaa/?rev=8323&view=rev
Author: deniger
Date: 2013-03-14 07:22:08 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Added Paths:
-----------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java
Removed Paths:
-------------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java
Deleted: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java 2013-03-13 23:49:12 UTC (rev 8322)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java 2013-03-14 07:22:08 UTC (rev 8323)
@@ -1,41 +0,0 @@
-/*
- * @creation 11 sept. 06
- * @modification $Date: 2008-05-13 12:10:48 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ebli.calque.action;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import javax.swing.Action;
-import javax.swing.KeyStroke;
-import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.commun.EbliActionSimple;
-
-/**
- * Une action de selection atomique.
- *
- * @author Bertrand Marchand
- * @version $Id$
- */
-public class CalqueNormalSelectionAction extends EbliActionSimple {
-
- private final transient ZScene scene_;
-
- /**
- * Cr\xE9ation de l'action.
- */
- public CalqueNormalSelectionAction(final ZScene _scn) {
- super("MODE_NORMAL", null, "MODE_NORMAL");
- putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
- scene_ = _scn;
- }
-
- @Override
- public void actionPerformed(ActionEvent _e) {
- scene_.setSelectionMode(SelectionMode.NORMAL);
- }
-}
\ No newline at end of file
Copied: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java (from rev 7853, trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueAtomicSelectionAction.java)
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java (rev 0)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java 2013-03-14 07:22:08 UTC (rev 8323)
@@ -0,0 +1,41 @@
+/*
+ * @creation 11 sept. 06
+ * @modification $Date: 2008-05-13 12:10:48 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.calque.action;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import javax.swing.Action;
+import javax.swing.KeyStroke;
+import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.commun.EbliActionSimple;
+
+/**
+ * Une action de selection atomique.
+ *
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class CalqueNormalSelectionAction extends EbliActionSimple {
+
+ private final transient ZScene scene_;
+
+ /**
+ * Cr\xE9ation de l'action.
+ */
+ public CalqueNormalSelectionAction(final ZScene _scn) {
+ super("MODE_NORMAL", null, "MODE_NORMAL");
+ putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
+ scene_ = _scn;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ scene_.setSelectionMode(SelectionMode.NORMAL);
+ }
+}
\ 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...> - 2013-03-13 23:49:19
|
Revision: 8322
http://fudaa.svn.sourceforge.net/fudaa/?rev=8322&view=rev
Author: deniger
Date: 2013-03-13 23:49:12 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
Added Paths:
-----------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java
Removed Paths:
-------------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java
Deleted: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java 2013-03-13 23:45:53 UTC (rev 8321)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java 2013-03-13 23:49:12 UTC (rev 8322)
@@ -1,89 +0,0 @@
-package org.fudaa.ebli.calque.action;
-
-import java.awt.event.ActionEvent;
-import javax.swing.JComponent;
-import javax.swing.JPopupMenu;
-import javax.swing.SwingUtilities;
-import org.fudaa.ctulu.CtuluCommandComposite;
-import org.fudaa.ebli.calque.BCalque;
-import org.fudaa.ebli.calque.BVueCalque;
-import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.calque.edition.ZCalqueEditable;
-import org.fudaa.ebli.calque.edition.ZEditorDefault;
-import org.fudaa.ebli.calque.edition.ZModeleEditable;
-import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.commun.EbliLib;
-import org.fudaa.ebli.geometrie.GrPoint;
-import org.fudaa.ebli.ressource.EbliResource;
-
-/**
- * Permet d'ajouter un sommet sur la ligne editable s\xE9lectionn\xE9e. Action \xE0 utiliser depuis le menu contextuel dans la vue calque.
- *
- * @author deniger ( genesis)
- */
-public class AddSommetAction extends EbliActionSimple {
-
- private final ZScene scene;
-
- public AddSommetAction(ZScene scene) {
- super(EbliLib.getS("Ajouter un sommet"), EbliResource.EBLI.getToolIcon("node-add"), "ADD_SOMMET");
- assert scene != null;
- this.scene = scene;
- }
-
- @Override
- public void actionPerformed(ActionEvent _e) {
- updateStateBeforeShow();
- if (isEnabled()) {
- ZCalqueEditable calqueActif = (ZCalqueEditable) scene.getCalqueActif();
- ZEditorDefault editor = (ZEditorDefault) calqueActif.getEditor();
- CtuluCommandComposite cmp = null;
- if (editor.getMng() != null) {
- cmp = new CtuluCommandComposite(EbliLib.getS("Ajout d'un sommet"));
- }
- Object source = _e.getSource();
- GrPoint pointReel = null;
- if (source instanceof JComponent) {
- JPopupMenu ancestorOfClass = (JPopupMenu) SwingUtilities.getAncestorOfClass(JPopupMenu.class, (JComponent) source);
- if (ancestorOfClass != null) {
- pointReel = (GrPoint) ancestorOfClass.getClientProperty(BVueCalque.POPUP_INIT_SCREEN_LOCATION);
- if (pointReel != null) {
- pointReel = pointReel.applique(scene.getCalqueActif().getVersReel());
- }
- }
- }
- if (pointReel == null) {
- return;
- }
- if (calqueActif.addAtomeProjectedOnSelectedGeometry(pointReel, cmp, null)) {
- scene.repainSelection();
- if (editor.getMng() != null && cmp != null) {
- editor.getMng().addCmd(cmp.getSimplify());
- }
- }
- }
- }
-
- @Override
- public void updateStateBeforeShow() {
- BCalque calqueActif = scene.getCalqueActif();
- boolean enable = false;
- if (calqueActif instanceof ZCalqueEditable) {
- ZCalqueEditable calqueEditable = (ZCalqueEditable) calqueActif;
- if (!calqueEditable.isSelectionEmpty()) {
- ZModeleEditable modelEditable = calqueEditable.getModelEditable();
- if (modelEditable.getGeomData() != null && modelEditable.getGeomData().isGeomModifiable()) {
- if (scene.canUseAtomicMode(calqueActif)) {
- enable = calqueActif instanceof ZCalqueAffichageDonnees && ((ZCalqueAffichageDonnees) calqueActif).getNbSelected() == 1;
- }
- }
- }
- }
- setEnabled(enable);
- }
-
- public boolean isActivatedFor(BCalque cqActif) {
- return scene.canUseAtomicMode(cqActif);
- }
-}
Copied: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java (from rev 8280, trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddCasierAction.java)
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java (rev 0)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java 2013-03-13 23:49:12 UTC (rev 8322)
@@ -0,0 +1,89 @@
+package org.fudaa.ebli.calque.action;
+
+import java.awt.event.ActionEvent;
+import javax.swing.JComponent;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+import org.fudaa.ctulu.CtuluCommandComposite;
+import org.fudaa.ebli.calque.BCalque;
+import org.fudaa.ebli.calque.BVueCalque;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.calque.edition.ZCalqueEditable;
+import org.fudaa.ebli.calque.edition.ZEditorDefault;
+import org.fudaa.ebli.calque.edition.ZModeleEditable;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.geometrie.GrPoint;
+import org.fudaa.ebli.ressource.EbliResource;
+
+/**
+ * Permet d'ajouter un sommet sur la ligne editable s\xE9lectionn\xE9e. Action \xE0 utiliser depuis le menu contextuel dans la vue calque.
+ *
+ * @author deniger ( genesis)
+ */
+public class AddSommetAction extends EbliActionSimple {
+
+ private final ZScene scene;
+
+ public AddSommetAction(ZScene scene) {
+ super(EbliLib.getS("Ajouter un sommet"), EbliResource.EBLI.getToolIcon("node-add"), "ADD_SOMMET");
+ assert scene != null;
+ this.scene = scene;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ updateStateBeforeShow();
+ if (isEnabled()) {
+ ZCalqueEditable calqueActif = (ZCalqueEditable) scene.getCalqueActif();
+ ZEditorDefault editor = (ZEditorDefault) calqueActif.getEditor();
+ CtuluCommandComposite cmp = null;
+ if (editor.getMng() != null) {
+ cmp = new CtuluCommandComposite(EbliLib.getS("Ajout d'un sommet"));
+ }
+ Object source = _e.getSource();
+ GrPoint pointReel = null;
+ if (source instanceof JComponent) {
+ JPopupMenu ancestorOfClass = (JPopupMenu) SwingUtilities.getAncestorOfClass(JPopupMenu.class, (JComponent) source);
+ if (ancestorOfClass != null) {
+ pointReel = (GrPoint) ancestorOfClass.getClientProperty(BVueCalque.POPUP_INIT_SCREEN_LOCATION);
+ if (pointReel != null) {
+ pointReel = pointReel.applique(scene.getCalqueActif().getVersReel());
+ }
+ }
+ }
+ if (pointReel == null) {
+ return;
+ }
+ if (calqueActif.addAtomeProjectedOnSelectedGeometry(pointReel, cmp, null)) {
+ scene.repainSelection();
+ if (editor.getMng() != null && cmp != null) {
+ editor.getMng().addCmd(cmp.getSimplify());
+ }
+ }
+ }
+ }
+
+ @Override
+ public void updateStateBeforeShow() {
+ BCalque calqueActif = scene.getCalqueActif();
+ boolean enable = false;
+ if (calqueActif instanceof ZCalqueEditable) {
+ ZCalqueEditable calqueEditable = (ZCalqueEditable) calqueActif;
+ if (!calqueEditable.isSelectionEmpty()) {
+ ZModeleEditable modelEditable = calqueEditable.getModelEditable();
+ if (modelEditable.getGeomData() != null && modelEditable.getGeomData().isGeomModifiable()) {
+ if (scene.canUseAtomicMode(calqueActif)) {
+ enable = calqueActif instanceof ZCalqueAffichageDonnees && ((ZCalqueAffichageDonnees) calqueActif).getNbSelected() == 1;
+ }
+ }
+ }
+ }
+ setEnabled(enable);
+ }
+
+ public boolean isActivatedFor(BCalque cqActif) {
+ return scene.canUseAtomicMode(cqActif);
+ }
+}
Deleted: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java 2013-03-13 23:45:53 UTC (rev 8321)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java 2013-03-13 23:49:12 UTC (rev 8322)
@@ -1,52 +0,0 @@
-/*
- * @creation 11 sept. 06
- * @modification $Date: 2008-05-13 12:10:48 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ebli.calque.action;
-
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.commun.EbliActionChangeState;
-import org.fudaa.ebli.commun.EbliLib;
-import org.fudaa.ebli.ressource.EbliResource;
-
-/**
- * Une action de selection atomique.
- *
- * @author Bertrand Marchand
- * @version $Id$
- */
-public class CalqueChangeAtomicSelectionAction extends EbliActionChangeState implements TreeSelectionListener {
-
- private final transient ZScene scene_;
-
- /**
- * Cr\xE9ation de l'action.
- */
- public CalqueChangeAtomicSelectionAction(final ZScene _scn) {
- super(EbliLib.getS("S\xE9lection mode sommet"), EbliResource.EBLI.getToolIcon("draw-atom"), "MODE_ATOME");
- scene_ = _scn;
- }
-
- @Override
- public void changeAction() {
- scene_.setSelectionMode(scene_.isAtomicMode() ? SelectionMode.NORMAL : SelectionMode.ATOMIC);
- }
-
- /**
- * Changement de calque selectionn\xE9.
- */
- @Override
- public void valueChanged(TreeSelectionEvent e) {
- updateState();
- }
-
- public void updateState() {
- setSelected(scene_.getSelectionMode() == SelectionMode.ATOMIC);
- }
-}
\ No newline at end of file
Copied: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java (from rev 7853, trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueAtomicSelectionAction.java)
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java (rev 0)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java 2013-03-13 23:49:12 UTC (rev 8322)
@@ -0,0 +1,52 @@
+/*
+ * @creation 11 sept. 06
+ * @modification $Date: 2008-05-13 12:10:48 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.calque.action;
+
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.commun.EbliActionChangeState;
+import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.ressource.EbliResource;
+
+/**
+ * Une action de selection atomique.
+ *
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class CalqueChangeAtomicSelectionAction extends EbliActionChangeState implements TreeSelectionListener {
+
+ private final transient ZScene scene_;
+
+ /**
+ * Cr\xE9ation de l'action.
+ */
+ public CalqueChangeAtomicSelectionAction(final ZScene _scn) {
+ super(EbliLib.getS("S\xE9lection mode sommet"), EbliResource.EBLI.getToolIcon("draw-atom"), "MODE_ATOME");
+ scene_ = _scn;
+ }
+
+ @Override
+ public void changeAction() {
+ scene_.setSelectionMode(scene_.isAtomicMode() ? SelectionMode.NORMAL : SelectionMode.ATOMIC);
+ }
+
+ /**
+ * Changement de calque selectionn\xE9.
+ */
+ @Override
+ public void valueChanged(TreeSelectionEvent e) {
+ updateState();
+ }
+
+ public void updateState() {
+ setSelected(scene_.getSelectionMode() == SelectionMode.ATOMIC);
+ }
+}
\ No newline at end of file
Deleted: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java 2013-03-13 23:45:53 UTC (rev 8321)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java 2013-03-13 23:49:12 UTC (rev 8322)
@@ -1,41 +0,0 @@
-/*
- * @creation 11 sept. 06
- * @modification $Date: 2008-05-13 12:10:48 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ebli.calque.action;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import javax.swing.Action;
-import javax.swing.KeyStroke;
-import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.commun.EbliActionSimple;
-
-/**
- * Une action de selection atomique.
- *
- * @author Bertrand Marchand
- * @version $Id$
- */
-public class CalqueNormalSelectionAction extends EbliActionSimple {
-
- private final transient ZScene scene_;
-
- /**
- * Cr\xE9ation de l'action.
- */
- public CalqueNormalSelectionAction(final ZScene _scn) {
- super("MODE_NORMAL", null, "MODE_NORMAL");
- putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
- scene_ = _scn;
- }
-
- @Override
- public void actionPerformed(ActionEvent _e) {
- scene_.setSelectionMode(SelectionMode.NORMAL);
- }
-}
\ No newline at end of file
Copied: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java (from rev 7853, trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueAtomicSelectionAction.java)
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java (rev 0)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java 2013-03-13 23:49:12 UTC (rev 8322)
@@ -0,0 +1,41 @@
+/*
+ * @creation 11 sept. 06
+ * @modification $Date: 2008-05-13 12:10:48 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.calque.action;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import javax.swing.Action;
+import javax.swing.KeyStroke;
+import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.commun.EbliActionSimple;
+
+/**
+ * Une action de selection atomique.
+ *
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class CalqueNormalSelectionAction extends EbliActionSimple {
+
+ private final transient ZScene scene_;
+
+ /**
+ * Cr\xE9ation de l'action.
+ */
+ public CalqueNormalSelectionAction(final ZScene _scn) {
+ super("MODE_NORMAL", null, "MODE_NORMAL");
+ putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
+ scene_ = _scn;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ scene_.setSelectionMode(SelectionMode.NORMAL);
+ }
+}
\ 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...> - 2013-03-13 23:46:03
|
Revision: 8321
http://fudaa.svn.sourceforge.net/fudaa/?rev=8321&view=rev
Author: deniger
Date: 2013-03-13 23:45:53 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
Added Paths:
-----------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java
Removed Paths:
-------------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java
Deleted: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java 2013-03-13 23:42:14 UTC (rev 8320)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java 2013-03-13 23:45:53 UTC (rev 8321)
@@ -1,89 +0,0 @@
-package org.fudaa.ebli.calque.action;
-
-import java.awt.event.ActionEvent;
-import javax.swing.JComponent;
-import javax.swing.JPopupMenu;
-import javax.swing.SwingUtilities;
-import org.fudaa.ctulu.CtuluCommandComposite;
-import org.fudaa.ebli.calque.BCalque;
-import org.fudaa.ebli.calque.BVueCalque;
-import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.calque.edition.ZCalqueEditable;
-import org.fudaa.ebli.calque.edition.ZEditorDefault;
-import org.fudaa.ebli.calque.edition.ZModeleEditable;
-import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.commun.EbliLib;
-import org.fudaa.ebli.geometrie.GrPoint;
-import org.fudaa.ebli.ressource.EbliResource;
-
-/**
- * Permet d'ajouter un sommet sur la ligne editable s\xE9lectionn\xE9e. Action \xE0 utiliser depuis le menu contextuel dans la vue calque.
- *
- * @author deniger ( genesis)
- */
-public class AddSommetAction extends EbliActionSimple {
-
- private final ZScene scene;
-
- public AddSommetAction(ZScene scene) {
- super(EbliLib.getS("Ajouter un sommet"), EbliResource.EBLI.getToolIcon("node-add"), "ADD_SOMMET");
- assert scene != null;
- this.scene = scene;
- }
-
- @Override
- public void actionPerformed(ActionEvent _e) {
- updateStateBeforeShow();
- if (isEnabled()) {
- ZCalqueEditable calqueActif = (ZCalqueEditable) scene.getCalqueActif();
- ZEditorDefault editor = (ZEditorDefault) calqueActif.getEditor();
- CtuluCommandComposite cmp = null;
- if (editor.getMng() != null) {
- cmp = new CtuluCommandComposite(EbliLib.getS("Ajout d'un sommet"));
- }
- Object source = _e.getSource();
- GrPoint pointReel = null;
- if (source instanceof JComponent) {
- JPopupMenu ancestorOfClass = (JPopupMenu) SwingUtilities.getAncestorOfClass(JPopupMenu.class, (JComponent) source);
- if (ancestorOfClass != null) {
- pointReel = (GrPoint) ancestorOfClass.getClientProperty(BVueCalque.POPUP_INIT_SCREEN_LOCATION);
- if (pointReel != null) {
- pointReel = pointReel.applique(scene.getCalqueActif().getVersReel());
- }
- }
- }
- if (pointReel == null) {
- return;
- }
- if (calqueActif.addAtomeProjectedOnSelectedGeometry(pointReel, cmp, null)) {
- scene.repainSelection();
- if (editor.getMng() != null && cmp != null) {
- editor.getMng().addCmd(cmp.getSimplify());
- }
- }
- }
- }
-
- @Override
- public void updateStateBeforeShow() {
- BCalque calqueActif = scene.getCalqueActif();
- boolean enable = false;
- if (calqueActif instanceof ZCalqueEditable) {
- ZCalqueEditable calqueEditable = (ZCalqueEditable) calqueActif;
- if (!calqueEditable.isSelectionEmpty()) {
- ZModeleEditable modelEditable = calqueEditable.getModelEditable();
- if (modelEditable.getGeomData() != null && modelEditable.getGeomData().isGeomModifiable()) {
- if (scene.canUseAtomicMode(calqueActif)) {
- enable = calqueActif instanceof ZCalqueAffichageDonnees && ((ZCalqueAffichageDonnees) calqueActif).getNbSelected() == 1;
- }
- }
- }
- }
- setEnabled(enable);
- }
-
- public boolean isActivatedFor(BCalque cqActif) {
- return scene.canUseAtomicMode(cqActif);
- }
-}
Copied: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java (from rev 8280, trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/action/AddCasierAction.java)
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java (rev 0)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/AddSommetAction.java 2013-03-13 23:45:53 UTC (rev 8321)
@@ -0,0 +1,89 @@
+package org.fudaa.ebli.calque.action;
+
+import java.awt.event.ActionEvent;
+import javax.swing.JComponent;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+import org.fudaa.ctulu.CtuluCommandComposite;
+import org.fudaa.ebli.calque.BCalque;
+import org.fudaa.ebli.calque.BVueCalque;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.calque.edition.ZCalqueEditable;
+import org.fudaa.ebli.calque.edition.ZEditorDefault;
+import org.fudaa.ebli.calque.edition.ZModeleEditable;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.geometrie.GrPoint;
+import org.fudaa.ebli.ressource.EbliResource;
+
+/**
+ * Permet d'ajouter un sommet sur la ligne editable s\xE9lectionn\xE9e. Action \xE0 utiliser depuis le menu contextuel dans la vue calque.
+ *
+ * @author deniger ( genesis)
+ */
+public class AddSommetAction extends EbliActionSimple {
+
+ private final ZScene scene;
+
+ public AddSommetAction(ZScene scene) {
+ super(EbliLib.getS("Ajouter un sommet"), EbliResource.EBLI.getToolIcon("node-add"), "ADD_SOMMET");
+ assert scene != null;
+ this.scene = scene;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ updateStateBeforeShow();
+ if (isEnabled()) {
+ ZCalqueEditable calqueActif = (ZCalqueEditable) scene.getCalqueActif();
+ ZEditorDefault editor = (ZEditorDefault) calqueActif.getEditor();
+ CtuluCommandComposite cmp = null;
+ if (editor.getMng() != null) {
+ cmp = new CtuluCommandComposite(EbliLib.getS("Ajout d'un sommet"));
+ }
+ Object source = _e.getSource();
+ GrPoint pointReel = null;
+ if (source instanceof JComponent) {
+ JPopupMenu ancestorOfClass = (JPopupMenu) SwingUtilities.getAncestorOfClass(JPopupMenu.class, (JComponent) source);
+ if (ancestorOfClass != null) {
+ pointReel = (GrPoint) ancestorOfClass.getClientProperty(BVueCalque.POPUP_INIT_SCREEN_LOCATION);
+ if (pointReel != null) {
+ pointReel = pointReel.applique(scene.getCalqueActif().getVersReel());
+ }
+ }
+ }
+ if (pointReel == null) {
+ return;
+ }
+ if (calqueActif.addAtomeProjectedOnSelectedGeometry(pointReel, cmp, null)) {
+ scene.repainSelection();
+ if (editor.getMng() != null && cmp != null) {
+ editor.getMng().addCmd(cmp.getSimplify());
+ }
+ }
+ }
+ }
+
+ @Override
+ public void updateStateBeforeShow() {
+ BCalque calqueActif = scene.getCalqueActif();
+ boolean enable = false;
+ if (calqueActif instanceof ZCalqueEditable) {
+ ZCalqueEditable calqueEditable = (ZCalqueEditable) calqueActif;
+ if (!calqueEditable.isSelectionEmpty()) {
+ ZModeleEditable modelEditable = calqueEditable.getModelEditable();
+ if (modelEditable.getGeomData() != null && modelEditable.getGeomData().isGeomModifiable()) {
+ if (scene.canUseAtomicMode(calqueActif)) {
+ enable = calqueActif instanceof ZCalqueAffichageDonnees && ((ZCalqueAffichageDonnees) calqueActif).getNbSelected() == 1;
+ }
+ }
+ }
+ }
+ setEnabled(enable);
+ }
+
+ public boolean isActivatedFor(BCalque cqActif) {
+ return scene.canUseAtomicMode(cqActif);
+ }
+}
Deleted: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java 2013-03-13 23:42:14 UTC (rev 8320)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java 2013-03-13 23:45:53 UTC (rev 8321)
@@ -1,52 +0,0 @@
-/*
- * @creation 11 sept. 06
- * @modification $Date: 2008-05-13 12:10:48 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ebli.calque.action;
-
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.commun.EbliActionChangeState;
-import org.fudaa.ebli.commun.EbliLib;
-import org.fudaa.ebli.ressource.EbliResource;
-
-/**
- * Une action de selection atomique.
- *
- * @author Bertrand Marchand
- * @version $Id$
- */
-public class CalqueChangeAtomicSelectionAction extends EbliActionChangeState implements TreeSelectionListener {
-
- private final transient ZScene scene_;
-
- /**
- * Cr\xE9ation de l'action.
- */
- public CalqueChangeAtomicSelectionAction(final ZScene _scn) {
- super(EbliLib.getS("S\xE9lection mode sommet"), EbliResource.EBLI.getToolIcon("draw-atom"), "MODE_ATOME");
- scene_ = _scn;
- }
-
- @Override
- public void changeAction() {
- scene_.setSelectionMode(scene_.isAtomicMode() ? SelectionMode.NORMAL : SelectionMode.ATOMIC);
- }
-
- /**
- * Changement de calque selectionn\xE9.
- */
- @Override
- public void valueChanged(TreeSelectionEvent e) {
- updateState();
- }
-
- public void updateState() {
- setSelected(scene_.getSelectionMode() == SelectionMode.ATOMIC);
- }
-}
\ No newline at end of file
Copied: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java (from rev 7853, trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueAtomicSelectionAction.java)
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java (rev 0)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueChangeAtomicSelectionAction.java 2013-03-13 23:45:53 UTC (rev 8321)
@@ -0,0 +1,52 @@
+/*
+ * @creation 11 sept. 06
+ * @modification $Date: 2008-05-13 12:10:48 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.calque.action;
+
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.commun.EbliActionChangeState;
+import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.ressource.EbliResource;
+
+/**
+ * Une action de selection atomique.
+ *
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class CalqueChangeAtomicSelectionAction extends EbliActionChangeState implements TreeSelectionListener {
+
+ private final transient ZScene scene_;
+
+ /**
+ * Cr\xE9ation de l'action.
+ */
+ public CalqueChangeAtomicSelectionAction(final ZScene _scn) {
+ super(EbliLib.getS("S\xE9lection mode sommet"), EbliResource.EBLI.getToolIcon("draw-atom"), "MODE_ATOME");
+ scene_ = _scn;
+ }
+
+ @Override
+ public void changeAction() {
+ scene_.setSelectionMode(scene_.isAtomicMode() ? SelectionMode.NORMAL : SelectionMode.ATOMIC);
+ }
+
+ /**
+ * Changement de calque selectionn\xE9.
+ */
+ @Override
+ public void valueChanged(TreeSelectionEvent e) {
+ updateState();
+ }
+
+ public void updateState() {
+ setSelected(scene_.getSelectionMode() == SelectionMode.ATOMIC);
+ }
+}
\ No newline at end of file
Deleted: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java 2013-03-13 23:42:14 UTC (rev 8320)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java 2013-03-13 23:45:53 UTC (rev 8321)
@@ -1,41 +0,0 @@
-/*
- * @creation 11 sept. 06
- * @modification $Date: 2008-05-13 12:10:48 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ebli.calque.action;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import javax.swing.Action;
-import javax.swing.KeyStroke;
-import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.commun.EbliActionSimple;
-
-/**
- * Une action de selection atomique.
- *
- * @author Bertrand Marchand
- * @version $Id$
- */
-public class CalqueNormalSelectionAction extends EbliActionSimple {
-
- private final transient ZScene scene_;
-
- /**
- * Cr\xE9ation de l'action.
- */
- public CalqueNormalSelectionAction(final ZScene _scn) {
- super("MODE_NORMAL", null, "MODE_NORMAL");
- putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
- scene_ = _scn;
- }
-
- @Override
- public void actionPerformed(ActionEvent _e) {
- scene_.setSelectionMode(SelectionMode.NORMAL);
- }
-}
\ No newline at end of file
Copied: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java (from rev 7853, trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueAtomicSelectionAction.java)
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java (rev 0)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/action/CalqueNormalSelectionAction.java 2013-03-13 23:45:53 UTC (rev 8321)
@@ -0,0 +1,41 @@
+/*
+ * @creation 11 sept. 06
+ * @modification $Date: 2008-05-13 12:10:48 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ebli.calque.action;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import javax.swing.Action;
+import javax.swing.KeyStroke;
+import org.fudaa.ebli.calque.ZCalqueGeometry.SelectionMode;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.commun.EbliActionSimple;
+
+/**
+ * Une action de selection atomique.
+ *
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class CalqueNormalSelectionAction extends EbliActionSimple {
+
+ private final transient ZScene scene_;
+
+ /**
+ * Cr\xE9ation de l'action.
+ */
+ public CalqueNormalSelectionAction(final ZScene _scn) {
+ super("MODE_NORMAL", null, "MODE_NORMAL");
+ putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
+ scene_ = _scn;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ scene_.setSelectionMode(SelectionMode.NORMAL);
+ }
+}
\ 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...> - 2013-03-11 21:17:10
|
Revision: 8316
http://fudaa.svn.sourceforge.net/fudaa/?rev=8316&view=rev
Author: deniger
Date: 2013-03-11 21:17:02 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-views/src/main/resources/org/fudaa/crue/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-03-11 21:08:34
|
Revision: 8315
http://fudaa.svn.sourceforge.net/fudaa/?rev=8315&view=rev
Author: deniger
Date: 2013-03-11 21:08:27 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java 2013-03-08 17:30:29 UTC (rev 8314)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java 2013-03-11 21:08:27 UTC (rev 8315)
@@ -264,7 +264,7 @@
// Dessin de la fleche
- if (showOrientation(i) && clipEcran.contient(ptDest)) {
+ if (showOrientation(i) && clipEcran.contientXY(ptDest)) {
GrVecteur vct = ptDest.soustraction(ptOrig);
vct.autoNormaliseXY();
vct.autoMultiplication(20);
@@ -274,7 +274,7 @@
// La point est lisse
int typeTrait = tl.getTypeTrait();
tl.setTypeTrait(TraceLigne.LISSE);
- tl.dessinePointe(_g, (int) xorig, (int) yorig, (int) ptDest.x_, (int) ptDest.y_, 11, 5);
+ tl.dessinePointe(_g, (int) xorig, (int) yorig, (int) ptDest.x_, (int) ptDest.y_, getFlecheSize(), getFlecheSize());
tl.setTypeTrait(typeTrait);
}
@@ -325,4 +325,8 @@
*/
protected void updateClip(Graphics2D _g, Shape oldClip, GrMorphisme _versEcran, int idx) {
}
+
+ public int getFlecheSize() {
+ return 11;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
