Menu
▾
▴
fudaa-svn-commit — svn commit with diffs
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(46) |
Jul
(37) |
Aug
(154) |
Sep
(140) |
Oct
(132) |
Nov
(104) |
Dec
(67) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(113) |
Feb
(73) |
Mar
(102) |
Apr
(106) |
May
(114) |
Jun
(67) |
Jul
(116) |
Aug
(48) |
Sep
(108) |
Oct
(296) |
Nov
(56) |
Dec
(53) |
| 2010 |
Jan
(95) |
Feb
(31) |
Mar
(40) |
Apr
(12) |
May
(10) |
Jun
(27) |
Jul
(19) |
Aug
(81) |
Sep
(48) |
Oct
(45) |
Nov
(40) |
Dec
(7) |
| 2011 |
Jan
(16) |
Feb
(32) |
Mar
(55) |
Apr
(38) |
May
(24) |
Jun
(37) |
Jul
(12) |
Aug
(16) |
Sep
(97) |
Oct
(90) |
Nov
(101) |
Dec
(89) |
| 2012 |
Jan
(18) |
Feb
(2) |
Mar
(54) |
Apr
(69) |
May
(97) |
Jun
(131) |
Jul
(70) |
Aug
(48) |
Sep
(48) |
Oct
(119) |
Nov
(194) |
Dec
(60) |
| 2013 |
Jan
(73) |
Feb
(35) |
Mar
(42) |
Apr
(28) |
May
(7) |
Jun
(17) |
Jul
(27) |
Aug
(10) |
Sep
(38) |
Oct
(12) |
Nov
(4) |
Dec
(16) |
| 2014 |
Jan
(33) |
Feb
(37) |
Mar
(19) |
Apr
(3) |
May
(47) |
Jun
(26) |
Jul
(22) |
Aug
|
Sep
(10) |
Oct
(30) |
Nov
(24) |
Dec
(19) |
| 2015 |
Jan
(13) |
Feb
(16) |
Mar
(36) |
Apr
(19) |
May
(5) |
Jun
(5) |
Jul
(3) |
Aug
(11) |
Sep
(22) |
Oct
(7) |
Nov
(14) |
Dec
|
| 2016 |
Jan
|
Feb
(26) |
Mar
(13) |
Apr
(61) |
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
(27) |
Nov
(14) |
Dec
(21) |
| 2017 |
Jan
(30) |
Feb
(4) |
Mar
(3) |
Apr
(5) |
May
(69) |
Jun
(29) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <had...@us...> - 2008-08-11 14:17:45
|
Revision: 3760
http://fudaa.svn.sourceforge.net/fudaa/?rev=3760&view=rev
Author: hadouxad
Date: 2008-08-11 14:17:51 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
- ajout etat supplementaire poru le jtree: si la widget est masquee, affiche icone differente
- Mise en place de l editor du graphe
- Mise en place de l editor du calque
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-11 14:17:07 UTC (rev 3759)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-11 14:17:51 UTC (rev 3760)
@@ -354,10 +354,12 @@
bar.add(new EbliWidgetActionBackGround(scene));
-//
-//boxEast.add(new ZEbliCalquesPanel());
-
-
+/*
+JFrame frame2=new JFrame();
+frame2.getContentPane().add(new EGFillePanel(g));
+frame2.setSize(500,500);
+frame2.setVisible(true);
+*/
p.doLayout();
}
}
\ 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: <had...@us...> - 2008-08-11 14:17:05
|
Revision: 3759
http://fudaa.svn.sourceforge.net/fudaa/?rev=3759&view=rev
Author: hadouxad
Date: 2008-08-11 14:17:07 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
- ajout etat supplementaire poru le jtree: si la widget est masquee, affiche icone differente
- Mise en place de l editor du graphe
- Mise en place de l editor du calque
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxPanel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java 2008-08-11 13:07:36 UTC (rev 3758)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java 2008-08-11 14:17:07 UTC (rev 3759)
@@ -7,6 +7,7 @@
import org.fudaa.ebli.trace.TraceLigne;
import org.fudaa.ebli.visuallibrary.layout.OverlayLayoutGap;
import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.InplaceEditorProvider;
import org.netbeans.api.visual.action.TextFieldInplaceEditor;
import org.netbeans.api.visual.action.WidgetAction;
import org.netbeans.api.visual.widget.LabelWidget;
@@ -55,6 +56,8 @@
WidgetAction editorAction = ActionFactory
.createInplaceEditorAction(this);
+
+
// -- ajout de l action au label correspondant --//
intern.getActions().addAction(editorAction);
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2008-08-11 13:07:36 UTC (rev 3758)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2008-08-11 14:17:07 UTC (rev 3759)
@@ -1,17 +1,31 @@
package org.fudaa.ebli.visuallibrary.calque;
import java.awt.Dimension;
+import java.awt.FlowLayout;
import java.awt.Graphics2D;
import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.util.Collections;
+import java.util.EnumSet;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.ZEbliCalquesPanel;
import org.fudaa.ebli.visuallibrary.EbliScene;
import org.fudaa.ebli.visuallibrary.EbliWidget;
+import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.InplaceEditorProvider;
+import org.netbeans.api.visual.action.WidgetAction;
+import org.netbeans.api.visual.widget.Widget;
-public class EbliWidgetVueCalque extends EbliWidget {
+import com.memoire.bu.BuButton;
+import com.memoire.bu.BuPanel;
+public class EbliWidgetVueCalque extends EbliWidget implements InplaceEditorProvider<BuPanel>{
+
ZEbliCalquesPanel vue_;
public EbliWidgetVueCalque(EbliScene scene, ZEbliCalquesPanel vue) {
@@ -19,6 +33,13 @@
vue_ = vue;
setPreferredSize(new Dimension(200, 200));
setMinimumSize(new Dimension(200, 200));
+
+ //-- creation de l action pour editor --//
+ WidgetAction editorAction = ActionFactory.createInplaceEditorAction(this);
+
+ // -- ajout de l action au widget correspondant --//
+ this.getActions().addAction(editorAction);
+
}
@Override
@@ -40,4 +61,67 @@
g.translate(-rec.x, -rec.y);
}
+
+ //-- methodes implements InplaceEditorProvider --//
+
+ /**
+ * Methode appeleee pour creer un editor correspondant
+ */
+public BuPanel createEditorComponent(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget) {
+ // TODO Auto-generated method stub
+
+
+
+ final BuPanel panelTest=new BuPanel(new FlowLayout(FlowLayout.CENTER));
+ panelTest.add(new JLabel("test panel"));
+ BuButton boutonTest =new BuButton("bouton cool");
+ boutonTest.addActionListener(new ActionListener(){
+
+ public void actionPerformed(ActionEvent e) {
+ // TODO Auto-generated method stub
+ panelTest.add(new JLabel("bouton appuy\xE9"));
+ panelTest.validate();
+ JFrame frameTruc=new JFrame();
+ frameTruc.getContentPane().add(new JLabel("bouton appuy\xE9"));
+ frameTruc.setSize(200,200);
+ frameTruc.setVisible(true);
+ }
+
+ });
+ panelTest.add(boutonTest);
+
+
+ return panelTest;
}
+
+public EnumSet<org.netbeans.api.visual.action.InplaceEditorProvider.ExpansionDirection> getExpansionDirections(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, BuPanel editor) {
+ // TODO Auto-generated method stub
+ return null;
+}
+
+public Rectangle getInitialEditorComponentBounds(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, BuPanel editor, Rectangle viewBounds) {
+ // TODO Auto-generated method stub
+ return null;
+}
+
+public void notifyClosing(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, BuPanel editor, boolean commit) {
+ // TODO Auto-generated method stub
+
+}
+
+public void notifyOpened(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, BuPanel editor) {
+ // TODO Auto-generated method stub
+
+}
+
+}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java 2008-08-11 13:07:36 UTC (rev 3758)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java 2008-08-11 14:17:07 UTC (rev 3759)
@@ -5,13 +5,19 @@
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.util.EnumSet;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
import javax.swing.JMenuItem;
+import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import org.fudaa.ctulu.CtuluResource;
import org.fudaa.ebli.courbe.EGAxe;
import org.fudaa.ebli.courbe.EGConfigureActionPalette;
+import org.fudaa.ebli.courbe.EGFillePanel;
import org.fudaa.ebli.courbe.EGGraphe;
import org.fudaa.ebli.courbe.EGGrapheModelListener;
import org.fudaa.ebli.courbe.EGObject;
@@ -19,11 +25,17 @@
import org.fudaa.ebli.visuallibrary.EbliScene;
import org.fudaa.ebli.visuallibrary.EbliWidget;
import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.InplaceEditorProvider;
import org.netbeans.api.visual.action.PopupMenuProvider;
+import org.netbeans.api.visual.action.WidgetAction;
import org.netbeans.api.visual.laf.LookFeel;
import org.netbeans.api.visual.model.ObjectState;
import org.netbeans.api.visual.widget.Widget;
+import sun.security.krb5.internal.PAEncTSEnc;
+
+import com.memoire.bu.BuButton;
+import com.memoire.bu.BuPanel;
import com.sun.org.apache.xerces.internal.impl.xs.opti.DefaultNode;
@@ -32,7 +44,7 @@
* @author adrien hadoux
*
*/
-public class EbliWidgetGraphe extends EbliWidget{
+public class EbliWidgetGraphe extends EbliWidget implements InplaceEditorProvider<BuPanel>{
private EGGraphe graphe;
private EbliNodeDefault nodeLegende=null;
@@ -51,6 +63,12 @@
setGraphe(_graphe);
+ //-- creation de l action pour editor --//
+ WidgetAction editorAction = ActionFactory.createInplaceEditorAction(this);
+
+ // -- ajout de l action au widget correspondant --//
+ this.getActions().addAction(editorAction);
+
}
@@ -137,5 +155,59 @@
}
+
+ //-- methodes implements InplaceEditorProvider --//
+
+ /**
+ * Methode appeleee pour creer un editor EGFillePanel correspondant a la vue
+ */
+ public /*EGFillePanel*/ BuPanel createEditorComponent(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget) {
+
+ //-- creation du menu d'actions--//
+ final JMenu menu = new JMenu();
+ menu.setName("menu du graphe");
+ menu.setText("menu du graphe");
+ // creation du panel Egfille correspondant
+ EGFillePanel panelGraphe=new EGFillePanel(this.graphe);
+
+ //--remplissage du menu --//
+ panelGraphe.fillSpecificMenu(menu);
+
+ //FIXME : comment construire le Jmenu principal ainsi que le tree qui qffiche les courbes ???
+
+
+ return panelGraphe;
+ }
+
+ public EnumSet<org.netbeans.api.visual.action.InplaceEditorProvider.ExpansionDirection> getExpansionDirections(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, /*EGFillePanel*/BuPanel editor) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Rectangle getInitialEditorComponentBounds(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, /*EGFillePanel*/BuPanel editor, Rectangle viewBounds) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void notifyClosing(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, /*EGFillePanel*/BuPanel editor, boolean commit) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void notifyOpened(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, /*EGFillePanel*/BuPanel editor) {
+ // TODO Auto-generated method stub
+
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java 2008-08-11 13:07:36 UTC (rev 3758)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java 2008-08-11 14:17:07 UTC (rev 3759)
@@ -90,6 +90,14 @@
// -- on rend visible la widget en fonction de la checkbox
node.getCreator().getWidget().setVisible((((EbliCheckBoxPanel) editor).checkBox).isSelected());
node.getCreator().getWidget().getEbliScene().refresh();
+
+ //-- mise a jour de l icone --//
+ if(((EbliCheckBoxPanel) editor).checkBox.isSelected())
+ ((EbliCheckBoxPanel) editor).labelRenderer.setIcon(renderer.iconLeafEnabled);
+
+ else
+ ((EbliCheckBoxPanel) editor).labelRenderer.setIcon(renderer.iconLeafDisabled);
+
}
});
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxPanel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxPanel.java 2008-08-11 13:07:36 UTC (rev 3758)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxPanel.java 2008-08-11 14:17:07 UTC (rev 3759)
@@ -29,6 +29,8 @@
add(checkBox);
}
setOpaque(false);
+
+
}
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java 2008-08-11 13:07:36 UTC (rev 3758)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java 2008-08-11 14:17:07 UTC (rev 3759)
@@ -32,13 +32,13 @@
Color selectionBorderColor, selectionForeground, selectionBackground, textForeground, textBackground;
- private Icon iconLeafEnabled=CtuluResource.CTULU.getIcon("crystal22_previsualiser");
- // private Icon iconLeafDisabled=CtuluResource.CTULU.getIcon("crystal22_previsualiser");
+ public Icon iconLeafEnabled=CtuluResource.CTULU.getIcon("crystal22_previsualiser");
+ public Icon iconLeafDisabled=CtuluResource.CTULU.getIcon("crystal22_cacher");
- private Icon iconSubDirectorie=CtuluResource.CTULU.getIcon("reouvrir_26");
+ public Icon iconSubDirectorie=CtuluResource.CTULU.getIcon("reouvrir_26");
- private Icon iconRoot=CtuluResource.CTULU.getIcon("maison_32");
+ public Icon iconRoot=CtuluResource.CTULU.getIcon("maison_32");
protected EbliCheckBoxPanel getLeafRenderer() {
@@ -91,7 +91,12 @@
returnValue.setText(node.getTitle());
returnValue.setSelected(node.getCreator().getWidget().isVisible());
- returnLabel=new BuLabel(this.iconLeafEnabled);
+
+ returnLabel=new BuLabel(this.iconLeafEnabled);
+
+
+
+ returnLabel.setEnabled(node.getCreator().getWidget().isVisible());
}
} /*else if (!leaf && !((DefaultMutableTreeNode) value).isRoot()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2008-08-11 13:07:51
|
Revision: 3758
http://fudaa.svn.sourceforge.net/fudaa/?rev=3758&view=rev
Author: hadouxad
Date: 2008-08-11 13:07:36 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
Modification du jtree pour prendre en compte les icons sur 3 niveaux differents
- root
- subdirectories
- leaf
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetFleche.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java
branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxPanel.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetFleche.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetFleche.java 2008-08-11 10:05:42 UTC (rev 3757)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetFleche.java 2008-08-11 13:07:36 UTC (rev 3758)
@@ -10,6 +10,7 @@
import java.awt.Point;
import java.awt.Polygon;
import java.awt.Rectangle;
+import java.awt.Shape;
import java.awt.geom.GeneralPath;
import java.util.ArrayList;
@@ -51,8 +52,8 @@
public static int ORIENTATION_EAST=2;
public static int ORIENTATION_WEST=3;
+ public Color couleurFleche=Color.black;
-
/**
* @param _scene
*/
@@ -90,14 +91,14 @@
l.setEpaisseur(largeurBorder);
-
+ l.setCouleur(couleurFleche);
//FIXME prob fleche pas tres jolie
l.dessineFleche(g,(int)( l.getEpaisseur() / 2),(int)( rec.height/2), (int)(rec.width-l.getEpaisseur()/2), (int)(rec.height/2));
+ /*Shape shape;
+ l.dessineShape(g, shape);
+ */
-
-
-
g.translate(-rec.x, -rec.y);
@@ -105,6 +106,20 @@
}
+
+
+
+ public Color getCouleurFleche() {
+ return couleurFleche;
+ }
+
+
+
+
+ public void setCouleurFleche(Color couleurFleche) {
+ this.couleurFleche = couleurFleche;
+ }
+
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java 2008-08-11 10:05:42 UTC (rev 3757)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java 2008-08-11 13:07:36 UTC (rev 3758)
@@ -136,7 +136,7 @@
//-- recuperation de la liste des widgets selectionnees --//
- Set<EbliNode> listeNode = (Set<EbliNode>) scene_.getNodes();
+ Set<EbliNode> listeNode = (Set<EbliNode>) scene_.getSelectedObjects();//scene_.getNodes();
//-- parcours des nodes
for(Iterator<EbliNode> it=listeNode.iterator();it.hasNext();){
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java 2008-08-11 10:05:42 UTC (rev 3757)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java 2008-08-11 13:07:36 UTC (rev 3758)
@@ -40,7 +40,7 @@
}
public Object getCellEditorValue() {
- JCheckBox checkbox = renderer.getLeafRenderer();
+ BuCheckBox checkbox = renderer.getLeafRenderer().checkBox;
// EbliNodeDefault checkBoxNode = new CheckBoxNode(checkbox.getText(),
// checkbox.isSelected());
@@ -73,7 +73,7 @@
// -- recuperation de l instance defaultnode
Object userObject = ((DefaultMutableTreeNode) value).getUserObject();
- if (userObject instanceof EbliNode && editor instanceof JCheckBox) {
+ if (userObject instanceof EbliNode && editor instanceof EbliCheckBoxPanel) {
final EbliNodeDefault node = (EbliNodeDefault) (((DefaultMutableTreeNode) value).getUserObject());
// -- suppression des anciens listeners --//
@@ -81,15 +81,21 @@
// ajoute le listener au checkbox pour afficher la widget en fonction de
// son click
- ((JCheckBox) editor).addActionListener(new ActionListener() {
+ if(((EbliCheckBoxPanel) editor).checkBox !=null){
+
+ System.err.println("checkbox ok poru le node: " + node.getTitle());
+ ((EbliCheckBoxPanel) editor).checkBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent event) {
-
+
// -- on rend visible la widget en fonction de la checkbox
- node.getCreator().getWidget().setVisible(((JCheckBox) editor).isSelected());
+ node.getCreator().getWidget().setVisible((((EbliCheckBoxPanel) editor).checkBox).isSelected());
node.getCreator().getWidget().getEbliScene().refresh();
}
});
+ }else{
+ System.err.println("checkbox FALSE poru le node: " + node.getTitle());
+ }
}
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxPanel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxPanel.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxPanel.java 2008-08-11 13:07:36 UTC (rev 3758)
@@ -0,0 +1,34 @@
+package org.fudaa.ebli.visuallibrary.tree;
+
+import com.memoire.bu.BuCheckBox;
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuPanel;
+
+/**
+ * Panel de renderer pour le tree
+ * @author genesis
+ *
+ */
+public class EbliCheckBoxPanel extends BuPanel{
+
+
+ private static final long serialVersionUID = -608817114677578183L;
+ BuCheckBox checkBox;
+ BuLabel labelRenderer;
+ public EbliCheckBoxPanel(){
+ setOpaque(false);
+ }
+
+ public void construct(){
+ if(labelRenderer !=null){
+ labelRenderer.setOpaque(false);
+ add(labelRenderer);
+ }
+ if(checkBox !=null){
+ checkBox.setOpaque(false);
+ add(checkBox);
+ }
+ setOpaque(false);
+ }
+
+}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java 2008-08-11 10:05:42 UTC (rev 3757)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java 2008-08-11 13:07:36 UTC (rev 3758)
@@ -4,26 +4,44 @@
import java.awt.Component;
import java.awt.Font;
+import javax.swing.Icon;
import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
import javax.swing.JTree;
import javax.swing.UIManager;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.TreeCellRenderer;
+import org.fudaa.ctulu.CtuluResource;
import org.fudaa.ebli.visuallibrary.EbliNode;
import org.fudaa.ebli.visuallibrary.EbliNodeDefault;
+import com.memoire.bu.BuCheckBox;
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuPanel;
import com.sun.org.apache.xerces.internal.impl.xs.opti.DefaultNode;
public class EbliCheckBoxTreeRenderer implements TreeCellRenderer {
- private JCheckBox leafRenderer = new JCheckBox();
+
+ //-- panel renderer --//
+ private EbliCheckBoxPanel leafRenderer = new EbliCheckBoxPanel();
private DefaultTreeCellRenderer nonLeafRenderer = new DefaultTreeCellRenderer();
Color selectionBorderColor, selectionForeground, selectionBackground, textForeground, textBackground;
- protected JCheckBox getLeafRenderer() {
+ private Icon iconLeafEnabled=CtuluResource.CTULU.getIcon("crystal22_previsualiser");
+ // private Icon iconLeafDisabled=CtuluResource.CTULU.getIcon("crystal22_previsualiser");
+
+ private Icon iconSubDirectorie=CtuluResource.CTULU.getIcon("reouvrir_26");
+
+
+ private Icon iconRoot=CtuluResource.CTULU.getIcon("maison_32");
+
+
+ protected EbliCheckBoxPanel getLeafRenderer() {
return leafRenderer;
}
@@ -41,12 +59,18 @@
* selectionBackground = UIManager.getColor("Tree.selectionBackground");
* textForeground = UIManager.getColor("Tree.textForeground");
* textBackground = UIManager.getColor("Tree.textBackground");
- */}
+ */
+
+
+
+ }
public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded,
boolean leaf, int row, boolean hasFocus) {
- Component returnValue;
+
+ BuLabel returnLabel = null;
+ BuCheckBox returnValue = null;
// cas particulier renderer: on met un checkbox que si on est feuille et pqs root (= cqs ou lqyer depourvu d objet graphique)
if (leaf && !((DefaultMutableTreeNode) value).isRoot()) {
@@ -57,35 +81,47 @@
if (userObject instanceof EbliNode) {
node = (EbliNodeDefault) (((DefaultMutableTreeNode) value).getUserObject());
- System.err.println("PS EbliNode!!! ROW: " + row);
+ //System.err.println("c est un EbliNode!!! ROW: " + row);
// -- creation d'une nouvelle checkbox aui sera ainsi unique pour chaque
// composant
- leafRenderer = new JCheckBox();
- leafRenderer.setOpaque(false);
+ returnValue=new BuCheckBox();
+ //leafRenderer.setOpaque(false);
- leafRenderer.setText(node.getTitle());
- leafRenderer.setSelected(node.getCreator().getWidget().isVisible());
- } else {
- System.err.println("TROP NULLLLLLLLLLLLLLLLLLL!!!");
- }
- // qccessible en fonction du tree
- leafRenderer.setEnabled(tree.isEnabled());
-
- /*
- * // foreground si selectionne ou non if (leafRenderer.isSelected()) {
- * leafRenderer.setForeground(selectionForeground);
- * leafRenderer.setBackground(selectionBackground); } else {
- * leafRenderer.setForeground(textForeground);
- * leafRenderer.setBackground(textBackground); }
- */
-
- returnValue = leafRenderer;
-
- } else {
+ returnValue.setText(node.getTitle());
+ returnValue.setSelected(node.getCreator().getWidget().isVisible());
+
+ returnLabel=new BuLabel(this.iconLeafEnabled);
+ }
+
+ } /*else if (!leaf && !((DefaultMutableTreeNode) value).isRoot()) {
+
+ returnLabel=new BuLabel(this.iconSubDirectorie);
returnValue = nonLeafRenderer.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
+
+ }*/else {
+ returnLabel=new BuLabel(((DefaultMutableTreeNode) value).toString(),this.iconRoot);
+ //returnValue = nonLeafRenderer.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
+
}
- return returnValue;
+
+
+ //-- creation du panel avec les informations --//
+ leafRenderer=new EbliCheckBoxPanel();
+
+ if(returnLabel!=null)
+ leafRenderer.labelRenderer=returnLabel;
+
+ if(returnValue!=null )
+ leafRenderer.checkBox=returnValue;
+
+ //-- construction du composant --//
+ leafRenderer.construct();
+
+ // qccessible en fonction du tree
+ leafRenderer.setEnabled(tree.isEnabled());
+
+ return leafRenderer;
}
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-11 10:05:42 UTC (rev 3757)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-11 13:07:36 UTC (rev 3758)
@@ -43,6 +43,7 @@
import org.fudaa.ebli.courbe.EGGraphe;
import org.fudaa.ebli.courbe.EGGrapheTreeModel;
import org.fudaa.ebli.courbe.EGGroup;
+import org.fudaa.ebli.courbe.EGTableGraphePanel;
import org.fudaa.ebli.trace.TraceLigne;
import org.fudaa.ebli.trace.TraceLigneModel;
import org.fudaa.ebli.visuallibrary.EbliNode;
@@ -353,7 +354,10 @@
bar.add(new EbliWidgetActionBackGround(scene));
+//
+//boxEast.add(new ZEbliCalquesPanel());
+
p.doLayout();
}
}
\ 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: <had...@us...> - 2008-08-11 10:05:42
|
Revision: 3757
http://fudaa.svn.sourceforge.net/fudaa/?rev=3757&view=rev
Author: hadouxad
Date: 2008-08-11 10:05:42 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
Ajout des fonctionnalites de
- Action de duplication de la totalite des widgets selectionnees
- Action de premier plan de la totalite des widgets selectionnee
- Action de arriere plan de la totalite des widgets selectionnees
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBackGround.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionDuplicate.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionForeGround.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-11 08:09:27 UTC (rev 3756)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-11 10:05:42 UTC (rev 3757)
@@ -67,11 +67,7 @@
public void actionPerformed(ActionEvent e) {
- // position a cote de l element initial
- Point nouvellePosition = new Point(
- (int) (EbliWidget.this.getLocation().x + EbliWidget.this.getClientArea().width / 2), (int) (EbliWidget.this
- .getLocation().y + EbliWidget.this.getClientArea().height / 2));
-
+
//-- recuperation du node a dupliquer --//
EbliNode n = (EbliNode) EbliWidget.this.getEbliScene().findObject(EbliWidget.this);
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBackGround.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBackGround.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBackGround.java 2008-08-11 10:05:42 UTC (rev 3757)
@@ -0,0 +1,72 @@
+package org.fudaa.ebli.visuallibrary.actions;
+
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.swing.AbstractAction;
+
+import org.fudaa.ebli.visuallibrary.EbliNode;
+import org.fudaa.ebli.visuallibrary.EbliScene;
+
+/**
+ * classe qui permet de placer les widgets selectionnes en arriere plan.
+ * @author genesis
+ *
+ */
+public class EbliWidgetActionBackGround extends AbstractAction{
+
+ EbliScene scene_;
+
+ public EbliWidgetActionBackGround(EbliScene _scene){
+ scene_=_scene;
+ putValue(NAME,"Arri\xE8re plan");
+ }
+
+ private static final long serialVersionUID = 1L;
+
+ public void actionPerformed(ActionEvent e) {
+ // TODO Auto-generated method stub
+
+
+ //-- recuperation de la liste des nodes de la scene --//
+ Set<EbliNode> listeNode = (Set<EbliNode>) scene_.getNodes();
+
+ //-- parcours des nodes
+ for(Iterator<EbliNode> it=listeNode.iterator();it.hasNext();){
+
+ EbliNode currentNode=it.next();
+ if(currentNode!=null && currentNode.isMovable()){
+
+ //-- deplacement a l arriere plan que si la widget est selectionnee --//
+ if(currentNode.getCreator().getWidget().getState().isSelected()){
+
+
+ //-- on ajoute au premierplan tous les autres widget sauf currentnode --//
+ for(Iterator<EbliNode> it2=listeNode.iterator();it2.hasNext();){
+
+ //-- recuperation du node
+ EbliNode foregroundNode=it2.next();
+
+ if(foregroundNode!=null && foregroundNode != currentNode && foregroundNode.isMovable() )
+
+ //-- ajout au premier plan du node --//
+ scene_.getVisu_().addChild(foregroundNode.getCreator().getWidget());
+
+ }
+
+ //-- rafraichissement de la scene --//
+ scene_.refresh();
+
+
+ }
+ }
+
+ }
+
+
+
+ }
+
+}
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionDuplicate.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionDuplicate.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionDuplicate.java 2008-08-11 10:05:42 UTC (rev 3757)
@@ -0,0 +1,84 @@
+package org.fudaa.ebli.visuallibrary.actions;
+
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.AbstractAction;
+
+import org.fudaa.ebli.visuallibrary.EbliNode;
+import org.fudaa.ebli.visuallibrary.EbliScene;
+
+
+/**
+ * classe qui permet de dupliquer l'objet selectionne
+ *
+ * pour conna\xEEtre les objet selectionnee, on interroge le state des widget isSelection()
+ * on duplique via la methode du node duplicate()
+ * duplication s effectue en bas par default
+ * @author genesis
+ *
+ */
+public class EbliWidgetActionDuplicate extends AbstractAction{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+ EbliScene scene_;
+
+ public EbliWidgetActionDuplicate(EbliScene _scene){
+ scene_=_scene;
+ putValue(NAME,"Duplication des \xE9lements s\xE9lectionn\xE9s");
+ }
+
+
+ public void actionPerformed(ActionEvent e) {
+ // TODO Auto-generated method stub
+
+ //-- recuperation de la liste des widgets selectionnees --//
+
+ Set<EbliNode> listeNode = (Set<EbliNode>) scene_.getNodes();
+
+ List<EbliNode> listeNodeADupliquer=new ArrayList<EbliNode>();
+
+ //-- parcours des nodes
+ for(Iterator<EbliNode> it=listeNode.iterator();it.hasNext();){
+
+ EbliNode currentNode=it.next();
+ if(currentNode!=null && currentNode.hasWidget()){
+
+ //-- duplication que si la widget est selectionnee --//
+ if(currentNode.getCreator().getWidget().getState().isSelected()){
+
+ listeNodeADupliquer.add(currentNode);
+
+
+ }
+
+ }
+ }
+ //-- duplication des noeuds saisis --//
+ for(Iterator<EbliNode> it=listeNodeADupliquer.iterator();it.hasNext();){
+ EbliNode currentNode=it.next();
+
+ //-- duplication du node --//
+ EbliNode node = currentNode.duplicate(null);
+ if(node !=null){
+
+ //-- ajout du node dans la scene --//
+ scene_.addNode(node);
+
+ //-- rafraichissement de la scene --//
+ scene_.refresh();
+
+ }
+ }
+
+ }
+
+
+}
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionForeGround.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionForeGround.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionForeGround.java 2008-08-11 10:05:42 UTC (rev 3757)
@@ -0,0 +1,63 @@
+package org.fudaa.ebli.visuallibrary.actions;
+
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.swing.AbstractAction;
+
+import org.fudaa.ebli.visuallibrary.EbliNode;
+import org.fudaa.ebli.visuallibrary.EbliScene;
+
+/**
+ * classe qui permet de placer les widgets selectionnes au premier plan.
+ * @author genesis
+ *
+ */
+public class EbliWidgetActionForeGround extends AbstractAction{
+
+ EbliScene scene_;
+
+ public EbliWidgetActionForeGround(EbliScene _scene){
+ scene_=_scene;
+ putValue(NAME,"Premier plan");
+ }
+
+ private static final long serialVersionUID = 1L;
+
+ public void actionPerformed(ActionEvent e) {
+ // TODO Auto-generated method stub
+
+
+ //-- recuperation de la liste des nodes de la scene --//
+ Set<EbliNode> listeNode = (Set<EbliNode>) scene_.getNodes();
+
+ //-- parcours des nodes
+ for(Iterator<EbliNode> it=listeNode.iterator();it.hasNext();){
+
+ EbliNode currentNode=it.next();
+ if(currentNode!=null && currentNode.isMovable()){
+
+ //-- deplacement au premier plan que si la widget est selectionnee --//
+ if(currentNode.getCreator().getWidget().getState().isSelected()){
+
+ //-- ajout au premier plan du node --//
+ scene_.getVisu_().addChild(currentNode.getCreator().getWidget());
+
+
+
+ //-- rafraichissement de la scene --//
+ scene_.refresh();
+
+
+ }
+ }
+
+ }
+
+
+
+ }
+
+}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-11 08:09:27 UTC (rev 3756)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-11 10:05:42 UTC (rev 3757)
@@ -18,6 +18,7 @@
import javax.swing.Box;
import javax.swing.JButton;
import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JScrollPane;
@@ -52,6 +53,9 @@
import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorRectangle;
import org.fudaa.ebli.visuallibrary.EbliWidgetDBLFleche;
import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionAlign;
+import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionBackGround;
+import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionDuplicate;
+import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionForeGround;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque;
import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorGraphe;
import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorLegende;
@@ -228,26 +232,28 @@
scene.addNode(node);
// -- ajout du fleche double sens nord--//
- node = new EbliNodeDefault();
- node.setTitle("Fleche Double");
- node.setCreator(new EbliWidgetCreatorDblFleche(EbliWidgetDBLFleche.ORIENTATION_WEST));
- node.setPreferedSize(new Dimension(100, 100));
- node.setPreferedLocation(new Point(450, 125));
- scene.addNode(node);
+ final EbliNodeDefault nodeDbl = new EbliNodeDefault();
+ nodeDbl.setTitle("Fleche Double");
+ nodeDbl.setCreator(new EbliWidgetCreatorDblFleche(EbliWidgetDBLFleche.ORIENTATION_WEST));
+ nodeDbl.setPreferedSize(new Dimension(100, 100));
+ nodeDbl.setPreferedLocation(new Point(450, 125));
+ scene.addNode(nodeDbl);
// -- ajout du fleche sens unique--//
- node = new EbliNodeDefault();
- node.setTitle("Fleche");
- node.setCreator(new EbliWidgetCreatorFleche(0));
- node.setPreferedSize(new Dimension(100, 100));
- node.setPreferedLocation(new Point(250, 525));
- scene.addNode(node);
+ final EbliNodeDefault nodeFleche = new EbliNodeDefault();
+ nodeFleche.setTitle("Fleche");
+ nodeFleche.setCreator(new EbliWidgetCreatorFleche(0));
+ nodeFleche.setPreferedSize(new Dimension(100, 100));
+ nodeFleche.setPreferedLocation(new Point(250, 525));
+ scene.addNode(nodeFleche);
+
+ // node.getCreator().getWidget().setState(state)
//if(node.getCreator().getWidget().)
+
-
// WidgetLegendeManagerOLD.createWidgetLegendeGraphe(this, visu, courbe,
// graphe.getClientArea());
@@ -340,34 +346,14 @@
bar =new JToolBar();
f.add(bar,BorderLayout.PAGE_END);
-bar.add(new AbstractAction("duplique rectangle"){
+bar.add(new EbliWidgetActionDuplicate(scene));
- public void actionPerformed(ActionEvent e) {
- EbliNode node = nodeRect.duplicate(null);
- if(node !=null){
- scene.addNode(node);
- scene.getView().repaint();
- }}
-});
-bar.add(new AbstractAction("duplique graphe"){
- public void actionPerformed(ActionEvent e) {
- EbliNode node = nodeG.duplicate(null);
- if(node !=null){
- scene.addNode(node);
- scene.getView().repaint();
- }}
-});
-bar.add(new AbstractAction("duplique calque"){
+bar.add(new EbliWidgetActionForeGround(scene));
- public void actionPerformed(ActionEvent e) {
- EbliNode node = nodeCalque.duplicate(null);
- if(node !=null){
- scene.addNode(node);
- scene.getView().repaint();
- }}
-});
+bar.add(new EbliWidgetActionBackGround(scene));
+
p.doLayout();
}
}
\ 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: <had...@us...> - 2008-08-11 08:09:22
|
Revision: 3756
http://fudaa.svn.sourceforge.net/fudaa/?rev=3756&view=rev
Author: hadouxad
Date: 2008-08-11 08:09:27 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
Resolution Bug: Ajout duplication et suppression propre du calque
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-11 07:49:27 UTC (rev 3755)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-11 08:09:27 UTC (rev 3756)
@@ -88,6 +88,8 @@
//info debug widget duplique
//duplique.getCreator().getWidget().setPreferredBounds(n.getCreator().getWidget().getPreferredBounds());
+ //-- raffraichissement de la scene --//
+ EbliWidget.this.getEbliScene().refresh();
}
@@ -103,7 +105,9 @@
EbliNode n = (EbliNode) EbliWidget.this.getEbliScene().findObject(EbliWidget.this);
EbliWidget.this.getEbliScene().removeNode(n);
-
+
+ //-- raffraichissement de la scene --//
+ EbliWidget.this.getEbliScene().refresh();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2008-08-11 07:49:20
|
Revision: 3755
http://fudaa.svn.sourceforge.net/fudaa/?rev=3755&view=rev
Author: hadouxad
Date: 2008-08-11 07:49:27 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
Resolution du FIXME:
lorsque la widget est selectionnee, son state est a isselected:
test poru recuperer les widgets selectionnees:
myWidget.getState().isSelected
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java 2008-08-11 07:43:50 UTC (rev 3754)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java 2008-08-11 07:49:27 UTC (rev 3755)
@@ -49,13 +49,13 @@
public final static int ALIGNCENTERVERTICAL=3;
public final static int ALIGNTOP=4;
public final static int ALIGNBOTTOM=5;
-
+
int typeAlignement_;
-
+
//liste des positions precedentes pour chaque widgets
List<Point> listPreviousPositions_;
-
+
public EbliWidgetActionAlign(EbliScene _scene, int _typeAlignement) {
super();
// TODO Auto-generated constructor stub
@@ -76,8 +76,8 @@
* methode qui recalcule la nouvelle position par rapport a la scene et a l alignement choisiT.
*/
private Point calculeNewLocation(Point _previousLocation,Dimension _dimensionWidget,Dimension _dimensionScene){
-
-
+
+
switch(typeAlignement_){
case ALIGNLEFT: return new Point(0,_previousLocation.y);
case ALIGNRIGHT: return new Point(_dimensionScene.width-_dimensionWidget.width,_previousLocation.y);
@@ -85,17 +85,17 @@
case ALIGNCENTERVERTICAL: return new Point(_previousLocation.x,_dimensionScene.height/2 -_dimensionWidget.height/2);
case ALIGNTOP: return new Point(_previousLocation.x,0);
case ALIGNBOTTOM: return new Point(_previousLocation.x,_dimensionScene.height-_dimensionWidget.height);
-
-
+
+
default: return _previousLocation;
}
-
-
+
+
}
-
-private Point calculeNewLocation(Point _previousLocation,Rectangle _dimensionWidget,Dimension _dimensionScene){
-
-
+
+ private Point calculeNewLocation(Point _previousLocation,Rectangle _dimensionWidget,Dimension _dimensionScene){
+
+
switch(typeAlignement_){
case ALIGNLEFT: return new Point(0,_previousLocation.y);
case ALIGNRIGHT: return new Point(_dimensionScene.width-_dimensionWidget.width,_previousLocation.y);
@@ -103,15 +103,15 @@
case ALIGNCENTERVERTICAL: return new Point(_previousLocation.x,_dimensionScene.height/2 -_dimensionWidget.height/2);
case ALIGNTOP: return new Point(_previousLocation.x,0);
case ALIGNBOTTOM: return new Point(_previousLocation.x,_dimensionScene.height-_dimensionWidget.height);
-
-
+
+
default: return _previousLocation;
}
-
-
+
+
}
-
+
private String traduct(int _align){
switch(typeAlignement_){
case ALIGNLEFT: return "\xE0 gauche";
@@ -120,50 +120,56 @@
case ALIGNCENTERVERTICAL: return "centr\xE9 vertical";
case ALIGNTOP: return "en haut";
case ALIGNBOTTOM: return "en bas";
-
-
+
+
default: return "";
}
}
-
+
/**
* action alignement qui realise l alignements de tous les composants
*/
public void alignComponents(){
-
+
//-- reinitialisation de la liste des historique des positions --//
listPreviousPositions_=new ArrayList<Point>();
+
+ //-- recuperation de la liste des widgets selectionnees --//
- //-- recuperation de la liste des widgets selectionnees --//
- //FIXME comment recuperer les nodes uniquements selectionnes? la je recupere tout...
Set<EbliNode> listeNode = (Set<EbliNode>) scene_.getNodes();
-
+
//-- parcours des nodes
for(Iterator<EbliNode> it=listeNode.iterator();it.hasNext();){
-
+
EbliNode currentNode=it.next();
if(currentNode!=null && currentNode.isMovable()){
- //-- enregistrement de la previous position --//
- listPreviousPositions_.add(currentNode.getPreferedLocation());
-
- //-- calcul de la nouvelle position du node en fonction de l alignement choisi --//
- Point newLocation=calculeNewLocation(currentNode.getCreator().getWidget().getLocation(), currentNode.getCreator().getWidget().getBounds(),scene_.getView().getSize());
-
- //-- tentative de modification de la position du node --//
- currentNode.setPreferedLocation(newLocation);
-
- currentNode.getCreator().getWidget().revalidate();
- currentNode.getCreator().getWidget().repaint();
+
+ //-- deplacement que si la widget est selectionnee --//
+ if(currentNode.getCreator().getWidget().getState().isSelected()){
+
+ //-- enregistrement de la previous position --//
+ listPreviousPositions_.add(currentNode.getPreferedLocation());
+
+ //-- calcul de la nouvelle position du node en fonction de l alignement choisi --//
+ Point newLocation=calculeNewLocation(currentNode.getCreator().getWidget().getLocation(), currentNode.getCreator().getWidget().getBounds(),scene_.getView().getSize());
+
+ //-- tentative de modification de la position du node --//
+ currentNode.setPreferedLocation(newLocation);
+
+ currentNode.getCreator().getWidget().revalidate();
+ currentNode.getCreator().getWidget().repaint();
+
+ }
}
-
+
}
//-- rafraichissement de la scene --//
scene_.refresh();
-
-
+
+
}
-
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2008-08-11 07:43:45
|
Revision: 3754
http://fudaa.svn.sourceforge.net/fudaa/?rev=3754&view=rev
Author: hadouxad
Date: 2008-08-11 07:43:50 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
cas particulier: prise en compte renderer du noeud root dans le cas ou il n y a pas de widget dans la scene
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java 2008-08-11 07:31:55 UTC (rev 3753)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxTreeRenderer.java 2008-08-11 07:43:50 UTC (rev 3754)
@@ -47,7 +47,8 @@
boolean leaf, int row, boolean hasFocus) {
Component returnValue;
- if (leaf) {
+ // cas particulier renderer: on met un checkbox que si on est feuille et pqs root (= cqs ou lqyer depourvu d objet graphique)
+ if (leaf && !((DefaultMutableTreeNode) value).isRoot()) {
// -- recuperation du node --//
Object userObject = ((DefaultMutableTreeNode) value).getUserObject();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2008-08-11 07:31:48
|
Revision: 3753
http://fudaa.svn.sourceforge.net/fudaa/?rev=3753&view=rev
Author: hadouxad
Date: 2008-08-11 07:31:55 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
Correction FIXME: raffraichissement desormais instantane dans la scene.
Il fallait utiliser la methode validate() de scene et pas autre chose
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2008-08-11 07:25:37 UTC (rev 3752)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2008-08-11 07:31:55 UTC (rev 3753)
@@ -225,7 +225,7 @@
* Methode qui permet de raffraichir les elements de la scene
*/
public void refresh(){
- revalidate();
+ this.validate();
this.repaint();
getView().repaint();
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java 2008-08-11 07:25:37 UTC (rev 3752)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java 2008-08-11 07:31:55 UTC (rev 3753)
@@ -160,6 +160,7 @@
//-- rafraichissement de la scene --//
scene_.refresh();
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2008-08-11 07:25:30
|
Revision: 3752
http://fudaa.svn.sourceforge.net/fudaa/?rev=3752&view=rev
Author: hadouxad
Date: 2008-08-11 07:25:37 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
implementation de la fonction de duplication pour le graphe, les feleches et fleches double.
probleme pour la vue calque
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorVueCalque.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetCreatorGraphe.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorVueCalque.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorVueCalque.java 2008-08-11 07:24:44 UTC (rev 3751)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorVueCalque.java 2008-08-11 07:25:37 UTC (rev 3752)
@@ -10,8 +10,16 @@
public class EbliWidgetCreatorVueCalque implements EbliWidgetCreator {
ZEbliCalquesPanel calque;
- EbliWidgetVueCalque res;
+ public ZEbliCalquesPanel getCalque() {
+ return calque;
+}
+public void setCalque(ZEbliCalquesPanel calque) {
+ this.calque = calque;
+}
+
+EbliWidgetVueCalque res;
+
public EbliWidgetCreatorVueCalque(ZEbliCalquesPanel calque) {
super();
this.calque = calque;
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetCreatorGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetCreatorGraphe.java 2008-08-11 07:24:44 UTC (rev 3751)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetCreatorGraphe.java 2008-08-11 07:25:37 UTC (rev 3752)
@@ -11,21 +11,29 @@
*/
public class EbliWidgetCreatorGraphe implements EbliWidgetCreator {
- EGGraphe g;
+ EGGraphe graphe;
+ public EGGraphe getGraphe() {
+ return graphe;
+ }
+
+ public void setGraphe(EGGraphe graphe) {
+ this.graphe = graphe;
+ }
+
EbliWidgetGraphe res;
public EbliWidgetCreatorGraphe(EGGraphe g) {
super();
- this.g = g;
+ this.graphe = g;
}
public EbliWidget create(EbliScene _scene) {
// TODO Auto-generated method stub
// creation de la widget correspondante
- res= new EbliWidgetGraphe(_scene, null, g);
+ res= new EbliWidgetGraphe(_scene, null, graphe);
// ajout des listener d ecoute du graphe
- g.getModel().addModelListener(
+ graphe.getModel().addModelListener(
new EbliWidgetGrapheController(res));
return res;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2008-08-11 07:24:37
|
Revision: 3751
http://fudaa.svn.sourceforge.net/fudaa/?rev=3751&view=rev
Author: hadouxad
Date: 2008-08-11 07:24:44 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
implementation de la fonction de duplication pour le graphe, les feleches et fleches double.
probleme pour la vue calque
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java 2008-08-09 15:14:54 UTC (rev 3750)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java 2008-08-11 07:24:44 UTC (rev 3751)
@@ -4,6 +4,9 @@
import java.awt.Point;
import java.util.Map;
+import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque;
+import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorGraphe;
+
public class EbliNodeDefault implements EbliNode {
@@ -26,20 +29,22 @@
EbliNode duplique= new EbliNodeDefault();
duplique.setTitle(getTitle());
-
-
-
- //-- creation d une instance similaire du creator--//
- EbliWidgetCreator creatorDuplique=null;
-
+
System.err.println("je suis instance de la classe "+creator.toString());
//-- duplique rectangle
if(creator instanceof EbliWidgetCreatorRectangle){
-
-
duplique.setCreator(new EbliWidgetCreatorRectangle(((EbliWidgetCreatorRectangle)getCreator()).getG()));
-
-
+ }else if(creator instanceof EbliWidgetCreatorFleche){
+ duplique.setCreator(new EbliWidgetCreatorFleche(((EbliWidgetCreatorFleche)getCreator()).orientation));
+ }else if(creator instanceof EbliWidgetCreatorDblFleche){
+ duplique.setCreator(new EbliWidgetCreatorDblFleche(((EbliWidgetCreatorDblFleche)getCreator()).getG()));
+ }else if(creator instanceof EbliWidgetCreatorGraphe){
+ duplique.setCreator(new EbliWidgetCreatorGraphe(((EbliWidgetCreatorGraphe)getCreator()).getGraphe()));
+ }else if(creator instanceof EbliWidgetCreatorVueCalque){
+ duplique.setCreator(new EbliWidgetCreatorVueCalque(((EbliWidgetCreatorVueCalque)getCreator()).getCalque()));
+ }else{
+ // instance pas identifie, impossible de dupliquer
+ return null;
}
duplique.setPreferedSize(getPreferedSize());
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-09 15:14:54 UTC (rev 3750)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-11 07:24:44 UTC (rev 3751)
@@ -83,7 +83,7 @@
// duplique.setPreferedLocation(nouvellePosition);
// -- ajout dans la scene --//
- if (EbliWidget.this.getScene() != null) {
+ if (duplique!=null && EbliWidget.this.getScene() != null) {
EbliWidget.this.getEbliScene().addNode(duplique);
//info debug widget duplique
//duplique.getCreator().getWidget().setPreferredBounds(n.getCreator().getWidget().getPreferredBounds());
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-09 15:14:54 UTC (rev 3750)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-11 07:24:44 UTC (rev 3751)
@@ -14,6 +14,7 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import javax.swing.AbstractAction;
import javax.swing.Box;
import javax.swing.JButton;
import javax.swing.JFrame;
@@ -170,14 +171,14 @@
// -- creation d un noeud Graphe --//
- EbliNodeDefault node = new EbliNodeDefault();
- node.setCreator(new EbliWidgetCreatorGraphe(g));
- node.setTitle("Graphe");
- node.setPreferedSize(new Dimension(200, 250));
- node.setPreferedLocation(new Point(12, 420));
- scene.addNode(node);
+ final EbliNodeDefault nodeG = new EbliNodeDefault();
+ nodeG.setCreator(new EbliWidgetCreatorGraphe(g));
+ nodeG.setTitle("Graphe");
+ nodeG.setPreferedSize(new Dimension(200, 250));
+ nodeG.setPreferedLocation(new Point(12, 420));
+ scene.addNode(nodeG);
-
+ EbliNodeDefault node;
// -- creation d un noeud legende --//
EbliNodeDefault nodeLegende = new EbliNodeDefault();
nodeLegende.setTitle("Legende");
@@ -192,10 +193,10 @@
br.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 5, Color.RED));
BVueCalque vueC = new BVueCalque(br);
vueC.setSize(new Dimension(200, 200));
- node = new EbliNodeDefault();
- node.setTitle("Vue Calque");
- node.setPreferedSize(new Dimension(400, 200));
- node.setPreferedLocation(new Point(250, 170));
+ final EbliNodeDefault nodeCalque = new EbliNodeDefault();
+ nodeCalque.setTitle("Vue Calque");
+ nodeCalque.setPreferedSize(new Dimension(400, 200));
+ nodeCalque.setPreferedLocation(new Point(250, 170));
// JFrame fr = new JFrame();
ZEbliCalquesPanel ebliCalquesPanel = new ZEbliCalquesPanel(br, new CtuluUIDefault());
@@ -203,8 +204,8 @@
// ebliCalquesPanel.setPreferredSize(new Dimension(400, 400));
// fr.setPreferredSize(new Dimension(400, 400));
// fr.setVisible(true);
- node.setCreator(new EbliWidgetCreatorVueCalque(ebliCalquesPanel));
- scene.addNode(node);
+ nodeCalque.setCreator(new EbliWidgetCreatorVueCalque(ebliCalquesPanel));
+ scene.addNode(nodeCalque);
// scene.addChild(new ComponentWidget(scene,
// test.getVisuPanel().getVueCalque()));
@@ -336,18 +337,37 @@
bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNTOP));
bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNBOTTOM));
-JButton boutontestAjout = new JButton("dupliquer rectangle");
-boutontestAjout.addActionListener(new ActionListener(){
+bar =new JToolBar();
+f.add(bar,BorderLayout.PAGE_END);
+bar.add(new AbstractAction("duplique rectangle"){
+
public void actionPerformed(ActionEvent e) {
EbliNode node = nodeRect.duplicate(null);
- scene.addNode(node);
+ if(node !=null){
+ scene.addNode(node);
scene.getView().repaint();
-
- }
-
+ }}
});
-bar.add(boutontestAjout);
+bar.add(new AbstractAction("duplique graphe"){
+
+ public void actionPerformed(ActionEvent e) {
+ EbliNode node = nodeG.duplicate(null);
+ if(node !=null){
+ scene.addNode(node);
+ scene.getView().repaint();
+ }}
+});
+bar.add(new AbstractAction("duplique calque"){
+
+ public void actionPerformed(ActionEvent e) {
+ EbliNode node = nodeCalque.duplicate(null);
+ if(node !=null){
+ scene.addNode(node);
+ scene.getView().repaint();
+ }}
+});
+
p.doLayout();
}
}
\ 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: <had...@us...> - 2008-08-09 15:14:45
|
Revision: 3750
http://fudaa.svn.sourceforge.net/fudaa/?rev=3750&view=rev
Author: hadouxad
Date: 2008-08-09 15:14:54 +0000 (Sat, 09 Aug 2008)
Log Message:
-----------
implementation de la fonction de duplication et test pour le rectangle objet graphe
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java 2008-08-09 14:57:45 UTC (rev 3749)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java 2008-08-09 15:14:54 UTC (rev 3750)
@@ -43,8 +43,14 @@
}
duplique.setPreferedSize(getPreferedSize());
- duplique.setPreferedLocation(getPreferedLocation());
+ //-- calcul nouvelle position
+ Point nouvellePosition = new Point(
+ getCreator().getWidget().getLocation().x, (int) (getCreator().getWidget().getLocation().y + getCreator().getWidget().getClientArea().height));
+
+ duplique.setPreferedLocation(nouvellePosition);
+ //duplique.setPreferedLocation(getPreferedLocation());
+
return duplique;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2008-08-09 14:57:36
|
Revision: 3749
http://fudaa.svn.sourceforge.net/fudaa/?rev=3749&view=rev
Author: hadouxad
Date: 2008-08-09 14:57:45 +0000 (Sat, 09 Aug 2008)
Log Message:
-----------
implementation de la fonction de duplication et test pour le rectangle objet graphe
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNode.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java
branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNode.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNode.java 2008-08-09 14:06:31 UTC (rev 3748)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNode.java 2008-08-09 14:57:45 UTC (rev 3749)
@@ -5,20 +5,21 @@
import java.util.Map;
public interface EbliNode {
+
String getTitle();
-
+ void setTitle(String title);
+
EbliWidgetCreator getCreator();
-
+ void setCreator(EbliWidgetCreator creator);
+
+ Dimension getPreferedSize();
void setPreferedSize(Dimension d);
-
- Dimension getPreferedSize();
-
EbliNode duplicate(Map options);
+ Point getPreferedLocation();
void setPreferedLocation(Point p);
- Point getPreferedLocation();
public String toString();
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java 2008-08-09 14:06:31 UTC (rev 3748)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java 2008-08-09 14:57:45 UTC (rev 3749)
@@ -18,10 +18,34 @@
}
-
+ /**
+ * methode qui permet de dupliquer un node
+ */
public EbliNode duplicate(Map options) {
// TODO Auto-generated method stub
- return null;
+ EbliNode duplique= new EbliNodeDefault();
+
+ duplique.setTitle(getTitle());
+
+
+
+ //-- creation d une instance similaire du creator--//
+ EbliWidgetCreator creatorDuplique=null;
+
+ System.err.println("je suis instance de la classe "+creator.toString());
+ //-- duplique rectangle
+ if(creator instanceof EbliWidgetCreatorRectangle){
+
+
+ duplique.setCreator(new EbliWidgetCreatorRectangle(((EbliWidgetCreatorRectangle)getCreator()).getG()));
+
+
+ }
+
+ duplique.setPreferedSize(getPreferedSize());
+ duplique.setPreferedLocation(getPreferedLocation());
+
+ return duplique;
}
@@ -86,6 +110,6 @@
}
+
-
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-09 14:06:31 UTC (rev 3748)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-09 14:57:45 UTC (rev 3749)
@@ -28,8 +28,12 @@
public class EbliWidget extends Widget {
private EbliScene scene_;
- private boolean useBorder_ = true;
+ public EbliScene getScene_() {
+ return scene_;
+}
+private boolean useBorder_ = true;
+
/**
* @param scene
* @param Point
@@ -68,25 +72,25 @@
(int) (EbliWidget.this.getLocation().x + EbliWidget.this.getClientArea().width / 2), (int) (EbliWidget.this
.getLocation().y + EbliWidget.this.getClientArea().height / 2));
- EbliWidget duplique;
+
+ //-- recuperation du node a dupliquer --//
+ EbliNode n = (EbliNode) EbliWidget.this.getEbliScene().findObject(EbliWidget.this);
+
+ // duplication du node en question
+ EbliNode duplique=n.duplicate(null);
+
+ // nouvelle position a cote de son predecesseur
+ // duplique.setPreferedLocation(nouvellePosition);
- try {
- // clonage de l'objet
- duplique = (EbliWidget) EbliWidget.this.clone();
- duplique.setPreferredSize(EbliWidget.this.getScene().getPreferredSize());
- duplique.setPreferredLocation(nouvellePosition);
-
- // -- ajout dans la scene --//
- if (EbliWidget.this.getScene() != null) {
- EbliWidget.this.getScene().addChild(duplique);
- }
-
- } catch (CloneNotSupportedException e1) {
- // TODO que fqire si ca pete? une peite fenetre d'erreur,
- // widget pas duplicable? ou alors surcharger la methode
- // dans les filles?
- e1.printStackTrace();
+ // -- ajout dans la scene --//
+ if (EbliWidget.this.getScene() != null) {
+ EbliWidget.this.getEbliScene().addNode(duplique);
+ //info debug widget duplique
+ //duplique.getCreator().getWidget().setPreferredBounds(n.getCreator().getWidget().getPreferredBounds());
+
}
+
+
}
});
@@ -161,4 +165,16 @@
useBorder_ = _useBorder;
}
+ /**
+ * methode qui construit une widget duplication pqr default, doit etre surchargee pour reproduire l' evenement
+ * @return
+ */
+ public EbliNode duplicate(){
+ EbliNode duplique =null;
+
+
+ return duplique;
+ }
+
+
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java 2008-08-09 14:06:31 UTC (rev 3748)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java 2008-08-09 14:57:45 UTC (rev 3749)
@@ -107,5 +107,7 @@
revalidate();
}
+
+
}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-09 14:06:31 UTC (rev 3748)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-09 14:57:45 UTC (rev 3749)
@@ -11,6 +11,8 @@
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import javax.swing.Box;
import javax.swing.JButton;
@@ -41,6 +43,7 @@
import org.fudaa.ebli.courbe.EGGroup;
import org.fudaa.ebli.trace.TraceLigne;
import org.fudaa.ebli.trace.TraceLigneModel;
+import org.fudaa.ebli.visuallibrary.EbliNode;
import org.fudaa.ebli.visuallibrary.EbliNodeDefault;
import org.fudaa.ebli.visuallibrary.EbliScene;
import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorDblFleche;
@@ -147,7 +150,7 @@
final EGFillePanel pn = new EGFillePanel(g);
// creation de la scene EBLI
- EbliScene scene = new EbliScene();
+ final EbliScene scene = new EbliScene();
// -- construction du jtree
@@ -206,12 +209,14 @@
// test.getVisuPanel().getVueCalque()));
// -- ajout du rectangle --//
- EbliNodeDefault nodeRect = new EbliNodeDefault();
+ final EbliNodeDefault nodeRect = new EbliNodeDefault();
nodeRect.setTitle("Rectangle");
nodeRect.setCreator(new EbliWidgetCreatorRectangle("Test recangle"));
nodeRect.setPreferedSize(new Dimension(200, 100));
nodeRect.setPreferedLocation(new Point(350, 125));
scene.addNode(nodeRect);
+
+
// -- ajout du fleche double sens diagonale--//
node = new EbliNodeDefault();
@@ -330,6 +335,19 @@
bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNCENTERVERTICAL));
bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNTOP));
bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNBOTTOM));
- p.doLayout();
+
+JButton boutontestAjout = new JButton("dupliquer rectangle");
+boutontestAjout.addActionListener(new ActionListener(){
+
+ public void actionPerformed(ActionEvent e) {
+ EbliNode node = nodeRect.duplicate(null);
+ scene.addNode(node);
+ scene.getView().repaint();
+
+ }
+
+});
+bar.add(boutontestAjout);
+p.doLayout();
}
}
\ 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: <had...@us...> - 2008-08-09 14:06:22
|
Revision: 3748
http://fudaa.svn.sourceforge.net/fudaa/?rev=3748&view=rev
Author: hadouxad
Date: 2008-08-09 14:06:31 +0000 (Sat, 09 Aug 2008)
Log Message:
-----------
src swingx pour attacher au jar
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ctulu/lib/swingx-0.9.3-src.zip
Property changes on: branches/Prepro-0.92-SNAPSHOT/ctulu/lib/swingx-0.9.3-src.zip
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2008-08-09 13:42:37
|
Revision: 3747
http://fudaa.svn.sourceforge.net/fudaa/?rev=3747&view=rev
Author: hadouxad
Date: 2008-08-09 13:42:46 +0000 (Sat, 09 Aug 2008)
Log Message:
-----------
correction class action align
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java 2008-08-08 20:08:31 UTC (rev 3746)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java 2008-08-09 13:42:46 UTC (rev 3747)
@@ -2,6 +2,7 @@
import java.awt.Dimension;
import java.awt.Point;
+import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
@@ -92,6 +93,24 @@
}
+private Point calculeNewLocation(Point _previousLocation,Rectangle _dimensionWidget,Dimension _dimensionScene){
+
+
+ switch(typeAlignement_){
+ case ALIGNLEFT: return new Point(0,_previousLocation.y);
+ case ALIGNRIGHT: return new Point(_dimensionScene.width-_dimensionWidget.width,_previousLocation.y);
+ case ALIGNCENTERHORIZONTAL: return new Point(_dimensionScene.width/2 -_dimensionWidget.width/2 ,_previousLocation.y);
+ case ALIGNCENTERVERTICAL: return new Point(_previousLocation.x,_dimensionScene.height/2 -_dimensionWidget.height/2);
+ case ALIGNTOP: return new Point(_previousLocation.x,0);
+ case ALIGNBOTTOM: return new Point(_previousLocation.x,_dimensionScene.height-_dimensionWidget.height);
+
+
+ default: return _previousLocation;
+ }
+
+
+ }
+
private String traduct(int _align){
switch(typeAlignement_){
@@ -128,7 +147,7 @@
listPreviousPositions_.add(currentNode.getPreferedLocation());
//-- calcul de la nouvelle position du node en fonction de l alignement choisi --//
- Point newLocation=calculeNewLocation(currentNode.getPreferedLocation(), currentNode.getCreator().getWidget().getPreferredSize(),scene_.getView().getSize());
+ Point newLocation=calculeNewLocation(currentNode.getCreator().getWidget().getLocation(), currentNode.getCreator().getWidget().getBounds(),scene_.getView().getSize());
//-- tentative de modification de la position du node --//
currentNode.setPreferedLocation(newLocation);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <opa...@us...> - 2008-08-08 20:08:22
|
Revision: 3746
http://fudaa.svn.sourceforge.net/fudaa/?rev=3746&view=rev
Author: opasteur
Date: 2008-08-08 20:08:31 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java 2008-08-08 20:01:53 UTC (rev 3745)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java 2008-08-08 20:08:31 UTC (rev 3746)
@@ -116,10 +116,10 @@
metierZonePlanimetrages[i].taillePas(element.getValue(2).doubleValue());
- System.err.println(reseau_.getBiefNumero(element.iBief()));
+ /*System.err.println(reseau_.getBiefNumero(element.iBief()));
System.err.println(element.abscDebut());
System.err.println(element.abscFin());
- System.err.println(element.getValue(2).doubleValue());
+ System.err.println(element.getValue(2).doubleValue());*/
i++;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <opa...@us...> - 2008-08-08 20:01:48
|
Revision: 3745
http://fudaa.svn.sourceforge.net/fudaa/?rev=3745&view=rev
Author: opasteur
Date: 2008-08-08 20:01:53 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierBief.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierReseau.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierZonePlanimetrage.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierBief.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierBief.java 2008-08-08 16:25:05 UTC (rev 3744)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierBief.java 2008-08-08 20:01:53 UTC (rev 3745)
@@ -757,24 +757,28 @@
return false;
}
public int getNbPasPlanimetrage() {
- int nbPas= 0;
- org.omg.CORBA.DoubleHolder coteMin= new org.omg.CORBA.DoubleHolder();
- org.omg.CORBA.DoubleHolder coteMax= new org.omg.CORBA.DoubleHolder();
- for (int i= 0; i < zonesPlanimetrage_.length; i++) {
- double pas= zonesPlanimetrage_[i].taillePas();
- int indDebut=
- getIndiceProfilAbscisse(zonesPlanimetrage_[i].abscisseDebut());
- int indFin= getIndiceProfilAbscisse(zonesPlanimetrage_[i].abscisseFin());
- if (indDebut < 0) indDebut = -indDebut;
- if (indFin < 0) indFin = -indFin;
- for (int j= indDebut; j <= indFin; j++) {
- profils_[j].coteMinMax(coteMin, coteMax);
- double h= coteMax.value - coteMin.value;
- nbPas= Math.max((int) (h / pas) + 1, nbPas);
- }
- }
- return nbPas;
+ return getNbPasPlanimetrage(zonesPlanimetrage_);
}
+
+ public int getNbPasPlanimetrage(MetierZonePlanimetrage[] zonesPlanimetrage) {
+ int nbPas= 0;
+ org.omg.CORBA.DoubleHolder coteMin= new org.omg.CORBA.DoubleHolder();
+ org.omg.CORBA.DoubleHolder coteMax= new org.omg.CORBA.DoubleHolder();
+ for (int i= 0; i < zonesPlanimetrage.length; i++) {
+ double pas= zonesPlanimetrage[i].taillePas();
+ int indDebut=
+ getIndiceProfilAbscisse(zonesPlanimetrage[i].abscisseDebut());
+ int indFin= getIndiceProfilAbscisse(zonesPlanimetrage[i].abscisseFin());
+ if (indDebut < 0) indDebut = -indDebut;
+ if (indFin < 0) indFin = -indFin;
+ for (int j= indDebut; j <= indFin; j++) {
+ profils_[j].coteMinMax(coteMin, coteMax);
+ double h= coteMax.value - coteMin.value;
+ nbPas= Math.max((int) (h / pas) + 1, nbPas);
+ }
+ }
+ return nbPas;
+ }
public double interpoleFond(double abscisse) {
double res= Double.POSITIVE_INFINITY;
MetierProfil p1= null;
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierReseau.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierReseau.java 2008-08-08 16:25:05 UTC (rev 3744)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierReseau.java 2008-08-08 20:01:53 UTC (rev 3745)
@@ -1053,6 +1053,13 @@
}
return Math.min(nbPas, 250);
}
+ public int getNbPasPlanimetrage(MetierZonePlanimetrage[] zonesPlanimetrage) {
+ int nbPas= 0;
+ for (int i= 0; i < biefs_.length; i++) {
+ nbPas= Math.max(nbPas, biefs_[i].getNbPasPlanimetrage(zonesPlanimetrage));
+ }
+ return Math.min(nbPas, 250);
+ }
public MetierSingularite[] getSingularitesHorsBief() {
MetierSingularite[] sings= singularites();
Vector resV= new Vector();
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierZonePlanimetrage.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierZonePlanimetrage.java 2008-08-08 16:25:05 UTC (rev 3744)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierZonePlanimetrage.java 2008-08-08 20:01:53 UTC (rev 3745)
@@ -52,4 +52,8 @@
taillePas_= t;
Notifieur.getNotifieur().fireObjetModifie(toString(), this, "taillePas");
}
+
+ /*public String toString(){
+ return "MetierZonePlanimetrage bief="+this.biefRattache().numero()+" abs debut "+this.abscisseDebut()+" abs fin "+this.abscisseFin()+" taille pas "+this.taillePas();
+ }*/
}
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java 2008-08-08 16:25:05 UTC (rev 3744)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java 2008-08-08 20:01:53 UTC (rev 3745)
@@ -1504,11 +1504,13 @@
String lit= st.nextToken();
double cx = 0;
double cy = 0;
- try{
- cx = Double.parseDouble(st.nextToken());
- cy = Double.parseDouble(st.nextToken());
- avecGeoReferencement=true;
- }catch(NoSuchElementException e){avecGeoReferencement=false;}
+ if (st.hasMoreTokens()){
+ try{
+ cx = Double.parseDouble(st.nextToken());
+ cy = Double.parseDouble(st.nextToken());
+ avecGeoReferencement=true;
+ }catch(NoSuchElementException e){avecGeoReferencement=false;}
+ }
if (avecGeoReferencement){
pt=new SParametresPt(x,y,cx,cy,lit);
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java 2008-08-08 16:25:05 UTC (rev 3744)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java 2008-08-08 20:01:53 UTC (rev 3745)
@@ -1533,12 +1533,13 @@
String lit= st.nextToken();
double cx = 0;
double cy = 0;
- try{
- cx = Double.parseDouble(st.nextToken());
- cy = Double.parseDouble(st.nextToken());
- avecGeoReferencement=true;
- }catch(NoSuchElementException e){avecGeoReferencement=false;}
-
+ if (st.hasMoreTokens()){
+ try{
+ cx = Double.parseDouble(st.nextToken());
+ cy = Double.parseDouble(st.nextToken());
+ avecGeoReferencement=true;
+ }catch(NoSuchElementException e){avecGeoReferencement=false;}
+ }
if (avecGeoReferencement){
pt2D=new MetierPoint2D(x,y,cx,cy);
}else{
@@ -1789,12 +1790,13 @@
String lit= st.nextToken();
double cx = 0;
double cy = 0;
- try{
- cx = Double.parseDouble(st.nextToken());
- cy = Double.parseDouble(st.nextToken());
- avecGeoReferencement=true;
- }catch(NoSuchElementException e){avecGeoReferencement=false;}
-
+ if (st.hasMoreTokens()){
+ try{
+ cx = Double.parseDouble(st.nextToken());
+ cy = Double.parseDouble(st.nextToken());
+ avecGeoReferencement=true;
+ }catch(NoSuchElementException e){avecGeoReferencement=false;}
+ }
if (avecGeoReferencement){
pt2D=new MetierPoint2D(x,y,cx,cy);
}else{
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java 2008-08-08 16:25:05 UTC (rev 3744)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java 2008-08-08 20:01:53 UTC (rev 3745)
@@ -9,6 +9,9 @@
package org.fudaa.fudaa.hydraulique1d.editor;
import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
+import org.fudaa.dodico.hydraulique1d.metier.MetierZonePlanimetrage;
+import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dLigneReelTableau;
+import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dLigneZoneTableau;
import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dTableauZoneTailleModel;
import com.memoire.bu.BuTextField;
@@ -17,7 +20,10 @@
import com.memoire.bu.BuHorizontalLayout;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuCheckBox;
+
import java.awt.event.*;
+import java.util.Iterator;
+import java.util.List;
/**
* Editeur des zones de planim\xE9trages (MetierZonePlanimetrage).<br>
* Appeler si l'utilisateur clic sur le menu "Mascaret/Planim\xE9trage".<br>
@@ -95,7 +101,32 @@
}
private void estimationPasPlanim() {
- tfNbPasPlanim_.setValue(new Integer(reseau_.getNbPasPlanimetrage()));
+ List lstPoints = modele_.getListePtsComplets();
+
+ //ON doit construire metierZonePlanimetrages car celui de l'objet m\xE9tier n'est pas \xE0 jour
+ MetierZonePlanimetrage[] metierZonePlanimetrages = new MetierZonePlanimetrage[lstPoints.size()];
+ int i = 0;
+ for (Iterator iter = lstPoints.iterator(); iter.hasNext();) {
+
+ Hydraulique1dLigneZoneTableau element = (Hydraulique1dLigneZoneTableau) iter.next();
+ metierZonePlanimetrages[i]=new MetierZonePlanimetrage();
+ metierZonePlanimetrages[i].biefRattache(reseau_.getBiefNumero(element.iBief()));
+ metierZonePlanimetrages[i].abscisseDebut(element.abscDebut());
+ metierZonePlanimetrages[i].abscisseFin(element.abscFin());
+ metierZonePlanimetrages[i].taillePas(element.getValue(2).doubleValue());
+
+
+ System.err.println(reseau_.getBiefNumero(element.iBief()));
+ System.err.println(element.abscDebut());
+ System.err.println(element.abscFin());
+ System.err.println(element.getValue(2).doubleValue());
+
+ i++;
+ }
+ System.err.println();
+ int res = reseau_.getNbPasPlanimetrage(metierZonePlanimetrages);
+ tfNbPasPlanim_.setValue(new Integer(res));
+ System.err.println("plani"+res);
}
private void enableTxtFieldButton() {
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java 2008-08-08 16:25:05 UTC (rev 3744)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java 2008-08-08 20:01:53 UTC (rev 3745)
@@ -117,7 +117,6 @@
*/
public boolean getValeurs() {
trier();
-
List listeTmp = getListeLignesCorrectes();
MetierZoneFrottement[] tabMetier = null;
boolean existeDifference = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-08-08 16:24:57
|
Revision: 3744
http://fudaa.svn.sourceforge.net/fudaa/?rev=3744&view=rev
Author: bmarchan
Date: 2008-08-08 16:25:05 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
Un peu de doc
Modified Paths:
--------------
branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueVisitor.java
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueVisitor.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueVisitor.java 2008-08-08 15:53:20 UTC (rev 3743)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueVisitor.java 2008-08-08 16:25:05 UTC (rev 3744)
@@ -7,13 +7,21 @@
*/
package org.fudaa.ebli.calque;
-
/**
+ * Un visiteur de calque. En g\xE9n\xE9ral, la visite se fait sur un ensemble de calques.
+ * A chaque nouvelle visite, les informations pertinentes sont enregistr\xE9es dans le
+ * visiteur.
+ *
* @author Fred Deniger
* @version $Id: BCalqueVisitor.java,v 1.2 2006-04-12 15:27:09 deniger Exp $
*/
public interface BCalqueVisitor {
+ /**
+ * Visite le calque pass\xE9 en argument et stocke les informations pertinentes.
+ * @param _cq Le calque a visiter.
+ * @return true : Le processus de visite peut se poursuivre sur le reste des calques.<br>
+ * false : Fin des visites.
+ */
boolean visit(BCalque _cq);
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2008-08-08 15:53:17
|
Revision: 3743
http://fudaa.svn.sourceforge.net/fudaa/?rev=3743&view=rev
Author: hadouxad
Date: 2008-08-08 15:53:20 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
- changement des noms de variables et ajout de fonctions pour EbliNode
- ajout de la classe EbliWidgetActionAlign dans org.fudaa.ebli.visuallibrary.actions qui permet de faire des align:
- a gauche
- a droite
- en haut
- en bas
- centr?\195?\169 horizontal
- centr?\195?\169 vertical
(on pourra donc combiner pour faire des trucs exotiques: en diagonale bas...)
Exemple: pour centrer dans les 2 directions, on combine centre horizontal et centre vertical
- gestion du listener d ecoute du tree en cas de suppression de widget:
- Fonction de suppression de la widget par clic droit ( on pourra rajouter un key event du style touche suppr...)
- fais appel a removeNode() de GraphScene ( non surcharg?\195?\169) mais qui fait appel a detachNodeWidget (node, widget) ( celle la surcharg?\195?\169e) qui fait un notify aux listener de la scene pour indiquer que le noeud a ?\195?\169t?\195?\169 supprim?\195?\169
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNode.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeModel.java
branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNode.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNode.java 2008-08-08 15:20:32 UTC (rev 3742)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNode.java 2008-08-08 15:53:20 UTC (rev 3743)
@@ -9,13 +9,29 @@
EbliWidgetCreator getCreator();
- Dimension getPreferedDimension();
+ void setPreferedSize(Dimension d);
+
+
+ Dimension getPreferedSize();
EbliNode duplicate(Map options);
- Point getLocation();
+ void setPreferedLocation(Point p);
+ Point getPreferedLocation();
+
public String toString();
+ /**
+ * Methode qui verifie que le node a une widget
+ * @return
+ */
+ public boolean hasWidget();
+ /**
+ * Methode qui verifie que le node est movable
+ * @return
+ */
+ public boolean isMovable();
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java 2008-08-08 15:20:32 UTC (rev 3742)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java 2008-08-08 15:53:20 UTC (rev 3743)
@@ -33,15 +33,15 @@
public void setPreferedLocation(Point p) {
this.preferedLocation = p;
// repositionnement du widget si existant
- if(getCreator()!=null && getCreator().getWidget()!=null)
+ if(hasWidget())
getCreator().getWidget().setPreferredLocation(p);
}
- public void setPreferedDimension(Dimension d) {
+ public void setPreferedSize(Dimension d) {
this.preferedSize = d;
// repositionnement du widget si existant
- if(getCreator()!=null && getCreator().getWidget()!=null)
+ if(hasWidget())
getCreator().getWidget().setPreferredSize(d);
}
@@ -55,12 +55,14 @@
return creator;
}
- public Point getLocation() {
+ public Point getPreferedLocation() {
+
return preferedLocation;
}
- public Dimension getPreferedDimension() {
+ public Dimension getPreferedSize() {
// TODO Auto-generated method stub
+
return preferedSize;
}
@@ -71,5 +73,19 @@
+ public boolean hasWidget() {
+ return (getCreator()!=null && getCreator().getWidget()!=null);
+
+ }
+
+
+ public boolean isMovable() {
+ // TODO Auto-generated method stub
+ return (hasWidget() && getPreferedLocation() !=null && getPreferedSize() !=null);
+ }
+
+
+
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2008-08-08 15:20:32 UTC (rev 3742)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2008-08-08 15:53:20 UTC (rev 3743)
@@ -30,7 +30,15 @@
*/
private LayerWidget visu_;
- private LayerWidget interactionLayer_;
+ public LayerWidget getVisu_() {
+ return visu_;
+}
+
+public void setVisu_(LayerWidget visu_) {
+ this.visu_ = visu_;
+}
+
+private LayerWidget interactionLayer_;
final private WidgetAction alignWithMoveAction;
/**
@@ -95,15 +103,37 @@
EbliWidget res = node.getCreator().create(this);
// -- remplissage des proprietes
- res.setPreferredLocation(node.getLocation());
- if (node.getPreferedDimension() != null)
- res.setPreferredSize(node.getPreferedDimension());
+ res.setPreferredLocation(node.getPreferedLocation());
+ if (node.getPreferedSize() != null)
+ res.setPreferredSize(node.getPreferedSize());
// -- ajout dans la vue layer --//
visu_.addChild(res);
return res;
}
+
+
+ /**
+ * Called by the removeNode method to notify that a node is removed from the graph model.
+ * The default implementation removes the node widget from its parent widget.
+ * @param node the removed node
+ * @param widget the removed node widget; null if the node is non-visual
+ *
+ * Surcharge pour faire appel au notify des listener et ainsi mettre ajour les listener
+ */
+ protected void detachNodeWidget (EbliNode node, Widget widget) {
+ //-- indique la suppresion du node chez le parent
+ notifyAllListenerNodeRemoved(node);
+
+ if (widget != null)
+ widget.removeFromParent ();
+
+
+ }
+
+
+
public LayerWidget getLayerVisu() {
return visu_;
@@ -190,4 +220,15 @@
}));
}
+
+ /**
+ * Methode qui permet de raffraichir les elements de la scene
+ */
+ public void refresh(){
+ revalidate();
+ this.repaint();
+ getView().repaint();
+
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-08 15:20:32 UTC (rev 3742)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-08 15:53:20 UTC (rev 3743)
@@ -96,17 +96,17 @@
public void actionPerformed(ActionEvent e) {
- // EbliWidget.this.setVisible(false);
+
EbliNode n = (EbliNode) EbliWidget.this.getEbliScene().findObject(EbliWidget.this);
EbliWidget.this.getEbliScene().removeNode(n);
- EbliWidget.this.getEbliScene().getLayerVisu().removeChild(EbliWidget.this);
+
}
});
JMenuItem menuItem3 = _popup.add("Masquer l'objet");
- menuItem3.setIcon(CtuluResource.CTULU.getIcon("crystal_non"));
+ menuItem3.setIcon(CtuluResource.CTULU.getIcon("crystal22_visibilite"));
menuItem3.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionAlign.java 2008-08-08 15:53:20 UTC (rev 3743)
@@ -0,0 +1,149 @@
+package org.fudaa.ebli.visuallibrary.actions;
+
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.beans.PropertyChangeListener;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.AbstractAction;
+
+import org.fudaa.ebli.visuallibrary.EbliNode;
+import org.fudaa.ebli.visuallibrary.EbliNodeDefault;
+import org.fudaa.ebli.visuallibrary.EbliScene;
+import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorGraphe;
+
+/**
+ * Action qui permet de realiser l alignement des composants.
+ *
+ *
+ *ATTTENTION CHOIX DE CONCEPTION:
+ *il faut que les EbliNode soit movables (isMovable()== true)
+ * pour pouvoir les aligner
+ * il faut donc lorss de la creation des nodes remplir les infos dimensions et size comme suit:
+ *
+ * EbliNodeDefault node = new EbliNodeDefault();
+ * node.setCreator(new EbliWidgetCreatorGraphe(g));
+ * node.setTitle("Graphe");
+ * node.setPreferedSize(new Dimension(300, 300));
+ * node.setPreferedLocation(new Point(4, 4));
+ * scene.addNode(node);
+ *
+ *@author Adrien Hadoux
+ *
+ */
+public class EbliWidgetActionAlign extends AbstractAction {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+ EbliScene scene_;
+ public final static int ALIGNLEFT=0;
+ public final static int ALIGNRIGHT=1;
+ public final static int ALIGNCENTERHORIZONTAL=2;
+ public final static int ALIGNCENTERVERTICAL=3;
+ public final static int ALIGNTOP=4;
+ public final static int ALIGNBOTTOM=5;
+
+ int typeAlignement_;
+
+ //liste des positions precedentes pour chaque widgets
+ List<Point> listPreviousPositions_;
+
+
+ public EbliWidgetActionAlign(EbliScene _scene, int _typeAlignement) {
+ super();
+ // TODO Auto-generated constructor stub
+ scene_=_scene;
+ typeAlignement_=_typeAlignement;
+ //-- renseignements des infos complementaires --//
+ putValue(NAME,"Alignement "+traduct(_typeAlignement));
+
+
+ }
+
+ public void actionPerformed(ActionEvent e) {
+ // TODO Auto-generated method stub
+ alignComponents();
+ }
+
+ /**
+ * methode qui recalcule la nouvelle position par rapport a la scene et a l alignement choisiT.
+ */
+ private Point calculeNewLocation(Point _previousLocation,Dimension _dimensionWidget,Dimension _dimensionScene){
+
+
+ switch(typeAlignement_){
+ case ALIGNLEFT: return new Point(0,_previousLocation.y);
+ case ALIGNRIGHT: return new Point(_dimensionScene.width-_dimensionWidget.width,_previousLocation.y);
+ case ALIGNCENTERHORIZONTAL: return new Point(_dimensionScene.width/2 -_dimensionWidget.width/2 ,_previousLocation.y);
+ case ALIGNCENTERVERTICAL: return new Point(_previousLocation.x,_dimensionScene.height/2 -_dimensionWidget.height/2);
+ case ALIGNTOP: return new Point(_previousLocation.x,0);
+ case ALIGNBOTTOM: return new Point(_previousLocation.x,_dimensionScene.height-_dimensionWidget.height);
+
+
+ default: return _previousLocation;
+ }
+
+
+ }
+
+
+ private String traduct(int _align){
+ switch(typeAlignement_){
+ case ALIGNLEFT: return "\xE0 gauche";
+ case ALIGNRIGHT: return "\xE0 droite";
+ case ALIGNCENTERHORIZONTAL: return "centr\xE9 horizontal";
+ case ALIGNCENTERVERTICAL: return "centr\xE9 vertical";
+ case ALIGNTOP: return "en haut";
+ case ALIGNBOTTOM: return "en bas";
+
+
+ default: return "";
+ }
+ }
+
+ /**
+ * action alignement qui realise l alignements de tous les composants
+ */
+ public void alignComponents(){
+
+ //-- reinitialisation de la liste des historique des positions --//
+ listPreviousPositions_=new ArrayList<Point>();
+
+ //-- recuperation de la liste des widgets selectionnees --//
+ //FIXME comment recuperer les nodes uniquements selectionnes? la je recupere tout...
+ Set<EbliNode> listeNode = (Set<EbliNode>) scene_.getNodes();
+
+ //-- parcours des nodes
+ for(Iterator<EbliNode> it=listeNode.iterator();it.hasNext();){
+
+ EbliNode currentNode=it.next();
+ if(currentNode!=null && currentNode.isMovable()){
+ //-- enregistrement de la previous position --//
+ listPreviousPositions_.add(currentNode.getPreferedLocation());
+
+ //-- calcul de la nouvelle position du node en fonction de l alignement choisi --//
+ Point newLocation=calculeNewLocation(currentNode.getPreferedLocation(), currentNode.getCreator().getWidget().getPreferredSize(),scene_.getView().getSize());
+
+ //-- tentative de modification de la position du node --//
+ currentNode.setPreferedLocation(newLocation);
+
+ currentNode.getCreator().getWidget().revalidate();
+ currentNode.getCreator().getWidget().repaint();
+ }
+
+ }
+ //-- rafraichissement de la scene --//
+ scene_.refresh();
+
+ }
+
+
+
+
+}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java 2008-08-08 15:20:32 UTC (rev 3742)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java 2008-08-08 15:53:20 UTC (rev 3743)
@@ -116,8 +116,8 @@
nodeLegende = new EbliNodeDefault();
nodeLegende.setCreator(new EbliWidgetCreatorLegende(getGraphe()));
- nodeLegende.setP(nouvellePosition);
- nodeLegende.setD(new Dimension(100, 100));
+ nodeLegende.setPreferedLocation(nouvellePosition);
+ nodeLegende.setPreferedSize(new Dimension(100, 100));
EbliWidgetGraphe.this.getEbliScene().addNode(nodeLegende);
//widgetLegende=WidgetLegendeManager.createLegende(EbliWidgetGraphe.this.getGraphe(), EbliWidgetGraphe.this.getScene_(),nouvellePosition);
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java 2008-08-08 15:20:32 UTC (rev 3742)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliCheckBoxNodeEditor.java 2008-08-08 15:53:20 UTC (rev 3743)
@@ -86,7 +86,7 @@
// -- on rend visible la widget en fonction de la checkbox
node.getCreator().getWidget().setVisible(((JCheckBox) editor).isSelected());
- node.getCreator().getWidget().getEbliScene().getView().repaint();
+ node.getCreator().getWidget().getEbliScene().refresh();
}
});
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeModel.java 2008-08-08 15:20:32 UTC (rev 3742)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeModel.java 2008-08-08 15:53:20 UTC (rev 3743)
@@ -13,6 +13,7 @@
import org.fudaa.ebli.visuallibrary.EbliNode;
import org.fudaa.ebli.visuallibrary.EbliNodeListener;
+import org.fudaa.ebli.visuallibrary.EbliScene;
/**
@@ -104,9 +105,27 @@
}
-public void noderemoved(EbliNode node) {
+public void noderemoved(EbliNode _node) {
// TODO Auto-generated method stub
+ //-- reconstruction des noeuds --//
+ nodeRoot_.removeAllChildren();
+
+ //-- recuperation de la scene --//
+ EbliScene scene=_node.getCreator().getWidget().getEbliScene();
+
+ //-- recuperation de la liste des nodes de scene --//
+ ArrayList<EbliNode> listeNodes=new ArrayList<EbliNode>(scene.getNodes());
+
+ for(Iterator<EbliNode> it=listeNodes.iterator();it.hasNext();){
+ //-- pqr lq suite on pourra faire un test si le noeud est sous element, par exemple la legende par rapport au graphe --//
+ EbliNode node=it.next();
+ nodeRoot_.add(new DefaultMutableTreeNode(node));
+ }
+
+ //-- rafraichissement du modele --//
+ modeleTree.reload();
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-08 15:20:32 UTC (rev 3742)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-08 15:53:20 UTC (rev 3743)
@@ -7,16 +7,19 @@
*/
package org.fudaa.ebli.all;
+import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Point;
import javax.swing.Box;
+import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JScrollPane;
import javax.swing.JTable;
+import javax.swing.JToolBar;
import javax.swing.JTree;
import javax.swing.WindowConstants;
import javax.swing.table.DefaultTableModel;
@@ -44,6 +47,7 @@
import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorFleche;
import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorRectangle;
import org.fudaa.ebli.visuallibrary.EbliWidgetDBLFleche;
+import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionAlign;
import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque;
import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorGraphe;
import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorLegende;
@@ -161,24 +165,22 @@
tree.setCellEditor(new EbliCheckBoxNodeEditor(tree));
tree.setEditable(true);
- // ajout graphe
- // GrapheWidget graphe=new GrapheWidget(scene,null,g);
- // graphe.setPreferredSize(new Dimension(300, 300));
- // scene.addWidget(graphe);
-
+
// -- creation d un noeud Graphe --//
EbliNodeDefault node = new EbliNodeDefault();
node.setCreator(new EbliWidgetCreatorGraphe(g));
node.setTitle("Graphe");
- node.setD(new Dimension(300, 300));
- node.setP(new Point(4, 4));
+ node.setPreferedSize(new Dimension(200, 250));
+ node.setPreferedLocation(new Point(12, 420));
scene.addNode(node);
+
// -- creation d un noeud legende --//
EbliNodeDefault nodeLegende = new EbliNodeDefault();
nodeLegende.setTitle("Legende");
nodeLegende.setCreator(new EbliWidgetCreatorLegende(g));
- nodeLegende.setD(new Dimension(100, 100));
+ nodeLegende.setPreferedSize(new Dimension(100, 100));
+ nodeLegende.setPreferedLocation(new Point(4, 270));
scene.addNode(nodeLegende);
// -- creation de la vue calque
@@ -189,6 +191,8 @@
vueC.setSize(new Dimension(200, 200));
node = new EbliNodeDefault();
node.setTitle("Vue Calque");
+ node.setPreferedSize(new Dimension(400, 200));
+ node.setPreferedLocation(new Point(250, 170));
// JFrame fr = new JFrame();
ZEbliCalquesPanel ebliCalquesPanel = new ZEbliCalquesPanel(br, new CtuluUIDefault());
@@ -205,34 +209,39 @@
EbliNodeDefault nodeRect = new EbliNodeDefault();
nodeRect.setTitle("Rectangle");
nodeRect.setCreator(new EbliWidgetCreatorRectangle("Test recangle"));
- // nodeRect.setD(new Dimension(100, 100));
- nodeRect.setP(new Point(350, 125));
+ nodeRect.setPreferedSize(new Dimension(200, 100));
+ nodeRect.setPreferedLocation(new Point(350, 125));
scene.addNode(nodeRect);
// -- ajout du fleche double sens diagonale--//
node = new EbliNodeDefault();
node.setTitle("Fleche Double");
node.setCreator(new EbliWidgetCreatorDblFleche(EbliWidgetDBLFleche.ORIENTATION_DIAG1));
- node.setD(new Dimension(100, 100));
- node.setP(new Point(450, 125));
+ node.setPreferedSize(new Dimension(100, 100));
+ node.setPreferedLocation(new Point(450, 125));
scene.addNode(node);
// -- ajout du fleche double sens nord--//
node = new EbliNodeDefault();
node.setTitle("Fleche Double");
node.setCreator(new EbliWidgetCreatorDblFleche(EbliWidgetDBLFleche.ORIENTATION_WEST));
- node.setD(new Dimension(100, 100));
- node.setP(new Point(450, 125));
+ node.setPreferedSize(new Dimension(100, 100));
+ node.setPreferedLocation(new Point(450, 125));
scene.addNode(node);
// -- ajout du fleche sens unique--//
node = new EbliNodeDefault();
node.setTitle("Fleche");
node.setCreator(new EbliWidgetCreatorFleche(0));
- node.setD(new Dimension(100, 100));
- node.setP(new Point(250, 525));
+ node.setPreferedSize(new Dimension(100, 100));
+ node.setPreferedLocation(new Point(250, 525));
scene.addNode(node);
+
+ //if(node.getCreator().getWidget().)
+
+
+
// WidgetLegendeManagerOLD.createWidgetLegendeGraphe(this, visu, courbe,
// graphe.getClientArea());
@@ -281,8 +290,10 @@
Box boxEast = Box.createVerticalBox();
boxEast.add(new BuScrollPane(t));
p.add(new JScrollPane(boxEast), BuBorderLayout.EAST);
-
- f.setContentPane(p);
+ f.setLayout(new BorderLayout());
+
+ //f.setContentPane(p);
+ f.add(p,BorderLayout.CENTER);
// fin
p.add(new JScrollPane(scene.createView()), BuBorderLayout.CENTER);
@@ -311,6 +322,14 @@
* scene.addNode(node);
*/
+JToolBar bar =new JToolBar();
+f.add(bar,BorderLayout.PAGE_START);
+bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNLEFT));
+bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNRIGHT));
+bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNCENTERHORIZONTAL));
+bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNCENTERVERTICAL));
+bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNTOP));
+bar.add(new EbliWidgetActionAlign(scene, EbliWidgetActionAlign.ALIGNBOTTOM));
p.doLayout();
}
}
\ 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: <opa...@us...> - 2008-08-08 15:20:23
|
Revision: 3742
http://fudaa.svn.sourceforge.net/fudaa/?rev=3742&view=rev
Author: opasteur
Date: 2008-08-08 15:20:32 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
Added Paths:
-----------
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion05.java
Added: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion05.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion05.java (rev 0)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion05.java 2008-08-08 15:20:32 UTC (rev 3742)
@@ -0,0 +1,596 @@
+/**
+ * @file Handler.java
+ * @creation 08 aout 2008
+ * @modification $Date: 2007-11-30 16:04:17 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.hydraulique1d.metier;
+
+import org.fudaa.dodico.boony.BoonyBase64;
+import org.fudaa.dodico.boony.BoonyDeserializerHandler;
+import org.fudaa.dodico.boony.BoonyDeserializerHandlerInterface;
+import org.fudaa.dodico.boony.BoonyLib;
+import org.fudaa.dodico.boony.BoonyXmlDeserializer;
+
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Stack;
+import java.util.TreeMap;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+
+import com.memoire.fu.FuLog;
+
+import org.fudaa.dodico.boony.BoonyXmlDeserializer.CorbaEnum;
+import java.util.StringTokenizer;
+import gnu.trove.TDoubleArrayList;
+
+
+
+/**
+ * Deserialisation du format 0.5 Mascaret.
+ * @author opasteur
+ * @version $Id: DeserializerHandlerVersion05.java,v 1.3 2007-11-30 16:04:17 jm_lacombe Exp $
+ */
+class DeserializerHandlerVersion05 implements ContentHandler, BoonyDeserializerHandlerInterface {
+
+ private final Stack arrays_;
+
+ // Map options_ = new Properties();
+ private static int tailleStringBuffer = 32;
+ private StringBuffer data_ = new StringBuffer(tailleStringBuffer);
+ private Map dobjetIObjet_;
+ private final Stack fields_;
+ protected boolean isCorba_ = true;
+
+ private boolean isTypeArrayByte_;
+ private boolean isTypeArrayDouble_;
+ protected final Object nullValue_ = new Object();
+ final Map obj_; // (id,obj)
+
+ private final Stack objects_;
+ private final Map ref_; // (obj,id)
+
+ private String singleClass_;
+ private List singles_;
+
+ private final Map typeClass_;
+
+ private final Map classNameTypeData_ = new TreeMap();
+
+ /**
+ * @param _containsCorbaObject true si des objets corba sont utilisees
+ */
+ public DeserializerHandlerVersion05(final boolean _containsCorbaObject) {
+ isCorba_ = _containsCorbaObject;
+ ref_ = new HashMap();
+ obj_ = new HashMap();
+ objects_ = new Stack();
+ fields_ = new Stack();
+ arrays_ = new Stack();
+ singles_ = new ArrayList();
+ typeClass_ = new TreeMap();
+ typeClass_.put("Bool", Boolean.class);
+ typeClass_.put("boolean", Boolean.TYPE);
+ typeClass_.put("Char", Character.class);
+ typeClass_.put("char", Character.TYPE);
+ typeClass_.put("byte", Byte.TYPE);
+ typeClass_.put("short", Short.TYPE);
+ typeClass_.put("Int", Integer.class);
+ typeClass_.put("int", Integer.TYPE);
+ typeClass_.put("long", Long.TYPE);
+ typeClass_.put("Float", Float.class);
+ typeClass_.put("float", Float.TYPE);
+ typeClass_.put("Double", Double.class);
+ typeClass_.put("double", Double.TYPE);
+ typeClass_.put("void", Void.TYPE);
+ typeClass_.put("String", String.class);
+
+ }
+
+ private String getNewClassName(final String _c) throws ClassNotFoundException {
+
+
+ final String PK_FUDAA_FUDAA_METIER="org.fudaa.fudaa.hydraulique1d.metier.";
+ String newpk;
+ int i=_c.lastIndexOf(".");
+ String oldpk=_c.substring(0,i+1);
+ String oldname=_c.substring(i+1, _c.length());
+
+
+ if (oldpk.startsWith(PK_FUDAA_FUDAA_METIER)) {
+ newpk="org.fudaa.dodico.hydraulique1d.metier.";
+ if (PK_FUDAA_FUDAA_METIER.length()<oldpk.length()) {
+ newpk+=oldpk.substring(PK_FUDAA_FUDAA_METIER.length());
+ }
+ }
+ // Aucun changement.
+ else {
+ return _c;
+ }
+
+ //System.err.println("getNewClassName "+newpk+oldname);
+ return newpk+oldname;
+ }
+
+ private Class getClass(final String _className) throws ClassNotFoundException {
+
+ String newClassName=getNewClassName(_className);
+
+ TypeData d = (TypeData) classNameTypeData_.get(newClassName);
+ if (d == null) {
+ d = new TypeData();
+ classNameTypeData_.put(newClassName, d);
+ }
+ if (d.c_ == null) {
+ d.c_ = Class.forName(newClassName);
+ }
+ return d.c_;
+ }
+
+ protected Field getField(final Class _c, final String _name) {
+
+ final String s = _c.getName();
+ //System.err.println("getField classNameTypeData_ "+classNameTypeData_+_name);
+ TypeData d = (TypeData) classNameTypeData_.get(s);
+ if (d == null) {
+ d = new TypeData();
+ d.c_ = _c;
+ classNameTypeData_.put(s, d);
+ }
+ Field f = (Field) d.nomField_.get(_name);
+ if (f == null) {
+ f = searchField(_c, _name);
+ d.nomField_.put(_name, f);
+ }
+ return f;
+ }
+
+ protected Object getFinalObjectToSet(final Object _dobjet) {
+ if (!isCorba_) {
+ return _dobjet;
+ }
+ if (dobjetIObjet_ == null) {
+ return _dobjet;
+ }
+ Object r = dobjetIObjet_.get(_dobjet);
+ if (r == null) {
+ r = _dobjet;
+ }
+ return r;
+ }
+
+ protected final Object getObj(final String _id) {
+ if ("null".equals(_id)) {
+ return null;
+ }
+
+ return obj_.get(_id);
+ }
+
+ protected Class normalize(final String _type) {
+ Class r = (Class) typeClass_.get(_type);
+ if (r == null) {
+ try {
+ r = getClass(_type);
+ } catch (final ClassNotFoundException ex) {
+ BoonyLib.warning("class not found for " + _type);
+ }
+ }
+ if (r == null) {
+ r = Object.class;
+ }
+ return r;
+ }
+
+
+
+
+
+ protected void saveCorbaObject(final Object _dobjet) {
+ if (!isCorba_) {
+ return;
+ }
+ if (dobjetIObjet_ == null) {
+ dobjetIObjet_ = new HashMap();
+ }
+ if (!dobjetIObjet_.containsKey(_dobjet)) {
+ // @todo A voir peut \xEAtre...
+// dobjetIObjet_.put(_dobjet, BoonyLib.buildStubFromDObject(_dobjet));
+ }
+ }
+
+ /**
+ * Recherche par recursivite les champs dans une classe.
+ *
+ * @param _c la classe en question
+ * @param _name le nom du champ a recherche
+ * @return null si pas de champ trouve
+ */
+ protected Field searchField(final Class _c, final String _name) {
+ if (_c == null) {
+ return null;
+ }
+ final Field[] fs = _c.getDeclaredFields();
+ if (fs != null) {
+ for (int i = fs.length - 1; i >= 0; i--) {
+ if (fs[i].getName().equals(_name)) {
+ return fs[i];
+ }
+ }
+ }
+ return searchField(_c.getSuperclass(), _name);
+ }
+
+ public void characters(final char[] _ch, final int _start, final int _length) throws SAXException {
+ data_.append(_ch, _start, _length);
+ }
+
+ public void endDocument() throws SAXException {}
+
+ public void endElement(final String _namespaceURI, final String _localName, final String _element) throws SAXException {
+ if (isTypeArrayByte_ || isTypeArrayDouble_) {
+ endElementTypeArray();
+ return;
+ }
+ final String data = data_.toString().trim();
+
+ /* if (data.length() > 0) {
+ trace(data);
+ }*/
+ if ("yapod".equals(_element)) {
+ // la base
+
+ } else if (("object".equals(_element)) || ("iobject".equals(_element))) {
+ Object o = objects_.pop();
+ if (o instanceof CorbaEnum) {
+ final Object id = ref_.get(o);
+
+ Object n = ((CorbaEnum) o).build();
+ if (n == null) {
+ FuLog.error("DBO: ### failed to build enum ");
+ n = nullValue_;
+ }
+ o = n;
+ ref_.put(o, id);
+ obj_.put(id, o);
+ }
+ } else if ("field".equals(_element)) {
+ final Field f = (Field) fields_.pop();
+
+ if (singles_.size() != 1) {
+ BoonyLib.warning("singles.size!=1 (" + singles_.size() + ")");
+
+ }
+ Object r = singles_.get(0);
+ if (r == nullValue_) {
+ r = null;
+
+ }
+ if (f != null) {
+ try {
+ final Object oToSet = getFinalObjectToSet(r);
+ f.set(objects_.peek(), oToSet);
+ } catch (final IllegalAccessException ex) {
+ FuLog.error("### no access to field " + f.getName() + " in " + objects_.peek().getClass());
+ }
+ }
+
+ singles_ = (List) fields_.pop();
+ } else if ("null".equals(_element)) {
+ singles_.add(nullValue_);
+ } else if ("single".equals(_element)) {
+ endElementSingle(data);
+ } else if ("array".equals(_element)) {
+ endElementArray();
+ } else if (!"reference".equals(_element)) {
+ BoonyLib.warning("unreconized tag: " + _element);
+ }
+ if (data_.length() > tailleStringBuffer) {
+// data_ = null;
+ //a laisser ?
+ // System.gc();
+ data_ = new StringBuffer(tailleStringBuffer);
+ }
+ }
+
+ private void endElementArray() {
+ final Object a = arrays_.pop();
+ final int l = Array.getLength(a);
+ if (singles_.size() != l) {
+ BoonyLib.warning("singles.size!=array.length (" + singles_.size() + ")");
+
+ }
+ for (int i = 0; i < l; i++) {
+ Object r = singles_.get(i);
+ if (r == nullValue_) {
+ r = null;
+ }
+ Array.set(a, i, getFinalObjectToSet(r));
+ }
+
+ singles_ = (List) arrays_.pop();
+ singles_.add(a);
+ }
+
+ private void endElementSingle(final String _data) {
+ Object o = nullValue_;
+ final Class c = normalize(singleClass_);
+
+ if (c == Boolean.class) {
+ o = Boolean.valueOf(_data);
+ } else if (c == Character.class) {
+ try {
+ o = new Character((char) new Integer(_data).intValue());
+ } catch (final NumberFormatException ex) {
+ BoonyLib.warning("invalid char value " + _data);
+ }
+ } else if (c == String.class) {
+ o = BoonyLib.fromXmlCharset(_data);
+ } else { // Number
+ try {
+ final Constructor x = c.getDeclaredConstructor(new Class[] { String.class });
+ x.setAccessible(true);
+ // YapodLib.setAccessible(x, true);
+ o = x.newInstance(new Object[] { _data });
+ } catch (final NoSuchMethodException ex) {
+ BoonyLib.warning("constructor(string) not found for class " + singleClass_);
+ } catch (final IllegalAccessException ex) {
+ BoonyLib.warning("constructor(string) not accessible " + singleClass_);
+ } catch (final InstantiationException ex) {
+ BoonyLib.warning("constructor(string) not instantiate " + singleClass_);
+ } catch (final InvocationTargetException ex) {
+ BoonyLib.warning("constructor(string) not target !" + singleClass_);
+ }
+ }
+
+ // trace(o);
+ singles_.add(o);
+ }
+
+
+
+ private void endElementTypeArray() {
+ if (isTypeArrayByte_) {
+ singles_.add(BoonyBase64.decode(data_.toString().getBytes()));
+ isTypeArrayByte_ = false;
+ }
+ else if (isTypeArrayDouble_) {
+ singles_.add(decodeArrayDouble(data_.toString()));
+ isTypeArrayDouble_ = false;
+
+ }
+ if (data_.length() > tailleStringBuffer) {
+// data_ = null;
+ // System.gc();
+ data_ = new StringBuffer(tailleStringBuffer);
+ }
+ }
+
+ private final static double[] decodeArrayDouble(final String _tab) {
+// System.err.println("appel de decodeArrayDouble");
+ final StringTokenizer stk = new StringTokenizer(_tab," ");
+ TDoubleArrayList liste = new TDoubleArrayList(_tab.length()/5);
+ while(stk.hasMoreElements()) {
+ liste.add(Double.parseDouble(stk.nextToken()));
+ }
+ return liste.toNativeArray();
+ }
+
+ public void endPrefixMapping(final String _prefix) throws SAXException {}
+
+ public Object getFirstObject() {
+ if (singles_.size() == 0) {
+ throw new NoSuchElementException();
+ }
+ Object r = singles_.get(0);
+ if (r == nullValue_) {
+ r = null;
+ }
+ singles_.remove(0);
+ return getFinalObjectToSet(r);
+ }
+
+ public void ignorableWhitespace(final char[] _ch, final int _start, final int _length) throws SAXException {}
+
+ public void processingInstruction(final String _target, final String _data) throws SAXException {}
+
+ public void setDocumentLocator(final Locator _locator) {}
+
+ public void skippedEntity(final String _name) throws SAXException {}
+
+ public void startDocument() throws SAXException {}
+
+ public void startElement(final String _namespaceURI, final String _toto, final String _element, final Attributes _atts) throws SAXException {
+ // public void startElement(String _element,AttributeList _atts) throws SAXException {
+ // trace(_element);
+ isTypeArrayByte_ = false;
+ if ("yapod".equals(_element)) {} else if (("object".equals(_element)) || (isCorba_ && ("iobject".equals(_element)))) {
+ final String type = _atts.getValue("type");
+ final String id = _atts.getValue("id");
+ Object o = nullValue_;
+ Class c = null;
+
+ try {
+ c = getClass(type);
+ } catch (final ClassNotFoundException ex) {
+ BoonyLib.warning("class not found " + type);
+ }
+
+ if (c != null) {
+ o = startCreateObject(type, o, c);
+ }
+
+ if (id != null) {
+ startSaveObject(_element, id, o);
+ }
+ objects_.push(o);
+ }
+
+ else if ("field".equals(_element)) {
+ startElementField(_atts);
+ } else if ("array-byte".equals(_element)) {
+ isTypeArrayByte_ = true;
+ }
+ else if ("array-double".equals(_element)) {
+ isTypeArrayDouble_ = true;
+ }
+
+ /*
+ * else if("array-int".equals(_element)) { }
+ */
+ else if ("null".equals(_element)) {} else if ("single".equals(_element)) {
+ singleClass_ = _atts.getValue("type");
+ } else if ("array".equals(_element)) {
+ startElementArray(_atts);
+ } else if ("reference".equals(_element)) {
+ final String id = _atts.getValue("idref");
+
+ Object o = getObj(id);
+ if (o == null) {
+ o = nullValue_;
+ }
+ singles_.add(o);
+ } else {
+ BoonyLib.warning("unreconized tag: " + _element);
+
+ // TMP @GDX
+ // if(!"".equals(data_.toString().trim()))
+ // warning("data should be empty: "+data_);
+
+ // Slow on 1.4
+ // data_.setLength(0);
+ // Change to:
+ }
+ data_ = new StringBuffer(tailleStringBuffer);
+ // options_.clear();
+ }
+
+ private void startElementArray(final Attributes _atts) {
+ final String type = _atts.getValue("type");
+ final String id = _atts.getValue("id");
+ final int length = Integer.parseInt(_atts.getValue("length"));
+ final int depth = Integer.parseInt(_atts.getValue("depth"));
+
+ final Class c = normalize(type);
+
+ final int[] dims = new int[depth];
+ dims[0] = length;
+ final Object a = Array.newInstance(c, dims);
+ //trace(a);
+
+ if (id != null) {
+ ref_.put(a, id);
+ obj_.put(id, a);
+ }
+
+ arrays_.push(singles_);
+ arrays_.push(a);
+ singles_ = new ArrayList(10);
+ }
+
+ private void startElementField(final Attributes _atts) {
+
+ final String name = _atts.getValue("name");
+
+ final Object o = objects_.peek();
+ final Class c = o.getClass();
+ final Field f = getField(c, name);
+ if (f != null) {
+ f.setAccessible(true);
+ }
+ //trace(f);
+
+ fields_.push(singles_);
+ fields_.push(f);
+ singles_ = new ArrayList();
+
+ /* if (f == null) {
+ FuLog.error("### field " + name + " removed in " + objects_.peek().getClass());
+ }*/
+ }
+
+ private void startSaveObject(final String _element, final String _id, final Object _o) {
+ ref_.put(_o, _id);
+ obj_.put(_id, _o);
+ if (isCorba_ && "iobject".equals(_element)) {
+ saveCorbaObject(_o);
+ }
+ }
+
+ private Object startCreateObject(final String _type, final Object _o, final Class _c) {
+ Object o = _o;
+ try {
+ final Constructor x = _c.getDeclaredConstructor(new Class[] {});
+ x.setAccessible(true);
+ o = x.newInstance(new Object[] {});
+ // trace(o);
+ } catch (final NoSuchMethodException ex) {} catch (final IllegalAccessException ex) {} catch (final InstantiationException ex) {} catch (final InvocationTargetException ex) {}
+
+ // CORBA Enum ?
+ if (o == nullValue_) {
+ if (isCorba_ && isCorbaEnum(_c)) {
+ o = new CorbaEnum(_c);
+ // trace(o);
+ }
+ }
+
+ if (o == nullValue_) {
+ BoonyLib.warning("default constructor not found for class " + _type);
+ }
+ return o;
+ }
+
+ /**
+ * @see org.xml.sax.ContentHandler#startPrefixMapping(java.lang.String, java.lang.String)
+ */
+ public void startPrefixMapping(final String _prefix, final String _uri) throws SAXException {}
+
+ /**
+ * Permet de suivre certains objet.
+ *
+ * @param _o l'objet a tracer
+ */
+ /*public void trace(final Object _o) {
+ // try { System.err.println("Yapod XML trace : "+_o); }
+ // catch(Throwable th) { }
+ }*/
+
+ /**
+ * utilise une map interne pour enregistrer l'etat d'une classe.
+ *
+ * @param _c la classe a tester
+ * @return si corba enum
+ */
+ public boolean isCorbaEnum(final Class _c) {
+ final String className = _c.getName();
+ TypeData d = (TypeData) classNameTypeData_.get(className);
+ if (d == null) {
+ d = new TypeData();
+ classNameTypeData_.put(className, d);
+ }
+ if (d.isCorbaEnum_ == null) {
+ d.isCorbaEnum_ = BoonyXmlDeserializer.isCorbaEnum(_c) ? Boolean.TRUE : Boolean.FALSE;
+ }
+ return d.isCorbaEnum_.booleanValue();
+ }
+
+ static class TypeData {
+
+ Class c_;
+ Map nomField_ = new TreeMap();
+ Boolean isCorbaEnum_;
+ }
+ }
Property changes on: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion05.java
___________________________________________________________________
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <opa...@us...> - 2008-08-08 15:17:27
|
Revision: 3741
http://fudaa.svn.sourceforge.net/fudaa/?rev=3741&view=rev
Author: opasteur
Date: 2008-08-08 15:17:33 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/fudaa_devel/dodico/idl/code/mascaret.idl
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion04.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierProfil.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DCalculMascaret.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/MascaretClient.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExport.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dBiefEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierGeometriePanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneProfilTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauProfilsModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/fudaa_devel/dodico/idl/code/mascaret.idl
===================================================================
--- trunk/fudaa_devel/dodico/idl/code/mascaret.idl 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/idl/code/mascaret.idl 2008-08-08 15:17:33 UTC (rev 3741)
@@ -833,6 +833,7 @@
reel absc; // abscisse utilisateur du profil
VSParametresPt pts; // les points du profil
booleen avecGeoReferencement; //booleen indiquant la pr\xE9sence de g\xE9or\xE9f\xE9rencement ou non
+ chaine infoGeoReferencement; //Contient le infos du g\xE9or\xE9f\xE9rencement indiqu\xE9 dans l'en-tete du ficher
};
typedef sequence <SParametresProfil> VSParametresProfil;
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -661,6 +661,8 @@
}
stemp = entite.isDefautValuesValides();
final String app = (String) mapEncours.get(kw_.getApparence());
+ System.err.println("app "+app);
+ System.err.println("stemp "+stemp);
if (stemp != null && ((app == null) || (app.indexOf("IS REQUIRED") < 0))) {
analyze_.addFatalError(getQuoteString() + noms[0] + "': "
+ DicoResource.getS("Les valeurs par d\xE9faut sont invalides"), ligne);
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion04.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion04.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion04.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -58,7 +58,7 @@
private List singles_;
private final Map typeClass_;
-
+
private final Map classNameTypeData_ = new TreeMap();
/**
@@ -89,10 +89,10 @@
* Mapping des anciennes classes dans les nouvelles.
*/
private String getNewClassName(final String _c) throws ClassNotFoundException {
+
final String PK_DODICO_HYDR="org.fudaa.dodico.hydraulique1d.";
final String PK_DODICO_CORBA_HYDR="org.fudaa.dodico.corba.hydraulique1d.";
final String PK_DODICO_CORBA_GEOM="org.fudaa.dodico.corba.geometrie.";
-
String newpk;
String newname;
@@ -116,6 +116,7 @@
else if (oldpk.startsWith(PK_DODICO_CORBA_GEOM)) {
newpk="org.fudaa.dodico.hydraulique1d.metier.geometrie.";
}
+
// Aucun changement.
else {
return _c;
@@ -163,6 +164,7 @@
protected Field getField(final Class _c, final String _name) {
final String s = _c.getName();
+
TypeData d = (TypeData) classNameTypeData_.get(s);
if (d == null) {
d = new TypeData();
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -38,7 +38,8 @@
*/
public class MetierEtude1d extends MetierHydraulique1d {
// IMPORTANT: NE PAS OUBLIER D'INCREMENTER CE NUMERO A CHAQUE MODIF DU FORMAT
- public final static String FORMAT_VERSION= "0.5"; // Les objets metiers ne sont plus corba, mais Java.
+ public final static String FORMAT_VERSION= "0.6"; // Les objets metiers ont \xE9t\xE9 d\xE9plac\xE9s de fudaa.hydraulique1d \xE0 dodico.hydraulique1d.
+ public final static String FORMAT_VERSION_0_5= "0.5"; // Les objets metiers ne sont plus corba, mais Java.
public final static String FORMAT_VERSION_0_4= "0.4"; // Passage en Java 1.4
public final static String FORMAT_VERSION_0_3= "0.3";
@@ -344,6 +345,15 @@
etude.versionFormat(FORMAT_VERSION);
}
}
+
+ // Version 0.5
+ else if (FORMAT_VERSION_0_5.compareTo(_version)==0){
+ System.out.println("=> Conversion format "+_version);
+ fluxLu.setHandler(new DeserializerHandlerVersion05(true));
+ Object[] infos=(Object[])fluxLu.read();
+ etude=(MetierEtude1d)infos[1];
+ etude.versionFormat(FORMAT_VERSION);
+ }
if(etude==null) return etude;
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierProfil.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierProfil.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierProfil.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -33,6 +33,7 @@
indiceLitMajDr(q.indiceLitMajDr());
indiceLitMajGa(q.indiceLitMajGa());
avecGeoreferencement(q.avecGeoreferencement());
+ infosGeoReferencement(q.infosGeoReferencement());
}
}
final public MetierHydraulique1d creeClone() {
@@ -50,6 +51,7 @@
p.indiceLitMinDr(indiceLitMinDr_);
p.indiceLitMajDr(indiceLitMajDr_);
p.avecGeoreferencement(avecGeoreferencement_);
+ p.infosGeoReferencement(infosGeoReferencement_);
return p;
}
final public String toString() {
@@ -69,6 +71,7 @@
indiceLitMajDr_= 0;
indiceLitMajGa_= 0;
avecGeoreferencement_=false;
+ infosGeoReferencement_="";
notifieObjetCree();
}
public void dispose() {
@@ -80,6 +83,7 @@
indiceLitMajDr_= -1;
indiceLitMajGa_= -1;
avecGeoreferencement_=false;
+ infosGeoReferencement_="";
super.dispose();
}
// attributs
@@ -110,6 +114,7 @@
abscisse_= s;
Notifieur.getNotifieur().fireObjetModifie(toString(), this, "abscisse");
}
+
private boolean avecGeoreferencement_;
public boolean avecGeoreferencement() {
return avecGeoreferencement_;
@@ -119,6 +124,16 @@
avecGeoreferencement_= b;
Notifieur.getNotifieur().fireObjetModifie(toString(), this, "avecGeoreferencement");
}
+
+ private String infosGeoReferencement_;
+ public String infosGeoReferencement() {
+ return infosGeoReferencement_;
+ }
+ public void infosGeoReferencement(String s) {
+ if (infosGeoReferencement_==s) return;
+ infosGeoReferencement_= s;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "infosGeoReferencement");
+ }
private MetierPoint2D[] points_;
public MetierPoint2D[] points() {
return points_;
@@ -398,7 +413,7 @@
if (p2.length != length) return false;
for (int i=0; i<length; i++)
- if (!((p[i].x==p2[i].x)&&(p[i].y==p2[i].y)))
+ if (!((p[i].x==p2[i].x)&&(p[i].y==p2[i].y) &&(p[i].cx==p2[i].cx)&&(p[i].cy==p2[i].cy)))
return false;
return true;
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DCalculMascaret.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DCalculMascaret.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DCalculMascaret.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -380,7 +380,7 @@
DParametresMascaret.ecritParametresCAS(ficCAS, params.parametresCAS());
setProgression("Ecriture des fichiers param\xE8tres", 55);
if (bInterrompu_) return;
- DParametresMascaret.ecritParametresGEO(ficGEO, params.parametresGEO());
+ DParametresMascaret.ecritParametresGEO(ficGEO, params.parametresGEO(),false);
setProgression("Ecriture des fichiers des lois hydrauliques", 70);
if (bInterrompu_) return;
DParametresMascaret.ecritLoisHydrauliques(path + nomEtude, true, params.loisHydrauliques());
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -1292,16 +1292,19 @@
SParametresProfil profil,
String nomBief,
int indBief,
- int indProfil)
+ int indProfil,
+ boolean ecrireGeoReferencement)
throws IOException {
String nomProfil= profil.nom;
if (nomProfil == null)
nomProfil= "prof" + (indBief + 1) + "_" + (indProfil + 1);
else if (nomProfil.equals(""))
nomProfil= "prof" + (indBief + 1) + "_" + (indProfil + 1);
- fgeo.writeln("PROFIL " + nomBief + " " + nomProfil + " " + profil.absc);
- if (profil.avecGeoReferencement){
- System.err.println("avec georef");
+ if (profil.infoGeoReferencement!=null && !profil.infoGeoReferencement.equals(""))
+ fgeo.writeln("PROFIL " + nomBief + " " + nomProfil + " " + profil.absc+" "+profil.infoGeoReferencement);
+ else
+ fgeo.writeln("PROFIL " + nomBief + " " + nomProfil + " " + profil.absc);
+ if (ecrireGeoReferencement && profil.avecGeoReferencement){
for (int i= 0; i < profil.pts.length; i++) {
fgeo.writeln(
profil.pts[i].x + " " + profil.pts[i].y + " " + profil.pts[i].lit+ " " + profil.pts[i].cx+ " " + profil.pts[i].cy);
@@ -1318,7 +1321,8 @@
private final static void ecritParametresBief(
FortranWriter fgeo,
SParametresBief bief,
- int indBief)
+ int indBief,
+ boolean ecrireGeoReferencement)
throws IOException {
String nomBief= bief.nom;
if (nomBief == null)
@@ -1326,7 +1330,7 @@
else if (nomBief.equals(""))
nomBief= "bief" + (indBief + 1);
for (int i= 0; i < bief.profils.length; i++) {
- ecritParametresProfil(fgeo, bief.profils[i], nomBief, indBief, i);
+ ecritParametresProfil(fgeo, bief.profils[i], nomBief, indBief, i,ecrireGeoReferencement);
}
}
@@ -1464,7 +1468,8 @@
}
private static SParametresProfil mascaretEnteteProfil(String line) throws NoSuchElementException, NumberFormatException {
- StringTokenizer st=new StringTokenizer(line);
+ System.err.println("hjohkh");
+ StringTokenizer st=new StringTokenizer(line);
SParametresProfil res=null;
/* String motCle = */
st.nextToken();
@@ -1475,7 +1480,18 @@
res=new SParametresProfil();
res.nom=nomProfil;
res.absc=abscisse;
- return res;
+
+ String infoGeoRef ="";
+ try{
+ while (st.hasMoreTokens()){ //boucle de lecture
+ infoGeoRef = infoGeoRef + " " +st.nextToken();
+ }
+ }catch (NoSuchElementException e){
+ }finally{
+ //System.err.println(" infoGeoRef"+infoGeoRef);
+ res.infoGeoReferencement=infoGeoRef;
+ return res;
+ }
}
private static boolean mascaretPointProfil(String line, Vector ptsProfil) throws NoSuchElementException, NumberFormatException {
@@ -1495,7 +1511,6 @@
}catch(NoSuchElementException e){avecGeoReferencement=false;}
if (avecGeoReferencement){
- System.err.println("georef found "+ cx +" "+cy);
pt=new SParametresPt(x,y,cx,cy,lit);
}else{
pt=new SParametresPt(x,y,0,0,lit);
@@ -1511,12 +1526,13 @@
public final static void ecritParametresGEO(
File fichier,
- SParametresGEO params) {
+ SParametresGEO params,
+ boolean ecrireGeoReferencement) {
try {
FortranWriter fgeo= new FortranWriter(new FileWriter(fichier));
System.out.println("Creation du fichier " + fichier.getName());
for (int i= 0; i < params.biefs.length; i++) {
- ecritParametresBief(fgeo, params.biefs[i], i);
+ ecritParametresBief(fgeo, params.biefs[i], i,ecrireGeoReferencement);
}
fgeo.close();
} catch (Exception ex) {
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/MascaretClient.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/MascaretClient.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/MascaretClient.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -275,8 +275,8 @@
pts[1].y = 10;
pts[2].y = 10;
pts[3].y = 20;
- parametresGEO.biefs[0].profils[0] = new SParametresProfil("AMONT_BIEF", 0, pts,false);
- parametresGEO.biefs[0].profils[1] = new SParametresProfil("AVAL_BIEF", 18000, pts,false);
+ parametresGEO.biefs[0].profils[0] = new SParametresProfil("AMONT_BIEF", 0, pts,false,"");
+ parametresGEO.biefs[0].profils[1] = new SParametresProfil("AVAL_BIEF", 18000, pts,false,"");
return parametresGEO;
}
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExport.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExport.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExport.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -8,12 +8,16 @@
*/
package org.fudaa.fudaa.hydraulique1d;
import java.io.File;
+import java.io.FileWriter;
import java.io.IOException;
import javax.swing.JFileChooser;
import javax.swing.filechooser.FileFilter;
import org.fudaa.ctulu.gui.CtuluFileChooser;
+import org.fudaa.dodico.corba.mascaret.SParametresBief;
+import org.fudaa.dodico.corba.mascaret.SParametresGEO;
+import org.fudaa.dodico.fortran.FortranWriter;
import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
import org.fudaa.dodico.hydraulique1d.metier.MetierCasier;
import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
@@ -43,8 +47,11 @@
MetierBief[] biefs) {
DParametresMascaret.ecritParametresGEO(
filename,
- ConvH1D_Masc.convertirParametresGeo(biefs));
+ ConvH1D_Masc.convertirParametresGeo(biefs),true);
}
+
+
+
public static final void exportGeometrie_CASIER(
File filename,
MetierCasier[] casiers) {
@@ -57,6 +64,8 @@
ConvH1D_Masc.convertirParametresGeoCasiers(casiers));
}
}
+
+
public static final void exportReprise_MASCARET(
File filename,
MetierParametresReprise paramReprise) {
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -1505,14 +1505,25 @@
res= bief.creeProfil();
res.nom(nomProfil);
res.abscisse(abscisse);
- return res;
+ String infoGeoRef ="";
+ try{
+ while (st.hasMoreTokens()){ //boucle de lecture
+ infoGeoRef = infoGeoRef + " " +st.nextToken();
+ }
+ }catch (NoSuchElementException e){
+ }finally{
+ //System.err.println(" infoGeoRef"+infoGeoRef);
+ res.infosGeoReferencement(infoGeoRef);
+ return res;
+ }
+
+
}
private static boolean mascaretPointProfil(
String logMsg,
String line,
Vector ptsProfil)
throws NoSuchElementException, NumberFormatException {
- System.err.println("in mascaretPointProfil");
MetierPoint2D pt2D;
boolean avecGeoReferencement = false;
@@ -1529,7 +1540,6 @@
}catch(NoSuchElementException e){avecGeoReferencement=false;}
if (avecGeoReferencement){
- System.err.println("georef found "+ cx +" "+cy);
pt2D=new MetierPoint2D(x,y,cx,cy);
}else{
pt2D=new MetierPoint2D(x,y);
@@ -1752,14 +1762,24 @@
res= new Hydraulique1dProfilModel();
res.nom(nomProfil);
res.setAbscisse(abscisse);
- return res;
+
+ String infoGeoRef ="";
+ try{
+ while (st.hasMoreTokens()){ //boucle de lecture
+ infoGeoRef = infoGeoRef + " " +st.nextToken();
+ }
+ }catch (NoSuchElementException e){
+ }finally{
+ //System.err.println(" infoGeoRef"+infoGeoRef);
+ res.infoGeoreferencement(infoGeoRef);
+ return res;
+ }
}
private static boolean mascaretPointProfil(
String logMsg,
String line,
ArrayList ptsProfil)
throws NoSuchElementException, NumberFormatException {
- System.err.println("in mascaretPointProfil");
MetierPoint2D pt2D;
boolean avecGeoReferencement = false;
@@ -1776,7 +1796,6 @@
}catch(NoSuchElementException e){avecGeoReferencement=false;}
if (avecGeoReferencement){
- System.err.println("georef found "+ cx +" "+cy);
pt2D=new MetierPoint2D(x,y,cx,cy);
}else{
pt2D=new MetierPoint2D(x,y);
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -82,7 +82,7 @@
private HashSet hsellisteners_=new HashSet();
private boolean avecGeoreferencement_;
-
+ private String infoGeoreferencement_;
// constructeurs
public Hydraulique1dProfilModel() {
@@ -94,6 +94,7 @@
ptLitMajDr_ = null;
ptLitMajGa_ = null;
avecGeoreferencement_ = false;
+ infoGeoreferencement_="";
}
public Hydraulique1dProfilModel(MetierProfil iprofil) {
@@ -106,6 +107,7 @@
setIndiceLitMinDr(iprofil.indiceLitMinDr());
setIndiceLitMajDr(iprofil.indiceLitMajDr());
avecGeoreferencement_= iprofil.avecGeoreferencement();
+ infoGeoreferencement_=iprofil.infosGeoReferencement();
}
public Object clone() {
@@ -123,6 +125,7 @@
clone.setIndiceLitMinDr(getIndiceLitMinDr());
clone.setIndiceLitMajDr(getIndiceLitMajDr());
clone.avecGeoreferencement(avecGeoreferencement_);
+ clone.infoGeoreferencement(infoGeoreferencement_);
return clone;
}
@@ -131,6 +134,8 @@
if (o instanceof Hydraulique1dProfilModel) {
Hydraulique1dProfilModel p = (Hydraulique1dProfilModel)o;
if (abscisse_ != p.getAbscisse()) return false;
+ if (!avecGeoreferencement_==p.avecGeoreferencement()) return false;
+ if (!infoGeoreferencement_.equals(p.infoGeoreferencement())) return false;
if (getIndiceLitMajDr() != p.getIndiceLitMajDr()) return false;
if (getIndiceLitMajGa() != p.getIndiceLitMajGa()) return false;
if (getIndiceLitMinDr() != p.getIndiceLitMinDr()) return false;
@@ -141,6 +146,8 @@
else if (o instanceof MetierProfil) {
MetierProfil p = (MetierProfil)o;
if (abscisse_ != p.abscisse()) return false;
+ if (!avecGeoreferencement_==p.avecGeoreferencement()) return false;
+ if (!infoGeoreferencement_.equals(p.infosGeoReferencement())) return false;
if (getIndiceLitMajDr() != p.indiceLitMajDr()) return false;
if (getIndiceLitMajGa() != p.indiceLitMajGa()) return false;
if (getIndiceLitMinDr() != p.indiceLitMinDr()) return false;
@@ -191,6 +198,14 @@
avecGeoreferencement_= b;
}
+ public String infoGeoreferencement() {
+ return infoGeoreferencement_;
+ }
+
+ public void infoGeoreferencement(String s) {
+ infoGeoreferencement_ = s;
+ }
+
public String nom() {
return nom_;
}
@@ -753,7 +768,7 @@
for (int i = 0; i < length; i++) {
Hydraulique1dPoint p2 = (Hydraulique1dPoint)liste.get(i);
- if (! ( (p[i].x == p2.x()) && (p[i].y == p2.y()))) {
+ if (! ( (p[i].x == p2.x()) && (p[i].y == p2.y())&& (p[i].cx == p2.Cx()) && (p[i].cy == p2.Cy()))) {
return false;
}
}
@@ -773,7 +788,7 @@
for (int i = 0; i < length; i++) {
Hydraulique1dPoint p1 = (Hydraulique1dPoint)l1.get(i);
Hydraulique1dPoint p2 = (Hydraulique1dPoint)l2.get(i);
- if (! ( (p1.x() == p2.x()) && (p1.y() == p2.y()))) {
+ if (! ( (p1.x() == p2.x()) && (p1.y() == p2.y()) && (p1.Cx() == p2.Cx()) && (p1.Cy() == p2.Cy()))) {
return false;
}
}
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -150,7 +150,16 @@
// Etude
entry=zf.getEntry("etude1d.xml");
- ietude1d_=ietude1d_.readFrom(zf.getInputStream(entry), false, MetierEtude1d.FORMAT_VERSION);
+
+ //On recupere la version de l'etude
+ byte[] b = new byte[1000];
+ zf.getInputStream(entry).read(b);
+ String DebutEtude = new String(b);
+ int indexVersion = DebutEtude.indexOf("<single type=\"String\">");
+ String versionEtude=DebutEtude.substring(indexVersion+22,indexVersion+25);
+
+ System.err.println("version de l'Etude lu "+versionEtude);
+ ietude1d_=ietude1d_.readFrom(zf.getInputStream(entry), false, versionEtude);
// R\xE9seau
entry=zf.getEntry("reseau.xml");
djaFrameReadFrom(zf.getInputStream(entry), FORMAT_DJA_VERSION);
@@ -341,15 +350,28 @@
System.out.println("Lecture du fichier XML contenant l'\xE9tude : " + fichierEtude.getName());
MetierEtude1d etd=null;
+ FileInputStream in;
// try{
// On teste en version 0.4
- FileInputStream in= new FileInputStream(fichierEtude);
+ in= new FileInputStream(fichierEtude);
etd=ietude1d_.readFrom(in, false,MetierEtude1d.FORMAT_VERSION_0_4);
in.close();
- // Si ca ne fonctionne pas, on teste en 0.5
+
+ // Si ca ne fonctionne pas, on teste les versions sup\xE9rieurs \xE0 0.5
if (etd==null) {
+
+ //On recupere la version de l'etude
+ in= new FileInputStream(fichierEtude);
+ byte[] b = new byte[1000];
+ in.read(b);
+ String DebutEtude = new String(b);
+ int indexVersion = DebutEtude.indexOf("<single type=\"String\">");
+ String versionEtude=DebutEtude.substring(indexVersion+22,indexVersion+25);
+
+
+ // On teste la version
in= new FileInputStream(fichierEtude);
- etd=ietude1d_.readFrom(in, false,MetierEtude1d.FORMAT_VERSION);
+ etd=ietude1d_.readFrom(in, false,versionEtude);
in.close();
}
ietude1d_=etd;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -2589,6 +2589,7 @@
geoMas.biefs[i].profils[j].nom =
biefs[i].profils()[j].nom().trim().replace(' ', '_');
geoMas.biefs[i].profils[j].avecGeoReferencement = biefs[i].profils()[j].avecGeoreferencement();
+ geoMas.biefs[i].profils[j].infoGeoReferencement = biefs[i].profils()[j].infosGeoReferencement();
geoMas.biefs[i].profils[j].pts =
new SParametresPt[biefs[i].profils()[j].points().length];
for (int k = 0; k < biefs[i].profils()[j].points().length; k++) {
@@ -2599,7 +2600,7 @@
biefs[i].profils()[j].points()[k].y;
geoMas.biefs[i].profils[j].pts[k].cx =
biefs[i].profils()[j].points()[k].cx;
- geoMas.biefs[i].profils[j].pts[k].cx =
+ geoMas.biefs[i].profils[j].pts[k].cy =
biefs[i].profils()[j].points()[k].cy;
if ( (biefs[i].profils()[j].indiceLitMinGa() <= k)
&& (k <= biefs[i].profils()[j].indiceLitMinDr())) {
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -438,6 +438,7 @@
biefs[i].profils()[j].abscisse(_params.biefs[i].profils[j].absc);
biefs[i].profils()[j].nom(_params.biefs[i].profils[j].nom);
biefs[i].profils()[j].avecGeoreferencement(_params.biefs[i].profils[j].avecGeoReferencement);
+ biefs[i].profils()[j].infosGeoReferencement(_params.biefs[i].profils[j].infoGeoReferencement);
biefs[i].profils()[j].points(new MetierPoint2D[_params.biefs[i].profils[j].pts.length]);
int indMinGa=_params.biefs[i].profils[j].pts.length;
int indMinDr=0;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dBiefEditor.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dBiefEditor.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dBiefEditor.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -130,7 +130,7 @@
modele_.setValeurs();
}
public boolean getValeurs() {
- return modele_.getValeurs();
+ return modele_.getValeurs();
}
/**
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierGeometriePanel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierGeometriePanel.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierGeometriePanel.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -184,8 +184,11 @@
0));
}
protected void importer() {
- File fichier=
- Hydraulique1dImport.chooseFile("geo", "Fichier geom\xE9trie du casier");
+
+ String[] extensionGeometrie = {"casier","geo"};
+ String[] descriptionGeometrie = {"Fichier geom\xE9trie du casier","Fichier geom\xE9trie du casier"};
+ File fichier=Hydraulique1dImport.chooseFile(extensionGeometrie,descriptionGeometrie);
+
if (fichier != null) {
try {
MetierGeometrieCasier[] tabGeo=
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneProfilTableau.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneProfilTableau.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneProfilTableau.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -59,7 +59,23 @@
return super.chaine();
}
+
/**
+ * Retourne avecGeoReferencement.
+ * @return boolean
+ */
+ public boolean avecGeoReferencement() {
+ return profilModel_.avecGeoreferencement();
+ }
+
+ /**
+ * Retourne infoGeoreferencement.
+ * @return String
+ */
+ public String infoGeoreferencement() {
+ return profilModel_.infoGeoreferencement();
+ }
+ /**
* Initialise le premier \xE9lement de la ligne.
* @param chaine La nouvelle valeur enti\xE8re de la ligne (peut \xEAtre nulle).
*/
@@ -104,6 +120,7 @@
else if (obj instanceof MetierProfil) {
MetierProfil iprofil = (MetierProfil)obj;
if (iprofil.abscisse() != abscisse()) return false;
+ if (iprofil.avecGeoreferencement() != avecGeoReferencement()) return false;
if ((iprofil.nom() == null)&&(nom()!=null)) return false;
if ((iprofil.nom() != null)&&(nom()==null)) return false;
if (!iprofil.nom().equals(nom())) return false;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauProfilsModel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauProfilsModel.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauProfilsModel.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -125,6 +125,7 @@
if (existeDifference) {
miseAJourModeleMetier(profilsTmp);
}
+
return existeDifference;
}
@@ -195,6 +196,8 @@
protected void initDProfil(Hydraulique1dLigneProfilTableau profilTab, MetierProfil iprofil) {
iprofil.abscisse(profilTab.abscisse());
iprofil.nom(profilTab.nom());
+ iprofil.avecGeoreferencement(profilTab.avecGeoReferencement());
+ iprofil.infosGeoReferencement(profilTab.infoGeoreferencement());
if (profilTab.profilModel() != null) {
iprofil.points(profilTab.profilModel().pointsNonNuls());
iprofil.indiceLitMajGa(profilTab.profilModel().getIndiceLitMajGa());
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2008-08-08 13:04:01 UTC (rev 3740)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2008-08-08 15:17:33 UTC (rev 3741)
@@ -1273,8 +1273,10 @@
.activate();
return;
}
- File fichier=
- Hydraulique1dImport.chooseFile("geo", "Fichier geom\xE9trie des casiers");
+ String[] extensionGeometrie = {"casier","geo"};
+ String[] descriptionGeometrie = {"Fichier geom\xE9trie des casiers","Fichier geom\xE9trie des casiers"};
+ File fichier=Hydraulique1dImport.chooseFile(extensionGeometrie,descriptionGeometrie);
+
if (fichier != null) {
MetierGeometrieCasier[] tabGeo=
Hydraulique1dImport.geometrieCasier(fichier, false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2008-08-08 13:03:51
|
Revision: 3740
http://fudaa.svn.sourceforge.net/fudaa/?rev=3740&view=rev
Author: hadouxad
Date: 2008-08-08 13:04:01 +0000 (Fri, 08 Aug 2008)
Log Message:
-----------
mise a jour de Eblinode default et test commit
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java 2008-08-07 22:45:03 UTC (rev 3739)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java 2008-08-08 13:04:01 UTC (rev 3740)
@@ -8,8 +8,8 @@
EbliWidgetCreator creator;
- Point p;
- Dimension d;
+ Point preferedLocation;
+ Dimension preferedSize;
String title;
@@ -30,12 +30,19 @@
this.title = title;
}
- public void setP(Point p) {
- this.p = p;
+ public void setPreferedLocation(Point p) {
+ this.preferedLocation = p;
+ // repositionnement du widget si existant
+ if(getCreator()!=null && getCreator().getWidget()!=null)
+ getCreator().getWidget().setPreferredLocation(p);
}
- public void setD(Dimension d) {
- this.d = d;
+ public void setPreferedDimension(Dimension d) {
+ this.preferedSize = d;
+
+ // repositionnement du widget si existant
+ if(getCreator()!=null && getCreator().getWidget()!=null)
+ getCreator().getWidget().setPreferredSize(d);
}
@@ -49,12 +56,12 @@
}
public Point getLocation() {
- return p;
+ return preferedLocation;
}
public Dimension getPreferedDimension() {
// TODO Auto-generated method stub
- return d;
+ return preferedSize;
}
public String toString() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <opa...@us...> - 2008-08-07 22:44:57
|
Revision: 3739
http://fudaa.svn.sourceforge.net/fudaa/?rev=3739&view=rev
Author: opasteur
Date: 2008-08-07 22:45:03 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierMethodeOpt.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierTypeLit.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierApportCrueCalageAuto.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCalageAuto.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCrueCalageAuto.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierMesureCrueCalageAuto.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierParametresCalageAuto.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierResultatsCalageAuto.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/CConversionHydraulique1d.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCrueCalagePanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCruesCalageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLaissesEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListingsCalageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresCalageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLaisseModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementCalageModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -20,6 +20,7 @@
import org.fudaa.dodico.boony.BoonyXgzSerializer;
import org.fudaa.dodico.boony.BoonyXmlDeserializer;
import org.fudaa.dodico.boony.BoonyXmlSerializer;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
import org.fudaa.dodico.hydraulique1d.metier.calageauto.*;
import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierMethodeOpt.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierMethodeOpt.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierMethodeOpt.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -12,21 +12,21 @@
{
private int __value;
private static int __size = 3;
- private static org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt[] __array = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt [__size];
+ private static org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt[] __array = new org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt [__size];
public static final int _DESCENTE_OPTIMALE = 0;
- public static final org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt DESCENTE_OPTIMALE = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt(_DESCENTE_OPTIMALE);
+ public static final org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt DESCENTE_OPTIMALE = new org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt(_DESCENTE_OPTIMALE);
public static final int _CASIER_NEWTON = 1;
- public static final org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt CASIER_NEWTON = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt(_CASIER_NEWTON);
+ public static final org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt CASIER_NEWTON = new org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt(_CASIER_NEWTON);
public static final int _ALGO_GENETIQUE = 2;
- public static final org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt ALGO_GENETIQUE = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt(_ALGO_GENETIQUE);
+ public static final org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt ALGO_GENETIQUE = new org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt(_ALGO_GENETIQUE);
public int value ()
{
return __value;
}
- public static org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt from_int (int value)
+ public static org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt from_int (int value)
{
if (value >= 0 && value < __size)
return __array[value];
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierTypeLit.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierTypeLit.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierTypeLit.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -14,19 +14,19 @@
{
private int __value;
private static int __size = 2;
- private static org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit[] __array = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit [__size];
+ private static org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit[] __array = new org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit [__size];
public static final int _MINEUR = 0;
- public static final org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit MINEUR = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit(_MINEUR);
+ public static final org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit MINEUR = new org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit(_MINEUR);
public static final int _MAJEUR = 1;
- public static final org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit MAJEUR = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit(_MAJEUR);
+ public static final org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit MAJEUR = new org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit(_MAJEUR);
public int value ()
{
return __value;
}
- public static org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit from_int (int value)
+ public static org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit from_int (int value)
{
if (value >= 0 && value < __size)
return __array[value];
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierApportCrueCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierApportCrueCalageAuto.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierApportCrueCalageAuto.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -8,7 +8,7 @@
*/
package org.fudaa.dodico.hydraulique1d.metier.calageauto;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierApportCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCalageAuto.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCalageAuto.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -8,10 +8,10 @@
*/
package org.fudaa.dodico.hydraulique1d.metier.calageauto;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierCalageAuto;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierParametresCalageAuto;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierResultatsCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierResultatsCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCrueCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCrueCalageAuto.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCrueCalageAuto.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -8,9 +8,9 @@
*/
package org.fudaa.dodico.hydraulique1d.metier.calageauto;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierApportCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierMesureCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierMesureCrueCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierMesureCrueCalageAuto.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierMesureCrueCalageAuto.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -8,7 +8,7 @@
*/
package org.fudaa.dodico.hydraulique1d.metier.calageauto;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierMesureCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierParametresCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierParametresCalageAuto.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierParametresCalageAuto.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -8,9 +8,9 @@
*/
package org.fudaa.dodico.hydraulique1d.metier.calageauto;
-import org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt;
-import org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierParametresCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
@@ -32,7 +32,8 @@
super();
pasGradient_=1;
nbMaxIterations_=100;
- typeLit_=org.fudaa.dodico.hydraulique1d.calageauto.MINEUR;
+ typeLit_= org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit.MINEUR;
+
precision_=0.01;
roInit_=1;
methodeOpt_=EnumMetierMethodeOpt.DESCENTE_OPTIMALE;
@@ -69,7 +70,7 @@
+ " nbMaxIterations : "
+ nbMaxIterations_
+ " typeLit : "
- + (typeLit_.equals(org.fudaa.dodico.hydraulique1d.calageauto.MINEUR) ? "mineur":"majeur")
+ + (typeLit_.equals( org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit.MINEUR) ? "mineur":"majeur")
+ " precision : "
+ precision_
+ " roInit : "
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierResultatsCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierResultatsCalageAuto.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierResultatsCalageAuto.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -8,7 +8,7 @@
*/
package org.fudaa.dodico.hydraulique1d.metier.calageauto;
-import org.fudaa.dodico.hydraulique1d.calageauto.MetierResultatsCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierResultatsCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatial;
import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/CConversionHydraulique1d.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/CConversionHydraulique1d.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/CConversionHydraulique1d.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -18,11 +18,11 @@
import org.fudaa.dodico.corba.mascaret.SParametresREP;
import org.fudaa.dodico.corba.mascaret.SParametresTailleMaxFichier;
import org.fudaa.dodico.corba.objet.IConnexion;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierResultatsCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.MetierCalculHydraulique1d;
import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
import org.fudaa.dodico.hydraulique1d.metier.MetierParametresTailleMaxFichier;
import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsGeneraux;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierResultatsCalageAuto;
/**
* Classe qui contient des m\xE9thodes utiles \xE0 la conversion entre les 2 mod\xE8les.
*
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -99,6 +99,12 @@
import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief;
import org.fudaa.dodico.corba.mascaret.SResultatsVariable;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.EnumMetierCondLimiteImposee;
import org.fudaa.dodico.hydraulique1d.metier.EnumMetierCritereArret;
import org.fudaa.dodico.hydraulique1d.metier.EnumMetierLimiteCalcule;
@@ -137,12 +143,6 @@
import org.fudaa.dodico.hydraulique1d.metier.MetierZone;
import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
import org.fudaa.dodico.hydraulique1d.metier.MetierZonePlanimetrage;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.casier.MetierGeometrieCasier;
import org.fudaa.dodico.hydraulique1d.metier.casier.MetierPlanimetrageCasier;
import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -93,6 +93,13 @@
import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief;
import org.fudaa.dodico.corba.mascaret.SResultatsVariable;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.EnumMetierCondLimiteImposee;
import org.fudaa.dodico.hydraulique1d.metier.EnumMetierCritereArret;
import org.fudaa.dodico.hydraulique1d.metier.EnumMetierLimiteCalcule;
@@ -134,13 +141,6 @@
import org.fudaa.dodico.hydraulique1d.metier.MetierZone;
import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
import org.fudaa.dodico.hydraulique1d.metier.MetierZonePlanimetrage;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.casier.MetierChenalLiaison;
import org.fudaa.dodico.hydraulique1d.metier.casier.MetierNuagePointsCasier;
import org.fudaa.dodico.hydraulique1d.metier.casier.MetierOrificeLiaison;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCrueCalagePanel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCrueCalagePanel.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCrueCalagePanel.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -18,10 +18,10 @@
import javax.swing.JScrollPane;
import javax.swing.border.TitledBorder;
-import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dLigneReelTableau;
import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dTableauReel;
import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dTableauReelModel;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCruesCalageEditor.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCruesCalageEditor.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCruesCalageEditor.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -20,9 +20,9 @@
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
import org.fudaa.ebli.commun.EbliPreferences;
import org.fudaa.ebli.dialog.BDialogContent;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLaissesEditor.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLaissesEditor.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLaissesEditor.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -10,10 +10,10 @@
import java.awt.event.ActionEvent;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.MetierDonneesHydrauliques;
import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
import org.fudaa.ebli.commun.EbliPreferences;
import org.fudaa.fudaa.hydraulique1d.CGlobal;
import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dTableauLaisseModel;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListingsCalageEditor.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListingsCalageEditor.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListingsCalageEditor.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -27,8 +27,8 @@
import javax.swing.text.StyledDocument;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierResultatsCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierResultatsCalageAuto;
import org.fudaa.ebli.commun.EbliListModelLargeString;
import org.fudaa.ebli.commun.EbliPreferences;
import org.fudaa.ebli.dialog.BDialogContent;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresCalageEditor.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresCalageEditor.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresCalageEditor.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -17,10 +17,10 @@
import javax.swing.border.Border;
import javax.swing.border.EtchedBorder;
-import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt;
import org.fudaa.dodico.hydraulique1d.metier.calageauto.EnumMetierTypeLit;
import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
import org.fudaa.ebli.commun.EbliPreferences;
import org.fudaa.ebli.dialog.BDialogContent;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementEditor.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementEditor.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementEditor.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -10,8 +10,8 @@
import java.awt.event.ActionEvent;
import java.io.File;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
import org.fudaa.ebli.commun.EbliPreferences;
import org.fudaa.fudaa.hydraulique1d.CGlobal;
import org.fudaa.fudaa.hydraulique1d.Hydraulique1dBaseApplication;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLaisseModel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLaisseModel.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLaisseModel.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -11,12 +11,12 @@
import java.util.ArrayList;
import java.util.List;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.MetierDonneesHydrauliques;
import org.fudaa.dodico.hydraulique1d.metier.MetierLaisse;
import org.fudaa.dodico.hydraulique1d.metier.MetierSite;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
import org.fudaa.fudaa.hydraulique1d.Hydraulique1dImport;
/**
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementCalageModel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementCalageModel.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementCalageModel.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -11,8 +11,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
/**
* Mod\xE8le de tableau pour les zones de frottements calage.
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java 2008-08-07 22:23:48 UTC (rev 3738)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java 2008-08-07 22:45:03 UTC (rev 3739)
@@ -11,9 +11,9 @@
import java.util.ArrayList;
import java.util.List;
+import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
-import org.fudaa.dodico.hydraulique1d.metier.calageauto.MetierCalageAuto;
/**
* Mod\xE8le de tableau pour les zones de frottements.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <opa...@us...> - 2008-08-07 22:23:42
|
Revision: 3738
http://fudaa.svn.sourceforge.net/fudaa/?rev=3738&view=rev
Author: opasteur
Date: 2008-08-07 22:23:48 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
Added Paths:
-----------
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierMethodeOpt.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierTypeLit.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierApportCrueCalageAuto.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCalageAuto.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCrueCalageAuto.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierMesureCrueCalageAuto.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierParametresCalageAuto.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierResultatsCalageAuto.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/package.html
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierCalageImage.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierCaracteristiqueLiaison.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierChenalLiaison.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierGeometrieCasier.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierNuagePointsCasier.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierOrificeLiaison.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierPlanimetrageCasier.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierSeuilLiaison.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierSiphonLiaison.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierTopologieCasierCasier.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierTopologieLiaison.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierTopologieRiviereCasier.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/package.html
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/evenement/
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/evenement/H1dObjetEvent.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/evenement/H1dObjetEventListener.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/evenement/Notifieur.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/geometrie/
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/geometrie/MetierPoint.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/geometrie/MetierPoint2D.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/loi/
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/loi/MetierLoiGeometrique.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/loi/MetierLoiHydrogramme.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/loi/MetierLoiLimniHydrogramme.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/loi/MetierLoiLimnigramme.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/loi/MetierLoiOuvertureVanne.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/loi/MetierLoiRegulation.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/loi/MetierLoiSeuil.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/loi/MetierLoiTarage.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/loi/MetierLoiTracer.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/loi/package.html
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/qualitedeau/
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/qualitedeau/EnumMetierModeleQualiteDEau.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/qualitedeau/EnumMetierOptionConvec.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/qualitedeau/EnumMetierOptionDiffus.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/qualitedeau/EnumMetierTypeCondLimiteTracer.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/qualitedeau/MetierConcentrationInitiale.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/qualitedeau/MetierLimiteQualiteDEau.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/qualitedeau/MetierOptionTraceur.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/qualitedeau/MetierParamPhysTracer.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/qualitedeau/MetierParametresConvecDiffu.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/qualitedeau/MetierParametresGenerauxQualiteDEau.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/qualitedeau/MetierParametresModeleQualiteEau.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/qualitedeau/MetierParametresQualiteDEau.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/EnumMetierEpaisseurSeuil.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/EnumMetierTypeSource.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierApport.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierBarrage.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierDeversoir.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierDeversoirComportementLoi.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierDeversoirComportementZCoefQ.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierPerteCharge.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierSeuil.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierSeuilDenoye.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierSeuilGeometrique.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierSeuilLimniAmont.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierSeuilLoi.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierSeuilNoye.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierSeuilTarageAmont.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierSeuilTarageAval.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierSeuilTranscritique.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierSeuilVanne.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/MetierSource.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/singularite/package.html
Added: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierMethodeOpt.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierMethodeOpt.java (rev 0)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierMethodeOpt.java 2008-08-07 22:23:48 UTC (rev 3738)
@@ -0,0 +1,45 @@
+package org.fudaa.dodico.hydraulique1d.metier.calageauto;
+
+
+/**
+* org/fudaa/dodico/corba/hydraulique1d/calageauto/EnumMetierMethodeOpt.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from D:/projets/fudaa/devel/produit/fudaa_devel/dodico/idl/metier/hydraulique1d.idl
+* mercredi 11 juillet 2007 15 h 16 CEST
+*/
+
+public class EnumMetierMethodeOpt
+{
+ private int __value;
+ private static int __size = 3;
+ private static org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt[] __array = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt [__size];
+
+ public static final int _DESCENTE_OPTIMALE = 0;
+ public static final org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt DESCENTE_OPTIMALE = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt(_DESCENTE_OPTIMALE);
+ public static final int _CASIER_NEWTON = 1;
+ public static final org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt CASIER_NEWTON = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt(_CASIER_NEWTON);
+ public static final int _ALGO_GENETIQUE = 2;
+ public static final org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt ALGO_GENETIQUE = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt(_ALGO_GENETIQUE);
+
+ public int value ()
+ {
+ return __value;
+ }
+
+ public static org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt from_int (int value)
+ {
+ if (value >= 0 && value < __size)
+ return __array[value];
+ else
+ throw new org.omg.CORBA.BAD_PARAM ();
+ }
+
+ // public EnumMetierMethodeOpt ()
+ // {}
+
+ protected EnumMetierMethodeOpt (int value)
+ {
+ __value = value;
+ __array[__value] = this;
+ }
+} // class EnumMetierMethodeOpt
Added: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierTypeLit.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierTypeLit.java (rev 0)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierTypeLit.java 2008-08-07 22:23:48 UTC (rev 3738)
@@ -0,0 +1,45 @@
+package org.fudaa.dodico.hydraulique1d.metier.calageauto;
+
+
+/**
+* org/fudaa/dodico/corba/hydraulique1d/calageauto/EnumMetierTypeLit.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from D:/projets/fudaa/devel/produit/fudaa_devel/dodico/idl/metier/hydraulique1d.idl
+* mercredi 11 juillet 2007 15 h 16 CEST
+*/
+
+
+// Les zones sont des zones de frottement standard auquelles on affecte le seul bief existant.
+public class EnumMetierTypeLit
+{
+ private int __value;
+ private static int __size = 2;
+ private static org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit[] __array = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit [__size];
+
+ public static final int _MINEUR = 0;
+ public static final org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit MINEUR = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit(_MINEUR);
+ public static final int _MAJEUR = 1;
+ public static final org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit MAJEUR = new org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit(_MAJEUR);
+
+ public int value ()
+ {
+ return __value;
+ }
+
+ public static org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit from_int (int value)
+ {
+ if (value >= 0 && value < __size)
+ return __array[value];
+ else
+ throw new org.omg.CORBA.BAD_PARAM ();
+ }
+
+ // public EnumMetierTypeLit ()
+ // {}
+
+ protected EnumMetierTypeLit (int value)
+ {
+ __value = value;
+ __array[__value] = this;
+ }
+} // class EnumMetierTypeLit
Added: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierApportCrueCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierApportCrueCalageAuto.java (rev 0)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierApportCrueCalageAuto.java 2008-08-07 22:23:48 UTC (rev 3738)
@@ -0,0 +1,90 @@
+/*
+ * @file MetierCasier.java
+ * @creation
+ * @modification $Date: 2007-11-20 11:43:25 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.hydraulique1d.metier.calageauto;
+
+import org.fudaa.dodico.hydraulique1d.calageauto.MetierApportCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
+
+/**
+ * Impl\xE9mentation de l'objet apport pour une crue de calage "MetierApportCrueCalageAuto".
+ * @version $Revision: 1.2 $ $Date: 2007-11-20 11:43:25 $ by $Author: bmarchan $
+ * @author Bertrand Marchand
+ */
+public class MetierApportCrueCalageAuto extends MetierHydraulique1d {
+ private double abscisse_;
+ private double debit_;
+
+ // Constructeur.
+ public MetierApportCrueCalageAuto() {
+ super();
+ abscisse_=0;
+ debit_=0;
+
+ notifieObjetCree();
+ }
+
+ public void initialise(MetierHydraulique1d _o) {
+ super.initialise(_o);
+ if (_o instanceof MetierApportCrueCalageAuto) {
+ MetierApportCrueCalageAuto q=(MetierApportCrueCalageAuto)_o;
+ abscisse(q.abscisse());
+ debit(q.debit());
+ }
+ }
+
+ final public MetierHydraulique1d creeClone() {
+ MetierApportCrueCalageAuto p= new MetierApportCrueCalageAuto();
+ p.initialise(this);
+ return p;
+ }
+
+ public String[] getInfos() {
+ String[] res= new String[2];
+ res[0]= "Apport";
+ res[1]=
+ super.getInfos()[1]
+ + " abscisse : "
+ + abscisse_
+ + " debit : "
+ + debit_;
+
+ return res;
+ }
+
+ public void dispose() {
+ abscisse_=0;
+ debit_=0;
+ super.dispose();
+ }
+
+ //--- Interface MetierApportCrueCalageAuto { ------------------------------------
+
+ public double abscisse() {
+ return abscisse_;
+ }
+
+ public void abscisse(double _abscisse) {
+ if (abscisse_==_abscisse) return;
+ abscisse_=_abscisse;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "abscisse");
+ }
+
+ public double debit() {
+ return debit_;
+ }
+
+ public void debit(double _debit) {
+ if (debit_==_debit) return;
+ debit_=_debit;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "debit");
+ }
+
+ //--- } Interface MetierApportCrueCalageAuto ------------------------------------
+}
Added: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCalageAuto.java (rev 0)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCalageAuto.java 2008-08-07 22:23:48 UTC (rev 3738)
@@ -0,0 +1,117 @@
+/*
+ * @file MetierCasier.java
+ * @creation
+ * @modification $Date: 2007-11-20 11:43:26 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.hydraulique1d.metier.calageauto;
+
+import org.fudaa.dodico.hydraulique1d.calageauto.MetierCalageAuto;
+import org.fudaa.dodico.hydraulique1d.calageauto.MetierCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.calageauto.MetierParametresCalageAuto;
+import org.fudaa.dodico.hydraulique1d.calageauto.MetierResultatsCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
+import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
+
+/**
+ * Impl\xE9mentation de l'objet racine du calage automatique "MetierCalageAuto".
+ * @version $Revision: 1.2 $ $Date: 2007-11-20 11:43:26 $ by $Author: bmarchan $
+ * @author Bertrand Marchand
+ */
+public class MetierCalageAuto extends MetierHydraulique1d {
+ private MetierParametresCalageAuto params_;
+ private MetierZoneFrottement[] zonesFrot_;
+ private MetierCrueCalageAuto[] crues_;
+ private MetierResultatsCalageAuto resultats_;
+
+ // Constructeur.
+ public MetierCalageAuto() {
+ super();
+ params_=new MetierParametresCalageAuto();
+ zonesFrot_=new MetierZoneFrottement[0];
+ crues_=new MetierCrueCalageAuto[0];
+ resultats_=new MetierResultatsCalageAuto();
+
+ notifieObjetCree();
+ }
+
+ public void initialise(MetierHydraulique1d _o) {
+ super.initialise(_o);
+ if (_o instanceof MetierCalageAuto) {
+ MetierCalageAuto q= (MetierCalageAuto)_o;
+ parametres(q.parametres());
+ zonesFrottement(q.zonesFrottement());
+ crues(q.crues());
+ resultats(q.resultats());
+ }
+ }
+
+ final public MetierHydraulique1d creeClone() {
+ MetierCalageAuto p=new MetierCalageAuto();
+ p.initialise(this);
+ return p;
+ }
+
+ public String[] getInfos() {
+ String[] res= new String[2];
+ res[0]= "CalageAuto";
+ res[1]=super.getInfos()[1];
+
+ return res;
+ }
+
+ public void dispose() {
+ if (params_!=null) params_.dispose();
+ zonesFrot_=null;
+ crues_=null;
+ if (resultats_!=null) resultats_.dispose();
+ super.dispose();
+ }
+
+ //--- Interface MetierCalageAuto { ----------------------------------------------
+
+ public MetierParametresCalageAuto parametres() {
+ return params_;
+ }
+
+ public void parametres(MetierParametresCalageAuto _params) {
+ if (params_==_params) return;
+ params_=_params;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "params");
+ }
+
+ public MetierZoneFrottement[] zonesFrottement() {
+ return zonesFrot_;
+ }
+
+ public void zonesFrottement(MetierZoneFrottement[] _zones) {
+ if (zonesFrot_==_zones) return;
+ zonesFrot_=_zones;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "zonesFrottement");
+ }
+
+ public MetierCrueCalageAuto[] crues() {
+ return crues_;
+ }
+
+ public void crues(MetierCrueCalageAuto[] _crues) {
+ if (crues_==_crues) return;
+ crues_=_crues;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "crues");
+ }
+
+ public MetierResultatsCalageAuto resultats() {
+ return resultats_;
+ }
+
+ public void resultats(MetierResultatsCalageAuto _resultats) {
+ if (resultats_==_resultats) return;
+ resultats_=_resultats;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "resultats");
+ }
+
+ //--- } Interface MetierCalageAuto ----------------------------------------------
+}
Added: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCrueCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCrueCalageAuto.java (rev 0)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCrueCalageAuto.java 2008-08-07 22:23:48 UTC (rev 3738)
@@ -0,0 +1,124 @@
+/*
+ * @file MetierCasier.java
+ * @creation
+ * @modification $Date: 2007-11-20 11:43:25 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.hydraulique1d.metier.calageauto;
+
+import org.fudaa.dodico.hydraulique1d.calageauto.MetierApportCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.calageauto.MetierCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.calageauto.MetierMesureCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
+
+/**
+ * Impl\xE9mentation de l'objet "MetierCrueCalageAuto" contenant la description d'une crue pour le calage automatique.
+ * @version $Revision: 1.2 $ $Date: 2007-11-20 11:43:25 $ by $Author: bmarchan $
+ * @author Bertrand Marchand
+ */
+public class MetierCrueCalageAuto extends MetierHydraulique1d {
+ private double debitAmont_;
+ private double coteAval_;
+ private MetierApportCrueCalageAuto [] apports_;
+ private MetierMesureCrueCalageAuto [] mesures_;
+
+ // Constructeur.
+ public MetierCrueCalageAuto() {
+ super();
+ debitAmont_=0;
+ coteAval_=0;
+ apports_=new MetierApportCrueCalageAuto[0];
+ mesures_=new MetierMesureCrueCalageAuto[0];
+
+ notifieObjetCree();
+ }
+
+ public void initialise(MetierHydraulique1d _o) {
+ super.initialise(_o);
+ if (_o instanceof MetierCrueCalageAuto) {
+ MetierCrueCalageAuto q=(MetierCrueCalageAuto)_o;
+ debitAmont(q.debitAmont());
+ coteAval(q.coteAval());
+ apports(q.apports());
+ mesures(q.mesures());
+ }
+ }
+
+ final public MetierHydraulique1d creeClone() {
+ MetierCrueCalageAuto p= new MetierCrueCalageAuto();
+ p.initialise(this);
+ return p;
+ }
+
+ public String[] getInfos() {
+ String[] res= new String[2];
+ res[0]= "Crue";
+ res[1]=
+ super.getInfos()[1]
+ + " debitAmont : "
+ + debitAmont_
+ + " coteAval : "
+ + coteAval_
+ + " nbApports : "
+ + apports_.length
+ + " nbMesures : "
+ + mesures_.length;
+
+ return res;
+ }
+
+ public void dispose() {
+ debitAmont_=0;
+ coteAval_=0;
+ apports_=null;
+ mesures_=null;
+ super.dispose();
+ }
+
+ //--- Interface MetierCrueCalageAuto { ------------------------------------------
+
+ public double debitAmont() {
+ return debitAmont_;
+ }
+
+ public void debitAmont(double _d) {
+ if (debitAmont_==_d) return;
+ debitAmont_=_d;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "debitAmont");
+ }
+
+ public double coteAval() {
+ return coteAval_;
+ }
+
+ public void coteAval(double _cote) {
+ if (coteAval_==_cote) return;
+ coteAval_=_cote;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "coteAval");
+ }
+
+ public MetierApportCrueCalageAuto[] apports() {
+ return apports_;
+ }
+
+ public void apports(MetierApportCrueCalageAuto[] _apports) {
+ if (apports_==_apports) return;
+ apports_=_apports;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "apports");
+ }
+
+ public MetierMesureCrueCalageAuto[] mesures() {
+ return mesures_;
+ }
+
+ public void mesures(MetierMesureCrueCalageAuto[] _mesures) {
+ if (mesures_==_mesures) return;
+ mesures_=_mesures;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "mesures");
+ }
+
+ //--- } Interface MetierCrueCalageAuto ------------------------------------------
+}
Added: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierMesureCrueCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierMesureCrueCalageAuto.java (rev 0)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierMesureCrueCalageAuto.java 2008-08-07 22:23:48 UTC (rev 3738)
@@ -0,0 +1,106 @@
+/*
+ * @file MetierCasier.java
+ * @creation
+ * @modification $Date: 2007-11-20 11:43:25 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.hydraulique1d.metier.calageauto;
+
+import org.fudaa.dodico.hydraulique1d.calageauto.MetierMesureCrueCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
+
+/**
+ * Impl\xE9mentation de l'objet mesure pour une crue de calage "MetierMesureCrueCalageAuto".
+ * @version $Revision: 1.2 $ $Date: 2007-11-20 11:43:25 $ by $Author: bmarchan $
+ * @author Bertrand Marchand
+ */
+public class MetierMesureCrueCalageAuto extends MetierHydraulique1d {
+ private double abscisse_;
+ private double cote_;
+ private double coefficient_;
+
+ // Constructeur.
+ public MetierMesureCrueCalageAuto() {
+ super();
+ abscisse_=0;
+ cote_=0;
+ coefficient_=1.0;
+
+ notifieObjetCree();
+ }
+
+ public void initialise(MetierHydraulique1d _o) {
+ super.initialise(_o);
+ if (_o instanceof MetierMesureCrueCalageAuto) {
+ MetierMesureCrueCalageAuto q=(MetierMesureCrueCalageAuto)_o;
+ abscisse(q.abscisse());
+ cote(q.cote());
+ coefficient(q.coefficient());
+ }
+ }
+
+ final public MetierHydraulique1d creeClone() {
+ MetierMesureCrueCalageAuto p= new MetierMesureCrueCalageAuto();
+ p.initialise(this);
+ return p;
+ }
+
+ public String[] getInfos() {
+ String[] res= new String[2];
+ res[0]= "Mesure";
+ res[1]=
+ super.getInfos()[1]
+ + " abscisse : "
+ + abscisse_
+ + " cote : "
+ + cote_
+ + " coefficient : "
+ + coefficient_;
+
+ return res;
+ }
+
+ public void dispose() {
+ abscisse_=0;
+ cote_=0;
+ coefficient_=0;
+ super.dispose();
+ }
+
+ //--- Interface MetierMesureCrueCalageAuto { ------------------------------------
+
+ public double abscisse() {
+ return abscisse_;
+ }
+
+ public void abscisse(double _abscisse) {
+ if (abscisse_==_abscisse) return;
+ abscisse_=_abscisse;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "abscisse");
+ }
+
+ public double cote() {
+ return cote_;
+ }
+
+ public void cote(double _cote) {
+ if (cote_==_cote) return;
+ cote_=_cote;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "cote");
+ }
+
+ public double coefficient() {
+ return coefficient_;
+ }
+
+ public void coefficient(double _coefficient) {
+ if (coefficient_==_coefficient) return;
+ coefficient_=_coefficient;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "coefficient");
+ }
+
+ //--- } Interface MetierMesureCrueCalageAuto ------------------------------------
+}
Added: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierParametresCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierParametresCalageAuto.java (rev 0)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierParametresCalageAuto.java 2008-08-07 22:23:48 UTC (rev 3738)
@@ -0,0 +1,157 @@
+/*
+ * @file MetierCasier.java
+ * @creation
+ * @modification $Date: 2007-11-20 11:43:24 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.hydraulique1d.metier.calageauto;
+
+import org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierMethodeOpt;
+import org.fudaa.dodico.hydraulique1d.calageauto.EnumMetierTypeLit;
+import org.fudaa.dodico.hydraulique1d.calageauto.MetierParametresCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
+
+/**
+ * Impl\xE9mentation de l'objet "MetierParametresCalageAuto" contenant les parametres pour le lancement du calage automatique.
+ * @version $Revision: 1.2 $ $Date: 2007-11-20 11:43:24 $ by $Author: bmarchan $
+ * @author Bertrand Marchand
+ */
+public class MetierParametresCalageAuto extends MetierHydraulique1d {
+ private double pasGradient_;
+ private int nbMaxIterations_;
+ private EnumMetierTypeLit typeLit_;
+ private double precision_;
+ private double roInit_;
+ private EnumMetierMethodeOpt methodeOpt_;
+
+ // Constructeur.
+ public MetierParametresCalageAuto() {
+ super();
+ pasGradient_=1;
+ nbMaxIterations_=100;
+ typeLit_=org.fudaa.dodico.hydraulique1d.calageauto.MINEUR;
+ precision_=0.01;
+ roInit_=1;
+ methodeOpt_=EnumMetierMethodeOpt.DESCENTE_OPTIMALE;
+
+ notifieObjetCree();
+ }
+
+ public void initialise(MetierHydraulique1d _o) {
+ super.initialise(_o);
+ if (_o instanceof MetierParametresCalageAuto) {
+ MetierParametresCalageAuto q=(MetierParametresCalageAuto)_o;
+ pasGradient(q.pasGradient());
+ nbMaxIterations(q.nbMaxIterations());
+ typeLit(q.typeLit());
+ precision(q.precision());
+ roInit(roInit());
+ methodeOpt(methodeOpt());
+ }
+ }
+
+ final public MetierHydraulique1d creeClone() {
+ MetierParametresCalageAuto p= new MetierParametresCalageAuto();
+ p.initialise(this);
+ return p;
+ }
+
+ public String[] getInfos() {
+ String[] res= new String[2];
+ res[0]= "Parametres";
+ res[1]=
+ super.getInfos()[1]
+ + " pasGradient : "
+ + pasGradient_
+ + " nbMaxIterations : "
+ + nbMaxIterations_
+ + " typeLit : "
+ + (typeLit_.equals(org.fudaa.dodico.hydraulique1d.calageauto.MINEUR) ? "mineur":"majeur")
+ + " precision : "
+ + precision_
+ + " roInit : "
+ + roInit_
+ + "methodeOpt : "
+ + (methodeOpt_.equals(EnumMetierMethodeOpt.DESCENTE_OPTIMALE) ? "Descente optimale":
+ methodeOpt_.equals(EnumMetierMethodeOpt.CASIER_NEWTON) ? "Casier newton":"Algo genetique");
+
+ return res;
+ }
+
+ public void dispose() {
+ pasGradient_=0;
+ nbMaxIterations_=0;
+ typeLit_=null;
+ precision_=0;
+ roInit_=0;
+ methodeOpt_=null;
+ super.dispose();
+ }
+
+ //--- Interface MetierParametresCalageAuto { ------------------------------------
+
+ public double pasGradient() {
+ return pasGradient_;
+ }
+
+ public void pasGradient(double _pas) {
+ if (pasGradient_==_pas) return;
+ pasGradient_=_pas;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "pasGradient");
+ }
+
+ public int nbMaxIterations() {
+ return nbMaxIterations_;
+ }
+
+ public void nbMaxIterations(int _nb) {
+ if (nbMaxIterations_==_nb) return;
+ nbMaxIterations_=_nb;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "nbMaxIterations");
+ }
+
+ public EnumMetierTypeLit typeLit() {
+ return typeLit_;
+ }
+
+ public void typeLit(EnumMetierTypeLit _type) {
+ if (typeLit_.equals(_type)) return;
+ typeLit_=_type;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "typeLit");
+ }
+
+ public double precision() {
+ return precision_;
+ }
+
+ public void precision(double _prec) {
+ if (precision_==_prec) return;
+ precision_=_prec;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "precision");
+ }
+
+ public double roInit() {
+ return roInit_;
+ }
+
+ public void roInit(double _ro) {
+ if (roInit_==_ro) return;
+ roInit_=_ro;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "roInit");
+ }
+
+ public EnumMetierMethodeOpt methodeOpt() {
+ return methodeOpt_;
+ }
+
+ public void methodeOpt(EnumMetierMethodeOpt _mth) {
+ if (methodeOpt_.equals(_mth)) return;
+ methodeOpt_=_mth;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "methodeOpt");
+ }
+
+ //--- } Interface MetierParametresCalageAuto ------------------------------------
+}
Added: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierResultatsCalageAuto.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierResultatsCalageAuto.java (rev 0)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierResultatsCalageAuto.java 2008-08-07 22:23:48 UTC (rev 3738)
@@ -0,0 +1,162 @@
+/*
+ * @file MetierCasier.java
+ * @creation
+ * @modification $Date: 2007-11-20 11:43:26 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.hydraulique1d.metier.calageauto;
+
+import org.fudaa.dodico.hydraulique1d.calageauto.MetierResultatsCalageAuto;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatial;
+import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
+
+/**
+ * Impl\xE9mentation de l'objet "MetierResultatsCalageAuto" contenant les r\xE9sultats du calage automatique.
+ * @version $Revision: 1.2 $ $Date: 2007-11-20 11:43:26 $ by $Author: bmarchan $
+ * @author Bertrand Marchand
+ */
+public class MetierResultatsCalageAuto extends MetierHydraulique1d {
+ private byte[] listingMascaret_;
+ private byte[] listingDamocles_;
+ private byte[] listingCalage_;
+ private byte[] messagesEcran_;
+ private byte[] messagesEcranErreur_;
+ private MetierResultatsTemporelSpatial resultats_;
+ private MetierZoneFrottement[] zonesCalees_;
+
+ // Constructeur.
+ public MetierResultatsCalageAuto() {
+ super();
+ listingMascaret_=new byte[0];
+ listingDamocles_=new byte[0];
+ listingCalage_=new byte[0];
+ messagesEcran_=new byte[0];
+ messagesEcranErreur_=new byte[0];
+ resultats_=new MetierResultatsTemporelSpatial();
+ zonesCalees_=new MetierZoneFrottement[0];
+
+ notifieObjetCree();
+ }
+
+ public void initialise(MetierHydraulique1d _o) {
+ super.initialise(_o);
+ if (_o instanceof MetierResultatsCalageAuto) {
+ MetierResultatsCalageAuto q=(MetierResultatsCalageAuto)_o;
+ listingMascaret(q.listingMascaret());
+ listingDamocles(q.listingDamocles());
+ listingCalage(q.listingCalage());
+ messagesEcran(q.messagesEcran());
+ messagesEcranErreur(q.messagesEcranErreur());
+ resultats(resultats());
+ zonesFrottementCalees(zonesFrottementCalees());
+ }
+ }
+
+ final public MetierHydraulique1d creeClone() {
+ MetierResultatsCalageAuto p= new MetierResultatsCalageAuto();
+ p.initialise(this);
+ return p;
+ }
+
+ final public String toString() { // Utile lors les d\xE9clenchement de notification sur modification d'attribut.
+ return "resultatsCalage";
+ }
+
+ public String[] getInfos() {
+ String[] res= new String[2];
+ res[0]= toString();
+ res[1]=
+ super.getInfos()[1];
+
+ return res;
+ }
+
+ public void dispose() {
+ listingMascaret_=null;
+ listingDamocles_=null;
+ listingCalage_=null;
+ messagesEcran_=null;
+ messagesEcranErreur_=null;
+ if (resultats_!=null) { resultats_.dispose(); resultats_=null; }
+ zonesCalees_=null;
+ super.dispose();
+ }
+
+ //--- Interface MetierResultatsCalageAuto { ------------------------------------
+
+ public byte[] listingMascaret() {
+ return listingMascaret_;
+ }
+
+ public void listingMascaret(byte[] _lis) {
+ if (listingMascaret_==_lis) return;
+ listingMascaret_=_lis;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "listingMascaret");
+ }
+
+ public byte[] listingDamocles() {
+ return listingDamocles_;
+ }
+
+ public void listingDamocles(byte[] _lis) {
+ if (listingDamocles_==_lis) return;
+ listingDamocles_=_lis;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "listingDamocles");
+ }
+
+ public byte[] listingCalage() {
+ return listingCalage_;
+ }
+
+ public void listingCalage(byte[] _lis) {
+ if (listingCalage_==_lis) return;
+ listingCalage_=_lis;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "listingCalage");
+ }
+
+ public byte[] messagesEcran() {
+ return messagesEcran_;
+ }
+
+ public void messagesEcran(byte[] _lis) {
+ if (messagesEcran_==_lis) return;
+ messagesEcran_=_lis;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "messagesEcran");
+ }
+
+ public byte[] messagesEcranErreur() {
+ return messagesEcranErreur_;
+ }
+
+ public void messagesEcranErreur(byte[] _lis) {
+ if (messagesEcranErreur_==_lis) return;
+ messagesEcranErreur_=_lis;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "messagesEcranErreur");
+ }
+
+ public MetierResultatsTemporelSpatial resultats() {
+ return resultats_;
+ }
+
+ public void resultats(MetierResultatsTemporelSpatial _res) {
+ if (resultats_==_res) return;
+ resultats_=_res;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "resultats");
+ }
+
+ public MetierZoneFrottement[] zonesFrottementCalees() {
+ return zonesCalees_;
+ }
+
+ public void zonesFrottementCalees(MetierZoneFrottement[] _zones) {
+ if (zonesCalees_==_zones) return;
+ zonesCalees_=_zones;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "zonesFrottementCalees");
+ }
+
+ //--- } Interface MetierResultatsCalageAuto ------------------------------------
+}
Added: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/package.html
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/package.html (rev 0)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/package.html 2008-08-07 22:23:48 UTC (rev 3738)
@@ -0,0 +1,7 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"><html><head><!--
+ copyright (c)1998-2005 EDF/LNHE
+ Tous droits r\xE9serv\xE9s.
+--></head><body bgcolor="white"><h2>Impl\xE9mentation des objets utilis\xE9s par le calage automatique.</h2>
+
+Ce package contient essentiellement les classes du module "calageauto".
+Utilis\xE9 pour Fudaa-Mascaret, il est n\xE9cessaire au calcul de calage automatique.</body></html>
Added: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierCalageImage.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierCalageImage.java (rev 0)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierCalageImage.java 2008-08-07 22:23:48 UTC (rev 3738)
@@ -0,0 +1,152 @@
+/**
+ * @file MetierCalageImage.java
+ * @creation
+ * @modification $Date: 2007-11-20 11:43:24 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.hydraulique1d.metier.casier;
+import org.fudaa.dodico.hydraulique1d.metier.casier.MetierCalageImage;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint2D;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
+/**
+ * Impl\xE9mentation de l'objet m\xE9tier "calage image" pour aider \xE0 d\xE9finir la g\xE9om\xE9trie d'un casier.
+ * Pas r\xE9ellement utilis\xE9.
+ * @version $Revision: 1.2 $ $Date: 2007-11-20 11:43:24 $ by $Author: bmarchan $
+ * @author Jean-Marc Lacombe
+ */
+public final class MetierCalageImage extends MetierHydraulique1d {
+ public void initialise(MetierHydraulique1d _o) {
+ super.initialise(_o);
+ if (_o instanceof MetierCalageImage) {
+ MetierCalageImage q= (MetierCalageImage)_o;
+ pt1Pixel(clone(q.pt1Pixel()));
+ pt2Pixel(clone(q.pt2Pixel()));
+ pt3Pixel(clone(q.pt3Pixel()));
+ pt1Utilisateur(clone(q.pt1Utilisateur()));
+ pt2Utilisateur(clone(q.pt2Utilisateur()));
+ pt3Utilisateur(clone(q.pt3Utilisateur()));
+ }
+ }
+ final public MetierHydraulique1d creeClone() {
+ MetierCalageImage p= new MetierCalageImage();
+ p.initialise(this);
+ return p;
+ }
+ /*** MetierLiaison ***/
+ // constructeurs
+ public MetierCalageImage() {
+ super();
+ pt1Pixel_.x= 0;
+ pt1Pixel_.y= 0;
+ pt1Utilisateur_.x= 0;
+ pt1Utilisateur_.y= 0;
+ pt2Pixel_.x= 10;
+ pt2Pixel_.y= 0;
+ pt2Utilisateur_.x= 10;
+ pt2Utilisateur_.y= 0;
+ pt3Pixel_.x= 0;
+ pt3Pixel_.y= 10;
+ pt3Utilisateur_.x= 0;
+ pt3Utilisateur_.y= 10;
+
+ notifieObjetCree();
+ }
+ public void dispose() {
+ pt1Pixel_.x= 0;
+ pt1Pixel_.y= 0;
+ pt1Utilisateur_.x= 0;
+ pt1Utilisateur_.y= 0;
+ pt2Pixel_.x= 0;
+ pt2Pixel_.y= 0;
+ pt2Utilisateur_.x= 0;
+ pt2Utilisateur_.y= 0;
+ pt3Pixel_.x= 0;
+ pt3Pixel_.y= 0;
+ pt3Utilisateur_.x= 0;
+ pt3Utilisateur_.y= 0;
+ super.dispose();
+ }
+ /*** MetierCalageImage ***/
+ // attributs
+ private MetierPoint2D pt1Pixel_;
+ public MetierPoint2D pt1Pixel() {
+ return pt1Pixel_;
+ }
+ public void pt1Pixel(MetierPoint2D s) {
+ if ((pt1Pixel_ != null)&&(s != null)) {
+ if ( (s.x == pt1Pixel_.x) && (s.y == pt1Pixel_.y))
+ return;
+ }
+ pt1Pixel_= s;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "pt1Pixel");
+ }
+ private MetierPoint2D pt1Utilisateur_;
+ public MetierPoint2D pt1Utilisateur() {
+ return pt1Utilisateur_;
+ }
+ public void pt1Utilisateur(MetierPoint2D s) {
+ if ((pt1Utilisateur_ != null)&&(s != null)) {
+ if ( (s.x == pt1Utilisateur_.x) && (s.y == pt1Utilisateur_.y))
+ return;
+ }
+ pt1Utilisateur_= s;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "pt1Utilisateur");
+ }
+ private MetierPoint2D pt2Pixel_;
+ public MetierPoint2D pt2Pixel() {
+ return pt2Pixel_;
+ }
+ public void pt2Pixel(MetierPoint2D s) {
+ if ((pt2Pixel_ != null)&&(s != null)) {
+ if ( (s.x == pt2Pixel_.x) && (s.y == pt2Pixel_.y))
+ return;
+ }
+ pt2Pixel_= s;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "pt2Pixel");
+ }
+ private MetierPoint2D pt2Utilisateur_;
+ public MetierPoint2D pt2Utilisateur() {
+ return pt2Utilisateur_;
+ }
+ public void pt2Utilisateur(MetierPoint2D s) {
+ if ((pt2Utilisateur_ != null)&&(s != null)) {
+ if ( (s.x == pt2Utilisateur_.x) && (s.y == pt2Utilisateur_.y))
+ return;
+ }
+ pt2Utilisateur_= s;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "pt2Utilisateur");
+ }
+ private MetierPoint2D pt3Pixel_;
+ public MetierPoint2D pt3Pixel() {
+ return pt3Pixel_;
+ }
+ public void pt3Pixel(MetierPoint2D s) {
+ if ((pt3Pixel_ != null)&&(s != null)) {
+ if ( (s.x == pt3Pixel_.x) && (s.y == pt3Pixel_.y))
+ return;
+ }
+ pt3Pixel_= s;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "pt3Pixel");
+ }
+ private MetierPoint2D pt3Utilisateur_;
+ public MetierPoint2D pt3Utilisateur() {
+ return pt3Utilisateur_;
+ }
+ public void pt3Utilisateur(MetierPoint2D s) {
+ if ((pt3Utilisateur_ != null)&&(s != null)) {
+ if ( (s.x == pt3Utilisateur_.x) && (s.y == pt3Utilisateur_.y))
+ return;
+ }
+ pt3Utilisateur_= s;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "pt3Utilisateur");
+ }
+ private static MetierPoint2D clone(MetierPoint2D pt) {
+ MetierPoint2D ptClone= new MetierPoint2D();
+ ptClone.x= pt.x;
+ ptClone.y= pt.y;
+ return ptClone;
+ }
+}
Added: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierCaracteristiqueLiaison.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierCaracteristiqueLiaison.java (rev 0)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierCaracteristiqueLiaison.java 2008-08-07 22:23:48 UTC (rev 3738)
@@ -0,0 +1,142 @@
+/**
+ * @file DCaracteristiqueLiaison.java
+ * @creation
+ * @modification $Date: 2007-11-20 11:43:24 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.hydraulique1d.metier.casier;
+import org.fudaa.dodico.hydraulique1d.metier.casier.MetierCaracteristiqueLiaison;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierSensDebitLiaison;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
+import org.fudaa.dodico.hydraulique1d.metier.Identifieur;
+/**
+ * Impl\xE9mentation de l'objet m\xE9tier "caract\xE9ristique d'une liaison".
+ * Abstraction des diff\xE9rents type de liaison (seuil, chenal, siphon, orifice).
+ * @version $Revision: 1.2 $ $Date: 2007-11-20 11:43:24 $ by $Author: bmarchan $
+ * @author Jean-Marc Lacombe
+ */
+public abstract class MetierCaracteristiqueLiaison extends MetierHydraulique1d {
+ public void initialise(MetierHydraulique1d _o) {
+ if (_o instanceof MetierCaracteristiqueLiaison) {
+ MetierCaracteristiqueLiaison q= (MetierCaracteristiqueLiaison)_o;
+ cote(q.cote());
+ id(q.id());
+ }
+ }
+ final public String toString() {
+ return "CaracteristiqueLiaison" + id_;
+ }
+ public MetierCaracteristiqueLiaison() {
+ super();
+ cote_=1;
+ id_= Identifieur.IDENTIFIEUR.identificateurLibre(
+ "org.fudaa.dodico.hydraulique1d.metier.casier.MetierCaracteristiqueLiaison");
+ }
+ public void dispose() {
+ cote_= 0;
+ id_=0;
+ super.dispose();
+ }
+ public String[] getInfos() {
+ String[] res= new String[2];
+ res[0]= "Caract\xE9ristiques liaison";
+ res[1]= "cote : " + cote_;
+ return res;
+ }
+ /*** DCaracteristiqueLiaison ***/
+ // attributs
+ protected int id_;
+ public int id() {
+ return id_;
+ }
+ public void id(int s) {
+ if (id_==s) return;
+ id_= s;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "id");
+ }
+ protected double cote_;
+ public double cote() {
+ return cote_;
+ }
+ public void cote(double s) {
+ if (cote_==s) return;
+ cote_= s;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "cote");
+ }
+ // m\xE9thodes
+ public boolean isSeuil() {
+ return false;
+ }
+ public boolean isChenal() {
+ return false;
+ }
+ public boolean isSiphon() {
+ return false;
+ }
+ public boolean isOrifice() {
+ return false;
+ }
+ public double getCote() {
+ return cote();
+ }
+ public void setCote(double cote) {
+ cote(cote);
+ }
+ public double getLargeur() {
+ throw new IllegalArgumentException("methode invalide : getLargeur()");
+ }
+ public void setLargeur(double largeur) {
+ throw new IllegalArgumentException("methode invalide : setLargeur()");
+ }
+ public double getLongueur() {
+ throw new IllegalArgumentException("methode invalide : getLongueur()");
+ }
+ public void setLongueur(double longueur) {
+ throw new IllegalArgumentException("methode invalide : setLongueur()");
+ }
+ public double getCoefQ() {
+ throw new IllegalArgumentException("methode invalide : getCoefQ()");
+ }
+ public void setCoefQ(double coefQ) {
+ throw new IllegalArgumentException("methode invalide : setCoefQ()");
+ }
+ public double getSection() {
+ throw new IllegalArgumentException("methode invalide : getSection()");
+ }
+ public void setSection(double section) {
+ throw new IllegalArgumentException("methode invalide : setSection()");
+ }
+ public double getCoefActivation() {
+ throw new IllegalArgumentException("methode invalide : getCoefActivation()");
+ }
+ public void setCoefActivation(double coefActivation) {
+ throw new IllegalArgumentException("methode invalide : setCoefActivation()");
+ }
+ public double getRugosite() {
+ throw new IllegalArgumentException("methode invalide : getRugosite()");
+ }
+ public void setRugosite(double rugosite) {
+ throw new IllegalArgumentException("methode invalide : setRugosite()");
+ }
+ public double getCoefPerteCharge() {
+ throw new IllegalArgumentException("methode invalide : getCoefPerteCharge()");
+ }
+ public void setCoefPerteCharge(double coefPerteCharge) {
+ throw new IllegalArgumentException("methode invalide : setCoefPerteCharge()");
+ }
+ public double getCoefQOrifice() {
+ throw new IllegalArgumentException("methode invalide : getCoefQOrifice()");
+ }
+ public void setCoefQOrifice(double coteMin) {
+ throw new IllegalArgumentException("methode invalide : setCoefQOrifice()");
+ }
+ public EnumMetierSensDebitLiaison getSensDebit() {
+ throw new IllegalArgumentException("methode invalide : getSensDebit()");
+ }
+ public void setSensDebit(EnumMetierSensDebitLiaison sensDebit) {
+ throw new IllegalArgumentException("methode invalide : setSensDebit()");
+ }
+}
Added: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierChenalLiaison.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierChenalLiaison.java (rev 0)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierChenalLiaison.java 2008-08-07 22:23:48 UTC (rev 3738)
@@ -0,0 +1,121 @@
+/**
+ * @file MetierSeuilLiaison.java
+ * @creation
+ * @modification $Date: 2007-11-20 11:43:24 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.hydraulique1d.metier.casier;
+import org.fudaa.dodico.hydraulique1d.metier.casier.MetierChenalLiaison;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
+/**
+ * Impl\xE9mentation de l'objet m\xE9tier caract\xE9ristique d'une "liaison chenal".
+ * Associe une largeur, une longueur et une rugosit\xE9.
+ * @version $Revision: 1.2 $ $Date: 2007-11-20 11:43:24 $ by $Author: bmarchan $
+ * @author Jean-Marc Lacombe
+ */
+public final class MetierChenalLiaison extends MetierCaracteristiqueLiaison {
+ public void initialise(MetierHydraulique1d _o) {
+ super.initialise(_o);
+ if (_o instanceof MetierChenalLiaison) {
+ MetierChenalLiaison q= (MetierChenalLiaison)_o;
+ largeur(q.largeur());
+ longueur(q.longueur());
+ rugosite(q.rugosite());
+ }
+ }
+ final public MetierHydraulique1d creeClone() {
+ MetierChenalLiaison p= new MetierChenalLiaison();
+ p.initialise(this);
+ return p;
+ }
+ /*** MetierLiaison ***/
+ // constructeurs
+ public MetierChenalLiaison() {
+ super();
+ largeur_= 1;
+ longueur_= 10;
+ rugosite_= 30;
+
+ notifieObjetCree();
+ }
+ public void dispose() {
+ id_= 0;
+ largeur_= 0;
+ longueur_= 0;
+ rugosite_= 0;
+ super.dispose();
+ }
+ public String[] getInfos() {
+ String[] res= new String[2];
+ res[0]= "Chenal";
+ res[1]=
+ super.getInfos()[1]
+ + " larg. : "
+ + largeur_
+ + " long. : "
+ + longueur_
+ + " rugosit\xE9 : "
+ + rugosite_;
+ return res;
+ }
+ /*** MetierSeuilLiaison ***/
+ // attributs
+ private double largeur_;
+ public double largeur() {
+ return largeur_;
+ }
+ public void largeur(double s) {
+ if (largeur_==s) return;
+ largeur_= s;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "largeur");
+ }
+ private double longueur_;
+ public double longueur() {
+ return longueur_;
+ }
+ public void longueur(double s) {
+ if (longueur_==s) return;
+ longueur_= s;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "longueur");
+ }
+ private double rugosite_;
+ public double rugosite() {
+ return rugosite_;
+ }
+ public void rugosite(double s) {
+ if (rugosite_==s) return;
+ rugosite_= s;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "rugosite");
+ }
+ // m\xE9thodes
+ public boolean isChenal() {
+ return true;
+ }
+ public double getLargeur() {
+ return largeur();
+ }
+ public void setLargeur(double largeur) {
+ largeur(largeur);
+ }
+ public double getLongueur() {
+ return longueur();
+ }
+ public void setLongueur(double longueur) {
+ longueur(longueur);
+ }
+ public double getRugosite() {
+ return rugosite();
+ }
+ public void setRugosite(double rugosite) {
+ rugosite(rugosite);
+ }
+ public double getCoteMoyenneFond() {
+ return cote();
+ }
+ public void setCoteMoyenneFond(double coteMoyenneFond) {
+ cote(coteMoyenneFond);
+ }
+}
Added: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierGeometrieCasier.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierGeometrieCasier.java (rev 0)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierGeometrieCasier.java 2008-08-07 22:23:48 UTC (rev 3738)
@@ -0,0 +1,97 @@
+/**
+ * @file MetierGeometrieCasier.java
+ * @creation
+ * @modification $Date: 2007-11-20 11:43:22 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.hydraulique1d.metier.casier;
+import org.fudaa.dodico.hydraulique1d.metier.casier.MetierGeometrieCasier;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint2D;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
+import org.fudaa.dodico.hydraulique1d.metier.Identifieur;
+/**
+ * Impl\xE9mentation de l'objet m\xE9tier "g\xE9om\xE9trie d'un casier".
+ * Abstraction des diff\xE9rentes g\xE9om\xE9trie (planim\xE9trage ou nuage de point).
+ * @version $Revision: 1.2 $ $Date: 2007-11-20 11:43:22 $ by $Author: bmarchan $
+ * @author Jean-Marc Lacombe
+ */
+public abstract class MetierGeometrieCasier extends MetierHydraulique1d {
+ public void initialise(MetierHydraulique1d _o) {
+ super.initialise(_o);
+ if (_o instanceof MetierGeometrieCasier) {
+ MetierGeometrieCasier q= (MetierGeometrieCasier)_o;
+ pasPlanimetrage(q.pasPlanimetrage());
+ }
+ }
+ final public String toString() {
+ String s= "Geometrie casier" + id_;
+ return s;
+ }
+ /*** MetierGeometrieCasier ***/
+ // constructeurs
+ public MetierGeometrieCasier() {
+ super();
+ id_= Identifieur.IDENTIFIEUR.identificateurLibre(getClass().getName());
+ pasPlanimetrage_= 1;
+ }
+ public void dispose() {
+ id_= 0;
+ pasPlanimetrage_= 0;
+ super.dispose();
+ }
+ // attributs
+ private int id_;
+ private double pasPlanimetrage_;
+ public double pasPlanimetrage() {
+ return pasPlanimetrage_;
+ }
+ public void pasPlanimetrage(double pasPlanimetrage) {
+ if (pasPlanimetrage_==pasPlanimetrage) return;
+ pasPlanimetrage_= pasPlanimetrage;
+ Notifieur.getNotifieur().fireObjetModifie(toString(), this, "pasPlanimetrage");
+ }
+ // les m\xE9thodes
+ public boolean isSurfaceDependCote() {
+ return false;
+ }
+ public void setSurfaceDependCote(boolean surfaceDependCote) {
+ throw new IllegalArgumentException("methode invalide : setSurfaceDependCote()");
+ }
+ public double getPasPlanimetrage() {
+ return pasPlanimetrage();
+ }
+ public void setPasPlanimetrage(double pasPlanimetrage) {
+ pasPlanimetrage(pasPlanimetrage);
+ }
+ public MetierPoint[] getPointsFrontiere() {
+ throw new IllegalArgumentException("methode invalide : getPointsFrontiere()");
+ }
+ public void setPointsFrontiere(MetierPoint[] points) {
+ throw new IllegalArgumentException("methode invalide : setPointsFrontiere()");
+ }
+ public MetierPoint[] getPointsInterieur() {
+ throw new IllegalArgumentException("methode invalide : getPointsInterieur()");
+ }
+ public void setPointsInterieur(MetierPoint[] points) {
+ throw new IllegalArgumentException("methode invalide : setPointsInterieur()");
+ }
+ public int getNbCotePlanimetrage() {
+ throw new IllegalArgumentException("methode invalide : getNbCotePlanimetrage()");
+ }
+ public boolean isNuagePoints() {
+ return false;
+ }
+ public boolean isPlanimetrage() {
+ return false;
+ }
+ public MetierPoint2D[] getPointsPlanimetrage() {
+ throw new IllegalArgumentException("methode invalide : getPointsPlanimetrage()");
+ }
+ public void setPointsPlanimetrage(MetierPoint2D[] points) {
+ throw new IllegalArgumentException("methode invalide : setPointsPlanimetrage()");
+ }
+}
Added: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierNuagePointsCasier.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierNuagePointsCasier.java (rev 0)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/casier/MetierNuagePointsCasier.java 2008-08-07 22:23:48 UTC (rev 3738)
@@ -0,0 +1,184 @@
+/**
+ * @file MetierNuagePointsCasier.java
+ * @creation
+ * @modification $Date: 2007-11-20 11:43:20 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.dodico.hydraulique1d.metier.casier;
+import java.util.Arrays;
+
+import org.fudaa.dodico.hydraulique1d.metier.casier.MetierCalageImage;
+import org.fudaa.dodico.hydraulique1d.metier.casier.MetierNuagePointsCasier;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
+/**
+ * Impl\xE9mentation de l'objet m\xE9tier g\xE9om\xE9trie d'un casier d\xE9crit par des "nuages de points 3D".
+ * Associe les nuages de points fronti\xE8res et int\xE9rieurs largeur, un indicateur
+ * de d\xE9pendance de la surface vis a vis de la cote.
+ * L'image et le calage de l'image ne sont pas encore utilis\xE9s.
+ * @version $Revision: 1.2 $ $Date: 2007-11-20 11:43:20 $ by $Author: bmarchan $
+ * @author Jean-Marc Lacombe
+ */
+public final class MetierNuagePointsCasier extends MetierGeometrieCasier {
+ public String[] getInfos() {
+ String[] res= new String[2];
+ res[0]= "Semi de points";
+ res[1]= "";
+ return res;
+ }
+ /*** MetierNuagePointsCasier ***/
+ public void initialise(MetierHydraulique1d _o) {
+ super.initialise(_o);
+ if (_o instanceof MetierNuagePointsCasier) {
+ MetierNuagePointsCasier q= (MetierNuagePointsCasier)_o;
+ surfaceDependCote(q.surfaceDependCote());
+ pointsFrontiere((MetierPoint[])q.pointsFrontiere().clone());
+ pointsInterieur((MetierPoint[])q.pointsInterieur().clone());
+ image((byte[])q.image().clone());
+ if (q.calage() != null)
+ calage((MetierCalageImage)q.calage().creeClone());
+ }
+ }
+ final public MetierHydraulique1d creeClone() {
+ MetierNuagePointsCasier p=
+ new MetierNuagePointsCasier();
+ p.initialise(this);
+ return p;
+ }
+ // constructeurs
+ public MetierNuagePointsCasier() {
+ super();
+ surfaceDependCote_= false;
+ pointsFrontiere_= new MetierPoint[0];
+ pointsInterieur_= new MetierPoint[0];
+ image_= new byte[0];
+ calage_= null;
+
+ notifieObjetCr...
[truncated message content] |
|
From: <de...@us...> - 2008-08-07 21:46:25
|
Revision: 3737
http://fudaa.svn.sourceforge.net/fudaa/?rev=3737&view=rev
Author: deniger
Date: 2008-08-07 21:46:35 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2008-08-07 21:44:40 UTC (rev 3736)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2008-08-07 21:46:35 UTC (rev 3737)
@@ -4,13 +4,9 @@
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import org.fudaa.ctulu.image.CtuluLibImage;
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.ZEbliCalquesPanel;
-import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.ebli.visuallibrary.EbliScene;
import org.fudaa.ebli.visuallibrary.EbliWidget;
@@ -29,8 +25,6 @@
protected void paintWidget() {
Rectangle rec = getClientArea();
Graphics2D g = getGraphics();
- System.err.println(rec);
-
g.translate(rec.x, rec.y);
// GrBoite b = vue_.getVueCalque().getViewBoite();
// vue_.getVueCalque().changeRepere(this, b);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2008-08-07 21:44:31
|
Revision: 3736
http://fudaa.svn.sourceforge.net/fudaa/?rev=3736&view=rev
Author: deniger
Date: 2008-08-07 21:44:40 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
maj vue 2d
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-07 21:44:21 UTC (rev 3735)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-07 21:44:40 UTC (rev 3736)
@@ -7,19 +7,11 @@
*/
package org.fudaa.ebli.all;
-import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Graphics2D;
import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.util.Collections;
import javax.swing.Box;
-import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
@@ -28,56 +20,42 @@
import javax.swing.JTree;
import javax.swing.WindowConstants;
import javax.swing.table.DefaultTableModel;
-import javax.swing.text.Utilities;
-import javax.swing.tree.TreePath;
-import org.fudaa.ctulu.CtuluResource;
+import org.fudaa.ctulu.CtuluUIDefault;
import org.fudaa.ctulu.gui.CtuluLibSwing;
-import org.fudaa.ctulu.image.CtuluLibImage;
import org.fudaa.ctulu.iterator.LogarithmicNumberIterator;
-import org.fudaa.ebli.courbe.EGAxe;
+import org.fudaa.ebli.calque.BVueCalque;
+import org.fudaa.ebli.calque.ZCalqueLigneBrisee;
+import org.fudaa.ebli.calque.ZEbliCalquesPanel;
+import org.fudaa.ebli.calque.edition.ZCalqueLigneBriseeEditable;
import org.fudaa.ebli.courbe.EGAxeHorizontal;
import org.fudaa.ebli.courbe.EGAxeVertical;
import org.fudaa.ebli.courbe.EGCourbeChild;
import org.fudaa.ebli.courbe.EGCourbeModelDefault;
import org.fudaa.ebli.courbe.EGFillePanel;
import org.fudaa.ebli.courbe.EGGraphe;
-import org.fudaa.ebli.courbe.EGGrapheModelListener;
import org.fudaa.ebli.courbe.EGGrapheTreeModel;
import org.fudaa.ebli.courbe.EGGroup;
-import org.fudaa.ebli.courbe.EGObject;
-import org.fudaa.ebli.tableau.EbliGrapheValeur;
import org.fudaa.ebli.trace.TraceLigne;
import org.fudaa.ebli.trace.TraceLigneModel;
-import org.fudaa.ebli.visuallibrary.EbliCheckBoxNodeEditor;
-import org.fudaa.ebli.visuallibrary.EbliCheckBoxTreeRenderer;
import org.fudaa.ebli.visuallibrary.EbliNodeDefault;
import org.fudaa.ebli.visuallibrary.EbliScene;
import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorDblFleche;
import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorFleche;
-import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorGraphe;
-import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorLegende;
import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorRectangle;
-import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorVue2d;
import org.fudaa.ebli.visuallibrary.EbliWidgetDBLFleche;
-import org.fudaa.ebli.visuallibrary.EbliWidgetGraphe;
-import org.fudaa.ebli.visuallibrary.EbliWidgetJXTree;
-import org.fudaa.ebli.visuallibrary.EbliWidgetJXTreeModel;
-import org.fudaa.ebli.visuallibrary.WidgetLegendeManager;
-import org.fudaa.ebli.visuallibrary.WidgetLegendeManagerOLD;
-import org.jdesktop.swingx.JXTree;
+import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque;
+import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorGraphe;
+import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorLegende;
+import org.fudaa.ebli.visuallibrary.tree.EbliCheckBoxNodeEditor;
+import org.fudaa.ebli.visuallibrary.tree.EbliCheckBoxTreeRenderer;
+import org.fudaa.ebli.visuallibrary.tree.EbliWidgetJXTree;
+import org.fudaa.ebli.visuallibrary.tree.EbliWidgetJXTreeModel;
import org.netbeans.api.visual.action.ActionFactory;
import org.netbeans.api.visual.border.BorderFactory;
-import org.netbeans.api.visual.graph.GraphScene;
import org.netbeans.api.visual.laf.LookFeel;
-import org.netbeans.api.visual.layout.LayoutFactory;
import org.netbeans.api.visual.model.ObjectState;
import org.netbeans.api.visual.widget.ComponentWidget;
-import org.netbeans.api.visual.widget.ImageWidget;
-import org.netbeans.api.visual.widget.LabelWidget;
-import org.netbeans.api.visual.widget.LayerWidget;
-import org.netbeans.api.visual.widget.Widget;
-import org.netbeans.api.visual.widget.general.IconNodeWidget;
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuPanel;
@@ -89,281 +67,250 @@
*/
public final class TestGraphe2 {
- private TestGraphe2() {
- super();
- }
+ private TestGraphe2() {
+ super();
+ }
- /**
- * @param _args
- * non utilise
- */
- public static void main(final String[] _args) {
- final EGGrapheTreeModel grapheModel = new EGGrapheTreeModel();
- final EGGraphe g = new EGGraphe(grapheModel);
- final EGAxeHorizontal x = new EGAxeHorizontal(false);
- x.setTitre("temps");
- x.setUnite("sec");
- x.setBounds(0.0001, 1000000);
- x.setAxisIterator(new LogarithmicNumberIterator());
- x.setGraduations(true);
- g.setXAxe(x);
- EGGroup gr = new EGGroup();
- gr.setTitle("gr 1");
- EGCourbeModelDefault m = new EGCourbeModelDefault(new double[] {
- 0.0001, 3, 4, 1000000 }, new double[] { 10000, 4, 5, 3 });
- EGCourbeChild c = new EGCourbeChild(gr);
- m.setTitle("toto bleue");
- c.setModel(m);
- c.setAspectContour(Color.cyan);
+ private static EGGraphe createGraphe() {
+ final EGGrapheTreeModel grapheModel = new EGGrapheTreeModel();
+ final EGGraphe g = new EGGraphe(grapheModel);
+ final EGAxeHorizontal x = new EGAxeHorizontal(false);
+ x.setTitre("temps");
+ x.setUnite("sec");
+ x.setBounds(0.0001, 1000000);
+ x.setAxisIterator(new LogarithmicNumberIterator());
+ x.setGraduations(true);
+ g.setXAxe(x);
+ EGGroup gr = new EGGroup();
+ gr.setTitle("gr 1");
+ EGCourbeModelDefault m = new EGCourbeModelDefault(new double[] { 0.0001, 3, 4, 1000000 }, new double[] { 10000, 4,
+ 5, 3 });
+ EGCourbeChild c = new EGCourbeChild(gr);
+ m.setTitle("toto bleue");
+ c.setModel(m);
+ c.setAspectContour(Color.cyan);
- gr.addEGComponent(c);
+ gr.addEGComponent(c);
- m = new EGCourbeModelDefault(new double[] { 0.0002, 5, 7, 900000 },
- new double[] { 0.001, 1, 3, 4 });
- c = new EGCourbeChild(gr);
- c.setAspectContour(Color.RED);
- m.setTitle("toto rouge");
- c.setModel(m);
+ m = new EGCourbeModelDefault(new double[] { 0.0002, 5, 7, 900000 }, new double[] { 0.001, 1, 3, 4 });
+ c = new EGCourbeChild(gr);
+ c.setAspectContour(Color.RED);
+ m.setTitle("toto rouge");
+ c.setModel(m);
- gr.addEGComponent(c);
+ gr.addEGComponent(c);
- EGAxeVertical y = new EGAxeVertical();
- y.setGraduations(true);
- y.setGrille(new TraceLigneModel(TraceLigne.LISSE, 1, Color.LIGHT_GRAY));
- y.setDroite(true);
- y.setAxisIterator(new LogarithmicNumberIterator());
- y.setBounds(0.0001, 10000);
- y.setLineColor(Color.blue);
- y.setTitre("essai 2");
- gr.setAxeY(y);
- grapheModel.add(gr);
- gr = new EGGroup();
- gr.setTitle("gr 2");
- m = new EGCourbeModelDefault(new double[] { 1, 8, 9, 10 },
- new double[] { 10, 4, 2, 24 });
- c = new EGCourbeChild(gr);
- c.setAspectContour(Color.yellow);
- m.setTitle("toto jaune");
- c.setModel(m);
- gr.addEGComponent(c);
- y = new EGAxeVertical();
- y.setGraduations(true);
- y.setBounds(0, 55);
- y.setTitre("essai 1");
- gr.setAxeY(y);
- gr.addEGComponent(c);
- m = new EGCourbeModelDefault(new double[] { 1, 3, 4, 5 }, new double[] {
- 14, 54, 25, 43 });
- c = new EGCourbeChild(gr);
- m.setTitle("toto vert");
- c.setAspectContour(Color.green);
- c.setModel(m);
- gr.addEGComponent(c);
- grapheModel.add(gr);
- final JFrame f = new JFrame();
- f.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
- f.setSize(new Dimension(1024, 768));
- final BuPanel p = new BuPanel();
- p.setLayout(new BuBorderLayout());
+ EGAxeVertical y = new EGAxeVertical();
+ y.setGraduations(true);
+ y.setGrille(new TraceLigneModel(TraceLigne.LISSE, 1, Color.LIGHT_GRAY));
+ y.setDroite(true);
+ y.setAxisIterator(new LogarithmicNumberIterator());
+ y.setBounds(0.0001, 10000);
+ y.setLineColor(Color.blue);
+ y.setTitre("essai 2");
+ gr.setAxeY(y);
+ grapheModel.add(gr);
+ gr = new EGGroup();
+ gr.setTitle("gr 2");
+ m = new EGCourbeModelDefault(new double[] { 1, 8, 9, 10 }, new double[] { 10, 4, 2, 24 });
+ c = new EGCourbeChild(gr);
+ c.setAspectContour(Color.yellow);
+ m.setTitle("toto jaune");
+ c.setModel(m);
+ gr.addEGComponent(c);
+ y = new EGAxeVertical();
+ y.setGraduations(true);
+ y.setBounds(0, 55);
+ y.setTitre("essai 1");
+ gr.setAxeY(y);
+ gr.addEGComponent(c);
+ m = new EGCourbeModelDefault(new double[] { 1, 3, 4, 5 }, new double[] { 14, 54, 25, 43 });
+ c = new EGCourbeChild(gr);
+ m.setTitle("toto vert");
+ c.setAspectContour(Color.green);
+ c.setModel(m);
+ gr.addEGComponent(c);
+ grapheModel.add(gr);
+ return g;
+ }
- g.setPreferredSize(new Dimension(200, 300));
- g.setSize(g.getPreferredSize());
- final JTree t = new JTree(grapheModel);
- t.setSelectionModel(grapheModel.getSelectionModel());
- t.setRootVisible(false);
+ /**
+ * @param _args
+ * non utilise
+ */
+ public static void main(final String[] _args) {
+ EGGraphe g = createGraphe();
+ final EGFillePanel pn = new EGFillePanel(g);
- Box boxEast = Box.createVerticalBox();
- boxEast.add(new BuScrollPane(t));
- p.add(new JScrollPane(boxEast), BuBorderLayout.EAST);
-
- f.setContentPane(p);
- final EGFillePanel pn = new EGFillePanel(g);
+ // creation de la scene EBLI
+ EbliScene scene = new EbliScene();
- // creation de la scene EBLI
- EbliScene scene = new EbliScene();
+ // -- construction du jtree
-
-
-
-
-
-
-
- //-- construction du jtree
-
- //etape 1 construction du model
- EbliWidgetJXTreeModel model=new EbliWidgetJXTreeModel(1/*,scene*/);
-
- //etape 2 SUPER IMPORTANT: ajout du model comme listener de la scene
- scene.addEbliNodeListener(model);
-
-
- //etape 3 creation du jtree
- EbliWidgetJXTree tree=new EbliWidgetJXTree(model);
-
- EbliCheckBoxTreeRenderer renderer = new EbliCheckBoxTreeRenderer();
- tree.setCellRenderer(renderer);
- tree.setCellEditor(new EbliCheckBoxNodeEditor(tree));
- tree.setEditable(true);
- p.add(tree,BuBorderLayout.WEST);
-
-
-
-
-
-
-
- // ajout graphe
- // GrapheWidget graphe=new GrapheWidget(scene,null,g);
- // graphe.setPreferredSize(new Dimension(300, 300));
- // scene.addWidget(graphe);
-
-
- //-- creation d un noeud Graphe --//
- EbliNodeDefault node = new EbliNodeDefault();
- node.setCreator(new EbliWidgetCreatorGraphe(g));
- node.setTitle("Graphe");
- node.setD(new Dimension(300, 300));
- node.setP(new Point(4, 4));
- scene.addNode(node);
+ // etape 1 construction du model
+ EbliWidgetJXTreeModel model = new EbliWidgetJXTreeModel(1/* ,scene */);
- //-- creation d un noeud legende --//
- EbliNodeDefault nodeLegende = new EbliNodeDefault();
- nodeLegende.setTitle("Legende");
- nodeLegende.setCreator(new EbliWidgetCreatorLegende(g));
- nodeLegende.setD(new Dimension(100, 100));
- scene.addNode(nodeLegende);
+ // etape 2 SUPER IMPORTANT: ajout du model comme listener de la scene
+ scene.addEbliNodeListener(model);
-
-
- //-- creation de la vue calque
- TestZCalquePoint test = new TestZCalquePoint();
- test.getVueCalque().setPreferredSize(new Dimension(200, 200));
- node = new EbliNodeDefault();
- node.setTitle("Vue Calque");
- node.setCreator(new EbliWidgetCreatorVue2d(test.getVisuPanel()));
- node.setD(new Dimension(200, 200));
- // scene.addNode(node);
- //scene.addChild(new ComponentWidget(scene, test.getVisuPanel().getVueCalque()));
+ // etape 3 creation du jtree
+ EbliWidgetJXTree tree = new EbliWidgetJXTree(model);
-
-
- //-- ajout du rectangle --//
- EbliNodeDefault nodeRect = new EbliNodeDefault();
- nodeRect.setTitle("Rectangle");
- nodeRect.setCreator(new EbliWidgetCreatorRectangle("Test recangle"));
-// nodeRect.setD(new Dimension(100, 100));
- nodeRect.setP(new Point(350,125));
- scene.addNode(nodeRect);
+ EbliCheckBoxTreeRenderer renderer = new EbliCheckBoxTreeRenderer();
+ tree.setCellRenderer(renderer);
+ tree.setCellEditor(new EbliCheckBoxNodeEditor(tree));
+ tree.setEditable(true);
-
- //-- ajout du fleche double sens diagonale--//
- node = new EbliNodeDefault();
- node.setTitle("Fleche Double");
- node.setCreator(new EbliWidgetCreatorDblFleche(EbliWidgetDBLFleche.ORIENTATION_DIAG1));
- node.setD(new Dimension(100, 100));
- node.setP(new Point(450,125));
- scene.addNode(node);
-
-
- //-- ajout du fleche double sens nord--//
- node = new EbliNodeDefault();
- node.setTitle("Fleche Double");
- node.setCreator(new EbliWidgetCreatorDblFleche(EbliWidgetDBLFleche.ORIENTATION_WEST));
- node.setD(new Dimension(100, 100));
- node.setP(new Point(450,125));
- scene.addNode(node);
-
-
- //-- ajout du fleche sens unique--//
- node = new EbliNodeDefault();
- node.setTitle("Fleche");
- node.setCreator(new EbliWidgetCreatorFleche(0));
- node.setD(new Dimension(100, 100));
- node.setP(new Point(250,525));
- scene.addNode(node);
-
-
-
-
+ // ajout graphe
+ // GrapheWidget graphe=new GrapheWidget(scene,null,g);
+ // graphe.setPreferredSize(new Dimension(300, 300));
+ // scene.addWidget(graphe);
-
- // WidgetLegendeManagerOLD.createWidgetLegendeGraphe(this, visu, courbe,
- // graphe.getClientArea());
+ // -- creation d un noeud Graphe --//
+ EbliNodeDefault node = new EbliNodeDefault();
+ node.setCreator(new EbliWidgetCreatorGraphe(g));
+ node.setTitle("Graphe");
+ node.setD(new Dimension(300, 300));
+ node.setP(new Point(4, 4));
+ scene.addNode(node);
- /*
- // ajout iconenode
- IconNodeWidget iconNode = new IconNodeWidget(scene);
- iconNode.setImage(CtuluResource.CTULU.getImage("crystal_non"));
- iconNode.setLabel("MyIconNode");
- // this.addChild (iconNode);
- iconNode.getActions().addAction(
- ActionFactory.createCenteredZoomAction(1.1));
- iconNode.getActions().addAction(ActionFactory.createPanAction());
- // assign HoverAction - the actual hovered widget is held by the scene
- iconNode.getActions().addAction(scene.createWidgetHoverAction());
- // MoveAction has to be after the hover action
- // otherwise MoveAction will always consume the event and HoverAction
- // will never be invoked
- iconNode.getActions().addAction(ActionFactory.createMoveAction());
- iconNode.setPreferredLocation(new Point(400, 150));
-*/
-
- JTable table = new JTable();
- table.setModel(new DefaultTableModel(new Object[][] { { "11", "12" },
- { "21", "22" } }, new Object[] { "First", "Second" }));
- ComponentWidget widgetJtable = new ComponentWidget(scene,
- new JScrollPane(table)) {
- public void notifyStateChanged(ObjectState previousState,
- ObjectState newState) {
- LookFeel lookFeel = getScene().getLookFeel();
+ // -- creation d un noeud legende --//
+ EbliNodeDefault nodeLegende = new EbliNodeDefault();
+ nodeLegende.setTitle("Legende");
+ nodeLegende.setCreator(new EbliWidgetCreatorLegende(g));
+ nodeLegende.setD(new Dimension(100, 100));
+ scene.addNode(nodeLegende);
- setBorder(BorderFactory.createResizeBorder(10));
+ // -- creation de la vue calque
+ final TestModelLigneBrisee m = TestModelLigneBrisee.buildDefault();
+ ZCalqueLigneBrisee br = new ZCalqueLigneBrisee(m);
+ br.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 5, Color.RED));
+ BVueCalque vueC = new BVueCalque(br);
+ vueC.setSize(new Dimension(200, 200));
+ node = new EbliNodeDefault();
+ node.setTitle("Vue Calque");
+// JFrame fr = new JFrame();
- }
- };
- widgetJtable.setBorder(BorderFactory.createResizeBorder(10));
- widgetJtable.setPreferredLocation(new Point(500, 300));
- widgetJtable.getActions().addAction(ActionFactory.createResizeAction());
- //scene.addChild(widgetJtable);
-
-
- // fin
- p.add(new JScrollPane(scene.createView()), BuBorderLayout.CENTER);
+ ZEbliCalquesPanel ebliCalquesPanel = new ZEbliCalquesPanel(br, new CtuluUIDefault());
+// fr.setContentPane(ebliCalquesPanel);
+// ebliCalquesPanel.setPreferredSize(new Dimension(400, 400));
+// fr.setPreferredSize(new Dimension(400, 400));
+// fr.setVisible(true);
+ node.setCreator(new EbliWidgetCreatorVueCalque(ebliCalquesPanel));
+ scene.addNode(node);
+ // scene.addChild(new ComponentWidget(scene,
+ // test.getVisuPanel().getVueCalque()));
- // ajout de la vue sattelite en bas \xE4 gauche
- boxEast.add(scene.createSatelliteView());
+ // -- ajout du rectangle --//
+ EbliNodeDefault nodeRect = new EbliNodeDefault();
+ nodeRect.setTitle("Rectangle");
+ nodeRect.setCreator(new EbliWidgetCreatorRectangle("Test recangle"));
+ // nodeRect.setD(new Dimension(100, 100));
+ nodeRect.setP(new Point(350, 125));
+ scene.addNode(nodeRect);
- final JMenu menu = new JMenu();
- menu.setName("essai");
- menu.setText("essai");
- pn.fillSpecificMenu(menu);
- final JMenuBar b = new JMenuBar();
- b.add(menu);
- f.setJMenuBar(b);
- f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ // -- ajout du fleche double sens diagonale--//
+ node = new EbliNodeDefault();
+ node.setTitle("Fleche Double");
+ node.setCreator(new EbliWidgetCreatorDblFleche(EbliWidgetDBLFleche.ORIENTATION_DIAG1));
+ node.setD(new Dimension(100, 100));
+ node.setP(new Point(450, 125));
+ scene.addNode(node);
- // f.pack();
- f.show();
- scene.setFont(CtuluLibSwing.getMiniFont());
- g.computeMarges(scene.getGraphics());
- g.fullRepaint();
-
-
-
-
-
-//-- ajout par la suite --/
-/*
- node = new EbliNodeDefault();
- node.setTitle("BOUDOUM");
- node.setCreator(new EbliWidgetCreatorRectangle("BOUDOUM"));
-
- node.setD(new Dimension(100, 100));
- node.setP(new Point(450,20));
- scene.addNode(node);
- */
-
- p.doLayout();
- }
+ // -- ajout du fleche double sens nord--//
+ node = new EbliNodeDefault();
+ node.setTitle("Fleche Double");
+ node.setCreator(new EbliWidgetCreatorDblFleche(EbliWidgetDBLFleche.ORIENTATION_WEST));
+ node.setD(new Dimension(100, 100));
+ node.setP(new Point(450, 125));
+ scene.addNode(node);
+
+ // -- ajout du fleche sens unique--//
+ node = new EbliNodeDefault();
+ node.setTitle("Fleche");
+ node.setCreator(new EbliWidgetCreatorFleche(0));
+ node.setD(new Dimension(100, 100));
+ node.setP(new Point(250, 525));
+ scene.addNode(node);
+
+ // WidgetLegendeManagerOLD.createWidgetLegendeGraphe(this, visu, courbe,
+ // graphe.getClientArea());
+
+ /*
+ * // ajout iconenode IconNodeWidget iconNode = new IconNodeWidget(scene);
+ * iconNode.setImage(CtuluResource.CTULU.getImage("crystal_non"));
+ * iconNode.setLabel("MyIconNode"); // this.addChild (iconNode);
+ * iconNode.getActions().addAction(
+ * ActionFactory.createCenteredZoomAction(1.1));
+ * iconNode.getActions().addAction(ActionFactory.createPanAction()); //
+ * assign HoverAction - the actual hovered widget is held by the scene
+ * iconNode.getActions().addAction(scene.createWidgetHoverAction()); //
+ * MoveAction has to be after the hover action // otherwise MoveAction will
+ * always consume the event and HoverAction // will never be invoked
+ * iconNode.getActions().addAction(ActionFactory.createMoveAction());
+ * iconNode.setPreferredLocation(new Point(400, 150));
+ */
+
+ JTable table = new JTable();
+ table.setModel(new DefaultTableModel(new Object[][] { { "11", "12" }, { "21", "22" } }, new Object[] { "First",
+ "Second" }));
+ ComponentWidget widgetJtable = new ComponentWidget(scene, new JScrollPane(table)) {
+ public void notifyStateChanged(ObjectState previousState, ObjectState newState) {
+
+ setBorder(BorderFactory.createResizeBorder(10));
+
+ }
+ };
+ widgetJtable.setBorder(BorderFactory.createResizeBorder(10));
+ widgetJtable.setPreferredLocation(new Point(500, 300));
+ widgetJtable.getActions().addAction(ActionFactory.createResizeAction());
+ // scene.addChild(widgetJtable);
+
+ final JFrame f = new JFrame();
+ f.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+ f.setSize(new Dimension(1024, 768));
+ final BuPanel p = new BuPanel();
+ p.setLayout(new BuBorderLayout());
+ p.add(tree, BuBorderLayout.WEST);
+ g.setPreferredSize(new Dimension(200, 300));
+ g.setSize(g.getPreferredSize());
+ final JTree t = new JTree((EGGrapheTreeModel) g.getModel());
+ t.setSelectionModel(((EGGrapheTreeModel) g.getModel()).getSelectionModel());
+ t.setRootVisible(false);
+
+ Box boxEast = Box.createVerticalBox();
+ boxEast.add(new BuScrollPane(t));
+ p.add(new JScrollPane(boxEast), BuBorderLayout.EAST);
+
+ f.setContentPane(p);
+ // fin
+ p.add(new JScrollPane(scene.createView()), BuBorderLayout.CENTER);
+
+ // ajout de la vue sattelite en bas \xE4 gauche
+ boxEast.add(scene.createSatelliteView());
+
+ final JMenu menu = new JMenu();
+ menu.setName("essai");
+ menu.setText("essai");
+ pn.fillSpecificMenu(menu);
+ final JMenuBar b = new JMenuBar();
+ b.add(menu);
+ f.setJMenuBar(b);
+ f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+ // f.pack();
+ f.setVisible(true);
+ scene.setFont(CtuluLibSwing.getMiniFont());
+
+ // -- ajout par la suite --/
+ /*
+ * node = new EbliNodeDefault(); node.setTitle("BOUDOUM");
+ * node.setCreator(new EbliWidgetCreatorRectangle("BOUDOUM"));
+ *
+ * node.setD(new Dimension(100, 100)); node.setP(new Point(450,20));
+ * scene.addNode(node);
+ */
+
+ p.doLayout();
+ }
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
