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...> - 2014-05-25 21:19:17
|
Revision: 8712
http://sourceforge.net/p/fudaa/svn/8712
Author: deniger
Date: 2014-05-25 21:19:14 +0000 (Sun, 25 May 2014)
Log Message:
-----------
am?\195?\169lioration affichage windows
Modified Paths:
--------------
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/dialog/BInternalDialog.java
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/dialog/BInternalDialog.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/dialog/BInternalDialog.java 2014-05-25 21:01:32 UTC (rev 8711)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/dialog/BInternalDialog.java 2014-05-25 21:19:14 UTC (rev 8712)
@@ -43,7 +43,8 @@
* @author Axel von Arnim
*/
public class BInternalDialog extends BuInternalFrame implements IDialogInterface, EbliPageable, DropTargetListener,
- BuCutCopyPasteInterface, BuUndoRedoInterface, BuSelectFindReplaceInterface, CtuluImageProducer {
+ BuCutCopyPasteInterface, BuUndoRedoInterface, BuSelectFindReplaceInterface, CtuluImageProducer {
+
List children_;
IDialogInterface parent_;
boolean modal_;
@@ -71,14 +72,25 @@
dialogSelected();
}
});
+
+ initIcon(_app);
}
+ protected void initIcon(final BuCommonInterface _app) {
+
+ try {
+ setFrameIcon(_app.getImplementation().getInformationsSoftware().logo);
+ } catch (Exception e) {
+ }
+ }
+
public BInternalDialog(final BuCommonInterface _app, final IDialogInterface _parent) {
this(_app);
if (_parent != null) {
parent_ = _parent;
parent_.addChildDialog(this);
}
+ initIcon(_app);
}
private boolean isContentPaneEbliPageable() {
@@ -177,7 +189,8 @@
// super.setVisible(false);
try {
setClosed(true);
- } catch (final java.beans.PropertyVetoException e) {}
+ } catch (final java.beans.PropertyVetoException e) {
+ }
if (appli_ == null) {
FuLog.warning("EBD: BInternalDialog: null app");
} else {
@@ -232,20 +245,20 @@
@Override
public String[] getEnabledActions() {
- ArrayList vactions=new ArrayList();
+ ArrayList vactions = new ArrayList();
if (isContentPaneEbliPageable()) {
- vactions.addAll(Arrays.asList(new String[]{"IMPRIMER","PREVISUALISER","MISEENPAGE"}));
+ vactions.addAll(Arrays.asList(new String[]{"IMPRIMER", "PREVISUALISER", "MISEENPAGE"}));
}
if (isContentPaneCutCopyPaste()) {
- vactions.addAll(Arrays.asList(new String[]{"COUPER","COPIER","COLLER"}));
+ vactions.addAll(Arrays.asList(new String[]{"COUPER", "COPIER", "COLLER"}));
}
if (isContentPaneUndoRedo()) {
- vactions.addAll(Arrays.asList(new String[]{"DEFAIRE","REFAIRE"}));
+ vactions.addAll(Arrays.asList(new String[]{"DEFAIRE", "REFAIRE"}));
}
if (isContentPaneSelectFindReplace()) {
- vactions.addAll(Arrays.asList(new String[]{"TOUTSELECTIONNER","RECHERCHER","REMPLACER"}));
+ vactions.addAll(Arrays.asList(new String[]{"TOUTSELECTIONNER", "RECHERCHER", "REMPLACER"}));
}
- return (String[])vactions.toArray(new String[0]);
+ return (String[]) vactions.toArray(new String[0]);
}
protected void dialogSelected() {
@@ -333,7 +346,6 @@
}
// Implementation de BuUndoRedoInterface
-
public void undo() {
if (isContentPaneUndoRedo()) {
getContentPaneUndoRedo().undo();
@@ -372,15 +384,15 @@
if (isContentPaneImageProducer()) {
return getContentPaneImageProducer().produceImage(_params);
}
- return CtuluLibImage.produceImageForComponent(this,_params);
+ return CtuluLibImage.produceImageForComponent(this, _params);
/* } */
}
public BufferedImage produceImage(int _w, int _h, Map _params) {
if (isContentPaneImageProducer()) {
- return getContentPaneImageProducer().produceImage(_w, _h,_params);
+ return getContentPaneImageProducer().produceImage(_w, _h, _params);
}
- return CtuluLibImage.produceImageForComponent(this, _w, _h,_params);
+ return CtuluLibImage.produceImageForComponent(this, _w, _h, _params);
}
public Dimension getDefaultImageDimension() {
@@ -398,12 +410,15 @@
getDesktopPane().getDesktopManager().activateFrame(this);
try {
setSelected(true);
- } catch (final java.beans.PropertyVetoException ex) {}
+ } catch (final java.beans.PropertyVetoException ex) {
+ }
}
- public void dragExit(final DropTargetEvent _dte) {}
+ public void dragExit(final DropTargetEvent _dte) {
+ }
- public void dragOver(final DropTargetDragEvent _dtde) {}
+ public void dragOver(final DropTargetDragEvent _dtde) {
+ }
public void drop(final DropTargetDropEvent _dtde) {
if (FuLog.isDebug()) {
@@ -412,8 +427,10 @@
getDesktopPane().getDesktopManager().deactivateFrame(this);
try {
setSelected(false);
- } catch (final java.beans.PropertyVetoException ex) {}
+ } catch (final java.beans.PropertyVetoException ex) {
+ }
}
- public void dropActionChanged(final DropTargetDragEvent _dtde) {}
+ public void dropActionChanged(final DropTargetDragEvent _dtde) {
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-05-25 21:01:36
|
Revision: 8711
http://sourceforge.net/p/fudaa/svn/8711
Author: deniger
Date: 2014-05-25 21:01:32 +0000 (Sun, 25 May 2014)
Log Message:
-----------
am?\195?\169lioration affichage windows
Modified Paths:
--------------
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooser.java
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooser.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooser.java 2014-05-21 21:12:23 UTC (rev 8710)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluFileChooser.java 2014-05-25 21:01:32 UTC (rev 8711)
@@ -12,7 +12,9 @@
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuPreferences;
import com.memoire.bu.BuVerticalLayout;
+import com.memoire.fu.FuLib;
import java.awt.Component;
+import java.awt.Dimension;
import java.awt.Frame;
import javax.swing.JComponent;
import javax.swing.JDialog;
@@ -20,6 +22,7 @@
import javax.swing.JRootPane;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
+
/**
* @author deniger
* @version $Id: CtuluFileChooser.java,v 1.7 2007-06-14 11:58:18 deniger Exp $
@@ -28,11 +31,11 @@
transient CtuluFileChooserFileTester tester_;
- public final CtuluFileChooserFileTester getTester(){
+ public final CtuluFileChooserFileTester getTester() {
return tester_;
}
- public final void setTester(final CtuluFileChooserFileTester _tester){
+ public final void setTester(final CtuluFileChooserFileTester _tester) {
tester_ = _tester;
}
@@ -42,6 +45,7 @@
/**
* Si _lastDir, le fileChooser est ouvert dans le dernier repertoire ouvert.
+ *
* @param _lastDir si true le rep courant est le dernier rep ouvert
*/
public CtuluFileChooser(final boolean _lastDir) {
@@ -55,34 +59,33 @@
* Permet d'enregistrer le dernier chemin utilise.
*/
@Override
- public void approveSelection(){
+ public void approveSelection() {
if (tester_ != null) {
- if(!tester_.isFileOk(getSelectedFile(),this)) {
+ if (!tester_.isFileOk(getSelectedFile(), this)) {
return;
}
}
BuPreferences.BU.putStringProperty(CtuluFavoriteFiles.PREF_LAST, getCurrentDirectory()
- .getAbsolutePath());
+ .getAbsolutePath());
super.approveSelection();
}
-
- protected void addOtherPanel( final JPanel _dest){
+
+ protected void addOtherPanel(final JPanel _dest) {
}
-
@Override
protected JDialog createDialog(final Component _parent) {
final Frame frame = _parent instanceof Frame ? (Frame) _parent : (Frame) SwingUtilities
- .getAncestorOfClass(Frame.class, _parent);
+ .getAncestorOfClass(Frame.class, _parent);
final String title = getUI().getDialogTitle(this);
getAccessibleContext().setAccessibleDescription(title);
final JDialog dialog = new JDialog(frame, title, true);
/*Container contentPane = dialog.getContentPane();
- contentPane.setLayout(new BorderLayout());
- contentPane.add(this, BorderLayout.CENTER);
-*/
+ contentPane.setLayout(new BorderLayout());
+ contentPane.add(this, BorderLayout.CENTER);
+ */
if (JDialog.isDefaultLookAndFeelDecorated()) {
final boolean supportsWindowDecorations = UIManager.getLookAndFeel().getSupportsWindowDecorations();
if (supportsWindowDecorations) {
@@ -99,16 +102,21 @@
pn.add(this);
addOtherPanel(pn);
/*if (tester_ != null) {
- errorMessage_ = new BuLabel();
- errorMessage_.setVisible(false);
- errorMessage_.setForeground(Color.RED);
- pn.add(errorMessage_);
- }*/
-
+ errorMessage_ = new BuLabel();
+ errorMessage_.setVisible(false);
+ errorMessage_.setForeground(Color.RED);
+ pn.add(errorMessage_);
+ }*/
+ pn.doLayout();
+// dialog.setContentPane(this);
dialog.setContentPane(pn);
dialog.pack();
+ if (FuLib.isWindows() && UIManager.getLookAndFeel().isNativeLookAndFeel()) {
+ dialog.setMinimumSize(new Dimension(800, 500));
+ }
dialog.setLocationRelativeTo(_parent);
+
return dialog;
}
-}
\ 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...> - 2014-05-21 21:11:25
|
Revision: 8709
http://sourceforge.net/p/fudaa/svn/8709
Author: deniger
Date: 2014-05-21 21:11:22 +0000 (Wed, 21 May 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java
Modified: trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java
===================================================================
--- trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java 2014-05-20 01:30:09 UTC (rev 8708)
+++ trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java 2014-05-21 21:11:22 UTC (rev 8709)
@@ -1,35 +1,31 @@
package org.fudaa.dodico.corba.mascaret;
-
/**
-* org/fudaa/dodico/corba/mascaret/SParametresNum.java .
-* Error reading Messages File.
-* Error reading Messages File.
-* mercredi 24 octobre 2012 16 h 50 CEST
-*/
+ * org/fudaa/dodico/corba/mascaret/SParametresNum.java . Error reading Messages File. Error reading Messages File. mercredi 24 octobre 2012 16 h 50
+ * CEST
+ */
+public final class SParametresNum implements org.omg.CORBA.portable.IDLEntity {
-public final class SParametresNum implements org.omg.CORBA.portable.IDLEntity
-{
public boolean calcOndeSubmersion = false;
- public double froudeLimCondLim = (double)0;
+ public double froudeLimCondLim = (double) 0;
public boolean traitImplicitFrot = false;
- public double hauteurEauMini = (double)0;
+ public double hauteurEauMini = (double) 0;
public boolean implicitNoyauTrans = false;
public boolean optimisNoyauTrans = false;
public boolean perteChargeAutoElargissement = false;
public boolean termesNonHydrostatiques = false;
- public boolean apportDebit = false;
+ public int apportDebit = 0;
public boolean attenuationConvection = false;
// termes non hydrostatiques pour le noyau transcritique
public org.fudaa.dodico.corba.mascaret.SParametresNumCasier parametresNumeriqueCasier = null;
- public SParametresNum ()
- {
+ public SParametresNum() {
} // ctor
- public SParametresNum (boolean _calcOndeSubmersion, double _froudeLimCondLim, boolean _traitImplicitFrot, double _hauteurEauMini, boolean _implicitNoyauTrans, boolean _optimisNoyauTrans, boolean _perteChargeAutoElargissement, boolean _termesNonHydrostatiques, org.fudaa.dodico.corba.mascaret.SParametresNumCasier _parametresNumeriqueCasier)
- {
+ public SParametresNum(boolean _calcOndeSubmersion, double _froudeLimCondLim, boolean _traitImplicitFrot, double _hauteurEauMini,
+ boolean _implicitNoyauTrans, boolean _optimisNoyauTrans, boolean _perteChargeAutoElargissement, boolean _termesNonHydrostatiques,
+ org.fudaa.dodico.corba.mascaret.SParametresNumCasier _parametresNumeriqueCasier) {
calcOndeSubmersion = _calcOndeSubmersion;
froudeLimCondLim = _froudeLimCondLim;
traitImplicitFrot = _traitImplicitFrot;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-05-20 01:30:12
|
Revision: 8708
http://sourceforge.net/p/fudaa/svn/8708
Author: deniger
Date: 2014-05-20 01:30:09 +0000 (Tue, 20 May 2014)
Log Message:
-----------
ajout nouveau variable pour Mascaret
Modified Paths:
--------------
trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaTransformData.java
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaTransformData.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaTransformData.java 2014-05-20 01:23:29 UTC (rev 8707)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaTransformData.java 2014-05-20 01:30:09 UTC (rev 8708)
@@ -144,6 +144,9 @@
}
public void zoom(int startScreenX, int startScreenY, int endScreenX, int endScreenY, int widthScreen, int heightScreen) {
+ if (scale == 0) {
+ return;
+ }
double wRatio = widthScreen / Math.abs((endScreenX - startScreenX) / scale);
double hRatio = heightScreen / Math.abs((endScreenY - startScreenY) / scale);
int x = getScaledX(true, startScreenX);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-05-20 01:23:33
|
Revision: 8707
http://sourceforge.net/p/fudaa/svn/8707
Author: deniger
Date: 2014-05-20 01:23:29 +0000 (Tue, 20 May 2014)
Log Message:
-----------
ajout nouveau variable pour Mascaret
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-05-20 01:23:12 UTC (rev 8706)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-05-20 01:23:29 UTC (rev 8707)
@@ -150,8 +150,8 @@
static {
isApp_.name = "Fudaa-Mascaret";
- isApp_.version = "3.2.1";
- isApp_.date = "13-02-2014";
+ isApp_.version = "3.3";
+ isApp_.date = "20-05-2014";
isApp_.rights = MascaretResource.MASCARET.getString("Tous droits r\xE9serv\xE9s") + ". EDF-CEREMA (c) 2001-2014";
// isApp_.contact = "http://www.openmascaret.org/index.php?option=com_kunena&view=category&Itemid=177&layout=list";
isApp_.contact = "ot-...@op...";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-05-20 01:23:14
|
Revision: 8706
http://sourceforge.net/p/fudaa/svn/8706
Author: deniger
Date: 2014-05-20 01:23:12 +0000 (Tue, 20 May 2014)
Log Message:
-----------
ajout nouveau variable pour Mascaret
Modified Paths:
--------------
trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaTransformData.java
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaTransformData.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaTransformData.java 2014-05-20 00:55:46 UTC (rev 8705)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaTransformData.java 2014-05-20 01:23:12 UTC (rev 8706)
@@ -60,17 +60,22 @@
}
public int getScaledX(MouseEvent _evt, boolean applyTranslation) {
+ final int x = _evt.getX();
+ return getScaledX(applyTranslation, x);
+ }
+
+ protected int getScaledX(boolean applyTranslation, final int x) {
if (applyTranslation) {
if (scale == 0) {
- return _evt.getX() - getTranslateX();
+ return x - getTranslateX();
} else {
- return (int) ((_evt.getX()) / scale) - getTranslateX();
+ return (int) ((x) / scale) - getTranslateX();
}
}
if (scale == 0) {
- return _evt.getX();
+ return x;
} else {
- return (int) ((_evt.getX()) / scale);
+ return (int) ((x) / scale);
}
}
@@ -105,17 +110,22 @@
}
public int getScaledY(MouseEvent _evt, boolean applyTranslation) {
+ final int y = _evt.getY();
+ return getScaledY(applyTranslation, y);
+ }
+
+ protected int getScaledY(boolean applyTranslation, final int y) {
if (applyTranslation) {
if (scale == 0) {
- return _evt.getY() - getTranslateY();
+ return y - getTranslateY();
} else {
- return (int) ((_evt.getY()) / scale) - getTranslateY();
+ return (int) ((y) / scale) - getTranslateY();
}
}
if (scale == 0) {
- return _evt.getY();
+ return y;
} else {
- return (int) ((_evt.getY()) / scale);
+ return (int) ((y) / scale);
}
}
@@ -134,14 +144,17 @@
}
public void zoom(int startScreenX, int startScreenY, int endScreenX, int endScreenY, int widthScreen, int heightScreen) {
- double wRatio = widthScreen / Math.abs(endScreenX - startScreenX);
- double hRatio = heightScreen / Math.abs(endScreenY - startScreenY);
-
+ double wRatio = widthScreen / Math.abs((endScreenX - startScreenX) / scale);
+ double hRatio = heightScreen / Math.abs((endScreenY - startScreenY) / scale);
+ int x = getScaledX(true, startScreenX);
+ int y = getScaledY(true, startScreenY);
translateX = 0;
translateY = 0;
scale = (int) Math.min(wRatio, hRatio);
- translateX = -(int) (startScreenX);
- translateY = -(int) (startScreenY);
+// x = getUnScaledX(x, true);
+// y = getUnScaledY(y, true);
+ translateX = -(int) (x);
+ translateY = -(int) (y);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-05-20 00:55:49
|
Revision: 8705
http://sourceforge.net/p/fudaa/svn/8705
Author: deniger
Date: 2014-05-20 00:55:46 +0000 (Tue, 20 May 2014)
Log Message:
-----------
ajout nouveau variable pour Mascaret
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/distrib/pom.xml
trunk/soft/fudaa-mascaret/pom.xml
trunk/soft/fudaa-mascaret/server/pom.xml
trunk/soft/fudaa-mascaret/ui/pom.xml
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauFrame.java
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretGridInteractive.java
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretScaledGridMouseListener.java
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/distrib/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/pom.xml 2014-05-20 00:55:34 UTC (rev 8704)
+++ trunk/soft/fudaa-mascaret/distrib/pom.xml 2014-05-20 00:55:46 UTC (rev 8705)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-mascaret</groupId>
<artifactId>fudaa-mascaret</artifactId>
- <version>3.2.1</version>
+ <version>3.3-SNAPSHOT</version>
</parent>
<artifactId>mascaret-distrib</artifactId>
<properties>
Modified: trunk/soft/fudaa-mascaret/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/pom.xml 2014-05-20 00:55:34 UTC (rev 8704)
+++ trunk/soft/fudaa-mascaret/pom.xml 2014-05-20 00:55:46 UTC (rev 8705)
@@ -15,7 +15,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-mascaret</groupId>
<artifactId>fudaa-mascaret</artifactId>
- <version>3.2.3-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
<name>Fudaa-Mascaret</name>
<packaging>pom</packaging>
<modules>
Modified: trunk/soft/fudaa-mascaret/server/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/server/pom.xml 2014-05-20 00:55:34 UTC (rev 8704)
+++ trunk/soft/fudaa-mascaret/server/pom.xml 2014-05-20 00:55:46 UTC (rev 8705)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-mascaret</groupId>
<artifactId>fudaa-mascaret</artifactId>
- <version>3.2.3-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</parent>
<artifactId>mascaret-server</artifactId>
<build>
Modified: trunk/soft/fudaa-mascaret/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/ui/pom.xml 2014-05-20 00:55:34 UTC (rev 8704)
+++ trunk/soft/fudaa-mascaret/ui/pom.xml 2014-05-20 00:55:46 UTC (rev 8705)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-mascaret</groupId>
<artifactId>fudaa-mascaret</artifactId>
- <version>3.2.3-SNAPSHOT</version>
+ <version>3.3-SNAPSHOT</version>
</parent>
<artifactId>mascaret-ui</artifactId>
<build>
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauFrame.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauFrame.java 2014-05-20 00:55:34 UTC (rev 8704)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauFrame.java 2014-05-20 00:55:46 UTC (rev 8705)
@@ -83,6 +83,7 @@
import com.memoire.dja.DjaResource;
import com.memoire.dja.DjaText;
import com.memoire.dja.DjaVector;
+import java.awt.BorderLayout;
import java.awt.Color;
import java.util.Map;
import java.awt.image.BufferedImage;
@@ -98,19 +99,19 @@
*/
public final class Hydraulique1dReseauFrame
extends EbliDjaFrame implements H1dObjetEventListener {
-
+
private BuPopupButton pbReseau_;
MetierEtude1d etude_;
MetierReseau reseau_;
Hydraulique1dIHMRepository ihmP_;
BuLabel lbStatus1_, lbStatus2_;
-
+
Hydraulique1dReseauPalette srcReseau_;
Hydraulique1dReseauPaletteBracket srcbrcks_;
DjaPaletteStroke srcstrks_;
DjaPaletteThickness srcthkns_;
BuButton btPositionner_;
-
+
private JToggleButton btZoom_;
private JToggleButton btMoveView_;
// private final String cmdZoomIncrease_ = "ZOOMINCREASE";
@@ -132,7 +133,7 @@
getGrid().addMouseMotionListener(mouseAdapter);
getGrid().addGridListener(new Hydraulique1dReseauGridAdapter(_etude.reseau()));
}
-
+
public Hydraulique1dReseauFrame(
BuCommonImplementation _app,
String _file,
@@ -140,7 +141,7 @@
MetierEtude1d _etude) {
this(_app, _file, _grid, _etude, null);
}
-
+
public Hydraulique1dReseauFrame(
BuCommonImplementation _app,
String _file,
@@ -181,7 +182,7 @@
pbThkns_.setToolTipText(Hydraulique1dResource.HYDRAULIQUE1D.getString("Palette d'\xE9paisseurs"));
pbThkns_.setIcon(DjaResource.DJA.getIcon("dja-thickness"));
pbThkns_.setEnabled(grid_.isInteractive());
-
+
btPositionner_ = new BuButton();
btPositionner_.setIcon(Hydraulique1dResource.HYDRAULIQUE1D.getIcon("hydraulique1drepositionner"));
btPositionner_.setActionCommand("REPOSITIONNER");
@@ -199,7 +200,7 @@
btZoom_.setName("bt" + ZOOM_ACTION);
btZoom_.setRequestFocusEnabled(false);
btZoom_.addActionListener(this);
-
+
btMoveView_ = new JToggleButton();
btMoveView_.setIcon(EbliResource.EBLI.getIcon("main"));
btMoveView_.setActionCommand(MOVE_ACTION);
@@ -210,7 +211,7 @@
//--add zoom mouse wheel listener --//
addZoomMouseWheelListener();
-
+
lbStatus1_ = new BuLabel();
lbStatus1_.setMinimumSize(new Dimension(40, 20));
lbStatus1_.setBorder(new BevelBorder(BevelBorder.LOWERED));
@@ -222,7 +223,7 @@
sptVert.setOneTouchExpandable(true);
sptVert.setDividerLocation(160);
sptVert.setPreferredSize(new Dimension(400, 25));
-
+
JComponent content = (JComponent) getContentPane();
content.add(sptVert, BuBorderLayout.SOUTH);
Dimension ps = new Dimension(400, 400);
@@ -232,10 +233,12 @@
setBackground(Color.WHITE);
scrollPane_.setBackground(Color.WHITE);
scrollPane_.setOpaque(true);
- ((JComponent) getContentPane()).setDoubleBuffered(false);
+ content.setDoubleBuffered(false);
grid_.setDoubleBuffered(false);
+ scrollPane_.setDoubleBuffered(false);
+ setDoubleBuffered(false);
}
-
+
@Override
public BufferedImage produceImage(final int _w, final int _h, final Map _params) {
return CtuluLibImage.produceImageForComponent(grid_, _w, _h, _params);
@@ -279,35 +282,35 @@
@Override
public void center() {
}
-
+
@Override
public Frame getFrame() {
return Hydraulique1dReseauFrame.this.getApp().getFrame();
}
-
+
@Override
public double getHSpacing() { // Semble ne servir a rien.
return 100;
}
-
+
@Override
public Node getSelectedNode() {
return null;
}
-
+
@Override
public double getVSpacing() { // Semble ne servir a rien.
return 100;
}
-
+
@Override
public void scale(double arg0) {
}
-
+
@Override
public void update(boolean arg0) {
}
-
+
@Override
public DRect windowRect() {
int size = Math.min(scrollPane_.getWidth(), scrollPane_.getHeight());
@@ -326,7 +329,7 @@
// Les noeuds
for (Enumeration e = objs.elements(); e.hasMoreElements();) {
DjaObject gobj = (DjaObject) e.nextElement();
-
+
if (gobj instanceof Hydraulique1dReseauExtremLibre || // Noeud extremite libre
gobj instanceof Hydraulique1dReseauCasier || // Noeud casier
gobj instanceof Hydraulique1dReseauNoeud) { // Noeud confluent
@@ -346,7 +349,7 @@
nd.setShape(Node.OVAL);
nd.setBoundingBox(gobj.getWidth(), gobj.getHeight());
}
-
+
nd.setId(id);
hid2dja.put(new Integer(id), gobj);
hdja2vgj.put(gobj, nd);
@@ -392,7 +395,7 @@
// Les edges
for (Enumeration e = objs.elements(); e.hasMoreElements();) {
DjaObject gobj = (DjaObject) e.nextElement();
-
+
if (gobj instanceof Hydraulique1dReseauBiefCourbe) { // Bief
Hydraulique1dReseauBiefCourbe gbief = (Hydraulique1dReseauBiefCourbe) gobj;
if (gbief.getBeginObject() == null) {
@@ -402,7 +405,7 @@
if (nd1 == null) {
return false;
}
-
+
Node nd2;
DjaAnchor[] ancs = gbief.getAnchors();
for (int i = 0; i < ancs.length; i++) {
@@ -461,11 +464,11 @@
gobj.setY((int) pos.y - gobj.getHeight() / 2);
}
}
-
+
repositionnerAretes();
repaint();
grid_.recenter();
-
+
if (false) { // Pour debug, cr\xE9ation d'un fichier GML contenant le graph, qui peut \xEAtre relu par l'appli VGJ.
PrintStream ps;
try {
@@ -475,14 +478,14 @@
GMLobject gmlgraph = GMLfile_.getGMLSubObject("graph", GMLobject.GMLlist, false);
graph.setGMLvalues(gmlgraph);
gmlgraph.prune();
-
+
ps.println(GMLfile_.toString(0));
ps.close();
} catch (FileNotFoundException e) {
e.printStackTrace();
}
}
-
+
return true;
}
@@ -491,14 +494,14 @@
*/
private void repositionnerAretes() {
DjaVector objs = grid_.getObjects();
-
+
for (Enumeration e = objs.elements(); e.hasMoreElements();) {
DjaObject gobj = (DjaObject) e.nextElement();
-
+
if (gobj instanceof Hydraulique1dReseauLiaisonCasier || // On limite le repositionnement aux biefs et liaisons.
gobj instanceof Hydraulique1dReseauBiefCourbe) {
DjaLink glien = (DjaLink) gobj;
-
+
DjaObject gobj1 = glien.getBeginObject();
int pos1 = glien.getBeginPosition();
int x1;
@@ -513,7 +516,7 @@
x1 = glien.getBeginX();
y1 = glien.getBeginY();
}
-
+
DjaObject gobj2 = glien.getEndObject();
int pos2 = glien.getEndPosition();
int x2;
@@ -528,7 +531,7 @@
x2 = glien.getEndX();
y2 = glien.getEndY();
}
-
+
if (gobj1 instanceof DjaForm) {
DjaAnchor anc = getAncre(gobj1, x2, y2);
glien.setBeginPosition(anc.getPosition());
@@ -551,7 +554,7 @@
Hashtable hbief2graph = new Hashtable();
// Mapping casier vers sa representation graphique
Hashtable hcasier2graph = new Hashtable();
-
+
MetierBief[] biefs = reseau_.biefs();
for (int i = 0; i < biefs.length; i++) {
// Creation des biefs
@@ -619,81 +622,81 @@
// Les deversoirs pour le bief
MetierDeversoir[] devers = biefs[i].deversoirs();
-
+
for (int j = 0; j < devers.length; j++) {
// Recherche de l'ancre la plus proche de l'abscisse
DjaAnchor ancre = getAncre(gbief, devers[j].abscisse());
-
+
Hydraulique1dReseauDeversoir gdevers = new Hydraulique1dReseauDeversoir(devers[j]);
gdevers.setEndObject(ancre.getParent());
gdevers.setEndPosition(ancre.getPosition());
gdevers.setBeginObject(ancre.getParent());
gdevers.setBeginPosition(ancre.getPosition());
-
+
grid_.add(gdevers);
}
// Les apports pour le bief
MetierApport[] apports = biefs[i].apports();
-
+
for (int j = 0; j < apports.length; j++) {
// Recherche de l'ancre la plus proche de l'abscisse
DjaAnchor ancre = getAncre(gbief, apports[j].abscisse());
-
+
Hydraulique1dReseauApport gapport = new Hydraulique1dReseauApport(apports[j]);
gapport.setEndObject(ancre.getParent());
gapport.setEndPosition(ancre.getPosition());
gapport.setBeginObject(ancre.getParent());
gapport.setBeginPosition(ancre.getPosition());
-
+
grid_.add(gapport);
}
// Les seuils pour le bief
MetierSeuil[] seuils = biefs[i].seuils();
-
+
for (int j = 0; j < seuils.length; j++) {
// Recherche de l'ancre la plus proche de l'abscisse
DjaAnchor ancre = getAncre(gbief, seuils[j].abscisse());
-
+
Hydraulique1dReseauSeuil gseuil = new Hydraulique1dReseauSeuil(seuils[j]);
gseuil.setEndObject(ancre.getParent());
gseuil.setEndPosition(ancre.getPosition());
gseuil.setBeginObject(ancre.getParent());
gseuil.setBeginPosition(ancre.getPosition());
-
+
grid_.add(gseuil);
}
// Les pertes de charge pour le bief
MetierPerteCharge[] pertes = biefs[i].pertesCharges();
-
+
for (int j = 0; j < pertes.length; j++) {
// Recherche de l'ancre la plus proche de l'abscisse
DjaAnchor ancre = getAncre(gbief, pertes[j].abscisse());
-
+
Hydraulique1dReseauPerteCharge gperte = new Hydraulique1dReseauPerteCharge(pertes[j]);
gperte.setEndObject(ancre.getParent());
gperte.setEndPosition(ancre.getPosition());
gperte.setBeginObject(ancre.getParent());
gperte.setBeginPosition(ancre.getPosition());
-
+
grid_.add(gperte);
}
// Les sources tracer pour le bief
MetierSource[] sources = biefs[i].sources();
-
+
for (int j = 0; j < sources.length; j++) {
// Recherche de l'ancre la plus proche de l'abscisse
DjaAnchor ancre = getAncre(gbief, sources[j].abscisse());
-
+
Hydraulique1dReseauSource gsource = new Hydraulique1dReseauSource(sources[j]);
gsource.setEndObject(ancre.getParent());
gsource.setEndPosition(ancre.getPosition());
gsource.setBeginObject(ancre.getParent());
gsource.setBeginPosition(ancre.getPosition());
-
+
grid_.add(gsource);
}
}
@@ -736,7 +739,7 @@
gliaison.setEndObject(ancre2.getParent());
gliaison.setEndPosition(ancre2.getPosition());
}
-
+
gliaison.maj(); // La mise a jour depend des accrochages.
grid_.add(gliaison);
}
@@ -759,7 +762,7 @@
int ind = (int) ((ancres.length + 1) * (_abs - absdeb) / (absfin - absdeb) + 0.5) - 1;
ind = Math.max(ind, 0);
ind = Math.min(ind, ancres.length - 1);
-
+
return ancres[ind];
}
@@ -782,10 +785,10 @@
dist = d;
}
}
-
+
return ancres[ind];
}
-
+
public void addBief(String type) {
MetierBief ibief = reseau_.creeBief();
Hydraulique1dReseauBiefCourbe bief;
@@ -798,24 +801,24 @@
grid_.add(bief);
repaint();
}
-
+
public void setStatus(String partieWest, String partieCenter) {
lbStatus1_.setText(partieWest);
lbStatus2_.setText(partieCenter);
}
-
+
public void addBief() {
addBief("droit");
}
-
+
public void addBiefCourbe() {
addBief("courbe");
}
-
+
public void addBiefDroit() {
addBief("droit");
}
-
+
public void addNoeud() {
MetierNoeud in = reseau_.creeNoeud();
Hydraulique1dReseauNoeud noeud = new Hydraulique1dReseauNoeud(in);
@@ -823,7 +826,7 @@
grid_.add(noeud);
repaint();
}
-
+
public void addQApport() {
MetierApport iapport = reseau_.creeApport();
Hydraulique1dReseauApport apport = new Hydraulique1dReseauApport(iapport);
@@ -832,7 +835,7 @@
initNumerosSingularites();
repaint();
}
-
+
public void addSourceTraceur() {
if (sourceAutoriser()) {
MetierSource isource = reseau_.creeSource();
@@ -843,7 +846,7 @@
repaint();
}
}
-
+
public void addPerteCharge() {
MetierPerteCharge iperteCharge = reseau_.creePerteCharge();
Hydraulique1dReseauPerteCharge perteCharge
@@ -853,7 +856,7 @@
initNumerosSingularites();
repaint();
}
-
+
public void addSeuil() {
MetierSeuil iseuil;
boolean transcritique
@@ -867,7 +870,7 @@
repaint();
}
}
-
+
public void addDeversoir() {
MetierDeversoir ideversoir = reseau_.creeDeversoir();
Hydraulique1dReseauDeversoir deversoir
@@ -877,7 +880,7 @@
initNumerosSingularites();
repaint();
}
-
+
public void addCasier() {
if (casierAutoriser()) {
MetierCasier icasier = reseau_.ajouterCasier();
@@ -887,7 +890,7 @@
repaint();
}
}
-
+
public void addLiaisonCasier() {
if (casierAutoriser()) {
MetierLiaison iliaison = reseau_.ajouterLiaison();
@@ -898,11 +901,11 @@
repaint();
}
}
-
+
public BuCommonImplementation getApp() {
return app_;
}
-
+
@Override
public void actionPerformed(ActionEvent _evt) {
String action = _evt.getActionCommand();
@@ -914,14 +917,17 @@
arg = action.substring(i + 1, action.length() - 1);
action = action.substring(0, i);
}
-
+
if ("DJA_TOGGLE_INTERACTIVE".equals(action)) {
DjaGridInteractive grille = (DjaGridInteractive) grid_;
- btMoveView_.setSelected(false);
- btZoom_.setSelected(false);
-
+ if (tbInteractive_.isSelected()) {
+ btMoveView_.setSelected(false);
+ btZoom_.setSelected(false);
+ ((MascaretGridInteractive) grid_).setZoom(false);
+ ((MascaretGridInteractive) grid_).setTranslationActive(false);
+ }
if (grille.isInteractive()) {
-
+
if (pbReseau_.isSelected()) {
pbReseau_.doClick();
}
@@ -934,9 +940,9 @@
if (pbThkns_.isSelected()) {
pbThkns_.doClick();
}
-
+
MessageAvertissement = ConstructionLiaisonsMetiers();
-
+
if (!MessageAvertissement.isEmpty()) {
BuDialogMessage dial
= new BuDialogMessage(app_, null, MessageAvertissement);
@@ -947,7 +953,7 @@
}
} // fin if (grille.isInteractive())
else {
-
+
}
if (MessageAvertissement.isEmpty()) {
super.actionPerformed(_evt);
@@ -997,13 +1003,13 @@
if (btZoom_.isSelected()) {
btMoveView_.setSelected(false);
}
- ((MascaretGridInteractive) grid_).toggleZoom();
-
+ ((MascaretGridInteractive) grid_).setZoom(btZoom_.isSelected());
+
} else if (MOVE_ACTION.equals(action)) {
if (btMoveView_.isSelected()) {
btZoom_.setSelected(false);
}
- ((MascaretGridInteractive) grid_).toggleTranslationAction();
+ ((MascaretGridInteractive) grid_).setTranslationActive(btMoveView_.isSelected());
} else {
super.actionPerformed(_evt);
}
@@ -1018,7 +1024,7 @@
((MascaretGridInteractive) grid_).zoomOn(e, e.getPreciseWheelRotation() < 0);
repaint(0);
}
-
+
});
}
@@ -1073,7 +1079,7 @@
ib.extrAmont().noeudRattache(in);
ib.extrAmont().conditionLimite(null);
in.ajouteExtremite(ib.extrAmont());
-
+
} else if (debut instanceof Hydraulique1dReseauExtremLibre) {
if (ib.extrAmont() != null) {
ib.extrAmont().noeudRattache(null);
@@ -1095,7 +1101,7 @@
}
repaint();
}
-
+
}
if (fin == null) {
Hydraulique1dReseauExtremLibre extremAval
@@ -1115,7 +1121,7 @@
ib.extrAval().noeudRattache(in);
ib.extrAval().conditionLimite(null);
in.ajouteExtremite(ib.extrAval());
-
+
} else if (fin instanceof Hydraulique1dReseauExtremLibre) {
if (ib.extrAval() != null) {
ib.extrAval().noeudRattache(null);
@@ -1137,7 +1143,7 @@
}
repaint();
}
-
+
}
} else if (element instanceof Hydraulique1dReseauSingularite) {
Hydraulique1dReseauSingularite singulGraph
@@ -1149,7 +1155,7 @@
= (MetierBief) (((Hydraulique1dReseauBiefCourbe) objetAttache)
.getData("bief"));
ib.ajouteSingularite(is);
-
+
} else {
ListObjetNonConnectes.add(is);
MessageAvertissement
@@ -1215,7 +1221,7 @@
//Verification du reseau et de la grille
objetsNonConnecte = Hydraulique1dReseauVerificateur.verifierBijectionMetierGraph(etude_, this);
-
+
if (objetsNonConnecte != null) {
for (int j = 0; j < objetsNonConnecte.length; j++) {
if (ListObjetNonConnectes.add(objetsNonConnecte[j])) {
@@ -1227,11 +1233,11 @@
}
}
}
-
+
return MessageAvertissement;
-
+
}
-
+
@Override
public JComponent[] getSpecificTools() {
JComponent[] r;
@@ -1241,7 +1247,7 @@
pbBrcks_.setDesktop((BuDesktop) getDesktopPane());
r = new JComponent[22];
int buttonPosition = 0;
-
+
r[buttonPosition++] = tbInteractive_;
r[buttonPosition++] = null;
r[buttonPosition++] = btRecenter_;
@@ -1261,16 +1267,16 @@
r[buttonPosition++] = pbBrcks_;
r[buttonPosition++] = null;
r[buttonPosition++] = pbReseau_;
-
+
r[buttonPosition++] = null;
r[buttonPosition++] = btZoom_;
r[buttonPosition++] = btMoveView_;
-
+
DjaFrame.setAlwaysEnable(btRecenter_);
DjaFrame.setAlwaysEnable(btZoom_);
DjaFrame.setAlwaysEnable(btMoveView_);
updateInteractiveTools(r);
-
+
return r;
}
@@ -1432,7 +1438,7 @@
if (liaisonGraphique == null) {
return;
}
-
+
liaisonGraphique.maj();
} else if (("caracteristiques".equals(champ)) && (source instanceof MetierLiaison)) {
MetierLiaison iliaison = (MetierLiaison) source;
@@ -1440,11 +1446,11 @@
if (liaisonGraph == null) {
return;
}
-
+
liaisonGraph.maj();
}
}
-
+
public void initNumerosSingularites() {
DjaGridInteractive grille = (DjaGridInteractive) grid_;
Enumeration objEnum = grille.getObjects().
@@ -1457,7 +1463,7 @@
is.numero(numero++);
}
}
-
+
private Hydraulique1dReseauNoeud rechercheNoeud(MetierNoeud inoeud) {
DjaGridInteractive grille = (DjaGridInteractive) grid_;
Enumeration objEnum = grille.getObjects().
@@ -1472,7 +1478,7 @@
}
return null;
}
-
+
private Hydraulique1dReseauExtremLibre rechercheExtremite(
MetierExtremite iextremite) {
DjaGridInteractive grille = (DjaGridInteractive) grid_;
@@ -1488,7 +1494,7 @@
}
return null;
}
-
+
private Hydraulique1dReseauLiaisonCasier rechercheLiaison(
MetierCaracteristiqueLiaison icaracLiai) {
DjaGridInteractive grille = (DjaGridInteractive) grid_;
@@ -1504,7 +1510,7 @@
}
return null;
}
-
+
private Hydraulique1dReseauBiefCourbe rechercheBief(MetierBief iBief) {
DjaGridInteractive grille = (DjaGridInteractive) grid_;
Enumeration objEnum = grille.getObjects().
@@ -1519,7 +1525,7 @@
}
return null;
}
-
+
private Hydraulique1dReseauLiaisonCasier rechercheLiaison(MetierLiaison iLiaison) {
DjaGridInteractive grille = (DjaGridInteractive) grid_;
Enumeration objEnum = grille.getObjects().
@@ -1534,7 +1540,7 @@
}
return null;
}
-
+
private Hydraulique1dReseauCasier rechercheCasier(MetierCasier iCasier) {
DjaGridInteractive grille = (DjaGridInteractive) grid_;
Enumeration objEnum = grille.getObjects().
@@ -1544,7 +1550,7 @@
= (Hydraulique1dReseauCasier) objEnum.nextElement();
MetierCasier casier = (MetierCasier) casierGraph.getData("casier");
try {
-
+
if (casier != null && casier.numero() == iCasier.numero()) {
return casierGraph;
}
@@ -1555,7 +1561,7 @@
}
return null;
}
-
+
private boolean casierAutoriser() {
if (etude_.paramGeneraux().regime().value()
== EnumMetierRegime._FLUVIAL_PERMANENT) {
@@ -1580,7 +1586,7 @@
}
return true;
}
-
+
private boolean sourceAutoriser() {
if (!etude_.qualiteDEau().parametresModeleQualiteEau().presenceTraceurs()) {
new BuDialogMessage(
@@ -1594,7 +1600,7 @@
}
return true;
}
-
+
private void decalage(DjaLink djaLink, int indice) {
int beginX = djaLink.getBeginX();
int beginY = djaLink.getBeginY();
@@ -1609,7 +1615,7 @@
djaLink.setEndX(endX + DX);
djaLink.setEndY(endY + DY);
}
-
+
private void decalage(DjaForm djaForm, int indice) {
int X = djaForm.getX();
int Y = djaForm.getY();
@@ -1653,9 +1659,9 @@
private EnumMetierSensDebitLiaison getSensLiaison(Hydraulique1dReseauLiaisonCasier liaison) {
int typeDebut = typeExtremite2TypeSimplifie(liaison.getBeginType());
int typeFin = typeExtremite2TypeSimplifie(liaison.getEndType());
-
+
MetierLiaison il = (MetierLiaison) liaison.getData("liaison");
-
+
if (il.isCasierCasier()) {
if ((typeDebut == 1) && (typeFin == 2)) {
return EnumMetierSensDebitLiaison.CASIER_VERS_BIEF_OU_VERS_AVAL;
@@ -1677,7 +1683,7 @@
}
return EnumMetierSensDebitLiaison.DEUX_SENS;
}
-
+
if (il.isRiviereCasier()) {
if (liaison.getBeginObject() instanceof Hydraulique1dReseauCasier) {
if ((typeDebut == 2) && (typeFin == 1)) {
@@ -1700,7 +1706,7 @@
}
return EnumMetierSensDebitLiaison.DEUX_SENS;
}
-
+
if (liaison.getBeginObject() instanceof Hydraulique1dReseauBiefCourbe) {
if ((typeDebut == 2) && (typeFin == 1)) {
return EnumMetierSensDebitLiaison.CASIER_VERS_BIEF_OU_VERS_AVAL;
@@ -1723,7 +1729,7 @@
return EnumMetierSensDebitLiaison.DEUX_SENS;
}
}
-
+
return EnumMetierSensDebitLiaison.DEUX_SENS;
}
}
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretGridInteractive.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretGridInteractive.java 2014-05-20 00:55:34 UTC (rev 8704)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretGridInteractive.java 2014-05-20 00:55:46 UTC (rev 8705)
@@ -1,9 +1,11 @@
package org.fudaa.fudaa.hydraulique1d.reseau;
-import java.awt.Insets;
-
import com.memoire.dja.DjaGridInteractive;
import com.memoire.dja.DjaVector;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Rectangle;
import java.awt.event.MouseEvent;
/**
@@ -17,9 +19,12 @@
public MascaretGridInteractive(boolean b, DjaVector djaVector) {
super(b, djaVector);
+ setOpaque(true);
+ setBackground(Color.WHITE);
mouseScaleListener = new MascaretScaledGridMouseListener(this);
addMouseListener(mouseScaleListener);
addMouseMotionListener(mouseScaleListener);
+ setDoubleBuffered(false);
}
public void setParentFrame(Hydraulique1dReseauFrame parentFrame) {
@@ -42,16 +47,28 @@
getTransform().setScale(scale);
}
- public void toggleTranslationAction() {
- mouseScaleListener.setMoveActionEnabled(!mouseScaleListener.isMoveActionEnabled());
+ public void setTranslationActive(boolean active) {
+ mouseScaleListener.setMoveActionEnabled(active);
}
- public void toggleZoom() {
- mouseScaleListener.setZoomActionEnabled(!mouseScaleListener.isZoomActionEnabled());
+ public void setZoom(boolean active) {
+ mouseScaleListener.setZoomActionEnabled(active);
}
@Override
- public void setInteractive(boolean _s) {
+ public void paint(Graphics g) {
+ final Dimension size = getSize();
+ Rectangle clip = new Rectangle(0, 0, size.width, size.height);
+ if (isOpaque()) {
+ g.setColor(getBackground());
+ g.fillRect(clip.x, clip.y, clip.width, clip.height);
+ }
+ super.paint(g);
+ }
+
+ @Override
+ public void setInteractive(boolean _s
+ ) {
super.setInteractive(_s);
if (_s) {
mouseScaleListener.setZoomActionEnabled(false);
@@ -61,6 +78,7 @@
public void zoomOn(MouseEvent evt, boolean zoomIn) {
getTransform().zoom(evt, zoomIn);
+ getParentFrame().repaint(0);
repaint(0);
}
@@ -77,7 +95,6 @@
// return translated;
//
// }
-
boolean isZoomOrMoveActivated() {
return mouseScaleListener.isMoveActionEnabled() || mouseScaleListener.isZoomActionEnabled();
}
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretScaledGridMouseListener.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretScaledGridMouseListener.java 2014-05-20 00:55:34 UTC (rev 8704)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/reseau/MascaretScaledGridMouseListener.java 2014-05-20 00:55:46 UTC (rev 8705)
@@ -81,11 +81,10 @@
}
boolean erase;
- Color selectionZone = new Color(224, 128, 224);
private void erase() {
Graphics g = grid.getGraphics();
- g.setXORMode(selectionZone);
+ g.setXORMode(Color.white);
if (erase) {
g.drawRect(lastXDrawn, lastYDrawn, lastWDrawn, lastHDrawn);
erase = false;
@@ -107,7 +106,7 @@
lastWDrawn = _evt.getX() - lastXDrawn;
lastHDrawn = _evt.getY() - lastYDrawn;
Graphics g = grid.getGraphics();
- g.setXORMode(selectionZone);
+ g.setXORMode(Color.white);
g.drawRect(lastXDrawn, lastYDrawn, lastWDrawn, lastHDrawn);
erase = true;
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-05-20 00:55:34 UTC (rev 8704)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-05-20 00:55:46 UTC (rev 8705)
@@ -171,7 +171,7 @@
isApp_.libraries = null;
isApp_.thanks = new String[]{"Fudaa team"};
idApp_.name = "Fudaa-Mascaret";
- idApp_.version = "3.2.1";
+ idApp_.version = "3.3";
idApp_.organization = "EDF-CEREMA";
idApp_.author = author;
idApp_.contact = "http://www.openmascaret.org/";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-05-20 00:55:37
|
Revision: 8704
http://sourceforge.net/p/fudaa/svn/8704
Author: deniger
Date: 2014-05-20 00:55:34 +0000 (Tue, 20 May 2014)
Log Message:
-----------
ajout nouveau variable pour Mascaret
Modified Paths:
--------------
trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaFrame.java
trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGrid.java
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaFrame.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaFrame.java 2014-05-20 00:09:28 UTC (rev 8703)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaFrame.java 2014-05-20 00:55:34 UTC (rev 8704)
@@ -34,7 +34,7 @@
protected DjaGrid grid_;
protected boolean tools_;
- private JComponent content_;
+ protected JComponent content_;
private BuBorderLayout layout_;
protected BuToggleButton tbInteractive_;
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGrid.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGrid.java 2014-05-20 00:09:28 UTC (rev 8703)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaGrid.java 2014-05-20 00:55:34 UTC (rev 8704)
@@ -391,7 +391,7 @@
}
}
- public final void paint(Graphics _g) {
+ public void paint(Graphics _g) {
boolean a = BuPreferences.BU.getBooleanProperty("antialias.all", false);
if (!a) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-05-20 00:09:30
|
Revision: 8703
http://sourceforge.net/p/fudaa/svn/8703
Author: deniger
Date: 2014-05-20 00:09:28 +0000 (Tue, 20 May 2014)
Log Message:
-----------
ajout nouveau variable pour Mascaret
Modified Paths:
--------------
trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaFrame.java
trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaMouseListener.java
trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaTransformData.java
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaFrame.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaFrame.java 2014-05-20 00:09:17 UTC (rev 8702)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaFrame.java 2014-05-20 00:09:28 UTC (rev 8703)
@@ -1,14 +1,13 @@
/**
* @modification $Date: 2007-05-04 13:42:00 $
- * @statut unstable
- * @file DjaFrame.java
- * @version 0.36
- * @author Guillaume Desnoix
- * @email gui...@de...
- * @license GNU General Public License 2 (GPL2)
- * @copyright 1998-2001 Guillaume Desnoix
+ * @statut unstable
+ * @file DjaFrame.java
+ * @version 0.36
+ * @author Guillaume Desnoix
+ * @email gui...@de...
+ * @license GNU General Public License 2 (GPL2)
+ * @copyright 1998-2001 Guillaume Desnoix
*/
-
package com.memoire.dja;
import java.awt.Color;
@@ -27,17 +26,17 @@
import com.memoire.bu.*;
public class DjaFrame extends BuInternalFrame implements BuCutCopyPasteInterface, BuPrintable,
- BuSelectFindReplaceInterface
-// BuUndoRedoInterface
+ BuSelectFindReplaceInterface // BuUndoRedoInterface
{
+
protected BuCommonImplementation app_;
protected String file_;
protected DjaGrid grid_;
protected boolean tools_;
-
+
private JComponent content_;
private BuBorderLayout layout_;
-
+
protected BuToggleButton tbInteractive_;
protected BuButton btRecenter_;
protected BuButton btOverlap_;
@@ -50,39 +49,40 @@
protected BuButton btTextFont_;
protected BuButton btAddText_;
protected BuButton btRemoveText_;
-
+
protected BuPopupButton pbForms_;
protected BuPopupButton pbLinks_;
protected BuPopupButton pbUml_;
protected BuPopupButton pbBrcks_;
protected BuPopupButton pbStrks_;
protected BuPopupButton pbThkns_;
-
+
public DjaFrame(BuCommonImplementation _app, String _file, DjaGrid _grid) {
this(_app, _file, _grid, true);
}
-
+
protected JScrollPane scrollPane_;
-
+
public DjaFrame(BuCommonImplementation _app, String _file, DjaGrid _grid, boolean _tools) {
super("", true, true, true, true);
app_ = _app;
grid_ = _grid;
tools_ = _tools;
-
+
setName("ifDJA");
// app_.installContextHelp(getRootPane(),"alma/source.html");
setFile(_file);
-
+
content_ = (JComponent) getContentPane();
layout_ = new BuBorderLayout();
content_.setLayout(layout_);
content_.setBorder(new EmptyBorder(0, 0, 0, 0));
-
+ content_.setDoubleBuffered(false);
scrollPane_ = new JScrollPane(grid_);
+ scrollPane_.setDoubleBuffered(false);
content_.add(scrollPane_, BuBorderLayout.CENTER);
-
+
tbInteractive_ = new BuToggleButton();
tbInteractive_.setIcon(DjaResource.DJA.getIcon("dja-interactive", 16));
tbInteractive_.setActionCommand("DJA_TOGGLE_INTERACTIVE");
@@ -92,7 +92,7 @@
tbInteractive_.setEnabled(grid_ instanceof DjaGridInteractive);
tbInteractive_.setSelected(grid_.isInteractive());
tbInteractive_.addActionListener(this);
-
+
btRecenter_ = new BuButton();
btRecenter_.setIcon(DjaResource.DJA.getIcon("dja-recenter", 16));
btRecenter_.setActionCommand("DJA_RECENTER");
@@ -101,7 +101,7 @@
btRecenter_.setRequestFocusEnabled(false);
btRecenter_.setEnabled(grid_ instanceof DjaGridInteractive);
btRecenter_.addActionListener(this);
-
+
btOverlap_ = new BuButton();
btOverlap_.setIcon(DjaResource.DJA.getIcon("dja-overlap", 16));
btOverlap_.setActionCommand("DJA_OVERLAP");
@@ -110,7 +110,7 @@
btOverlap_.setRequestFocusEnabled(false);
btOverlap_.setEnabled(grid_ instanceof DjaGridInteractive);
btOverlap_.addActionListener(this);
-
+
btFront_ = new BuButton();
btFront_.setIcon(DjaResource.DJA.getIcon("disposerdevant", 16));
btFront_.setActionCommand("DJA_FRONT");
@@ -119,7 +119,7 @@
btFront_.setRequestFocusEnabled(false);
btFront_.setEnabled(grid_ instanceof DjaGridInteractive);
btFront_.addActionListener(this);
-
+
btBack_ = new BuButton();
btBack_.setIcon(DjaResource.DJA.getIcon("disposerderriere", 16));
btBack_.setActionCommand("DJA_BACK");
@@ -128,7 +128,7 @@
btBack_.setRequestFocusEnabled(false);
btBack_.setEnabled(grid_ instanceof DjaGridInteractive);
btBack_.addActionListener(this);
-
+
btResize_ = new BuButton();
btResize_.setIcon(DjaResource.DJA.getIcon("redimensionner", 16));
btResize_.setActionCommand("DJA_RESIZE");
@@ -137,7 +137,7 @@
btResize_.setRequestFocusEnabled(false);
btResize_.setEnabled(grid_ instanceof DjaGridInteractive);
btResize_.addActionListener(this);
-
+
btForeground_ = new BuButton();
btForeground_.setIcon(DjaResource.DJA.getIcon("avantplan", 16));
btForeground_.setActionCommand("DJA_FOREGROUND");
@@ -146,7 +146,7 @@
btForeground_.setRequestFocusEnabled(false);
btForeground_.setEnabled(grid_ instanceof DjaGridInteractive);
btForeground_.addActionListener(this);
-
+
btBackground_ = new BuButton();
btBackground_.setIcon(DjaResource.DJA.getIcon("arriereplan", 16));
btBackground_.setActionCommand("DJA_BACKGROUND");
@@ -155,7 +155,7 @@
btBackground_.setRequestFocusEnabled(false);
btBackground_.setEnabled(grid_ instanceof DjaGridInteractive);
btBackground_.addActionListener(this);
-
+
btTextColor_ = new BuButton();
btTextColor_.setIcon(DjaResource.DJA.getIcon("couleurtexte", 16));
btTextColor_.setActionCommand("DJA_TEXTCOLOR");
@@ -164,7 +164,7 @@
btTextColor_.setRequestFocusEnabled(false);
btTextColor_.setEnabled(grid_ instanceof DjaGridInteractive);
btTextColor_.addActionListener(this);
-
+
btTextFont_ = new BuButton();
btTextFont_.setIcon(DjaResource.DJA.getIcon("fonte", 16));
btTextFont_.setActionCommand("DJA_TEXTFONT");
@@ -173,7 +173,7 @@
btTextFont_.setRequestFocusEnabled(false);
btTextFont_.setEnabled(grid_ instanceof DjaGridInteractive);
btTextFont_.addActionListener(this);
-
+
btAddText_ = new BuButton();
btAddText_.setIcon(DjaResource.DJA.getIcon("ajouter", 16));
btAddText_.setActionCommand("DJA_ADDTEXT");
@@ -182,7 +182,7 @@
btAddText_.setRequestFocusEnabled(false);
btAddText_.setEnabled(grid_ instanceof DjaGridInteractive);
btAddText_.addActionListener(this);
-
+
btRemoveText_ = new BuButton();
btRemoveText_.setIcon(DjaResource.DJA.getIcon("enlever", 16));
btRemoveText_.setActionCommand("DJA_REMOVETEXT");
@@ -191,38 +191,38 @@
btRemoveText_.setRequestFocusEnabled(false);
btRemoveText_.setEnabled(grid_ instanceof DjaGridInteractive);
btRemoveText_.addActionListener(this);
-
+
if (tools_) {
DjaPaletteForm srcforms = new DjaPaletteForm(this);
pbForms_ = new BuPopupButton(DjaResource.DJA.getString("Formes"), srcforms);
pbForms_.setToolTipText(DjaResource.DJA.getString("Palette de formes"));
pbForms_.setIcon(DjaResource.DJA.getIcon("dja-box", 16));
pbForms_.setEnabled(grid_ instanceof DjaGridInteractive);
-
+
DjaPaletteLink srclinks = new DjaPaletteLink(this);
pbLinks_ = new BuPopupButton(DjaResource.DJA.getString("Liens"), srclinks);
pbLinks_.setToolTipText(DjaResource.DJA.getString("Palette de liens"));
pbLinks_.setIcon(DjaResource.DJA.getIcon("dja-brokenarrow", 16));
pbLinks_.setEnabled(grid_ instanceof DjaGridInteractive);
-
+
DjaPaletteUml srcuml = new DjaPaletteUml(this);
pbUml_ = new BuPopupButton(DjaResource.DJA.getString("Elts UML"), srcuml);
pbUml_.setToolTipText(DjaResource.DJA.getString("Palette d'\xE9l\xE9ments UML"));
pbUml_.setIcon(DjaResource.DJA.getIcon("dja-umlclass", 16));
pbUml_.setEnabled(grid_ instanceof DjaGridInteractive);
-
+
DjaPaletteBracket srcbrcks = new DjaPaletteBracket(this);
pbBrcks_ = new BuPopupButton(DjaResource.DJA.getString("Extr\xE9mit\xE9s"), srcbrcks);
pbBrcks_.setToolTipText(DjaResource.DJA.getString("Palette d'extr\xE9mit\xE9s"));
pbBrcks_.setIcon(DjaResource.DJA.getIcon("dja-links", 16));
pbBrcks_.setEnabled(grid_ instanceof DjaGridInteractive);
-
+
DjaPaletteStroke srcstrks = new DjaPaletteStroke(this);
pbStrks_ = new BuPopupButton("Traits", srcstrks);
pbStrks_.setToolTipText(DjaResource.DJA.getString("Palette de traits"));
pbStrks_.setIcon(DjaResource.DJA.getIcon("dja-strokes", 16));
pbStrks_.setEnabled(grid_ instanceof DjaGridInteractive);
-
+
DjaPaletteThickness srcthkns = new DjaPaletteThickness(this);
pbThkns_ = new BuPopupButton("Epaisseurs", srcthkns);
pbThkns_.setToolTipText(DjaResource.DJA.getString("Palette d'\xE9paisseurs"));
@@ -236,43 +236,45 @@
* pbThkns_.setPaletteLocation(0,ps1.height+ps2.height);
*/
}
-
+
setFrameIcon(BuResource.BU.getFrameIcon("graphe"));
-
+
Dimension ps = new Dimension(296, 296);
setPreferredSize(ps);
setSize(ps);
// setLocation(150,10);
}
-
+
public void setSelected(boolean _state) throws PropertyVetoException {
super.setSelected(_state);
- if (isSelected()) grid_.requestFocus();
+ if (isSelected()) {
+ grid_.requestFocus();
+ }
}
-
+
public DjaGrid getGrid() {
return grid_;
}
-
+
public String getFile() {
return file_;
}
-
+
public void setFile(String _file) {
file_ = _file;
int i = file_.lastIndexOf(System.getProperty("file.separator"));
setTitle(file_.substring(i + 1));
}
-
+
public String getSource() {
StringBuffer r = new StringBuffer();
DjaSaver.saveAsText(grid_.getObjects(), r);
return r.toString();
}
-
+
public Image getImage() {
Image r;
-
+
synchronized (grid_) {
Dimension d = grid_.getSize();
r = grid_.createImage(d.width, d.height);
@@ -282,17 +284,17 @@
g.fillRect(0, 0, d.width, d.height);
grid_.paint(g);
}
-
+
return r;
}
-
+
public void actionPerformed(ActionEvent _evt) {
// JComponent source=(JComponent)_evt.getSource();
// System.err.println("DjaFrame : "+source);
String action = _evt.getActionCommand();
String arg = "";
-
+
int i = action.indexOf('(');
if (i >= 0) {
arg = action.substring(i + 1, action.length() - 1);
@@ -301,15 +303,10 @@
// System.err.println("action="+action);
// System.err.println("arg ="+arg);
-
if ("DJA_TOGGLE_INTERACTIVE".equals(action)) {
((DjaGridInteractive) grid_).setInteractive(!grid_.isInteractive());
-
- JComponent[] c = getSpecificTools();
- boolean b = grid_.isInteractive();
- for (int j = 1; j < c.length; j++)
- // All except the first one
- if (c[j] != null) c[j].setEnabled(b);
+
+ updateInteractiveStates();
} else if ("DJA_RECENTER".equals(action)) {
grid_.recenter();
} else if ("DJA_OVERLAP".equals(action)) {
@@ -333,42 +330,108 @@
} else if ("DJA_REMOVETEXT".equals(action)) {
DjaLib.removeText((DjaGridInteractive) grid_);
} else if ("DJA_CREATE_FORM".equals(action)) {
- if ("Box".equals(arg)) grid_.add(new DjaBox());
- if ("RoundBox".equals(arg)) grid_.add(new DjaRoundBox());
- if ("Diamond".equals(arg)) grid_.add(new DjaDiamond());
- if ("Square".equals(arg)) grid_.add(new DjaSquare());
- if ("Circle".equals(arg)) grid_.add(new DjaCircle());
- if ("Ellipse".equals(arg)) grid_.add(new DjaEllipse());
- if ("HLine".equals(arg)) grid_.add(new DjaHLine());
- if ("VLine".equals(arg)) grid_.add(new DjaVLine());
+ if ("Box".equals(arg)) {
+ grid_.add(new DjaBox());
+ }
+ if ("RoundBox".equals(arg)) {
+ grid_.add(new DjaRoundBox());
+ }
+ if ("Diamond".equals(arg)) {
+ grid_.add(new DjaDiamond());
+ }
+ if ("Square".equals(arg)) {
+ grid_.add(new DjaSquare());
+ }
+ if ("Circle".equals(arg)) {
+ grid_.add(new DjaCircle());
+ }
+ if ("Ellipse".equals(arg)) {
+ grid_.add(new DjaEllipse());
+ }
+ if ("HLine".equals(arg)) {
+ grid_.add(new DjaHLine());
+ }
+ if ("VLine".equals(arg)) {
+ grid_.add(new DjaVLine());
+ }
} else if ("DJA_CREATE_UML".equals(action)) {
- if ("Class".equals(arg)) grid_.add(new DjaUmlClass());
- if ("AbstractClass".equals(arg)) grid_.add(new DjaUmlClass());
- if ("TemplateClass".equals(arg)) grid_.add(new DjaUmlClass());
- if ("Note".equals(arg)) grid_.add(new DjaUmlNote());
- if ("SmallPackage".equals(arg)) grid_.add(new DjaUmlSmallPackage());
- if ("LargePackage".equals(arg)) grid_.add(new DjaUmlLargePackage());
- if ("Actor".equals(arg)) grid_.add(new DjaUmlActor());
- if ("Usecase".equals(arg)) grid_.add(new DjaUmlUsecase());
- if ("Lifeline".equals(arg)) grid_.add(new DjaUmlLifeline());
- if ("Object".equals(arg)) grid_.add(new DjaUmlObject());
- if ("Component".equals(arg)) grid_.add(new DjaUmlComponent());
- if ("Node".equals(arg)) grid_.add(new DjaUmlNode());
- if ("ClassIcon".equals(arg)) grid_.add(new DjaUmlClassIcon());
- if ("State".equals(arg)) grid_.add(new DjaUmlState());
- if ("Join".equals(arg)) grid_.add(new DjaUmlJoin());
- if ("Branch".equals(arg)) grid_.add(new DjaUmlBranch());
+ if ("Class".equals(arg)) {
+ grid_.add(new DjaUmlClass());
+ }
+ if ("AbstractClass".equals(arg)) {
+ grid_.add(new DjaUmlClass());
+ }
+ if ("TemplateClass".equals(arg)) {
+ grid_.add(new DjaUmlClass());
+ }
+ if ("Note".equals(arg)) {
+ grid_.add(new DjaUmlNote());
+ }
+ if ("SmallPackage".equals(arg)) {
+ grid_.add(new DjaUmlSmallPackage());
+ }
+ if ("LargePackage".equals(arg)) {
+ grid_.add(new DjaUmlLargePackage());
+ }
+ if ("Actor".equals(arg)) {
+ grid_.add(new DjaUmlActor());
+ }
+ if ("Usecase".equals(arg)) {
+ grid_.add(new DjaUmlUsecase());
+ }
+ if ("Lifeline".equals(arg)) {
+ grid_.add(new DjaUmlLifeline());
+ }
+ if ("Object".equals(arg)) {
+ grid_.add(new DjaUmlObject());
+ }
+ if ("Component".equals(arg)) {
+ grid_.add(new DjaUmlComponent());
+ }
+ if ("Node".equals(arg)) {
+ grid_.add(new DjaUmlNode());
+ }
+ if ("ClassIcon".equals(arg)) {
+ grid_.add(new DjaUmlClassIcon());
+ }
+ if ("State".equals(arg)) {
+ grid_.add(new DjaUmlState());
+ }
+ if ("Join".equals(arg)) {
+ grid_.add(new DjaUmlJoin());
+ }
+ if ("Branch".equals(arg)) {
+ grid_.add(new DjaUmlBranch());
+ }
} else if ("DJA_CREATE_LINK".equals(action)) {
- if ("DirectArrow".equals(arg)) grid_.add(new DjaDirectArrow());
- if ("BrokenArrow".equals(arg)) grid_.add(new DjaBrokenArrow());
- if ("ArcArrow".equals(arg)) grid_.add(new DjaArcArrow());
- if ("BezierArrow".equals(arg)) grid_.add(new DjaBezierArrow());
- if ("ZigZagArrow".equals(arg)) grid_.add(new DjaZigZagArrow());
-
- if ("ZigZagArrow3".equals(arg)) grid_.add(new DjaZigZagArrow(3));
- if ("ZigZagArrow4".equals(arg)) grid_.add(new DjaZigZagArrow(4));
- if ("ZigZagArrow5".equals(arg)) grid_.add(new DjaZigZagArrow(5));
- if ("ZigZagArrow6".equals(arg)) grid_.add(new DjaZigZagArrow(6));
+ if ("DirectArrow".equals(arg)) {
+ grid_.add(new DjaDirectArrow());
+ }
+ if ("BrokenArrow".equals(arg)) {
+ grid_.add(new DjaBrokenArrow());
+ }
+ if ("ArcArrow".equals(arg)) {
+ grid_.add(new DjaArcArrow());
+ }
+ if ("BezierArrow".equals(arg)) {
+ grid_.add(new DjaBezierArrow());
+ }
+ if ("ZigZagArrow".equals(arg)) {
+ grid_.add(new DjaZigZagArrow());
+ }
+
+ if ("ZigZagArrow3".equals(arg)) {
+ grid_.add(new DjaZigZagArrow(3));
+ }
+ if ("ZigZagArrow4".equals(arg)) {
+ grid_.add(new DjaZigZagArrow(4));
+ }
+ if ("ZigZagArrow5".equals(arg)) {
+ grid_.add(new DjaZigZagArrow(5));
+ }
+ if ("ZigZagArrow6".equals(arg)) {
+ grid_.add(new DjaZigZagArrow(6));
+ }
} else if ("DJA_STROKE".equals(action)) {
DjaLib.setProperty(((DjaGridInteractive) grid_).getSelection(), "trace", arg);
} else if ("DJA_THICKNESS".equals(action)) {
@@ -385,33 +448,36 @@
} else if ("DJA_END_ORIENTATION".equals(action)) {
int t = Integer.parseInt(arg);
DjaLib.setEndO(((DjaGridInteractive) grid_).getSelection(), t);
- } else
+ } else {
super.actionPerformed(_evt);
-
+ }
+
grid_.repaint();
}
-
+
private static DjaVector clipboard = new DjaVector();
-
+
public void copy() {
- if (grid_.isInteractive()) clipboard = ((DjaGridInteractive) grid_).cloneSelection();
+ if (grid_.isInteractive()) {
+ clipboard = ((DjaGridInteractive) grid_).cloneSelection();
+ }
}
-
+
public void cut() {
if (grid_.isInteractive()) {
clipboard = ((DjaGridInteractive) grid_).cloneSelection();
-
+
for (Enumeration e = ((DjaGridInteractive) grid_).getSelection().elements(); e.hasMoreElements();) {
DjaObject o = (DjaObject) e.nextElement();
grid_.removeDependencies(o);
grid_.remove(o);
}
-
+
((DjaGridInteractive) grid_).clearSelection();
grid_.repaint();
}
}
-
+
public void duplicate() {
if (grid_.isInteractive()) {
copy();
@@ -419,50 +485,53 @@
((DjaGridInteractive) grid_).moveSelection(DjaOptions.deltaX, DjaOptions.deltaY);
}
}
-
- public void find() {}
-
+
+ public void find() {
+ }
+
public void paste() {
if (grid_.isInteractive()) {
DjaVector s = DjaLib.clone(clipboard);
-
+
for (Enumeration e = s.elements(); e.hasMoreElements();) {
DjaObject o = (DjaObject) e.nextElement();
o.setOwner(null);
grid_.add(o);
}
-
+
((DjaGridInteractive) grid_).setSelection(s);
grid_.repaint();
}
}
-
- public void replace() {}
-
+
+ public void replace() {
+ }
+
public void print(PrintJob _job, Graphics _g) {
BuPrinter.INFO_DOC = new BuInformationsDocument();
BuPrinter.INFO_DOC.name = getTitle();
BuPrinter.INFO_DOC.logo = BuResource.BU.getIcon("graphe", 24);
-
+
BuPrinter.printComponent(_job, _g, grid_);
}
-
+
public void select() {
- if (grid_.isInteractive()) ((DjaGridInteractive) grid_).setSelectionToAll();
+ if (grid_.isInteractive()) {
+ ((DjaGridInteractive) grid_).setSelectionToAll();
+ }
}
// BuInternalFrame
-
public String[] getEnabledActions() {
- String[] r = new String[] { "ENREGISTRER", "ENREGISTRERSOUS", "IMPRIMER", "PREVISUALISER", "COUPER", "COPIER",
- "COLLER", "DUPLIQUER", "TOUTSELECTIONNER", };
+ String[] r = new String[]{"ENREGISTRER", "ENREGISTRERSOUS", "IMPRIMER", "PREVISUALISER", "COUPER", "COPIER",
+ "COLLER", "DUPLIQUER", "TOUTSELECTIONNER",};
return r;
}
-
+
public JComponent[] getSpecificTools() {
JComponent[] r;
final int N = 15;
-
+
if (!tools_) {
r = new JComponent[N];
} else {
@@ -472,7 +541,7 @@
pbStrks_.setDesktop((BuDesktop) getDesktopPane());
pbThkns_.setDesktop((BuDesktop) getDesktopPane());
pbBrcks_.setDesktop((BuDesktop) getDesktopPane());
-
+
r = new JComponent[N + 8];
r[N] = null;
r[N + 1] = pbStrks_;
@@ -483,7 +552,7 @@
r[N + 6] = pbLinks_;
r[N + 7] = pbUml_;
}
-
+
r[0] = tbInteractive_;
r[1] = null;
r[2] = btRecenter_;
@@ -501,4 +570,23 @@
r[14] = btRemoveText_;
return r;
}
+
+ protected void updateInteractiveStates() {
+ JComponent[] c = getSpecificTools();
+ updateInteractiveTools(c);
+ }
+
+ protected void updateInteractiveTools(JComponent[] c) {
+ boolean b = grid_.isInteractive();
+ for (int j = 1; j < c.length; j++) // All except the first one
+ {
+ if (c[j] != null && c[j].getClientProperty("buttonAlwaysEnable") != Boolean.TRUE) {
+ c[j].setEnabled(b);
+ }
+ }
+ }
+
+ public static void setAlwaysEnable(JComponent jc) {
+ jc.putClientProperty("buttonAlwaysEnable", Boolean.TRUE);
+ }
}
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaMouseListener.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaMouseListener.java 2014-05-20 00:09:17 UTC (rev 8702)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaMouseListener.java 2014-05-20 00:09:28 UTC (rev 8703)
@@ -266,6 +266,9 @@
}
public void mouseReleased(MouseEvent _evt) {
+ if (!enable) {
+ return;
+ }
Rectangle r = null;
if (last_ != null) {
Modified: trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaTransformData.java
===================================================================
--- trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaTransformData.java 2014-05-20 00:09:17 UTC (rev 8702)
+++ trunk/framework/ctulu-bu/src/main/java/com/memoire/dja/DjaTransformData.java 2014-05-20 00:09:28 UTC (rev 8703)
@@ -119,4 +119,30 @@
}
}
+ public void zoom(MouseEvent evt, boolean out) {
+ int initX = getScaledX(evt);
+ int initY = getScaledY(evt);
+ if (out) {
+ scale = scale * 1.1f;
+ } else {
+ scale = scale * 0.9f;
+ }
+ int newX = getScaledX(evt);
+ int newY = getScaledY(evt);
+ translateX = translateX + (newX - initX);
+ translateY = translateY + (newY - initY);
+ }
+
+ public void zoom(int startScreenX, int startScreenY, int endScreenX, int endScreenY, int widthScreen, int heightScreen) {
+ double wRatio = widthScreen / Math.abs(endScreenX - startScreenX);
+ double hRatio = heightScreen / Math.abs(endScreenY - startScreenY);
+
+ translateX = 0;
+ translateY = 0;
+ scale = (int) Math.min(wRatio, hRatio);
+ translateX = -(int) (startScreenX);
+ translateY = -(int) (startScreenY);
+
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-05-17 11:56:43
|
Revision: 8699
http://sourceforge.net/p/fudaa/svn/8699
Author: deniger
Date: 2014-05-17 11:56:32 +0000 (Sat, 17 May 2014)
Log Message:
-----------
ajout nouveau variable pour Mascaret
Modified Paths:
--------------
trunk/business/fudaa-common-corba/pom.xml
Modified: trunk/business/fudaa-common-corba/pom.xml
===================================================================
--- trunk/business/fudaa-common-corba/pom.xml 2014-05-17 11:49:15 UTC (rev 8698)
+++ trunk/business/fudaa-common-corba/pom.xml 2014-05-17 11:56:32 UTC (rev 8699)
@@ -3,16 +3,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <dodico-corba.version>1.1-SNAPSHOT</dodico-corba.version>
+ <dodico-corba.version>1.2-SNAPSHOT</dodico-corba.version>
</properties>
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>business-pom</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</parent>
<groupId>org.fudaa.business</groupId>
<artifactId>fudaa-common-corba</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
<name>fudaa-common-corba</name>
<dependencyManagement>
<dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-05-17 11:49:17
|
Revision: 8698
http://sourceforge.net/p/fudaa/svn/8698
Author: deniger
Date: 2014-05-17 11:49:15 +0000 (Sat, 17 May 2014)
Log Message:
-----------
ajout nouveau variable pour Mascaret
Modified Paths:
--------------
trunk/business/dodico-corba/pom.xml
trunk/business/dodico-corba/src/main/idl/code/mascaret.idl
trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java
Modified: trunk/business/dodico-corba/pom.xml
===================================================================
--- trunk/business/dodico-corba/pom.xml 2014-04-29 11:48:14 UTC (rev 8697)
+++ trunk/business/dodico-corba/pom.xml 2014-05-17 11:49:15 UTC (rev 8698)
@@ -7,11 +7,11 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>business-pom</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</parent>
<groupId>org.fudaa.business</groupId>
<artifactId>dodico-corba</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.2-SNAPSHOT</version>
<name>dodico-corba</name>
<!-- on importe les dépendences du framework -->
<dependencyManagement>
Modified: trunk/business/dodico-corba/src/main/idl/code/mascaret.idl
===================================================================
--- trunk/business/dodico-corba/src/main/idl/code/mascaret.idl 2014-04-29 11:48:14 UTC (rev 8697)
+++ trunk/business/dodico-corba/src/main/idl/code/mascaret.idl 2014-05-17 11:49:15 UTC (rev 8698)
@@ -85,6 +85,8 @@
booleen perteChargeAutoElargissement; // pertes de charge automatique noyau transcritique
booleen termesNonHydrostatiques; // termes non hydrostatiques pour le noyau transcritique
SParametresNumCasier parametresNumeriqueCasier; // param\xE8tres num\xE9riques utilis\xE9 par casier
+ booleen apportDebit;
+ booleen frottementsParois;
};
//-----------FIN RUBRIQUE PARAMETRES NUMERIQUES-------------------------
Modified: trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java
===================================================================
--- trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java 2014-04-29 11:48:14 UTC (rev 8697)
+++ trunk/business/dodico-corba/src/main/java/org/fudaa/dodico/corba/mascaret/SParametresNum.java 2014-05-17 11:49:15 UTC (rev 8698)
@@ -18,6 +18,8 @@
public boolean optimisNoyauTrans = false;
public boolean perteChargeAutoElargissement = false;
public boolean termesNonHydrostatiques = false;
+ public boolean apportDebit = false;
+ public boolean attenuationConvection = false;
// termes non hydrostatiques pour le noyau transcritique
public org.fudaa.dodico.corba.mascaret.SParametresNumCasier parametresNumeriqueCasier = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-04-08 11:34:52
|
Revision: 8694
http://sourceforge.net/p/fudaa/svn/8694
Author: deniger
Date: 2014-04-08 11:34:49 +0000 (Tue, 08 Apr 2014)
Log Message:
-----------
CRUE-640
Modified Paths:
--------------
trunk/soft/fudaa-crue/nb-configuration.xml
Modified: trunk/soft/fudaa-crue/nb-configuration.xml
===================================================================
--- trunk/soft/fudaa-crue/nb-configuration.xml 2014-04-08 09:03:46 UTC (rev 8693)
+++ trunk/soft/fudaa-crue/nb-configuration.xml 2014-04-08 11:34:49 UTC (rev 8694)
@@ -9,6 +9,7 @@
<config-data xmlns="http://www.netbeans.org/ns/maven-config-data/1">
<configurations>
<configuration id="noIntegrationTests" profiles="noIntegrationTests"/>
+ <configuration id="release" profiles="release"/>
</configurations>
</config-data>
</project-shared-configuration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-04-02 22:31:00
|
Revision: 8692
http://sourceforge.net/p/fudaa/svn/8692
Author: deniger
Date: 2014-04-02 22:30:52 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
CRUE-640
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/Bundle.properties
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties
trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/calcul/Bundle.properties
trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/Bundle.properties
trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties
trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/Bundle.properties
trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/actions/Bundle.properties
trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/rptg/Bundle.properties
trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/Bundle.properties
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 2014-04-02 22:21:23 UTC (rev 8691)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2014-04-02 22:30:52 UTC (rev 8692)
@@ -1276,7 +1276,7 @@
ProfilEnLong.Type=Profils en long
Temporel.Type=Temporel
MultiVar.Type=Multi-Variables
-RPTG.Type=Pr\u00e9-traitement g\u00e9om\u00e9trique
+RPTG.Type=Pr\u00e9traitement g\u00e9om\u00e9trique
Planimetry.Type=Planim\u00e9trie
otfa.report.typeUnknown=Le rapport {0} est de type inconnu
otfa.report.notFound=Le rapport {0} n''a pas \u00e9t\u00e9 trouv\u00e9
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java 2014-04-02 22:21:23 UTC (rev 8691)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/InitPerspectiveInstaller.java 2014-04-02 22:30:52 UTC (rev 8692)
@@ -52,7 +52,7 @@
}
@Override
- @Messages("FudaaCrueClosing.Label=Fudaa-Crue est cours de fermeture...")
+ @Messages("FudaaCrueClosing.Label=Fudaa-Crue est en cours de fermeture...")
public boolean closing() {
SelectedPerspectiveService selectedPerspectiveService = Lookup.getDefault().lookup(SelectedPerspectiveService.class);
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/Bundle.properties 2014-04-02 22:21:23 UTC (rev 8691)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/Bundle.properties 2014-04-02 22:30:52 UTC (rev 8692)
@@ -11,8 +11,8 @@
HINT_ModellingVisualTopComponent= Vue planim\u00e9trique
CTL_ModellingNetworkTopComponent=R\u00e9seau
HINT_ModellingNetworkTopComponent=R\u00e9seau
-CTL_ModellingEMHTopComponent=EMHs
-HINT_ModellingEMHTopComponent=EMH
+CTL_ModellingEMHTopComponent=Explorateur EMHs
+HINT_ModellingEMHTopComponent=Explorateur EMHs
CTL_ModellingComputeDataTopComponent=Liste des calculs
HINT_ModellingComputeDataTopComponent=Liste des calculs
emhTopComponent.NoScenarioLoadedInformations=<Vide>
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties 2014-04-02 22:21:23 UTC (rev 8691)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/action/Bundle.properties 2014-04-02 22:30:52 UTC (rev 8692)
@@ -42,10 +42,10 @@
ModellingOpenListeCLimMsNodeAction.Name=Liste des CLimMs du sc\u00e9nario
ModellingOpenListeCLimMsNodeAction.NewFrame.Name=Liste des CLimMs du sc\u00e9nario (nouvelle fen\u00eatre)
-ModellingModeleOPTGNodeAction.Name=Ordre de pr\u00e9-traitement g\u00e9om\u00e9trique
-ModellingModeleOPTGNodeAction.NewFrame.Name=Ordre de pr\u00e9-traitement g\u00e9om\u00e9trique (nouvelle fen\u00eatre)
-ModellingModeleOPTRNodeAction.Name=Ordre de pr\u00e9-traitement r\u00e9seau
-ModellingModeleOPTRNodeAction.NewFrame.Name=Ordre de pr\u00e9-traitement r\u00e9seau (nouvelle fen\u00eatre)
+ModellingModeleOPTGNodeAction.Name=Ordre de pr\u00e9traitement g\u00e9om\u00e9trique
+ModellingModeleOPTGNodeAction.NewFrame.Name=Ordre de pr\u00e9traitement g\u00e9om\u00e9trique (nouvelle fen\u00eatre)
+ModellingModeleOPTRNodeAction.Name=Ordre de pr\u00e9traitement r\u00e9seau
+ModellingModeleOPTRNodeAction.NewFrame.Name=Ordre de pr\u00e9traitement r\u00e9seau (nouvelle fen\u00eatre)
ModellingModelePNUMNodeAction.Name=Param\u00e8tres num\u00e9riques
ModellingModelePNUMNodeAction.NewFrame.Name=Param\u00e8tres num\u00e9riques (nouvelle fen\u00eatre)
ModellingModeleOPTINodeAction.Name=Ordre de pr\u00e9-traitement des conditions initiales
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/calcul/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/calcul/Bundle.properties 2014-04-02 22:21:23 UTC (rev 8691)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/resources/org/fudaa/fudaa/crue/modelling/calcul/Bundle.properties 2014-04-02 22:30:52 UTC (rev 8692)
@@ -12,12 +12,12 @@
PNUM.ParamNumCalcVraiPerm.DisplayName=Calcul permanent
-CTL_ModellingModeleOPTGTopComponent=Ordre de pr\u00e9-traitement g\u00e9om\u00e9trique
-HINT_ModellingModeleOPTGTopComponent=Ordre de pr\u00e9-traitement g\u00e9om\u00e9trique
-CTL_ModellingModeleOPTRTopComponent=Ordre de pr\u00e9-traitement r\u00e9seau
-HINT_ModellingModeleOPTRTopComponent=Ordre de pr\u00e9-traitement r\u00e9seau
-CTL_ModellingModeleOPTITopComponent=Ordre de pr\u00e9-traitement des conditions initiales
-HINT_ModellingModeleOPTITopComponent=Ordre de pr\u00e9-traitement des conditions initiales
+CTL_ModellingModeleOPTGTopComponent=Ordre de pr\u00e9traitement g\u00e9om\u00e9trique
+HINT_ModellingModeleOPTGTopComponent=Ordre de pr\u00e9traitement g\u00e9om\u00e9trique
+CTL_ModellingModeleOPTRTopComponent=Ordre de pr\u00e9traitement r\u00e9seau
+HINT_ModellingModeleOPTRTopComponent=Ordre de pr\u00e9traitement r\u00e9seau
+CTL_ModellingModeleOPTITopComponent=Ordre de pr\u00e9traitement des conditions initiales
+HINT_ModellingModeleOPTITopComponent=Ordre de pr\u00e9traitement des conditions initiales
CTL_ModellingScenarioORESTopComponent=Demandes de r\u00e9sultats
HINT_ModellingScenarioORESTopComponent=Demandes de r\u00e9sultats
CTL_ModellingModelePNUMTopComponent=Param\u00e8tres num\u00e9riques
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/Bundle.properties 2014-04-02 22:21:23 UTC (rev 8691)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/resources/org/fudaa/fudaa/crue/otfa/Bundle.properties 2014-04-02 22:30:52 UTC (rev 8692)
@@ -7,8 +7,8 @@
CTL_SomeAction=Lancer tout
OtfaBilanExecution.DialogTitle=Bilan de l'ex\u00e9cution OTFA
CTL_OtfaCampagneTopComponentAction=Test
-CTL_OTFAPropertiesAction=Propri\u00e9t\u00e9s OTFA
-HINT_OTFAPropertiesAction=Propri\u00e9t\u00e9s OTFA
+CTL_OTFAPropertiesAction=Propri\u00e9t\u00e9s
+HINT_OTFAPropertiesAction=Propri\u00e9t\u00e9s
ExecuterCampagneAction.Title=Executer la campagne
OtfaCampagneTopComponent.jLabel7.text=Date cr\u00e9ation :
OtfaCampagneTopComponent.dateCreation.text=
Modified: trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties 2014-04-02 22:21:23 UTC (rev 8691)
+++ trunk/soft/fudaa-crue/ui-post/src/main/resources/org/fudaa/fudaa/crue/post/Bundle.properties 2014-04-02 22:30:52 UTC (rev 8692)
@@ -14,8 +14,8 @@
CTL_PostPropertiesTopComponent=Propri\u00e9t\u00e9s
HINT_PostPropertiesTopComponent=Propri\u00e9t\u00e9s
PostReportsTopComponent.FirstColumn=Compte-Rendus
-CTL_PostEmhExplorerTopComponent=Exploreur EMHs
-HINT_PostEmhExplorerTopComponent=Exploreur EMHs
+CTL_PostEmhExplorerTopComponent=Explorateur EMHs
+HINT_PostEmhExplorerTopComponent=Explorateur EMHs
CTL_PostCtuluLogTopComponent=Compte-rendu op\u00e9ration
HINT_PostCtuluLogTopComponent=Compte-rendu de la derni\u00e8re op\u00e9ration
postMainTopComponent.NoRunLoadedInformations=<Aucun run charg\u00e9>
Modified: trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/Bundle.properties 2014-04-02 22:21:23 UTC (rev 8691)
+++ trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/Bundle.properties 2014-04-02 22:30:52 UTC (rev 8692)
@@ -12,14 +12,14 @@
HINT_ReportSelectRunTopComponent=S\u00e9lection des fichiers r\u00e9sultats
CTL_ReportTimeTopComponent=Gestionnaire temporel
HINT_ReportTimeTopComponent=Gestionnaire temporel
-CTL_ReportVariableTopComponent=Variables
-HINT_ReportVariableTopComponent=Variables
+CTL_ReportVariableTopComponent=VariablesFC
+HINT_ReportVariableTopComponent=VariablesFC
CTL_ReportViewManagerTopComponent=Gestionnaire de vues r\u00e9sultats
HINT_ReportViewManagerTopComponent=Gestionnaire de vues r\u00e9sultats
CTL_ReportVisualTopComponent=Vue planim\u00e9trique
HINT_ReportVisualTopComponent=Vue planim\u00e9trique
-CTL_ReportLayersTreeComponent=Calques
-HINT_ReportLayersTreeComponent=Calques
+CTL_ReportLayersTreeComponent=Gestionnaire de calques
+HINT_ReportLayersTreeComponent=Gestionnaire de calques
CTL_ReportDFRTTopComponent=Frottements
HINT_ReportDFRTTopComponent=Frottements
CTL_ReportDLHYTopComponent=Lois hydrauliques
Modified: trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/actions/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/actions/Bundle.properties 2014-04-02 22:21:23 UTC (rev 8691)
+++ trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/actions/Bundle.properties 2014-04-02 22:30:52 UTC (rev 8692)
@@ -5,7 +5,7 @@
ReportSetAsAlternatifNodeAction.DisplayName=Utiliser comme run alternatif
ReportUnsetAsAlternatifNodeAction.DisplayName=Ne plus utiliser comme run alternatif
OpenProfilTransversal.ActionName=Profil en travers
-OpenRPTG.ActionName=Pr\u00e9-traitement g\u00e9om\u00e9trique
+OpenRPTG.ActionName=Pr\u00e9traitement g\u00e9om\u00e9trique
OpenProfilLongitudinal.ActionName=Profil longitudinal
OpenTemporal.ActionName=Courbe temporelle
OpenMulitVar.ActionName=Multi-Variables
Modified: trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/rptg/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/rptg/Bundle.properties 2014-04-02 22:21:23 UTC (rev 8691)
+++ trunk/soft/fudaa-crue/ui-report/src/main/resources/org/fudaa/fudaa/crue/report/rptg/Bundle.properties 2014-04-02 22:30:52 UTC (rev 8692)
@@ -1,11 +1,11 @@
-CTL_ReportRPTGTopComponent=Pr\u00e9-traitement g\u00e9om\u00e9trique
-HINT_ReportRPTGTopComponent=Pr\u00e9-traitement g\u00e9om\u00e9trique
+CTL_ReportRPTGTopComponent=Pr\u00e9traitement g\u00e9om\u00e9trique
+HINT_ReportRPTGTopComponent=Pr\u00e9traitement g\u00e9om\u00e9trique
ChooseEMH.ButtonName=Changer EMH
ChoosePrevious.ButtonName=Pr\u00e9c\u00e9dent
ChooseNext.ButtonName=Suivante
ChooseVariable.ButtonName=Variables
ChooseEMHName.Label=EMH \u00e0 utiliser:
-ChooseEMHName.DialogTitle=Pr\u00e9-traitement g\u00e9om\u00e9trique
+ChooseEMHName.DialogTitle=Pr\u00e9traitement g\u00e9om\u00e9trique
ChooseVariable.LabelHorizontal=Variable horizontal:
ChooseVariable.LabelFirst=Variable 1:
ChooseVariable.LabelSecond=Variable 2:
Modified: trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/Bundle.properties 2014-04-02 22:21:23 UTC (rev 8691)
+++ trunk/soft/fudaa-crue/ui-study/src/main/resources/org/fudaa/fudaa/crue/study/Bundle.properties 2014-04-02 22:30:52 UTC (rev 8692)
@@ -13,8 +13,8 @@
CTL_ScenariosTopComponent=Sc\u00e9narios
CTL_FileListTopComponent=Fichiers
CTL_SousModeleListTopComponent=Sous-Mod\u00e8les
-CTL_StudyPropertiesAction=Propri\u00e9t\u00e9s \u00e9tudes
-HINT_StudyPropertiesAction=Propri\u00e9t\u00e9s \u00e9tudes
+CTL_StudyPropertiesAction=Propri\u00e9t\u00e9s
+HINT_StudyPropertiesAction=Propri\u00e9t\u00e9s
HINT_ModeleListTopComponent=Liste des mod\u00e8les disponibles
HINT_FileListTopComponent=Liste des fichiers
HINT_ScenariosTopComponent=Liste des sc\u00e9narios
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-04-02 22:21:29
|
Revision: 8691
http://sourceforge.net/p/fudaa/svn/8691
Author: deniger
Date: 2014-04-02 22:21:23 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
CRUE-617
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorBuilder.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegate.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateLongitudinal.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportGlobalService.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportResultService.java
trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/RapportCustomEditor.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGGrapheBuilder.java
Added Paths:
-----------
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateMultiVar.java
trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateRPTG.java
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 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2014-04-02 22:21:23 UTC (rev 8691)
@@ -1320,4 +1320,8 @@
Export.Calcul.ColumnName=Calcul
Export.Temps.ColumnName=Temps
Report.RunNonCurrentIgnored=Les donn\u00e9es des runs alternatifs ne sont pas export\u00e9s
-otfa.report.longitudinalFirstColName=Branche / Section
\ No newline at end of file
+otfa.report.longitudinalFirstColName=Branche / Section
+otfa.report.exportTo=Export rapport {0} vers {1}
+otfa.report.emhNotFound=L''EMH {0} n''a pas \u00e9t\u00e9 trouv\u00e9e
+otfa.report.emhNoRPTG=L''EMH {0} ne poss\u00e8de pas de r\u00e9sultat de pr\u00e9-traitement
+otfa.report.exportRPTG.on=Export RPTG sur EMH
\ No newline at end of file
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaExecutor.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -372,15 +372,15 @@
if (StringUtils.isNotEmpty(item.getRapport())) {
final CtuluLogGroup reportGroup = logs.createGroup("otfa.reportCreation");
reportGroup.setDescriptionArgs(item.getRapport());
- CtuluLogGroup logReport = new CtuluLogGroup(BusinessMessages.RESOURCE_BUNDLE);
if (managerScenario.getRunCourant() == null) {
- logReport.createNewLog("otfa.report.loading").addSevereError("otfa.report.notGenerated.NoCurrentRun");
+ reportGroup.createNewLog("otfa.report.loading").addSevereError("otfa.report.notGenerated.NoCurrentRun");
} else {
OtfaReportExecutor report = new OtfaReportExecutor(projet, managerScenario, emhScenario, item, campagne);
- report.exportCSV(logReport);
+ report.exportCSV(reportGroup);
}
+
}
}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutor.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -116,7 +116,7 @@
File targetFile = null;
File modeleDir = projet.getDirForRunModele(managerScenario, managerScenario.getManagerFils(defaultModele.getId()), run);
if (CtuluLibString.isEmpty(targetCsvFile)) {
- targetCsvFile = report.getType().geti18n().toLowerCase() + "_" + CtuluLibFile.getSansExtension(xml.getName()) + ".csv";
+ targetCsvFile = report.getType().name().toLowerCase() + "_" + CtuluLibFile.getSansExtension(xml.getName()) + ".csv";
targetFile = new File(modeleDir, targetCsvFile).getAbsoluteFile();
} else {
targetFile = new File(targetCsvFile);
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorBuilder.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorBuilder.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -11,13 +11,13 @@
* @author Frederic Deniger
*/
public class OtfaReportExecutorBuilder {
-
+
private final OtfaReportExecutor parent;
-
+
public OtfaReportExecutorBuilder(OtfaReportExecutor parent) {
this.parent = parent;
}
-
+
protected OtfaReportExecutorDelegate createDelegate(ReportConfigContrat config, ReportViewLineInfoAndType reportInfo,
OtfaReportGlobalService reportGlobalService) {
switch (config.getType()) {
@@ -25,8 +25,12 @@
return new OtfaReportExecutorDelegateTemporal(parent, reportInfo, config, reportGlobalService);
case LONGITUDINAL:
return new OtfaReportExecutorDelegateLongitudinal(parent, reportInfo, config, reportGlobalService);
+ case MULTI_VAR:
+ return new OtfaReportExecutorDelegateMultiVar(parent, reportInfo, config, reportGlobalService);
+ case RPTG:
+ return new OtfaReportExecutorDelegateRPTG(parent, reportInfo, config, reportGlobalService);
}
return null;
}
-
+
}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegate.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegate.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegate.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -91,6 +91,7 @@
}
public void exportTo(File targetFile, CtuluLog log) {
+ log.addInfo("otfa.report.exportTo", reportInfo.getInfo().getNom(), targetFile.getAbsolutePath());
CSVPrinter writer = null;
try {
writer = new CSVPrinter(new FileOutputStream(targetFile));
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateLongitudinal.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateLongitudinal.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateLongitudinal.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -63,7 +63,7 @@
@Override
protected void exportTo(CSVPrinter printer, CtuluLog log) throws IOException {
- ReportLongitudinalConfig config = (ReportLongitudinalConfig) super.config;
+ ReportLongitudinalConfig content = (ReportLongitudinalConfig) super.config;
final CrueConfigMetier ccm = reportGlobalService.getResultService().getCcm();
ReportLongitudinalLimitHelper limitHelper = new ReportLongitudinalLimitHelper(ccm);
final Map<String, String> displayNameById = limitHelper.getDisplayNameById();
@@ -71,8 +71,8 @@
StringBuilder builder = new StringBuilder();
builder.append(quote).append(BusinessMessages.getString("otfa.report.longitudinalFirstColName")).append(quote).append(super.delimiter);
builder.append(quote).append(propertyXp.getDisplayNom()).append(quote);
- final List<ResultatTimeKey> profilTimes = config.getTimes();
- final List<ReportRunVariableKey> variables = config.getProfilVariables();
+ final List<ResultatTimeKey> profilTimes = content.getTimes();
+ final List<ReportRunVariableKey> variables = content.getProfilVariables();
for (ReportRunVariableKey variable : variables) {
if (ReportVariableTypeEnum.LIMIT_PROFIL.equals(variable.getVariable().getVariableType())) {
String displayName = displayNameById.get(variable.getVariableName());
@@ -99,7 +99,7 @@
log.addWarn(BusinessMessages.getString("Report.RunNonCurrentIgnored"));
}
printer.writelnComment(builder.toString());
- final List<ReportLongitudinalBrancheConfig> branchesConfig = config.getBranchesConfig();
+ final List<ReportLongitudinalBrancheConfig> branchesConfig = content.getBranchesConfig();
ReportLongitudinalPositionBuilder positionBuilder = new ReportLongitudinalPositionBuilder(reportGlobalService.getResultService(), ccm);
final ReportRunKey runCourant = new ReportRunKey();
Set<ReportRunKey> keys = Collections.singleton(runCourant);
Copied: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateMultiVar.java (from rev 8689, trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateTemporal.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateMultiVar.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateMultiVar.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -0,0 +1,80 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.projet.otfa;
+
+import com.Ostermiller.util.CSVPrinter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.dodico.crue.common.BusinessMessages;
+import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey;
+import org.fudaa.dodico.crue.projet.report.ReportMultiVarConfig;
+import org.fudaa.dodico.crue.projet.report.ReportViewLineInfoAndType;
+import org.fudaa.dodico.crue.projet.report.data.ReportRunKey;
+import org.fudaa.dodico.crue.projet.report.data.ReportRunVariableEmhKey;
+import org.fudaa.dodico.crue.projet.report.data.ReportRunVariableHelper;
+import org.fudaa.dodico.crue.projet.report.data.ReportVariableKey;
+import org.fudaa.dodico.crue.projet.report.persist.ReportConfigContrat;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class OtfaReportExecutorDelegateMultiVar extends OtfaReportExecutorDelegate {
+
+ public OtfaReportExecutorDelegateMultiVar(OtfaReportExecutor parent, ReportViewLineInfoAndType reportInfo, ReportConfigContrat config,
+ OtfaReportGlobalService reportGlobalService) {
+ super(parent, reportInfo, config, reportGlobalService);
+ }
+
+ @Override
+ protected void exportTo(CSVPrinter printer, CtuluLog log) throws IOException {
+ ReportMultiVarConfig content = (ReportMultiVarConfig) super.config;
+ Map<String, List<ReportRunKey>> keyByVar = ReportRunVariableHelper.getByEmh(content.getReportRunEmhs());
+ List<ReportRunVariableEmhKey> keysToUse = new ArrayList<ReportRunVariableEmhKey>();
+ boolean containsNonCurrent = false;
+ ReportRunKey current = new ReportRunKey();
+ final ReportVariableKey horizontalVariableKey = super.reportGlobalService.getResultService().createVariableKey(content.getHorizontalVar());
+ for (String variableName : content.getVariables()) {
+ final ReportVariableKey verticalVariableKey = super.reportGlobalService.getResultService().createVariableKey(variableName);
+ for (String emhName : content.getEmhs()) {
+ List<ReportRunKey> keys = keyByVar.get(emhName);
+ if (containsAlternatif(keys)) {
+ containsNonCurrent = true;
+ }
+ if (containsCurrent(keys)) {
+ keysToUse.add(new ReportRunVariableEmhKey(current, horizontalVariableKey, emhName));
+ keysToUse.add(new ReportRunVariableEmhKey(current, verticalVariableKey, emhName));
+
+ }
+ }
+ }
+ if (containsNonCurrent) {
+ log.addWarn(BusinessMessages.getString("Report.RunNonCurrentIgnored"));
+ }
+ StringBuilder builder = new StringBuilder();
+ boolean addDelim = false;
+ for (ReportRunVariableEmhKey key : keysToUse) {
+ if (addDelim) {
+ builder.append(super.delimiter);
+ }
+ addDelim = true;
+ builder.append(quote).append(key.getRunVariableKey().getVariable().getVariableDisplayName()).append(" - ").append(key.getEmhName()).
+ append(quote);
+
+ }
+ printer.printlnComment(builder.toString());
+ final List<ResultatTimeKey> times = reportGlobalService.getRangeSelectedTimeKeys();
+ for (ResultatTimeKey time : times) {
+ for (ReportRunVariableEmhKey key : keysToUse) {
+ super.printVariable(printer, reportGlobalService.getResultService().getValue(time, key.getRunVariableKey(), key.getEmhName()), key.
+ getVariableName());
+ }
+ printer.println();
+ }
+ }
+
+}
Copied: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateRPTG.java (from rev 8689, trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateTemporal.java)
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateRPTG.java (rev 0)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportExecutorDelegateRPTG.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -0,0 +1,111 @@
+/*
+ GPL 2
+ */
+package org.fudaa.dodico.crue.projet.otfa;
+
+import com.Ostermiller.util.CSVPrinter;
+import java.io.IOException;
+import java.util.List;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluLog;
+import org.fudaa.dodico.crue.common.BusinessMessages;
+import org.fudaa.dodico.crue.config.ccm.ConfigLoi;
+import org.fudaa.dodico.crue.config.ccm.CrueConfigMetier;
+import org.fudaa.dodico.crue.metier.emh.EMH;
+import org.fudaa.dodico.crue.metier.emh.LoiFF;
+import org.fudaa.dodico.crue.metier.emh.ResPrtGeo;
+import org.fudaa.dodico.crue.metier.helper.LoiHelper;
+import org.fudaa.dodico.crue.projet.report.ReportRPTGConfig;
+import org.fudaa.dodico.crue.projet.report.ReportViewLineInfoAndType;
+import org.fudaa.dodico.crue.projet.report.persist.ReportConfigContrat;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class OtfaReportExecutorDelegateRPTG extends OtfaReportExecutorDelegate {
+
+ public static LoiFF findLoi(List<LoiFF> lois, String varX, String varY, CrueConfigMetier ccm) {
+ for (LoiFF loiFF : lois) {
+ ConfigLoi config = ccm.getConfLoi().get(loiFF.getType());
+ if (config.getVarAbscisse().getNom().equals(varX) && config.getVarOrdonnee().getNom().equals(varY)) {
+ return loiFF;
+ } else if (config.getVarAbscisse().getNom().equals(varY) && config.getVarOrdonnee().getNom().equals(varX)) {
+ return LoiHelper.switchAbscOrdonnee(loiFF);
+ }
+ }
+ return null;
+ }
+
+ public OtfaReportExecutorDelegateRPTG(OtfaReportExecutor parent, ReportViewLineInfoAndType reportInfo, ReportConfigContrat config,
+ OtfaReportGlobalService reportGlobalService) {
+ super(parent, reportInfo, config, reportGlobalService);
+ }
+
+ @Override
+ protected void exportTo(CSVPrinter printer, CtuluLog log) throws IOException {
+ ReportRPTGConfig content = (ReportRPTGConfig) super.config;
+ EMH emh = reportGlobalService.getResultService().getRunCourant().getEMH(content.getEmh());
+ if (emh == null) {
+ log.addError("otfa.report.emhNotFound", content.getEmh());
+ return;
+ }
+ ResPrtGeo rptg = emh.getRPTG();
+ if (rptg == null) {
+ log.addError("otfa.report.emhNoRPTG", content.getEmh());
+ return;
+ }
+ printer.writelnComment(BusinessMessages.getString("otfa.report.exportRPTG.on") + ": " + emh.getNom());
+ List<LoiFF> lois = rptg.getLois();
+ final String var1 = content.getVar1();
+ final String var2 = content.getVar2();
+ final String varH = content.getVarHorizontal();
+ LoiFF lois1 = null;
+ LoiFF lois2 = null;
+ if (var1 != null) {
+ lois1 = findLoi(lois, varH, var1, reportGlobalService.getResultService().getCcm());
+ }
+ if (var2 != null) {
+ lois2 = findLoi(lois, varH, var2, reportGlobalService.getResultService().getCcm());
+ }
+ int max1 = 0;
+ int max2 = 0;
+ StringBuilder builder = new StringBuilder();
+ if (lois1 != null) {
+ max1 = lois1.getNombrePoint();
+ builder.append(super.quote).append(reportGlobalService.getResultService().getVariableName(varH)).append(super.quote);
+ builder.append(super.delimiter).append(super.quote).append(reportGlobalService.getResultService().getVariableName(var1)).append(super.quote);
+ }
+ if (lois2 != null) {
+ max2 = lois2.getNombrePoint();
+ if (builder.length() > 0) {
+ builder.append(super.delimiter);
+ }
+ builder.append(super.quote).append(reportGlobalService.getResultService().getVariableName(varH)).append(super.quote);
+ builder.append(super.delimiter).append(super.quote).append(reportGlobalService.getResultService().getVariableName(var2)).append(super.quote);
+ }
+ int maxSize = Math.max(max1, max2);
+ printer.printlnComment(builder.toString());
+ for (int i = 0; i < maxSize; i++) {
+ if (lois1 != null) {
+ if (i >= max1) {
+ printer.print(StringUtils.EMPTY);
+ printer.print(StringUtils.EMPTY);
+ }
+ printVariable(printer, lois1.getAbscisse(i), varH);
+ printVariable(printer, lois1.getOrdonnee(i), var1);
+ }
+ if (lois2 != null) {
+ if (i >= max2) {
+ printer.print(StringUtils.EMPTY);
+ printer.print(StringUtils.EMPTY);
+ }
+ printVariable(printer, lois2.getAbscisse(i), varH);
+ printVariable(printer, lois2.getOrdonnee(i), var2);
+ }
+ printer.println();
+ }
+
+ }
+
+}
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportGlobalService.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportGlobalService.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportGlobalService.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -9,7 +9,6 @@
import java.util.Map;
import org.fudaa.dodico.crue.metier.emh.ResultatTimeKey;
import org.fudaa.dodico.crue.projet.report.ReportGlobalServiceContrat;
-import org.fudaa.dodico.crue.projet.report.ReportResultProviderServiceContrat;
import org.fudaa.dodico.crue.projet.report.formule.function.AggregationCacheKey;
import org.netbeans.api.progress.ProgressRunnable;
Modified: trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportResultService.java
===================================================================
--- trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportResultService.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/crue-otfa/src/main/java/org/fudaa/dodico/crue/projet/otfa/OtfaReportResultService.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -136,6 +136,14 @@
return getRunCourant().getEMH(nom);
}
+ public String getVariableName(String varName) {
+ if (formuleService.isFormule(varName)) {
+ return varName;
+ }
+ ItemVariable property = getCcm().getProperty(varName);
+ return property == null ? varName : property.getDisplayNom();
+ }
+
@Override
public PropertyNature getPropertyNature(String varName) {
if (formuleService.isFormule(varName)) {
Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/RapportCustomEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/RapportCustomEditor.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/property/RapportCustomEditor.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -4,6 +4,7 @@
import java.awt.Color;
import org.fudaa.fudaa.crue.common.editor.CustomEditorAbstract;
import java.io.File;
+import java.util.Arrays;
import java.util.List;
import javax.swing.JComponent;
import javax.swing.JLabel;
@@ -60,7 +61,12 @@
ReportIndexReaderHelper helper = new ReportIndexReaderHelper(projet);
String value = (String) editor.getValue();
TreeNode selectedValue = null;
+ List<ReportContentType> toAvoid = Arrays.asList(ReportContentType.PLANIMETRY, ReportContentType.TRANSVERSAL);
for (ReportContentType reportContentType : values) {
+ //on ignore les rapports non gérés.
+ if (toAvoid.contains(reportContentType)) {
+ continue;
+ }
final CrueIOResu<List<ReportViewLineInfo>> linesIO = helper.readType(reportContentType);
if (linesIO != null && CtuluLibArray.isNotEmpty(linesIO.getMetier())) {
DefaultMutableTreeNode lineParent = new DefaultMutableTreeNode(reportContentType.getFolderName());
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/config/AbstractReportGrapheBuilder.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -285,10 +285,13 @@
axeVConfig.apply(axe);
}
}
- if (horizontalPersist != null) {
+ boolean performZoom = false;
+ if (horizontalPersist != null && StringUtils.equals(horizontalPersist.getTitre(), uiController.getAxeX().getTitre())) {
horizontalPersist.apply(uiController.getAxeX());
+ } else {
+ performZoom = true;
}
- if (fromTemplate || content.isNoZoomSet()) {
+ if (performZoom || fromTemplate || content.isNoZoomSet()) {
uiController.getGraphe().restore();
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/multivar/ReportMultiVarGrapheBuilder.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -40,12 +40,11 @@
* @author Frederic Deniger
*/
public class ReportMultiVarGrapheBuilder extends AbstractReportGrapheBuilder<CourbesUiController, ReportMultiVarConfig> {
-
+
public ReportMultiVarGrapheBuilder(CourbesUiController uiController, ViewCourbeManager loiLabelsManager) {
super(uiController, loiLabelsManager);
}
-
-
+
@Override
public List<EGCourbeSimple> getInternCourbes(ReportMultiVarConfig content, ProgressHandle progress) {
if (!reportService.isRunLoaded()) {
@@ -60,6 +59,10 @@
return Collections.emptyList();
}
PropertyNature propertyHorizontal = reportResultProviderService.getPropertyNature(content.getHorizontalVar());
+ //on change de variables horizontales: on oublie les pref.
+ if (propertyHorizontal != axeX.getUserObject()) {
+ content.saveAxeH(null);
+ }
axeX.setTitre(propertyHorizontal.getDisplayName());
axeX.setUniteVisible(true);
axeX.setUnite(propertyHorizontal.getUnite());
@@ -68,20 +71,12 @@
axeX.setSpecificFormat(new CtuluNumberFormatDefault(propertyHorizontal.getFormatter(DecimalFormatEpsilonEnum.PRESENTATION)));
axeX.setSpecificDetailFormat(new CtuluNumberFormatDefault(propertyHorizontal.getFormatter(DecimalFormatEpsilonEnum.COMPARISON)));
axeX.setUserObject(propertyHorizontal);
-// EGCourbe selectedComponent = uiController.getEGGrapheSimpleModel().getSelectedComponent();
-// Object selectedKey = null;
-// if (selectedComponent != null && selectedComponent.getModel() != null) {
-// selectedKey = ((CourbeModelWithKey) selectedComponent.getModel()).getKey();
-// if (ReportVerticalTimeKey.isTimeKey(selectedKey)) {
-// selectedKey = null;
-// }
-// }
Map<String, List<ReportRunKey>> keyByVar = ReportRunVariableHelper.getByEmh(content.getReportRunEmhs());
List<ResultatTimeKey> times = reportService.getRangeSelectedTimeKeys();
List<EGCourbeSimple> courbes = new ArrayList<EGCourbeSimple>();
Map<String, EGAxeVertical> saved = new HashMap<String, EGAxeVertical>();
for (String variableName : content.getVariables()) {
-
+
PropertyNature property = reportResultProviderService.getPropertyNature(variableName);
ReportVariableKey variableKey = reportResultProviderService.createVariableKey(variableName);
EGAxeVertical axeVertical = getOrCreateAxeVerticalConfigured(property, content, saved);
@@ -99,9 +94,6 @@
final EGCourbePersist persist = content.getCourbeconfigs().get(key);
applyPersistConfig(persist, courbe);
courbes.add(courbe);
-// if (selectedKey == null) {
-// selectedKey = key;
-// }
}
}
}
@@ -109,16 +101,16 @@
}
return courbes;
}
-
+
@Override
public void updateResultCurvesAfterTimeChanged(ReportMultiVarConfig content) {
}
-
+
@Override
public List<EGCourbeSimple> getInternCourbesAfterTimeChanged(ReportMultiVarConfig content, ProgressHandle progress) {
return Collections.emptyList();
}
-
+
private LoiConstanteCourbeModel createCourbeModel(ReportMultiVarConfig config, List<ResultatTimeKey> times, ReportRunVariableEmhKey key) {
ReportRunVariableKey hKey = new ReportRunVariableKey(key.getRunVariableKey().getRunKey(), reportResultProviderService.createVariableKey(
config.getHorizontalVar()));
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGGrapheBuilder.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGGrapheBuilder.java 2014-04-02 19:38:44 UTC (rev 8690)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/rptg/ReportRPTGGrapheBuilder.java 2014-04-02 22:21:23 UTC (rev 8691)
@@ -18,6 +18,7 @@
import org.fudaa.dodico.crue.metier.emh.LoiFF;
import org.fudaa.dodico.crue.metier.emh.ResPrtGeo;
import org.fudaa.dodico.crue.metier.helper.LoiHelper;
+import org.fudaa.dodico.crue.projet.otfa.OtfaReportExecutorDelegateRPTG;
import org.fudaa.ebli.courbe.EGAxeVertical;
import org.fudaa.ebli.courbe.EGCourbePersist;
import org.fudaa.ebli.courbe.EGCourbeSimple;
@@ -92,19 +93,6 @@
return courbe;
}
- private LoiFF findLoi(List<LoiFF> lois, String varX, String varY, CrueConfigMetier ccm) {
- for (LoiFF loiFF : lois) {
- ConfigLoi config = ccm.getConfLoi().get(loiFF.getType());
- if (config.getVarAbscisse().getNom().equals(varX) && config.getVarOrdonnee().getNom().equals(varY)) {
- return loiFF;
- } else if (config.getVarAbscisse().getNom().equals(varY) && config.getVarOrdonnee().getNom().equals(varX)) {
- return LoiHelper.switchAbscOrdonnee(loiFF);
- }
- }
- return null;
-
- }
-
@Override
public List<EGCourbeSimple> getInternCourbes(ReportRPTGConfig content, ProgressHandle progress) {
final String varHorizontal = content.getVarHorizontal();
@@ -147,7 +135,7 @@
protected EGCourbeSimple createCourbe(List<LoiFF> lois, ReportRPTGConfig config, final String emhName, final String var1, CrueConfigMetier ccm,
boolean main, Map<String, EGAxeVertical> axesY) {
- LoiFF loi1 = findLoi(lois, config.getVarHorizontal(), var1, ccm);
+ LoiFF loi1 = OtfaReportExecutorDelegateRPTG.findLoi(lois, config.getVarHorizontal(), var1, ccm);
if (loi1 != null) {
PropertyNature property1 = reportResultProviderService.getPropertyNature(var1);
ItemVariable varX = reportResultProviderService.getCcmVariable(config.getVarHorizontal());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-03-25 11:44:10
|
Revision: 8682
http://sourceforge.net/p/fudaa/svn/8682
Author: deniger
Date: 2014-03-25 11:44:06 +0000 (Tue, 25 Mar 2014)
Log Message:
-----------
update des traductions
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheConfigNode.java
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java 2014-03-25 10:33:04 UTC (rev 8681)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheChooserUI.java 2014-03-25 11:44:06 UTC (rev 8682)
@@ -97,15 +97,15 @@
view.getOutline().setRootVisible(false);
List<String> columns = new ArrayList<String>();
columns.add(ReportLongitudinalBrancheConfig.PROP_NAME);
- columns.add(NbBundle.getMessage(ReportLongitudinalBrancheConfig.class, "name.property"));
+ columns.add(NbBundle.getMessage(ReportLongitudinalBrancheChooserUI.class, "name.property"));
columns.add(ReportLongitudinalBrancheConfig.PROP_SENS);
- columns.add(NbBundle.getMessage(ReportLongitudinalBrancheConfig.class, "sens.property"));
+ columns.add(NbBundle.getMessage(ReportLongitudinalBrancheChooserUI.class, "sens.property"));
columns.add(ReportLongitudinalBrancheConfig.PROP_LENGTH);
- columns.add(NbBundle.getMessage(ReportLongitudinalBrancheConfig.class, "length.property"));
+ columns.add(NbBundle.getMessage(ReportLongitudinalBrancheChooserUI.class, "length.property"));
columns.add(ReportLongitudinalBrancheConfig.PROP_DECAL);
- columns.add(NbBundle.getMessage(ReportLongitudinalBrancheConfig.class, "decalXp.property"));
+ columns.add(NbBundle.getMessage(ReportLongitudinalBrancheChooserUI.class, "decalXp.property"));
columns.add(ReportLongitudinalBrancheConfig.PROP_LENGTH_HYD);
- columns.add(NbBundle.getMessage(ReportLongitudinalBrancheConfig.class, "lengthHyd.property"));
+ columns.add(NbBundle.getMessage(ReportLongitudinalBrancheChooserUI.class, "lengthHyd.property"));
view.setPropertyColumns(columns.toArray(new String[columns.size()]));
view.setNodePopupFactory(new CustomNodePopupFactory());
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheConfigNode.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheConfigNode.java 2014-03-25 10:33:04 UTC (rev 8681)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/longitudinal/ReportLongitudinalBrancheConfigNode.java 2014-03-25 11:44:06 UTC (rev 8682)
@@ -111,7 +111,8 @@
protected Sheet createSheet() {
ReportLongitudinalBrancheConfig brancheConfig = getLookup().lookup(ReportLongitudinalBrancheConfig.class);
PropertyNodeBuilder builder = new PropertyNodeBuilder();
- List<PropertySupportReflection> createFromPropertyDesc = builder.createFromPropertyDesc(DecimalFormatEpsilonEnum.PRESENTATION, brancheConfig, this);
+ List<PropertySupportReflection> createFromPropertyDesc = builder.
+ createFromPropertyDesc(DecimalFormatEpsilonEnum.PRESENTATION, brancheConfig, this);
Sheet res = Sheet.createDefault();
Sheet.Set set = Sheet.createPropertiesSet();
res.put(set);
@@ -131,9 +132,11 @@
}
CatEMHBranche branche = (CatEMHBranche) reportService.getRunCourant().getEMH(brancheConfig.getName());
if (branche != null) {
- String value = TransformerEMHHelper.formatFromPropertyName(CrueConfigMetierConstants.PROP_XP, branche.getLength(), reportService.getCcm(), DecimalFormatEpsilonEnum.PRESENTATION);
- String valueDetail = TransformerEMHHelper.formatFromPropertyName(CrueConfigMetierConstants.PROP_XP, branche.getLength(), reportService.getCcm(), DecimalFormatEpsilonEnum.PRESENTATION);
- String displayName = NbBundle.getMessage(ReportLongitudinalBrancheConfig.class, "lengthHyd.property");
+ String value = TransformerEMHHelper.formatFromPropertyName(CrueConfigMetierConstants.PROP_XP, branche.getLength(), reportService.getCcm(),
+ DecimalFormatEpsilonEnum.PRESENTATION);
+ String valueDetail = TransformerEMHHelper.formatFromPropertyName(CrueConfigMetierConstants.PROP_XP, branche.getLength(), reportService.getCcm(),
+ DecimalFormatEpsilonEnum.PRESENTATION);
+ String displayName = NbBundle.getMessage(ReportLongitudinalBrancheConfigNode.class, "lengthHyd.property");
PropertyStringReadOnly lenghtHyd = new PropertyStringReadOnly(value, ReportLongitudinalBrancheConfig.PROP_LENGTH_HYD, displayName, displayName);
lenghtHyd.setShortDescription(valueDetail);
set.put(lenghtHyd);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-03-25 10:33:08
|
Revision: 8681
http://sourceforge.net/p/fudaa/svn/8681
Author: deniger
Date: 2014-03-25 10:33:04 +0000 (Tue, 25 Mar 2014)
Log Message:
-----------
CRUE-639
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/AddFileAction.java
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/AddFileAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/AddFileAction.java 2014-03-25 10:14:51 UTC (rev 8680)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/AddFileAction.java 2014-03-25 10:33:04 UTC (rev 8681)
@@ -77,8 +77,8 @@
return false;
}
- List<File> invalidFiles = new ArrayList<File>();
- List<File> invalidOptrFiles = new ArrayList<File>();
+ List<File> invalidFiles = new ArrayList<>();
+ List<File> invalidOptrFiles = new ArrayList<>();
for (File file : files) {
final String name = file.getName();
@@ -86,7 +86,7 @@
if (!file.isFile() || (type == null) || !ValidationPatternHelper.isFilenameValide(name, type)) {
invalidFiles.add(file);
- } else if (CrueFileType.OPTR.equals(type) && projetService.isOptrAccepted()) {
+ } else if (CrueFileType.OPTR.equals(type) && !projetService.isOptrAccepted()) {
invalidOptrFiles.add(file);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-03-25 10:14:54
|
Revision: 8680
http://sourceforge.net/p/fudaa/svn/8680
Author: deniger
Date: 2014-03-25 10:14:51 +0000 (Tue, 25 Mar 2014)
Log Message:
-----------
maj des tests unitaires
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java
trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/TraceProfilToDonPrtGeoProfilSectionTransformerTest.java
Removed Paths:
-------------
trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point.dbf
trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point.shp
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java 2014-03-25 10:03:32 UTC (rev 8679)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java 2014-03-25 10:14:51 UTC (rev 8680)
@@ -8,7 +8,6 @@
import org.fudaa.ebli.calque.edition.ZCalqueEditable;
import org.fudaa.fudaa.crue.common.services.SysdocUrlBuilder;
import org.fudaa.fudaa.sig.layer.FSigEditor;
-import org.openide.util.HelpCtx;
/**
*
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/TraceProfilToDonPrtGeoProfilSectionTransformerTest.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/TraceProfilToDonPrtGeoProfilSectionTransformerTest.java 2014-03-25 10:03:32 UTC (rev 8679)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/sig/traceprofil/TraceProfilToDonPrtGeoProfilSectionTransformerTest.java 2014-03-25 10:14:51 UTC (rev 8680)
@@ -38,10 +38,10 @@
@BeforeClass
public static void extractFile() throws IOException {
targetDir = CtuluLibFile.createTempDir();
- shapeFile = new File(targetDir, "EMG_Profil_point.shp");
- File dbfFile = new File(targetDir, "EMG_Profil_point.dbf");
- CtuluLibFile.getFileFromJar("/ggcrue/EMG_Profil_point.shp", shapeFile);
- CtuluLibFile.getFileFromJar("/ggcrue/EMG_Profil_point.dbf", dbfFile);
+ shapeFile = new File(targetDir, "EMG_Profil_point_canal_de_fuite.shp");
+ File dbfFile = new File(targetDir, "EMG_Profil_point_canal_de_fuite.dbf");
+ CtuluLibFile.getFileFromJar("/ggcrue/EMG_Profil_point_canal_de_fuite.shp", shapeFile);
+ CtuluLibFile.getFileFromJar("/ggcrue/EMG_Profil_point_canal_de_fuite.dbf", dbfFile);
}
@AfterClass
@@ -57,6 +57,9 @@
assertNotNull(sousModele);
CtuluLogResult<GISZoneCollectionLigneBrisee> loadProfilTrace = SigHelperForTest.loadProfilTrace(shapeFile);
TraceProfilToSectionPreloadProcessor processor = new TraceProfilToSectionPreloadProcessor(scenario);
+ if (loadProfilTrace.getLog().containsErrorOrSevereError()) {
+ loadProfilTrace.getLog().printResume();
+ }
TraceProfilSousModeleContent preload = processor.preload(loadProfilTrace.getResultat(), null, null);
assertEquals(loadProfilTrace.getResultat().getNumGeometries(), preload.traceProfilSousModeles.size());
assertEquals(0, preload.traceProfilPositionByName.get((String) loadProfilTrace.getResultat().getModel(0).getObjectValueAt(0)));
@@ -64,34 +67,4 @@
}
- @Test
- public void testTransform() {
- EMHScenario scenario = ScenarioBuilderForTests.buildDefaultScenario();
- EMHSousModele sousModele = scenario.getModeles().get(0).getSousModeles().get(0);
- assertNotNull(sousModele);
- CtuluLogResult<GISZoneCollectionLigneBrisee> loadProfilTrace = SigHelperForTest.loadProfilTrace(shapeFile);
- TraceProfilToDonPrtGeoProfilSectionTransformer transformer = new TraceProfilToDonPrtGeoProfilSectionTransformer(TestCoeurConfig.INSTANCE.
- getCrueConfigMetier(), sousModele);
- CtuluLogResult<DonPrtGeoProfilSection> donPrtGeoProfilSection = transformer.getDonPrtGeoProfilSection(loadProfilTrace.getResultat(), 0);
- assertFalse(donPrtGeoProfilSection.getLog().containsErrorOrSevereError());
- DonPrtGeoProfilSection resultat = donPrtGeoProfilSection.getResultat();
-
- assertNotNull(resultat);
- assertEquals(46, resultat.getPtProfilSize());
- List<LitNumerote> litNumerote = resultat.getLitNumerote();
- assertEquals(5, litNumerote.size());
- LitNumerote lit = litNumerote.get(2);
- assertNotNull(lit.getFrot());
- //1.08
- assertEquals(1.08, lit.getLimDeb().getXt(), 1e-5);
- assertEquals(114.03, lit.getLimFin().getXt(), 1e-5);
-
- List<DonPrtGeoProfilEtiquette> etiquettes = resultat.getEtiquettes();
- assertEquals(2, etiquettes.size());
- assertEquals(10.93, etiquettes.get(0).getPoint().getXt(), 1e-5);
-
-
-
-
- }
}
\ No newline at end of file
Deleted: trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point.dbf
===================================================================
(Binary files differ)
Deleted: trunk/soft/fudaa-crue/ui-planimetry/src/test/resources/ggcrue/EMG_Profil_point.shp
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-03-25 10:03:35
|
Revision: 8679
http://sourceforge.net/p/fudaa/svn/8679
Author: deniger
Date: 2014-03-25 10:03:32 +0000 (Tue, 25 Mar 2014)
Log Message:
-----------
utilisation du plugin maven de netbeans plus r?\195?\169cent
Modified Paths:
--------------
trunk/soft/fudaa-crue/pom.xml
Modified: trunk/soft/fudaa-crue/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/pom.xml 2014-03-25 09:43:59 UTC (rev 8678)
+++ trunk/soft/fudaa-crue/pom.xml 2014-03-25 10:03:32 UTC (rev 8679)
@@ -346,7 +346,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
- <version>3.8.1</version>
+ <version>3.13</version>
<extensions>true</extensions>
</plugin>
</plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-03-25 09:31:11
|
Revision: 8677
http://sourceforge.net/p/fudaa/svn/8677
Author: deniger
Date: 2014-03-25 09:31:08 +0000 (Tue, 25 Mar 2014)
Log Message:
-----------
maj de la version du pom
Modified Paths:
--------------
trunk/soft/fudaa-mascaret/pom.xml
trunk/soft/fudaa-mascaret/server/pom.xml
trunk/soft/fudaa-mascaret/ui/pom.xml
trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/soft/fudaa-mascaret/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/pom.xml 2014-03-20 16:21:22 UTC (rev 8676)
+++ trunk/soft/fudaa-mascaret/pom.xml 2014-03-25 09:31:08 UTC (rev 8677)
@@ -11,11 +11,11 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>soft-pom</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</parent>
<groupId>org.fudaa.soft.fudaa-mascaret</groupId>
<artifactId>fudaa-mascaret</artifactId>
- <version>3.2.1</version>
+ <version>3.2.3-SNAPSHOT</version>
<name>Fudaa-Mascaret</name>
<packaging>pom</packaging>
<modules>
Modified: trunk/soft/fudaa-mascaret/server/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/server/pom.xml 2014-03-20 16:21:22 UTC (rev 8676)
+++ trunk/soft/fudaa-mascaret/server/pom.xml 2014-03-25 09:31:08 UTC (rev 8677)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-mascaret</groupId>
<artifactId>fudaa-mascaret</artifactId>
- <version>3.2.1</version>
+ <version>3.2.3-SNAPSHOT</version>
</parent>
<artifactId>mascaret-server</artifactId>
<build>
Modified: trunk/soft/fudaa-mascaret/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/ui/pom.xml 2014-03-20 16:21:22 UTC (rev 8676)
+++ trunk/soft/fudaa-mascaret/ui/pom.xml 2014-03-25 09:31:08 UTC (rev 8677)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-mascaret</groupId>
<artifactId>fudaa-mascaret</artifactId>
- <version>3.2.1</version>
+ <version>3.2.3-SNAPSHOT</version>
</parent>
<artifactId>mascaret-ui</artifactId>
<build>
Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-03-20 16:21:22 UTC (rev 8676)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2014-03-25 09:31:08 UTC (rev 8677)
@@ -283,7 +283,7 @@
getApp().removeAction("VISIBLE_LEFTCOLUMN");
setEnableMenu();
assistant_ = new BuAssistant();
- assistant_.setLog(false);
+ //assistant_.setLog(false);
MascaretResource.ASSISTANT = assistant_;
Hydraulique1dResource.setAssistant(assistant_);
BuMainPanel mp = getApp().getMainPanel();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-03-19 18:13:26
|
Revision: 8673
http://sourceforge.net/p/fudaa/svn/8673
Author: deniger
Date: 2014-03-19 18:13:23 +0000 (Wed, 19 Mar 2014)
Log Message:
-----------
simplification du NodePopupFactory pour utilise le TopComponent comportant l'OutlineView
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-application/pom.xml
Modified: trunk/soft/fudaa-crue/ui-application/pom.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-application/pom.xml 2014-03-18 23:14:50 UTC (rev 8672)
+++ trunk/soft/fudaa-crue/ui-application/pom.xml 2014-03-19 18:13:23 UTC (rev 8673)
@@ -184,10 +184,6 @@
<os>
<family>Windows</family>
</os>
-
- <file>
- <exists>${basedir}/src/main/resources/installer/ReplaceVistaIcon.exe</exists>
- </file>
</activation>
<build>
<plugins>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 8672
http://sourceforge.net/p/fudaa/svn/8672
Author: deniger
Date: 2014-03-18 23:14:50 +0000 (Tue, 18 Mar 2014)
Log Message:
-----------
simplification du NodePopupFactory pour utilise le TopComponent comportant l'OutlineView
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java 2014-03-18 23:09:43 UTC (rev 8671)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/AbstractModellingListEditionTopComponent.java 2014-03-18 23:14:50 UTC (rev 8672)
@@ -1,11 +1,7 @@
package org.fudaa.fudaa.crue.modelling.list;
-import java.awt.Rectangle;
-import java.awt.dnd.Autoscroll;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionAdapter;
-import java.awt.event.MouseMotionListener;
import java.util.List;
import org.apache.commons.lang.ArrayUtils;
import org.fudaa.dodico.crue.metier.emh.EMH;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-03-18 23:09:46
|
Revision: 8671
http://sourceforge.net/p/fudaa/svn/8671
Author: deniger
Date: 2014-03-18 23:09:43 +0000 (Tue, 18 Mar 2014)
Log Message:
-----------
simplification du NodePopupFactory pour utilise le TopComponent comportant l'OutlineView
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListNodePopupFactory.java
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListNodePopupFactory.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListNodePopupFactory.java 2014-03-18 23:08:46 UTC (rev 8670)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListNodePopupFactory.java 2014-03-18 23:09:43 UTC (rev 8671)
@@ -15,7 +15,6 @@
import org.fudaa.dodico.crue.metier.emh.EMHSectionProfil;
import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
import org.fudaa.fudaa.crue.common.node.NodeHelper;
-import org.fudaa.fudaa.crue.modelling.AbstractModellingTopComponent;
import org.fudaa.fudaa.crue.modelling.ModellingTopComponentWithSpecificAction;
import org.fudaa.fudaa.crue.modelling.emh.ModellingOpenEMHNodeAction;
import org.fudaa.fudaa.crue.modelling.loi.ProfilSectionOpenOnSelectedSectionNodeAction;
@@ -29,7 +28,7 @@
*/
public class ListNodePopupFactory extends NodePopupFactory {
- AbstractModellingTopComponent topComponent;
+ AbstractModellingListEditionTopComponent topComponent;
public ListNodePopupFactory(AbstractModellingListEditionTopComponent topComponent) {
this.topComponent = topComponent;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-03-18 23:08:51
|
Revision: 8670
http://sourceforge.net/p/fudaa/svn/8670
Author: deniger
Date: 2014-03-18 23:08:46 +0000 (Tue, 18 Mar 2014)
Log Message:
-----------
simplification du NodePopupFactory pour utilise le TopComponent comportant l'OutlineView
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListNodePopupFactory.java
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListNodePopupFactory.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListNodePopupFactory.java 2014-03-18 12:09:51 UTC (rev 8669)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/ListNodePopupFactory.java 2014-03-18 23:08:46 UTC (rev 8670)
@@ -31,7 +31,7 @@
AbstractModellingTopComponent topComponent;
- public ListNodePopupFactory(AbstractModellingTopComponent topComponent) {
+ public ListNodePopupFactory(AbstractModellingListEditionTopComponent topComponent) {
this.topComponent = topComponent;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 8664
http://sourceforge.net/p/fudaa/svn/8664
Author: deniger
Date: 2014-03-10 20:54:37 +0000 (Mon, 10 Mar 2014)
Log Message:
-----------
modification pour l'export CSV depuis OTFA
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java 2014-03-10 20:48:38 UTC (rev 8663)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java 2014-03-10 20:54:37 UTC (rev 8664)
@@ -23,6 +23,7 @@
import org.fudaa.ebli.commun.EbliActionPaletteAbstract;
import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.geometrie.GrBoite;
+import org.fudaa.ebli.repere.BControleRepereTexte;
import org.fudaa.ebli.ressource.EbliResource;
import org.fudaa.fudaa.crue.common.PerspectiveEnum;
import org.fudaa.fudaa.crue.common.action.ExportImageAction;
@@ -239,6 +240,25 @@
jc.setEnabled(editable);
}
+ @Override
+ protected EbliActionInterface createRepereAction() {
+ final EbliActionPaletteAbstract plAction = new EbliActionPaletteAbstract(EbliLib.getS("Repère"),
+ EbliResource.EBLI.getIcon("repere"),
+ "CHANGE_REFERENCE") {
+ @Override
+ public JComponent buildContentPane() {
+ final BControleRepereTexte crt = new BControleRepereTexte(pn_.getVueCalque());
+ crt.addRepereEventListener(pn_.getVueCalque());
+ SysdocUrlBuilder.installHelpShortcut(crt, "testRepereAction");
+ return crt;
+ }
+ };
+ plAction.setParent(pn_);
+ plAction.putValue(Action.SHORT_DESCRIPTION, EbliLib.getS("Transformations du repère"));
+ return plAction;
+ }
+
+
public void addEditAction(Action action) {
final String name = (String) action.getValue(Action.ACTION_COMMAND_KEY);
assert name != null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-03-10 20:48:40
|
Revision: 8663
http://sourceforge.net/p/fudaa/svn/8663
Author: deniger
Date: 2014-03-10 20:48:38 +0000 (Mon, 10 Mar 2014)
Log Message:
-----------
modification pour l'export CSV depuis OTFA
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ExportImageAction.java
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ExportImageAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ExportImageAction.java 2014-03-10 20:38:36 UTC (rev 8662)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/action/ExportImageAction.java 2014-03-10 20:48:38 UTC (rev 8663)
@@ -5,11 +5,15 @@
import com.memoire.bu.BuResource;
import java.awt.event.ActionEvent;
+import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibImage;
+import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.image.CtuluImageExport;
+import org.fudaa.ctulu.image.CtuluImageExportPanel;
import org.fudaa.ctulu.image.CtuluImageProducer;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.fudaa.crue.common.helper.CtuluUIForNetbeans;
+import org.fudaa.fudaa.crue.common.services.SysdocUrlBuilder;
import org.openide.util.NbBundle;
/**
@@ -21,13 +25,18 @@
private final CtuluImageProducer imageProducer;
public ExportImageAction(CtuluImageProducer producer) {
- super(NbBundle.getMessage(ExportImageAction.class, "ExportImageAction.DisplayName"), BuResource.BU.getIcon("photographie"), CtuluLibImage.SNAPSHOT_COMMAND);
+ super(NbBundle.getMessage(ExportImageAction.class, "ExportImageAction.DisplayName"), BuResource.BU.getIcon("photographie"),
+ CtuluLibImage.SNAPSHOT_COMMAND);
this.imageProducer = producer;
setDefaultToolTip(NbBundle.getMessage(ExportImageAction.class, "ExportImageAction.Tooltip"));
}
@Override
public void actionPerformed(ActionEvent _e) {
- CtuluImageExport.exportImageFor(CtuluUIForNetbeans.DEFAULT, imageProducer);
+ CtuluUI ui = CtuluUIForNetbeans.DEFAULT;
+ CtuluImageExportPanel panel = new CtuluImageExportPanel(imageProducer, ui);
+ SysdocUrlBuilder.installHelpShortcut(panel, "testExportImage");
+ panel.afficheModale(ui.getParentComponent(), CtuluLib
+ .getS("Enregistrement image"));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|