Menu
▾
▴
fudaa-svn-commit — svn commit with diffs
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(46) |
Jul
(37) |
Aug
(154) |
Sep
(140) |
Oct
(132) |
Nov
(104) |
Dec
(67) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(113) |
Feb
(73) |
Mar
(102) |
Apr
(106) |
May
(114) |
Jun
(67) |
Jul
(116) |
Aug
(48) |
Sep
(108) |
Oct
(296) |
Nov
(56) |
Dec
(53) |
| 2010 |
Jan
(95) |
Feb
(31) |
Mar
(40) |
Apr
(12) |
May
(10) |
Jun
(27) |
Jul
(19) |
Aug
(81) |
Sep
(48) |
Oct
(45) |
Nov
(40) |
Dec
(7) |
| 2011 |
Jan
(16) |
Feb
(32) |
Mar
(55) |
Apr
(38) |
May
(24) |
Jun
(37) |
Jul
(12) |
Aug
(16) |
Sep
(97) |
Oct
(90) |
Nov
(101) |
Dec
(89) |
| 2012 |
Jan
(18) |
Feb
(2) |
Mar
(54) |
Apr
(69) |
May
(97) |
Jun
(131) |
Jul
(70) |
Aug
(48) |
Sep
(48) |
Oct
(119) |
Nov
(194) |
Dec
(60) |
| 2013 |
Jan
(73) |
Feb
(35) |
Mar
(42) |
Apr
(28) |
May
(7) |
Jun
(17) |
Jul
(27) |
Aug
(10) |
Sep
(38) |
Oct
(12) |
Nov
(4) |
Dec
(16) |
| 2014 |
Jan
(33) |
Feb
(37) |
Mar
(19) |
Apr
(3) |
May
(47) |
Jun
(26) |
Jul
(22) |
Aug
|
Sep
(10) |
Oct
(30) |
Nov
(24) |
Dec
(19) |
| 2015 |
Jan
(13) |
Feb
(16) |
Mar
(36) |
Apr
(19) |
May
(5) |
Jun
(5) |
Jul
(3) |
Aug
(11) |
Sep
(22) |
Oct
(7) |
Nov
(14) |
Dec
|
| 2016 |
Jan
|
Feb
(26) |
Mar
(13) |
Apr
(61) |
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
(27) |
Nov
(14) |
Dec
(21) |
| 2017 |
Jan
(30) |
Feb
(4) |
Mar
(3) |
Apr
(5) |
May
(69) |
Jun
(29) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <de...@us...> - 2008-08-07 21:44:15
|
Revision: 3735
http://fudaa.svn.sourceforge.net/fudaa/?rev=3735&view=rev
Author: deniger
Date: 2008-08-07 21:44:21 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
Mise en place lookandfeel
maj auto de la vue
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/EbliWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetFleche.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliLookFeel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/
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/EbliWidgetVueCalque.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/
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/EbliWidgetCreatorLegende.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/graphe/EbliWidgetGrapheController.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/WidgetLegendeManager.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/WidgetLegendeManagerOLD.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/layout/
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/layout/OverlayLayoutGap.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/
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/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTree.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeModel.java
Removed Paths:
-------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxNodeEditor.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxTreeRenderer.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorGraphe.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorLegende.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorVue2d.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGrapheController.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTree.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTreeModel.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetVue2D.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/OverlayLayoutGap.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManager.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManagerOLD.java
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxNodeEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxNodeEditor.java 2008-08-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxNodeEditor.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -1,102 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.awt.event.MouseEvent;
-import java.util.EventObject;
-
-import javax.swing.AbstractCellEditor;
-import javax.swing.JCheckBox;
-import javax.swing.JTree;
-import javax.swing.event.ChangeEvent;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreeCellEditor;
-import javax.swing.tree.TreePath;
-
-import com.memoire.bu.BuCheckBox;
-/**
- * Editeur dans le tree
- * @author Adrien Hadoux
- *
- */
-public class EbliCheckBoxNodeEditor extends AbstractCellEditor implements TreeCellEditor {
-
- EbliCheckBoxTreeRenderer renderer = new EbliCheckBoxTreeRenderer();
-
- ChangeEvent changeEvent = null;
-
- EbliWidgetJXTree tree;
-
- public EbliCheckBoxNodeEditor(EbliWidgetJXTree tree) {
- this.tree = tree;
- }
-
- public Object getCellEditorValue() {
- JCheckBox checkbox = renderer.getLeafRenderer();
- // EbliNodeDefault checkBoxNode = new CheckBoxNode(checkbox.getText(),
- // checkbox.isSelected());
-
-
- return checkbox.getText();//checkBoxNode;
- }
-
- public boolean isCellEditable(EventObject event) {
- boolean returnValue = false;
- if (event instanceof MouseEvent) {
- MouseEvent mouseEvent = (MouseEvent) event;
- TreePath path = tree.getPathForLocation(mouseEvent.getX(),
- mouseEvent.getY());
- if (path != null) {
- Object node = path.getLastPathComponent();
- if ((node != null) && (node instanceof DefaultMutableTreeNode)) {
- DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) node;
- Object userObject = treeNode.getUserObject();
- returnValue = ((treeNode.isLeaf()) && (userObject instanceof EbliNodeDefault));
- }
- }
- }
- return returnValue;
- // return true;
- }
-
- public Component getTreeCellEditorComponent(JTree tree, final Object value,
- boolean selected, boolean expanded, boolean leaf, int row) {
-
- final Component editor =renderer.getTreeCellRendererComponent(tree, value,true, expanded, leaf, row, true);
-
- //-- recuperation de l instance defaultnode
- Object userObject = ((DefaultMutableTreeNode) value).getUserObject();
-
-
-
- if (userObject instanceof EbliNode && editor instanceof JCheckBox) {
- final EbliNodeDefault node= (EbliNodeDefault)(((DefaultMutableTreeNode)value).getUserObject());
-
- //-- suppression des anciens listeners --//
- // ((JCheckBox) editor).re
-
-
-
- // ajoute le listener au checkbox pour afficher la widget en fonction de son click
- ((JCheckBox) editor).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());
-
-
- }
- });
-
- }
-
-
-
-
-
- return editor;
- }
- }
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxTreeRenderer.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxTreeRenderer.java 2008-08-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxTreeRenderer.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -1,98 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
-
-import javax.swing.JCheckBox;
-import javax.swing.JTree;
-import javax.swing.UIManager;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeCellRenderer;
-import javax.swing.tree.TreeCellRenderer;
-
-import com.sun.org.apache.xerces.internal.impl.xs.opti.DefaultNode;
-
-public class EbliCheckBoxTreeRenderer implements TreeCellRenderer {
- private JCheckBox leafRenderer = new JCheckBox();
-
- private DefaultTreeCellRenderer nonLeafRenderer = new DefaultTreeCellRenderer();
-
- Color selectionBorderColor, selectionForeground, selectionBackground,
- textForeground, textBackground;
-
- protected JCheckBox getLeafRenderer() {
- return leafRenderer;
- }
-
- public EbliCheckBoxTreeRenderer() {
- /*Font fontValue;
- fontValue = UIManager.getFont("Tree.font");
- if (fontValue != null) {
- leafRenderer.setFont(fontValue);
- }
- Boolean booleanValue = (Boolean) UIManager
- .get("Tree.drawsFocusBorderAroundIcon");
- leafRenderer.setFocusPainted((booleanValue != null)
- && (booleanValue.booleanValue()));
-
- selectionBorderColor = UIManager.getColor("Tree.selectionBorderColor");
- selectionForeground = UIManager.getColor("Tree.selectionForeground");
- 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;
- if (leaf) {
-
-
- //-- recuperation du node --//
- Object userObject = ((DefaultMutableTreeNode) value).getUserObject();
-
-
- EbliNodeDefault node=null;
- if (userObject instanceof EbliNode) {
- node= (EbliNodeDefault)(((DefaultMutableTreeNode)value).getUserObject());
-
- System.err.println("PS EbliNode!!! ROW: "+row);
-
- //-- creation d'une nouvelle checkbox aui sera ainsi unique pour chaque composant
- leafRenderer=new JCheckBox();
-
- 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 = nonLeafRenderer.getTreeCellRendererComponent(tree,
- value, selected, expanded, leaf, row, hasFocus);
- }
- return returnValue;
- }
-
-
- }
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliLookFeel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliLookFeel.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliLookFeel.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -0,0 +1,46 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.Color;
+
+import org.netbeans.api.visual.border.Border;
+import org.netbeans.api.visual.border.BorderFactory;
+import org.netbeans.api.visual.model.ObjectState;
+import org.netbeans.modules.visual.laf.DefaultLookFeel;
+
+public class EbliLookFeel extends DefaultLookFeel {
+
+ private static final Color COLOR_HOVERED = new Color(0x447BCD);
+ private static final Color COLOR_SELECTED = COLOR_HOVERED.brighter();
+ private static final int MINI_THICKNESS = 8;
+ private static final Border MINI_BORDER_SELECTED = BorderFactory.createRoundedBorder(MINI_THICKNESS, MINI_THICKNESS,
+ MINI_THICKNESS, MINI_THICKNESS, COLOR_SELECTED, COLOR_SELECTED.darker());
+
+ private static final Border RESIZE_BORDER = BorderFactory.createResizeBorder(MINI_THICKNESS, COLOR_HOVERED, true);
+ private static final Border RESIZE_BORDER_SELECTED = BorderFactory.createCompositeBorder(BorderFactory
+ .createRoundedBorder(0, 0, 0, 0, COLOR_SELECTED, COLOR_HOVERED), RESIZE_BORDER);
+ private static final Border DEFAULT_BORDER = BorderFactory.createEmptyBorder(8);
+
+ public Border getBorder(ObjectState _state) {
+ return getBorder(_state, true);
+ }
+
+ public Border getBorder(ObjectState _state, boolean resizable) {
+ if (resizable) {
+ if (_state.isHovered()) {
+ if (_state.isSelected()) {
+ return RESIZE_BORDER_SELECTED;
+ }
+ return RESIZE_BORDER;
+ }
+ if (_state.isSelected()) {
+ return MINI_BORDER_SELECTED;
+ }
+
+ } else {
+ // a continuer pour le cas non retaillable
+
+ }
+
+ return DEFAULT_BORDER;
+ }
+}
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-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -1,28 +1,21 @@
package org.fudaa.ebli.visuallibrary;
-import java.awt.Dimension;
import java.awt.Point;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import javax.swing.JComponent;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
-import org.fudaa.ctulu.CtuluResource;
-import org.fudaa.ebli.courbe.EGGraphe;
import org.netbeans.api.visual.action.ActionFactory;
import org.netbeans.api.visual.action.PopupMenuProvider;
+import org.netbeans.api.visual.action.WidgetAction;
import org.netbeans.api.visual.graph.GraphScene;
-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 org.netbeans.modules.visual.layout.OverlayLayout;
/**
* classe de gestion de la scene principale
@@ -32,212 +25,169 @@
*/
public class EbliScene extends GraphScene<EbliNode, EbliEdge> {
- /**
- * la visu du graphscene
- */
- private LayerWidget visu_;
+ /**
+ * la visu du graphscene
+ */
+ private LayerWidget visu_;
-
- /**
- * la liste des listener associes a la scene
- */
- List<EbliNodeListener> listenerList ;
-
- public EbliScene() {
- super();
+ private LayerWidget interactionLayer_;
+ final private WidgetAction alignWithMoveAction;
- // creation du layer de mise en page
- visu_ = new LayerWidget(this);
- addChild(visu_);
+ /**
+ * la liste des listener associes a la scene
+ */
+ Collection<EbliNodeListener> listenerList;
- // -- ajoute l'action du zoom ( ctrl + clic)
- getActions().addAction(ActionFactory.createCenteredZoomAction(1.1));
+ public EbliScene() {
+ super();
+ setLookFeel(new EbliLookFeel());
+ // creation du layer de mise en page
+ visu_ = new LayerWidget(this);
+ addChild(visu_);
+ interactionLayer_ = new LayerWidget(this);
+ addChild(interactionLayer_);
+ alignWithMoveAction = ActionFactory.createAlignWithMoveAction(visu_, interactionLayer_, ActionFactory
+ .createDefaultAlignWithMoveDecorator(),false);
- // -- ajouter le menu popup de base
- setMenuBase();
-
+ // -- ajoute l'action du zoom ( ctrl + clic)
+ getActions().addAction(ActionFactory.createZoomAction(1.1, true));
- }
+ // -- ajouter le menu popup de base
+ setMenuBase();
- public LayerWidget getVisu_() {
- return visu_;
- }
+ }
- public void setVisu_(LayerWidget visu_) {
- this.visu_ = visu_;
- }
+ /**
+ * Methode qui permet d ajouter un listener
+ *
+ * @param listener
+ */
+ public void addEbliNodeListener(EbliNodeListener listener) {
+ // init si necessaire
+ if (listenerList == null)
+ listenerList = new HashSet<EbliNodeListener>();
+ // ajout
+ listenerList.add(listener);
+ }
- @Override
- protected void notifyNodeAdded(EbliNode node, Widget widget) {
- //-- notifier tous les listener que le noeud a ete attache --//
- notifyAllListenerNodeAdded(node);
- }
+ @Override
+ protected void attachEdgeSourceAnchor(EbliEdge edge, EbliNode oldSourceNode, EbliNode sourceNode) {
+ // TODO Auto-generated method stub
- @Override
- protected void attachEdgeSourceAnchor(EbliEdge edge,
- EbliNode oldSourceNode, EbliNode sourceNode) {
- // TODO Auto-generated method stub
+ }
- }
+ @Override
+ protected void attachEdgeTargetAnchor(EbliEdge edge, EbliNode oldTargetNode, EbliNode targetNode) {
+ // TODO Auto-generated method stub
- @Override
- protected void attachEdgeTargetAnchor(EbliEdge edge,
- EbliNode oldTargetNode, EbliNode targetNode) {
- // TODO Auto-generated method stub
+ }
- }
+ @Override
+ protected Widget attachEdgeWidget(EbliEdge edge) {
+ // TODO Auto-generated method stub
+ return null;
+ }
- @Override
- protected Widget attachEdgeWidget(EbliEdge edge) {
- // TODO Auto-generated method stub
- return null;
- }
+ @Override
+ protected Widget attachNodeWidget(EbliNode node) {
- @Override
- protected Widget attachNodeWidget(EbliNode node) {
+ // -- creation de la widget ici --//
+ EbliWidget res = node.getCreator().create(this);
- // -- creation de la widget ici --//
- EbliWidget res = node.getCreator().create(this);
+ // -- remplissage des proprietes
+ res.setPreferredLocation(node.getLocation());
+ if (node.getPreferedDimension() != null)
+ res.setPreferredSize(node.getPreferedDimension());
- // -- remplissage des proprietes
- res.setPreferredLocation(node.getLocation());
- if (node.getPreferedDimension() != null)
- res.setPreferredSize(node.getPreferedDimension());
+ // -- ajout dans la vue layer --//
+ visu_.addChild(res);
- // -- ajout dans la vue layer --//
- visu_.addChild(res);
-
-
+ return res;
+ }
- return res;
- }
+ public LayerWidget getLayerVisu() {
+ return visu_;
+ }
- /**
- * methode qui permet d'ajouter une widget dans la vue principale
- */
- public void addWidget(EbliWidget widget) {
+ public WidgetAction getMoveAction() {
+ return alignWithMoveAction;
+ }
- addWidget(widget, null, null);
+ /**
+ * Methode qui permet d envoyer le signal du node ajout\xE9 a tous les listener
+ *
+ * @param listener
+ */
+ public void notifyAllListenerNodeAdded(EbliNode node) {
+ if (listenerList == null)
+ return;
+ for (Iterator<EbliNodeListener> it = listenerList.iterator(); it.hasNext();) {
+ it.next().nodeAdded(node);
+ }
- }
+ }
- public void addWidget(EbliWidget widget, Point preferredLocation,
- Dimension preferedSize) {
+ /**
+ * Methode qui permet d envoyer le signal du node retir\xE9 a tous les listener
+ *
+ * @param listener
+ */
+ public void notifyAllListenerNodeRemoved(EbliNode node) {
+ if (listenerList == null)
+ return;
- if (preferedSize != null) {
- widget.setPreferredSize(preferedSize);
- }
- if (preferredLocation != null) {
- widget.setPreferredLocation(preferredLocation);
- }
+ for (Iterator<EbliNodeListener> it = listenerList.iterator(); it.hasNext();) {
+ EbliNodeListener listener = it.next();
+ listener.noderemoved(node);
+ }
- getVisu_().addChild(widget);
+ }
- }
+ @Override
+ protected void notifyNodeAdded(EbliNode node, Widget widget) {
+ // -- notifier tous les listener que le noeud a ete attache --//
+ notifyAllListenerNodeAdded(node);
+ }
- /**
- * recupere une version miniature de la vue aui se rafraichit simultanement
- * avec la scene
- *
- * @return
- */
- public JComponent getSatteliteView() {
- return this.createSatelliteView();
- }
+ public void setMenuBase() {
+ getActions().addAction(ActionFactory.createPopupMenuAction(new PopupMenuProvider() {
+ public JPopupMenu getPopupMenu(Widget widget, Point localLocation) {
+ JPopupMenu popup = new JPopupMenu();
- /**
- * retourne la vue Jcomponent associ\xE9 Utile pour l'integration dans les
- * components existants
- */
- public JComponent getSwingView() {
- return this.getView();
- }
+ JMenuItem menuItem1 = popup.add("Ajouter Graphe");
+ menuItem1.addActionListener(new ActionListener() {
- public void setMenuBase() {
- getActions().addAction(
- ActionFactory.createPopupMenuAction(new PopupMenuProvider() {
- public JPopupMenu getPopupMenu(Widget widget,
- Point localLocation) {
- JPopupMenu popup = new JPopupMenu();
+ public void actionPerformed(ActionEvent e) {
- JMenuItem menuItem1 = popup.add("Ajouter Graphe");
- menuItem1.addActionListener(new ActionListener() {
+ }
- public void actionPerformed(ActionEvent e) {
+ });
- }
+ JMenuItem menuItem2 = popup.add("Ajouter Maillage");
+ menuItem2.addActionListener(new ActionListener() {
- });
+ public void actionPerformed(ActionEvent e) {
- JMenuItem menuItem2 = popup.add("Ajouter Maillage");
- menuItem2.addActionListener(new ActionListener() {
+ }
- public void actionPerformed(ActionEvent e) {
+ });
- }
+ JMenuItem menuItem3 = popup.add("Fermer l'objet");
+ menuItem3.addActionListener(new ActionListener() {
- });
+ public void actionPerformed(ActionEvent e) {
- JMenuItem menuItem3 = popup.add("Fermer l'objet");
- menuItem3.addActionListener(new ActionListener() {
+ // fermeture des widgets children
+ EbliScene.this.removeChildren();
+ // fermeture du widget donne
+ EbliScene.this.removeFromParent();
- public void actionPerformed(ActionEvent e) {
+ }
- // fermeture des widgets children
- EbliScene.this.removeChildren();
- // fermeture du widget donne
- EbliScene.this.removeFromParent();
+ });
+ return popup;
+ }
+ }));
+ }
- }
-
- });
- return popup;
- }
- }));
- }
-
-
- /**
- * Methode qui permet d ajouter un listener
- * @param listener
- */
- public void addEbliNodeListener(EbliNodeListener listener){
- // init si necessaire
- if(listenerList==null)
- listenerList= new ArrayList<EbliNodeListener>();
- //ajout
- listenerList.add(listener);
- }
-
- /**
- * Methode qui permet d envoyer le signal du node ajout\xE9 a tous les listener
- * @param listener
- */
- public void notifyAllListenerNodeAdded(EbliNode node){
- if(listenerList==null)
- return;
-
- for(Iterator<EbliNodeListener> it=listenerList.iterator();it.hasNext();){
- EbliNodeListener listener=it.next();
- listener.nodeAdded(node);
- }
-
- }
-
- /**
- * Methode qui permet d envoyer le signal du node retir\xE9 a tous les listener
- * @param listener
- */
- public void notifyAllListenerNodeRemoved(EbliNode node){
- if(listenerList==null)
- return;
-
- for(Iterator<EbliNodeListener> it=listenerList.iterator();it.hasNext();){
- EbliNodeListener listener=it.next();
- listener.noderemoved(node);
- }
-
- }
-
-
}
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-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -25,155 +25,140 @@
* @author Adrien Hadoux
*
*/
-class EbliWidget extends Widget {
+public class EbliWidget extends Widget {
- private static final Border RESIZE_BORDER = BorderFactory
- .createResizeBorder(8, Color.blue.brighter().brighter(), true);
- private static final Border DEFAULT_BORDER = BorderFactory
- .createEmptyBorder(8);
+ private EbliScene scene_;
+ private boolean useBorder_ = true;
- private EbliScene scene_;
+ /**
+ * @param scene
+ * @param Point
+ * : indiaue la location preferentiel. peut etre nul
+ */
+ public EbliWidget(EbliScene scene) {
+ super(scene);
+ setScene_(scene);
+ getActions().addAction(scene.createSelectAction());
+ getActions().addAction(ActionFactory.createResizeAction());
+ getActions().addAction(scene.createWidgetHoverAction());
+ getActions().addAction(scene.getMoveAction());
- public EbliScene getScene_() {
- return scene_;
- }
+ // positionnement de la widget si precise
+ // if(preferredLocation!=null)
+ // setPreferredLocation(preferredLocation);
- public void setScene_(EbliScene scene_) {
- this.scene_ = scene_;
- }
+ // menu clic droit basique (fermeture, duplication)
+ setMenu();
+ }
- /**
- * @param scene
- * @param Point
- * : indiaue la location preferentiel. peut etre nul
- */
- public EbliWidget(EbliScene scene) {
- super(scene);
- setScene_(scene);
- getActions().addAction(ActionFactory.createResizeAction());
- getActions().addAction(ActionFactory.createMoveAction());
- getActions().addAction(scene.createWidgetHoverAction());
- // getActions().addAction( scene.createSelectAction());
+ /**
+ * Methode de construction des menus de base
+ *
+ * @param _popup
+ */
+ public void constructPopupMenuBase(JPopupMenu _popup) {
+ JMenuItem menuItem1 = _popup.add("Dupliquer l'objet");
+ menuItem1.setIcon(CtuluResource.CTULU.getIcon("crystal22_cascade"));
+ menuItem1.addActionListener(new ActionListener() {
- setBorder(DEFAULT_BORDER);
+ public void actionPerformed(ActionEvent e) {
- // positionnement de la widget si precise
- // if(preferredLocation!=null)
- // setPreferredLocation(preferredLocation);
+ // 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));
- // menu clic droit basique (fermeture, duplication)
- setMenu();
- }
+ EbliWidget duplique;
- @Override
- public void notifyStateChanged(ObjectState previousState,
- ObjectState newState) {
- LookFeel lookFeel = getScene().getLookFeel();
+ try {
+ // clonage de l'objet
+ duplique = (EbliWidget) EbliWidget.this.clone();
+ duplique.setPreferredSize(EbliWidget.this.getScene().getPreferredSize());
+ duplique.setPreferredLocation(nouvellePosition);
- // setBorder(lookFeel.getMiniBorder(newState));
+ // -- ajout dans la scene --//
+ if (EbliWidget.this.getScene() != null) {
+ EbliWidget.this.getScene().addChild(duplique);
+ }
- if (!newState.isHovered() && !newState.isSelected()) {
- setBorder(DEFAULT_BORDER);
- return;
- }
- setBorder(newState.isSelected() ? (newState.isHovered() ? RESIZE_BORDER
- : lookFeel.getMiniBorder(newState))
- : (newState.isHovered() ? RESIZE_BORDER : lookFeel
- .getMiniBorder(newState)));
- }
+ } 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();
+ }
+ }
- /**
- * Methode generique qui fait apparaitre un menuItem propre au composant et
- * offre les op\xE9rations de base on ouvre le menu via le clic droit ou le
- * raccourcis shift+F10
- */
+ });
+ JMenuItem menuItem2 = _popup.add("Fermer l'objet");
+ menuItem2.setIcon(CtuluResource.CTULU.getIcon("crystal_non"));
+ menuItem2.addActionListener(new ActionListener() {
- public void setMenu() {
- getActions().addAction(
- ActionFactory.createPopupMenuAction(new PopupMenuProvider() {
- public JPopupMenu getPopupMenu(Widget widget,
- Point localLocation) {
- JPopupMenu popup = new JPopupMenu();
+ public void actionPerformed(ActionEvent e) {
- // -- creation du menu commun a tous les widgets
- constructPopupMenuBase(popup);
+ // 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);
- return popup;
- }
- }));
- }
+ }
- /**
- * Methode de construction des menus de base
- *
- * @param _popup
- */
- public void constructPopupMenuBase(JPopupMenu _popup) {
- JMenuItem menuItem1 = _popup.add("Dupliquer l'objet");
- menuItem1.setIcon(CtuluResource.CTULU.getIcon("crystal22_cascade"));
- menuItem1.addActionListener(new ActionListener() {
+ });
- public void actionPerformed(ActionEvent e) {
+ JMenuItem menuItem3 = _popup.add("Masquer l'objet");
+ menuItem3.setIcon(CtuluResource.CTULU.getIcon("crystal_non"));
+ menuItem3.addActionListener(new ActionListener() {
- // 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));
+ public void actionPerformed(ActionEvent e) {
- EbliWidget duplique;
+ EbliWidget.this.setVisible(false);
- 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();
- }
- }
+ public EbliScene getEbliScene() {
+ return scene_;
+ }
- });
- JMenuItem menuItem2 = _popup.add("Fermer l'objet");
- menuItem2.setIcon(CtuluResource.CTULU.getIcon("crystal_non"));
- menuItem2.addActionListener(new ActionListener() {
+ public boolean isUseBorder() {
+ return useBorder_;
+ }
- public void actionPerformed(ActionEvent e) {
+ @Override
+ public void notifyStateChanged(ObjectState previousState, ObjectState newState) {
+ if (!useBorder_) {
+ return;
+ }
+ setBorder(getScene().getLookFeel().getBorder(newState));
+ }
- //EbliWidget.this.setVisible(false);
- EbliNode n = (EbliNode) EbliWidget.this.getScene_().findObject(
- EbliWidget.this);
- EbliWidget.this.getScene_().removeNode(n);
- EbliWidget.this.getScene_().getVisu_().removeChild(EbliWidget.this);
-
+ /**
+ * Methode generique qui fait apparaitre un menuItem propre au composant et
+ * offre les op\xE9rations de base on ouvre le menu via le clic droit ou le
+ * raccourcis shift+F10
+ */
- }
+ public void setMenu() {
+ getActions().addAction(ActionFactory.createPopupMenuAction(new PopupMenuProvider() {
+ public JPopupMenu getPopupMenu(Widget widget, Point localLocation) {
+ JPopupMenu popup = new JPopupMenu();
- });
-
- JMenuItem menuItem3 = _popup.add("Masquer l'objet");
- menuItem3.setIcon(CtuluResource.CTULU.getIcon("crystal_non"));
- menuItem3.addActionListener(new ActionListener() {
+ // -- creation du menu commun a tous les widgets
+ constructPopupMenuBase(popup);
- public void actionPerformed(ActionEvent e) {
+ return popup;
+ }
+ }));
+ }
- EbliWidget.this.setVisible(false);
-
+ public void setScene_(EbliScene scene_) {
+ this.scene_ = scene_;
+ }
- }
+ public void setUseBorder(boolean _useBorder) {
+ useBorder_ = _useBorder;
+ }
- });
- }
-
}
\ No newline at end of file
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorGraphe.java 2008-08-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorGraphe.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -1,36 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-import org.fudaa.ebli.courbe.EGGraphe;
-/**
- * interface qui permet de creer un widget
- * @author genesis
- *
- */
-public class EbliWidgetCreatorGraphe implements EbliWidgetCreator {
-
- EGGraphe g;
- EbliWidgetGraphe res;
-
- public EbliWidgetCreatorGraphe(EGGraphe g) {
- super();
- this.g = g;
- }
-
- public EbliWidget create(EbliScene _scene) {
- // TODO Auto-generated method stub
- // creation de la widget correspondante
- res= new EbliWidgetGraphe(_scene, null, g);
-
- // ajout des listener d ecoute du graphe
- new EbliWidgetGrapheController(res);
-
- return res;
- }
-
- public EbliWidget getWidget() {
- // TODO Auto-generated method stub
- return res;
- }
-
-
-}
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorLegende.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorLegende.java 2008-08-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorLegende.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -1,32 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-import org.fudaa.ebli.courbe.EGGraphe;
-
-public class EbliWidgetCreatorLegende implements EbliWidgetCreator {
-
- EGGraphe g;
- EbliWidget res;
- public EbliWidgetCreatorLegende(EGGraphe g) {
- super();
- this.g = g;
- }
-
- public EGGraphe getG() {
- return g;
- }
-
- public void setG(EGGraphe g) {
- this.g = g;
- }
-
- public EbliWidget create(EbliScene _scene) {
- res= WidgetLegendeManager.createLegende(g, _scene, null);
- return res;
- }
-
- public EbliWidget getWidget() {
- // TODO Auto-generated method stub
- return res;
- }
-
-}
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorVue2d.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorVue2d.java 2008-08-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorVue2d.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -1,26 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-import org.fudaa.ebli.calque.BVueCalque;
-import org.fudaa.ebli.calque.ZEbliCalquesPanel;
-
-public class EbliWidgetCreatorVue2d implements EbliWidgetCreator {
-
- ZEbliCalquesPanel calque;
- EbliWidgetVue2D res;
-
- public EbliWidgetCreatorVue2d(ZEbliCalquesPanel calque) {
- super();
- this.calque = calque;
- }
-
- public EbliWidget create(EbliScene _scene) {
- res= new EbliWidgetVue2D(_scene, calque);
- return res;
- }
-
- public EbliWidget getWidget() {
- // TODO Auto-generated method stub
- return res;
- }
-
-}
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-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetFleche.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -17,6 +17,7 @@
import org.fudaa.ebli.trace.TraceIcon;
import org.fudaa.ebli.trace.TraceIconModel;
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.ConnectProvider;
import org.netbeans.api.visual.action.TextFieldInplaceEditor;
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java 2008-08-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -1,146 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JMenuItem;
-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.EGGraphe;
-import org.fudaa.ebli.courbe.EGGrapheModelListener;
-import org.fudaa.ebli.courbe.EGObject;
-import org.netbeans.api.visual.action.ActionFactory;
-import org.netbeans.api.visual.action.PopupMenuProvider;
-import org.netbeans.api.visual.laf.LookFeel;
-import org.netbeans.api.visual.model.ObjectState;
-import org.netbeans.api.visual.widget.Widget;
-
-import com.sun.org.apache.xerces.internal.impl.xs.opti.DefaultNode;
-
-
-/**
- * widget qui contient un objet graphe
- * @author adrien hadoux
- *
- */
-public class EbliWidgetGraphe extends EbliWidget{
-
- private EGGraphe graphe;
- private EbliNodeDefault nodeLegende=null;
-
- public EGGraphe getGraphe() {
- return graphe;
- }
-
- public void setGraphe(EGGraphe graphe) {
- this.graphe = graphe;
- }
-
- public EbliWidgetGraphe(EbliScene scene, Point preferredLocation, EGGraphe _graphe) {
- super(scene);
- // TODO Auto-generated constructor stub
- setGraphe(_graphe);
-
-
- }
-
- public void notifyStateChanged(ObjectState previousState,
- ObjectState newState) {
- LookFeel lookFeel = getScene().getLookFeel();
-
- setBorder(lookFeel.getBorder(newState));
-
-
- }
-
- protected void paintWidget() {
- Rectangle rec = getClientArea();
-
- // BufferedImage image = courbe.produceImage(
- // rec.width - 1, rec.height - 1,
- // Collections.EMPTY_MAP);
- getGraphics().translate(rec.x, rec.y);
- graphe.setSize(rec.width - 1,
- rec.height - 1);
- graphe.computeMarges(getGraphics());
- graphe.dessine(getGraphics(), rec.width - 1,
- rec.height - 1, false );
- }
-
-
-
- /**
- * Surcharge de la creation du menu de base en ajoutant les menus specifiques
- */
- public void setMenu() {
- getActions ().addAction (ActionFactory.createPopupMenuAction (new PopupMenuProvider() {
- public JPopupMenu getPopupMenu (Widget widget, Point localLocation) {
- JPopupMenu popup = new JPopupMenu ();
-
- //-- creation du menu commun a tous les widgets
- constructPopupMenuBase(popup);
-
- //-- Menu sp\xF6cifiques a l'application--//
- constructPopupMenuSpecifique(popup);
- return popup;
- }
- }));
- }
-
- /**
- * ajoutant la possibilit\xE9 de configurer la courbe ainsi que la l\xE9gende
- * @param _popup
- */
- private void constructPopupMenuSpecifique(JPopupMenu _popup){
-
-
-
- JMenuItem menuItem=_popup.add ("Ajouter la l\xE9gende");
- menuItem.setIcon(CtuluResource.CTULU.getIcon("crystal22_commentaire"));
- menuItem.addActionListener(new ActionListener(){
-
- public void actionPerformed(ActionEvent e) {
-
- //-- creation de la l\xE9gende --//
- if(EbliWidgetGraphe.this.getScene_()!=null){
-
- //position a cote de la widget graphe
- Point nouvellePosition=new Point((int)(EbliWidgetGraphe.this.getLocation().x),(int)(EbliWidgetGraphe.this.getLocation().y+EbliWidgetGraphe.this.getBounds().height*1.2));
-
- //getScene_().addChild(new EbliWidget(getScene_(),null));
- //addChild (WidgetLegendeManager.createLegende(GrapheWidget.this.getGraphe(), GrapheWidget.this.getScene_(),null));
- if(!EbliWidgetGraphe.this.getScene_().isObject(nodeLegende)){
-
- //-- creation d'un node legende --//
- nodeLegende = new EbliNodeDefault();
-
- nodeLegende.setCreator(new EbliWidgetCreatorLegende(getGraphe()));
- nodeLegende.setP(nouvellePosition);
- nodeLegende.setD(new Dimension(100, 100));
- EbliWidgetGraphe.this.getScene_().addNode(nodeLegende);
-
- //widgetLegende=WidgetLegendeManager.createLegende(EbliWidgetGraphe.this.getGraphe(), EbliWidgetGraphe.this.getScene_(),nouvellePosition);
-
- }
-
- //GrapheWidget.this.addChild(widgetLegende);
- }
- }
-
- });
-
-
- //-- creation du menu config de la courbe
- _popup.add(new EGConfigureActionPalette(graphe.getModel()));
-
-
-
- }
-
-}
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGrapheController.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGrapheController.java 2008-08-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGrapheController.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -1,42 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-import org.fudaa.ebli.courbe.EGAxe;
-import org.fudaa.ebli.courbe.EGGrapheModelListener;
-import org.fudaa.ebli.courbe.EGObject;
-
-public class EbliWidgetGrapheController implements EGGrapheModelListener {
- EbliWidgetGraphe w;
-
- public EbliWidgetGrapheController(EbliWidgetGraphe w) {
- super();
- this.w = w;
- }
-
- public void structureChanged() {
- w.repaint();
-
- }
-
- public void courbeContentChanged(EGObject _c, boolean restore) {
- w.repaint();
-
- }
-
- public void courbeAspectChanged(EGObject _c, boolean _visibil) {
- // graphe.paint();
- w.repaint();
- // TODO Auto-generated method stub
-
- }
-
- public void axeContentChanged(EGAxe _c) {
- w.repaint();
-
- }
-
- public void axeAspectChanged(EGAxe _c) {
- w.repaint();
-
- }
-
-}
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTree.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTree.java 2008-08-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTree.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -1,40 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.tree.TreeModel;
-
-import org.jdesktop.swingx.JXTree;
-
-public class EbliWidgetJXTree extends JXTree implements TreeSelectionListener{
-
- // modele du tree
- private EbliWidgetJXTreeModel model_;
-
-
-
- public EbliWidgetJXTree(EbliWidgetJXTreeModel newModel) {
- super(newModel.getModeleTree());
- // TODO Auto-generated constructor stub
- model_=newModel;
-
- //-- selection unique des elments du
-
- }
-
- public EbliWidgetJXTreeModel getModel_() {
- return model_;
- }
-
- public void setModel_(EbliWidgetJXTreeModel model_) {
- this.model_ = model_;
- }
-
- public void valueChanged(TreeSelectionEvent e) {
- // TODO Auto-generated method stub
-
- }
-
-
-
-}
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTreeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTreeModel.java 2008-08-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTreeModel.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -1,111 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.swing.event.TreeModelListener;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.MutableTreeNode;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreePath;
-
-
-/**
- * Modele du Jxtree:
- * contient l'ensemble des infos du tree
- * les infos sont des node referencant les widgets
- * @author Adrien Hadoux
- *
- */
-public class EbliWidgetJXTreeModel implements EbliNodeListener{
-
-public static String NAMELAYER="Layer";
-
-//-- noeud aui se trouve au sommet --//
-DefaultMutableTreeNode nodeRoot_;
-
-//-- modele du tree --//
-DefaultTreeModel modeleTree;
-
-//-- scene principale pour recuperer la liste des noeuds --//
-//EbliScene scene;
-
-public EbliWidgetJXTreeModel(int numLayer/*, EbliScene scene*/) {
-
- // TODO Auto-generated constructor stub
-
- nodeRoot_=new DefaultMutableTreeNode(NAMELAYER+numLayer);
-
- //this.scene=scene;
-
- //-- construction de la hierarchie des nodes a partir des nodes de la scene --//
- //constructModelNode();
-
-
- modeleTree=new DefaultTreeModel(nodeRoot_);
-}
-
-
-public DefaultTreeModel getModeleTree() {
- return modeleTree;
-}
-
-
-public void setModeleTree(DefaultTreeModel modeleTree) {
- this.modeleTree = modeleTree;
-}
-
-
-public void setNodeRoot_(DefaultMutableTreeNode nodeRoot_) {
- this.nodeRoot_ = nodeRoot_;
-}
-
-
-/**
- * methode qui construit la hierarchie des nodes a partir de la scene
- */
-/*
- public DefaultMutableTreeNode constructModelNode(){
-
- //-- 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));
- }
- return nodeRoot_;
- }
-*/
-
-public DefaultMutableTreeNode getNodeRoot_() {
- return nodeRoot_;
-}
-
-public void addNode(EbliNode node){
-nodeRoot_.add(new DefaultMutableTreeNode(node));
-
-//-- rafraichissement du modele --//
-modeleTree.reload();
-
-}
-
-
-public void nodeAdded(EbliNode node) {
- addNode(node);
-
-
-}
-
-
-public void noderemoved(EbliNode node) {
- // TODO Auto-generated method stub
-
-}
-
-
-
-}
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-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -1,26 +1,18 @@
package org.fudaa.ebli.visuallibrary;
-import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Insets;
-import java.awt.Point;
import java.awt.Rectangle;
-import org.fudaa.ebli.courbe.EGCourbe;
-import org.fudaa.ebli.trace.TraceIcon;
-import org.fudaa.ebli.trace.TraceIconModel;
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.ConnectProvider;
import org.netbeans.api.visual.action.TextFieldInplaceEditor;
import org.netbeans.api.visual.action.WidgetAction;
-import org.netbeans.api.visual.layout.LayoutFactory.SerialAlignment;
import org.netbeans.api.visual.widget.LabelWidget;
-import org.netbeans.api.visual.widget.Scene;
import org.netbeans.api.visual.widget.Widget;
+import org.netbeans.api.visual.widget.LabelWidget.Alignment;
import org.netbeans.api.visual.widget.LabelWidget.VerticalAlignment;
-import org.netbeans.modules.visual.layout.FlowLayout;
-import org.netbeans.modules.visual.layout.OverlayLayout;
/**
* Legende Widget qui permet de construire des rectangles avec du texte
@@ -50,6 +42,7 @@
intern = new LabelWidget(_scene);
intern.setVerticalAlignment(VerticalAlignment.CENTER);
+ intern.setAlignment(Alignment.CENTER);
intern.setLabel(label);
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java 2008-08-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -7,6 +7,7 @@
import org.netbeans.api.visual.action.TextFieldInplaceEditor;
import org.netbeans.api.visual.action.WidgetAction;
import org.netbeans.api.visual.layout.LayoutFactory.SerialAlignment;
+import org.netbeans.api.visual.model.ObjectState;
import org.netbeans.api.visual.widget.LabelWidget;
import org.netbeans.api.visual.widget.Scene;
import org.netbeans.api.visual.widget.Widget;
@@ -53,6 +54,10 @@
intern.setLabel(cb_.getTitle());
}
+// @Override
+// public void notifyStateChanged(ObjectState _previousState, ObjectState _newState) {
+// }
+
/**
* @return the cb_
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetVue2D.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetVue2D.java 2008-08-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetVue2D.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -1,34 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.util.Collections;
-
-import org.fudaa.ebli.calque.BVueCalque;
-import org.fudaa.ebli.calque.ZEbliCalquesPanel;
-
-public class EbliWidgetVue2D extends EbliWidget {
-
- ZEbliCalquesPanel vue_;
-
- public EbliWidgetVue2D(EbliScene scene, ZEbliCalquesPanel vue) {
- super(scene);
- vue_ = vue;
- // TODO Auto-generated constructor stub
- }
-
- @Override
- protected void paintWidget() {
- Rectangle rec = getClientArea();
- Graphics2D g = getGraphics();
-
- g.translate(rec.x, rec.y);
- vue_.setSize(rec.width, rec.height);
- vue_.restaurer();
- vue_.paint(g);
- // TODO Auto-generated method stub
- super.paintWidget();
- g.translate(-rec.x, -rec.y);
- }
-
-}
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/OverlayLayoutGap.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/OverlayLayoutGap.java 2008-08-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/OverlayLayoutGap.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -1,62 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-import java.awt.Dimension;
-import java.awt.Insets;
-import java.awt.Point;
-import java.awt.Rectangle;
-
-import org.netbeans.api.visual.layout.Layout;
-import org.netbeans.api.visual.widget.Widget;
-
-public class OverlayLayoutGap implements Layout {
-
- Insets inGaps_;
-
- public OverlayLayoutGap(Insets _inGaps) {
- super();
- inGaps_ = _inGaps;
- }
-
- public void layout(Widget widget) {
- Dimension total = new Dimension();
- for (Widget child : widget.getChildren()) {
- if (!child.isVisible())
- continue;
- Dimension size = child.getPreferredBounds().getSize();
- if (size.width > total.width)
- total.width = size.width;
- if (size.height > total.height)
- total.height = size.height;
- }
- total.width -= inGaps_.left + inGaps_.right;
- total.height -= inGaps_.top + inGaps_.bottom;
- for (Widget child : widget.getChildren()) {
- Point location = child.getPreferredBounds().getLocation();
- child.resolveBounds(new Point(-location.x+inGaps_.left, -location.y+inGaps_.top),
- new Rectangle(location, total));
- }
- }
-
- public boolean requiresJustification(Widget widget) {
- return true;
- }
-
- public void justify(Widget widget) {
- Rectangle clientArea = widget.getClientArea();
- clientArea.x+=inGaps_.left;
- clientArea.y+=inGaps_.top;
- clientArea.width -= inGaps_.left + inGaps_.right;
- clientArea.height -= inGaps_.top + inGaps_.bottom;
- for (Widget child : widget.getChildren()) {
- if (child.isVisible()) {
- Point location = child.getPreferredBounds().getLocation();
- child.resolveBounds(new Point(clientArea.x - location.x,
- clientArea.y - location.y), new Rectangle(location,
- clientArea.getSize()));
- } else {
- child.resolveBounds(clientArea.getLocation(), new Rectangle());
- }
- }
- }
-
-}
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManager.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManager.java 2008-08-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManager.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -1,127 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JFrame;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-
-import org.fudaa.ctulu.iterator.LogarithmicNumberIterator;
-import org.fudaa.ebli.courbe.EGAxe;
-import org.fudaa.ebli.courbe.EGAxeHorizontal;
-import org.fudaa.ebli.courbe.EGAxeVertical;
-import org.fudaa.ebli.courbe.EGCourbe;
-import org.fudaa.ebli.courbe.EGCourbeChild;
-import org.fudaa.ebli.courbe.EGCourbeModelDefault;
-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.trace.TraceIcon;
-import org.fudaa.ebli.trace.TraceIconModel;
-import org.fudaa.ebli.trace.TraceLigne;
-import org.fudaa.ebli.trace.TraceLigneModel;
-import org.netbeans.api.visual.action.ActionFactory;
-import org.netbeans.api.visual.action.PopupMenuProvider;
-import org.netbeans.api.visual.graph.GraphScene;
-import org.netbeans.api.visual.laf.LookFeel;
-import org.netbeans.api.visual.layout.LayoutFactory.SerialAlignment;
-import org.netbeans.api.visual.model.ObjectState;
-import org.netbeans.api.visual.widget.LabelWidget;
-import org.netbeans.api.visual.widget.LayerWidget;
-import org.netbeans.api.visual.widget.Scene;
-import org.netbeans.api.visual.widget.Widget;
-import org.netbeans.modules.visual.layout.FlowLayout;
-import org.netbeans.modules.visual.layout.OverlayLayout;
-
-/**
- * @author denf01a adrien hadoux
- * @creation 5 ao\xFBt 2008
- * @version
- *
- */
-public class WidgetLegendeManager {
-
-
-
- /**
- * Creation de la legende
- * @param g
- * @param scene
- * @param PreferredLocation peut etre null
- * @return
- */
- public static EbliWidget createLegende(final EGGraphe g, final EbliScene scene,final Point PreferredLocation) {
- final EGCourbe[] cs = g.getModel().getCourbes();
- final EbliWidget res = new EbliWidget(scene);
- res.setLayout(new FlowLayout(true, SerialAlignment.LEFT_TOP, 5));// a modifier pour setter le gap
- //res.setLayout(new OverlayLayout());
- for (int i = 0; i < cs.length; i++) {
- final EbliWidget line = new EbliWidget(scene);
- line.setLayout(new FlowLayout(false, SerialAlignment.JUSTIFY, 5));
-
- //creation de la widget titre
- final EbliWidgetTitle tw=new EbliWidgetTitle(scene, cs[i],null);
-
- //creation de la widget ligne
- EbliWidgetLine lw=new EbliWidgetLine(scene, cs[i],null);
-
- lw.setEnabled(false);
- line.addChild(lw);
- line.addChild(tw);
- res.addChild(line);
-
- //-- ajouter le listener EGGraphe pour ecouter et \xE9ettre a jour els l\xE9gendes --//
- g.getModel().addModelListener(new EGGrapheModelListener() {
-
- public void structureChanged() {
- line.repaint();
- tw.majLabel();
-
- }
-
- public void courbeContentChanged(EGObject _c, boolean restore) {
- line.repaint();
- tw.majLabel();
-
- }
-
- public void courbeAspectChanged(EGObject _c, boolean _visibil) {
- line.repaint();
- tw.majLabel();
-
- }
-
- public void axeContentChanged(EGAxe _c) {
- line.repaint();
- tw.majLabel();
- }
-
- public void axeAspectChanged(EGAxe _c) {
- line.repaint();
- tw.majLabel();
- }
- });
-
- }
-
-
-
-
- return res;
- }
-
-
-
-}
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManagerOLD.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManagerOLD.java 2008-08-07 21:26:39 UTC (rev 3734)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManagerOLD.java 2008-08-07 21:44:21 UTC (rev 3735)
@@ -1,184 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.fudaa.ctulu.CtuluResource;
-import org.fudaa.ctulu.image.CtuluImageProducer;
-import org.fudaa.ctulu.image.CtuluLibImage;
-import org.fudaa.ebli.courbe.EGAxe;
-import org.fudaa.ebli.courbe.EGCourbe;
-import org.fudaa.ebli.courbe.EGGraphe;
-import org.fudaa.ebli.courbe.EGGrapheModelListener;
-import org.fudaa.ebli.courbe.EGObject;
-import org.netbeans.api.visual.action.ActionFactory;
-import org.netbeans.api.visual.action.SelectProvider;
-import org.netbeans.api.visual.action.TextFieldInplaceEditor;
-import org.netbeans.api.visual.graph.GraphScene;
-import org.netbeans.api.visual.laf.LookFeel;
-import org.netbeans.api.visual.model.ObjectState;
-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 sun.awt.image.ToolkitImage;
-
-
-
-/**
- * Classe qui g\xE9n\xE8re les l\xE9gendes de chacun des graphes
- *
- *
- * @author Adrien Hadoux
- *
- */
-
-public class WidgetLegendeManagerOLD {
-
-
- static List<ImageWidget> listeWidgets=null;
-
- //gap vertical entre chaque widget legendes
- final static int Vgap=10;
- //gap horizontal entre chaque widget legendes
- final static int Hgap=10;
-
- final static int widthDefault=100;
- final static int heightDefault=30;
-
-
- public static void createWidgetLegendeGraphe(GraphScene scene,LayerWidget visu,EGGraphe graphe, Rectangle areaGraphe) {
-
-
- listeWidgets=new ArrayList<ImageWidget>();
-
- //-- cr\xE9ation, affichage et ajout du listener du graphe pour chacune des widgets suivantes --//
-
- for(int i=0; i<graphe.getModel().getCourbes().length;i++){
-
- final EGCourbe courbe=graphe.getModel().getCourbes()[i];
- final int cpt=i;
-
-
-
- //--creation d un nouveau widget image --//
- final ImageWidget legendeWidget=new ImageWidget (scene){
- public void notifyStateChanged(ObjectState previousState,
- ObjectState newState) {
- LookFeel lookFeel = getScene().getLookFeel();
- ...
[truncated message content] |
|
From: <opa...@us...> - 2008-08-07 21:26:29
|
Revision: 3734
http://fudaa.svn.sourceforge.net/fudaa/?rev=3734&view=rev
Author: opasteur
Date: 2008-08-07 21:26:39 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion04.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLoiHydraulique.java
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-07 21:25:57 UTC (rev 3733)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion04.java 2008-08-07 21:26:39 UTC (rev 3734)
@@ -102,19 +102,19 @@
// Mapping des noms de package.
if (oldpk.startsWith(PK_DODICO_HYDR)) {
- newpk="org.fudaa.fudaa.hydraulique1d.metier.";
+ newpk="org.fudaa.dodico.hydraulique1d.metier.";
if (PK_DODICO_HYDR.length()<oldpk.length()) {
newpk+=oldpk.substring(PK_DODICO_HYDR.length());
}
}
else if (oldpk.startsWith(PK_DODICO_CORBA_HYDR)) {
- newpk="org.fudaa.fudaa.hydraulique1d.metier.";
+ newpk="org.fudaa.dodico.hydraulique1d.metier.";
if (PK_DODICO_CORBA_HYDR.length()<oldpk.length()) {
newpk+=oldpk.substring(PK_DODICO_CORBA_HYDR.length());
}
}
else if (oldpk.startsWith(PK_DODICO_CORBA_GEOM)) {
- newpk="org.fudaa.fudaa.hydraulique1d.metier.geometrie.";
+ newpk="org.fudaa.dodico.hydraulique1d.metier.geometrie.";
}
// Aucun changement.
else {
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLoiHydraulique.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLoiHydraulique.java 2008-08-07 21:25:57 UTC (rev 3733)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLoiHydraulique.java 2008-08-07 21:26:39 UTC (rev 3734)
@@ -24,7 +24,7 @@
/**
* Impl\xE9mentation abstraite de l'objet m\xE9tier "loi hydraulique" des donn\xE9es hydrauliques.
* Associe un nom et un num\xE9ro.
- * @see org.fudaa.fudaa.hydraulique1d.metier.loi.
+ * @see org.fudaa.dodico.hydraulique1d.metier.loi.
* @version $Revision: 1.2 $ $Date: 2007-11-20 11:42:28 $ by $Author: bmarchan $
* @author Jean-Marc Lacombe
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <opa...@us...> - 2008-08-07 21:25:48
|
Revision: 3733
http://fudaa.svn.sourceforge.net/fudaa/?rev=3733&view=rev
Author: opasteur
Date: 2008-08-07 21:25:57 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
Removed Paths:
-------------
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/metier/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2008-08-07 16:50:51
|
Revision: 3732
http://fudaa.svn.sourceforge.net/fudaa/?rev=3732&view=rev
Author: hadouxad
Date: 2008-08-07 16:50:58 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
AFFECT?\195?\137 - # 40: L?\195?\169gende pour les courbe 1d
http://mantis.genesis-groupe.com//view.php?id=40
- ajout du renderermodel checkbox du tree
- ajout du renderer editeur du tree
- fonctionnalite de masquage affichage des widget fonctionne
- fonction de masquage clic droit surla widget fonctionne aussi avec le jtree
FIXME: il faut trouver une astuce pour faire un revalidate/repaint de la scene car sinon il faut mettre le curseur dessus pour voir les maj
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/test/org/fudaa/ebli/all/TestGraphe2.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxNodeEditor.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxTreeRenderer.java
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxNodeEditor.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxNodeEditor.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxNodeEditor.java 2008-08-07 16:50:58 UTC (rev 3732)
@@ -0,0 +1,102 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.MouseEvent;
+import java.util.EventObject;
+
+import javax.swing.AbstractCellEditor;
+import javax.swing.JCheckBox;
+import javax.swing.JTree;
+import javax.swing.event.ChangeEvent;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeCellEditor;
+import javax.swing.tree.TreePath;
+
+import com.memoire.bu.BuCheckBox;
+/**
+ * Editeur dans le tree
+ * @author Adrien Hadoux
+ *
+ */
+public class EbliCheckBoxNodeEditor extends AbstractCellEditor implements TreeCellEditor {
+
+ EbliCheckBoxTreeRenderer renderer = new EbliCheckBoxTreeRenderer();
+
+ ChangeEvent changeEvent = null;
+
+ EbliWidgetJXTree tree;
+
+ public EbliCheckBoxNodeEditor(EbliWidgetJXTree tree) {
+ this.tree = tree;
+ }
+
+ public Object getCellEditorValue() {
+ JCheckBox checkbox = renderer.getLeafRenderer();
+ // EbliNodeDefault checkBoxNode = new CheckBoxNode(checkbox.getText(),
+ // checkbox.isSelected());
+
+
+ return checkbox.getText();//checkBoxNode;
+ }
+
+ public boolean isCellEditable(EventObject event) {
+ boolean returnValue = false;
+ if (event instanceof MouseEvent) {
+ MouseEvent mouseEvent = (MouseEvent) event;
+ TreePath path = tree.getPathForLocation(mouseEvent.getX(),
+ mouseEvent.getY());
+ if (path != null) {
+ Object node = path.getLastPathComponent();
+ if ((node != null) && (node instanceof DefaultMutableTreeNode)) {
+ DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) node;
+ Object userObject = treeNode.getUserObject();
+ returnValue = ((treeNode.isLeaf()) && (userObject instanceof EbliNodeDefault));
+ }
+ }
+ }
+ return returnValue;
+ // return true;
+ }
+
+ public Component getTreeCellEditorComponent(JTree tree, final Object value,
+ boolean selected, boolean expanded, boolean leaf, int row) {
+
+ final Component editor =renderer.getTreeCellRendererComponent(tree, value,true, expanded, leaf, row, true);
+
+ //-- recuperation de l instance defaultnode
+ Object userObject = ((DefaultMutableTreeNode) value).getUserObject();
+
+
+
+ if (userObject instanceof EbliNode && editor instanceof JCheckBox) {
+ final EbliNodeDefault node= (EbliNodeDefault)(((DefaultMutableTreeNode)value).getUserObject());
+
+ //-- suppression des anciens listeners --//
+ // ((JCheckBox) editor).re
+
+
+
+ // ajoute le listener au checkbox pour afficher la widget en fonction de son click
+ ((JCheckBox) editor).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());
+
+
+ }
+ });
+
+ }
+
+
+
+
+
+ return editor;
+ }
+ }
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxNodeEditor.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxTreeRenderer.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxTreeRenderer.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxTreeRenderer.java 2008-08-07 16:50:58 UTC (rev 3732)
@@ -0,0 +1,98 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
+
+import javax.swing.JCheckBox;
+import javax.swing.JTree;
+import javax.swing.UIManager;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import javax.swing.tree.TreeCellRenderer;
+
+import com.sun.org.apache.xerces.internal.impl.xs.opti.DefaultNode;
+
+public class EbliCheckBoxTreeRenderer implements TreeCellRenderer {
+ private JCheckBox leafRenderer = new JCheckBox();
+
+ private DefaultTreeCellRenderer nonLeafRenderer = new DefaultTreeCellRenderer();
+
+ Color selectionBorderColor, selectionForeground, selectionBackground,
+ textForeground, textBackground;
+
+ protected JCheckBox getLeafRenderer() {
+ return leafRenderer;
+ }
+
+ public EbliCheckBoxTreeRenderer() {
+ /*Font fontValue;
+ fontValue = UIManager.getFont("Tree.font");
+ if (fontValue != null) {
+ leafRenderer.setFont(fontValue);
+ }
+ Boolean booleanValue = (Boolean) UIManager
+ .get("Tree.drawsFocusBorderAroundIcon");
+ leafRenderer.setFocusPainted((booleanValue != null)
+ && (booleanValue.booleanValue()));
+
+ selectionBorderColor = UIManager.getColor("Tree.selectionBorderColor");
+ selectionForeground = UIManager.getColor("Tree.selectionForeground");
+ 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;
+ if (leaf) {
+
+
+ //-- recuperation du node --//
+ Object userObject = ((DefaultMutableTreeNode) value).getUserObject();
+
+
+ EbliNodeDefault node=null;
+ if (userObject instanceof EbliNode) {
+ node= (EbliNodeDefault)(((DefaultMutableTreeNode)value).getUserObject());
+
+ System.err.println("PS EbliNode!!! ROW: "+row);
+
+ //-- creation d'une nouvelle checkbox aui sera ainsi unique pour chaque composant
+ leafRenderer=new JCheckBox();
+
+ 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 = nonLeafRenderer.getTreeCellRendererComponent(tree,
+ value, selected, expanded, leaf, row, hasFocus);
+ }
+ return returnValue;
+ }
+
+
+ }
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliCheckBoxTreeRenderer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-07 14:48:20 UTC (rev 3731)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNode.java 2008-08-07 16:50:58 UTC (rev 3732)
@@ -16,5 +16,6 @@
Point getLocation();
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-07 14:48:20 UTC (rev 3731)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java 2008-08-07 16:50:58 UTC (rev 3732)
@@ -11,6 +11,8 @@
Point p;
Dimension d;
String title;
+
+
public String getTitle() {
return title;
}
@@ -60,4 +62,7 @@
return title;
}
+
+
+
}
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-07 14:48:20 UTC (rev 3731)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-07 16:50:58 UTC (rev 3732)
@@ -151,17 +151,26 @@
public void actionPerformed(ActionEvent e) {
- EbliWidget.this.setVisible(false);
+ //EbliWidget.this.setVisible(false);
EbliNode n = (EbliNode) EbliWidget.this.getScene_().findObject(
EbliWidget.this);
EbliWidget.this.getScene_().removeNode(n);
+ EbliWidget.this.getScene_().getVisu_().removeChild(EbliWidget.this);
+
- // NE PAS DECOCHER CES ELEMENTS
- // fermeture des widgets children
- // EbliWidget.this.removeChildren();
- // fermeture du widget donne
- // EbliWidget.this.removeFromParent();
+ }
+ });
+
+ JMenuItem menuItem3 = _popup.add("Masquer l'objet");
+ menuItem3.setIcon(CtuluResource.CTULU.getIcon("crystal_non"));
+ menuItem3.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+
+ EbliWidget.this.setVisible(false);
+
+
}
});
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 14:48:20 UTC (rev 3731)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-07 16:50:58 UTC (rev 3732)
@@ -49,6 +49,8 @@
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;
@@ -199,7 +201,10 @@
//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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <opa...@us...> - 2008-08-07 14:48:19
|
Revision: 3731
http://fudaa.svn.sourceforge.net/fudaa/?rev=3731&view=rev
Author: opasteur
Date: 2008-08-07 14:48:20 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dBaseImplementation.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/Hydraulique1dPoint.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/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/conv/ConvUnite.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dApportEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dBiefEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dConcentrationsInitialesEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dConditionsInitialesEditor.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/Hydraulique1dCustomizer.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dDeversoirEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dExtremLibreEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLaissesEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLigneInitialeEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListeLoiCombo.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListingsCalageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiHydrauliqueCellEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiHydrauliqueEditor2.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiHydrauliqueLibraryEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiSeuilEditor2.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dMaillageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dMeteoEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dModeleQEauEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoeudFluvEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoeudTransEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoeudTransParamEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoyauEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresCalageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresGenerauxAvancesEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresGenerauxEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresRepriseEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresResultatsEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresResultatsQualiteDEauEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresTemporelsEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParamsGenerauxQualiteDEauEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParamsPhysiqueQEEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPerteChargeEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dResultatsGenerauxEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSectionsSeriesEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilAvecLoiEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilChooser.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilLoiEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilVanneEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSitesEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSourceEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dTableauZoneEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dTableauxEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dVariablesResultatsEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dVisuInitialeEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementCalageEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneSecheEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierApportDebitPanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierCaracLiaisonPanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierGeometriePanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierLiaisonEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierNumeriqueEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierPlanimEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierSemiPointsEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierTableauPlanimPanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierTableauXYZPanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/tableau/Hydraulique1dCasierTabPlanimModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/tableau/Hydraulique1dCasierTabXYZ.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/tableau/Hydraulique1dCasierTabXYZModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilSimpleEditor.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilTableauPanel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dGrapheProfilDataset.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHMRepository.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Apport2.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Base.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Bief.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Casier.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierLiaison.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierNumerique.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierPlanim.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierSemiPoints.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ConcentrationsInitiales.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ConditionsInitiales.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CruesCalage.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Deversoir.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ExtremiteLibre.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_GraphesResultats.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Laisse.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_LibraryLoiHydraulique.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_LigneInitiale.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ListingsCalage.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_LoiHydraulique2.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Maillage2.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Meteo.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ModeleQEau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Noyau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamCalage.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamGeneraux.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamReprise.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamResultat.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamResultatQualiteDEau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamTemporel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamsGenerauxQualiteDEau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamsPhysiqueQE.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Planimetrage2.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Profil.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ProfilResultats.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ResultatsGeneraux.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SectionsParSections.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SectionsParSerie2.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SeuilAvecLoi.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SeuilLoi.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SeuilVanne.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SitesStockage.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Source.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Tableaux.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_VariableResultat.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_VisuInitiale.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesFrottement.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesFrottementACaler.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesFrottementCalees.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesSeches.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauApport.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBarragePrincipal.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefCourbe.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefDroit.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauCasier.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauDeversoir.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauExtremLibre.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauFrame.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauGridAdapter.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauLiaisonCasier.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauMouseAdapter.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauNoeud.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauPerteCharge.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauSeuil.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauSingularite.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauSource.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauVerificateur.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneConcentrationsInitialesTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneLaisseTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneLigneDEauTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneOptionsTraceurTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneParamsPhysiqueQETableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneProfilTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneSiteTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneZoneFrottementTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneZoneTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneZoneTailleTableau.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauConcInitsModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLaisseModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLigneEauModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauOptionsTraceurModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauParamsPhysQEModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauProfilsModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauSiteModel.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
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneSecheModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneTailleModel.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dBaseImplementation.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dBaseImplementation.java 2008-08-07 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dBaseImplementation.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -7,8 +7,8 @@
* @mail de...@fu...
*/
package org.fudaa.fudaa.hydraulique1d;
-import org.fudaa.fudaa.hydraulique1d.metier.evenement.H1dObjetEvent;
-import org.fudaa.fudaa.hydraulique1d.metier.evenement.H1dObjetEventListener;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.H1dObjetEvent;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.H1dObjetEventListener;
import org.fudaa.fudaa.commun.impl.FudaaImplementation;
import org.fudaa.fudaa.commun.projet.FudaaParamChangeLog;
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-07 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExport.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -14,16 +14,16 @@
import javax.swing.filechooser.FileFilter;
import org.fudaa.ctulu.gui.CtuluFileChooser;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierBief;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierEtude1d;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLigneEauInitiale;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLigneEauPoint;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresReprise;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierReseau;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierResultatsTemporelSpatial;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiTracer;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.MetierParamPhysTracer;
+import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
+import org.fudaa.dodico.hydraulique1d.metier.MetierCasier;
+import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLigneEauInitiale;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLigneEauPoint;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresReprise;
+import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatial;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiTracer;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.MetierParamPhysTracer;
import org.fudaa.dodico.mascaret.DParametresMascaret;
import org.fudaa.dodico.mascaret.DResultatsMascaret;
import org.fudaa.fudaa.hydraulique1d.conv.ConvH1D_Masc;
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-07 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -33,32 +33,32 @@
import org.fudaa.dodico.corba.lido.SParametresPRO;
import org.fudaa.dodico.corba.mascaret.SParametresCAS;
import org.fudaa.dodico.corba.mascaret.SParametresGEO;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierMethodeMaillage;
+import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSections;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSeries;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSeriesUnitaire;
+import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLoiHydraulique;
+import org.fudaa.dodico.hydraulique1d.metier.MetierMaillage;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresGeneraux;
+import org.fudaa.dodico.hydraulique1d.metier.MetierProfil;
+import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatial;
+import org.fudaa.dodico.hydraulique1d.metier.MetierSite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierZoneFrottement;
+import org.fudaa.dodico.hydraulique1d.metier.casier.MetierGeometrieCasier;
+import org.fudaa.dodico.hydraulique1d.metier.casier.MetierNuagePointsCasier;
+import org.fudaa.dodico.hydraulique1d.metier.casier.MetierPlanimetrageCasier;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint2D;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.MetierParamPhysTracer;
import org.fudaa.dodico.lido.DParametresLido;
import org.fudaa.dodico.mascaret.DParametresMascaret;
import org.fudaa.dodico.mascaret.DResultatsMascaret;
import org.fudaa.dodico.mascaret.FichierMascaretException;
import org.fudaa.fudaa.hydraulique1d.conv.ConvH1D_Masc;
import org.fudaa.fudaa.hydraulique1d.conv.ConvMasc_H1D;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierMethodeMaillage;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierBief;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierDefinitionSectionsParSections;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierDefinitionSectionsParSeries;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierDefinitionSectionsParSeriesUnitaire;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierEtude1d;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLoiHydraulique;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierMaillage;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresGeneraux;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierProfil;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierReseau;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierResultatsTemporelSpatial;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierSite;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierZoneFrottement;
-import org.fudaa.fudaa.hydraulique1d.metier.casier.MetierGeometrieCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.casier.MetierNuagePointsCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.casier.MetierPlanimetrageCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.geometrie.MetierPoint;
-import org.fudaa.fudaa.hydraulique1d.metier.geometrie.MetierPoint2D;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.MetierParamPhysTracer;
import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dLigneConcentrationsInitialesTableau;
import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dLigneLaisseTableau;
import org.fudaa.fudaa.hydraulique1d.tableau.Hydraulique1dLigneLigneDEauTableau;
@@ -1365,8 +1365,8 @@
}
- public static void importProfilsPRO_MASCARET(File filename, MetierBief[] biefs) {
- Vector profils= new Vector();
+ public static void importProfilsPRO_MASCARET(File filename, MetierBief[] biefs) {
+ Vector profils= new Vector();
Vector ptsProfil= new Vector();
String logMsg=
"R\xE9sultat de l'importation de " + filename.getPath() + ":\n\n";
@@ -1415,7 +1415,9 @@
logMsg += "profil vide: '" + line + "' (ligne " + lineNb + ")\n";
break;
} /*else {*/
- mascaretPointProfil(logMsg, line, ptsProfil);
+ boolean avecGeoref = mascaretPointProfil(logMsg, line, ptsProfil);
+ //Si un seul point possede un g\xE9oref alors avecGeoreferencement \xE0 true
+ if (avecGeoref) nouveauProfil.avecGeoreferencement(avecGeoref);
etat= "points";
//}
} else if (etat.equals("points")) {
@@ -1505,23 +1507,44 @@
res.abscisse(abscisse);
return res;
}
- private static void mascaretPointProfil(
+ private static boolean mascaretPointProfil(
String logMsg,
String line,
Vector ptsProfil)
throws NoSuchElementException, NumberFormatException {
+ System.err.println("in mascaretPointProfil");
+ MetierPoint2D pt2D;
+ boolean avecGeoReferencement = false;
+
StringTokenizer st= new StringTokenizer(line);
- MetierPoint2D pt2D=
- new MetierPoint2D(
- Double.parseDouble(st.nextToken()),
- Double.parseDouble(st.nextToken()));
+ double x = Double.parseDouble(st.nextToken());
+ double y = Double.parseDouble(st.nextToken());
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 (avecGeoReferencement){
+ System.err.println("georef found "+ cx +" "+cy);
+ pt2D=new MetierPoint2D(x,y,cx,cy);
+ }else{
+ pt2D=new MetierPoint2D(x,y);
+ }
+
if ((!lit.equals("B")) && (!lit.equals("T")))
throw new NumberFormatException(lit);
+
+
Object[] pt= new Object[2];
pt[0]= pt2D;
pt[1]= lit;
ptsProfil.add(pt);
+
+ return avecGeoReferencement;
}
private static void mascaretInitIndiceLit(
MetierProfil nouveauProfil,
@@ -1591,7 +1614,7 @@
return (Hydraulique1dProfilModel[])profils.toArray(new Hydraulique1dProfilModel[profils.size()]);
}
public static Hydraulique1dProfilModel[] importProfilsPRO_MASCARET(File filename) {
- ArrayList profils= new ArrayList();
+ ArrayList profils= new ArrayList();
ArrayList ptsProfil= new ArrayList();
String logMsg=
"R\xE9sultat de l'importation de " + filename.getPath() + ":\n\n";
@@ -1638,7 +1661,9 @@
logMsg += "profil vide: '" + line + "' (ligne " + lineNb + ")\n";
break;
} /*else {*/
- mascaretPointProfil(logMsg, line, ptsProfil);
+ boolean avecGeoref = mascaretPointProfil(logMsg, line, ptsProfil);
+ //Si un seul point possede un g\xE9oref alors avecGeoreferencement \xE0 true
+ if (avecGeoref) nouveauProfil.avecGeoreferencement(avecGeoref);
etat= "points";
//}
} else if (etat.equals("points")) {
@@ -1664,7 +1689,10 @@
break;
}
} else {
- mascaretPointProfil(logMsg, line, ptsProfil);
+
+ boolean avecGeoref = mascaretPointProfil(logMsg, line, ptsProfil);
+ //Si un seul point possede un g\xE9oref alors avecGeoreferencement \xE0 true
+ if (avecGeoref) nouveauProfil.avecGeoreferencement(avecGeoref);
// etat="points";
}
} // fin test etat
@@ -1726,23 +1754,45 @@
res.setAbscisse(abscisse);
return res;
}
- private static void mascaretPointProfil(
+ private static boolean mascaretPointProfil(
String logMsg,
String line,
ArrayList ptsProfil)
throws NoSuchElementException, NumberFormatException {
- StringTokenizer st= new StringTokenizer(line);
- MetierPoint2D pt2D=
- new MetierPoint2D(
- Double.parseDouble(st.nextToken()),
- Double.parseDouble(st.nextToken()));
- String lit= st.nextToken();
- if ((!lit.equals("B")) && (!lit.equals("T")))
- throw new NumberFormatException(lit);
- Object[] pt= new Object[2];
- pt[0]= pt2D;
- pt[1]= lit;
- ptsProfil.add(pt);
+ System.err.println("in mascaretPointProfil");
+ MetierPoint2D pt2D;
+ boolean avecGeoReferencement = false;
+
+ StringTokenizer st= new StringTokenizer(line);
+ double x = Double.parseDouble(st.nextToken());
+ double y = Double.parseDouble(st.nextToken());
+ 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 (avecGeoReferencement){
+ System.err.println("georef found "+ cx +" "+cy);
+ pt2D=new MetierPoint2D(x,y,cx,cy);
+ }else{
+ pt2D=new MetierPoint2D(x,y);
+ }
+
+ if ((!lit.equals("B")) && (!lit.equals("T")))
+ throw new NumberFormatException(lit);
+
+
+ Object[] pt= new Object[2];
+ pt[0]= pt2D;
+ pt[1]= lit;
+ ptsProfil.add(pt);
+
+ return avecGeoReferencement;
+
}
private static void mascaretInitIndiceLit(
Hydraulique1dProfilModel nouveauProfil,
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dPoint.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dPoint.java 2008-08-07 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dPoint.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -8,7 +8,7 @@
*/
package org.fudaa.fudaa.hydraulique1d;
-import org.fudaa.fudaa.hydraulique1d.metier.geometrie.MetierPoint2D;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint2D;
/**
* Mod\xE8le de donn\xE9e utilis\xE9 pour repr\xE9senter un point d\u2019un profil.
* Ce mod\xE8le est utilis\xE9 par la classe \xAB\xA0Hydraulique1dProfilModel\xA0\xBB.
@@ -18,6 +18,9 @@
public final class Hydraulique1dPoint implements Cloneable {
private Double X_=null;
private Double Y_=null;
+ //Coordonn\xE9es de g\xE9oreferencement
+ private Double CX_=null;
+ private Double CY_=null;
/**
@@ -32,7 +35,7 @@
* @param pt le point 2D.
*/
public Hydraulique1dPoint(MetierPoint2D pt) {
- this(pt.x, pt.y);
+ this(pt.x, pt.y,pt.cx,pt.cy);
}
/**
* Constructeur d'un point \xE0 partir 2 r\xE9els primitifs.
@@ -40,7 +43,10 @@
* @param y deuxi\xE8me \xE9l\xE9ment .
*/
public Hydraulique1dPoint(double x, double y) {
- this(doubleValue(x), doubleValue(y));
+ this(doubleValue(x), doubleValue(y));
+ }
+ public Hydraulique1dPoint(double x, double y, double cx, double cy) {
+ this(doubleValue(x), doubleValue(y),doubleValue(cx), doubleValue(cy));
}
/**
@@ -51,59 +57,67 @@
public Hydraulique1dPoint(Double x, Double y) {
X_= x;
Y_=y;
+ CX_=new Double(0);
+ CY_=new Double(0);
}
+ public Hydraulique1dPoint(Double x, Double y,Double cx, Double cy) {
+ X_= x;
+ Y_=y;
+ CX_=cx;
+ CY_=cy;
+ }
public MetierPoint2D toSPoint2D() {
- MetierPoint2D pt2D = new MetierPoint2D(x(),y());
+ MetierPoint2D pt2D = new MetierPoint2D(x(),y(),Cx(),Cy());
return pt2D;
}
/**
- * @return la valeur du premier \xE9lement (double non primitif).
+ * @return la valeur du premier \xE9lement de coordon\xE9e(double non primitif).
*/
public Double X() {
return X_;
}
/**
- * @return la valeur du premier \xE9lement (double primitif).
+ * @return la valeur du premier \xE9lement de coordon\xE9e(double primitif).
*/
public double x() {
return doubleValue(X_);
}
/**
- * Initialise le premier \xE9lement.
+ * Initialise le premier \xE9lement de coordon\xE9e.
* @param X La nouvelle valeur du premier \xE9lement (peut \xEAtre null).
*/
public void X(Double X) {
X_=X;
}
/**
- * Initialise le premier \xE9lement.
+ * Initialise le premier \xE9lement de coordon\xE9e.
* @param x La nouvelle valeur du premier \xE9lement.
*/
public void x(double x) {
X_= doubleValue(x);
}
/**
- * @return la valeur du deuxi\xE8me \xE9lement (double non primitif).
+ * @return la valeur du deuxi\xE8me \xE9lement de coordon\xE9e(double non primitif).
*/
public Double Y() {
return Y_;
}
/**
- * @return la valeur du deuxi\xE8me \xE9lement (double primitif).
+ * @return la valeur du deuxi\xE8me \xE9lement de coordon\xE9e (double primitif).
*/
public double y() {
return doubleValue(Y_);
}
/**
- * Initialise le deuxi\xE8me \xE9lement.
+ * Initialise le deuxi\xE8me \xE9lement de coordon\xE9e.
* @param Y La nouvelle valeur du deuxi\xE8me \xE9lement (peut \xEAtre null).
*/
public void Y(Double Y) {
Y_=Y;
}
/**
- * Initialise le deuxi\xE8me \xE9lement.
+ * Initialise le deuxi\xE8me \xE9lement de coordon\xE9e.
* @param y La nouvelle valeur du deuxi\xE8me \xE9lement.
*/
public void y(double y) {
@@ -111,6 +125,59 @@
}
/**
+ * @return la valeur du premier \xE9lement de coordon\xE9e(double non primitif).
+ */
+ public Double CX() {
+ return CX_;
+ }
+ /**
+ * @return la valeur du premier \xE9lement de coordon\xE9e(double primitif).
+ */
+ public double Cx() {
+ return doubleValue(CX_);
+ }
+ /**
+ * Initialise le premier \xE9lement de coordon\xE9e.
+ * @param X La nouvelle valeur du premier \xE9lement (peut \xEAtre null).
+ */
+ public void CX(Double CX) {
+ CX_=CX;
+ }
+ /**
+ * Initialise le premier \xE9lement de coordon\xE9e.
+ * @param x La nouvelle valeur du premier \xE9lement.
+ */
+ public void Cx(double Cx) {
+ CX_= doubleValue(Cx);
+ }
+ /**
+ * @return la valeur du deuxi\xE8me \xE9lement de coordon\xE9e (double non primitif).
+ */
+ public Double CY() {
+ return CY_;
+ }
+ /**
+ * @return la valeur du deuxi\xE8me \xE9lement de coordon\xE9e(double primitif).
+ */
+ public double Cy() {
+ return doubleValue(CY_);
+ }
+ /**
+ * Initialise le deuxi\xE8me \xE9lement de coordon\xE9e.
+ * @param Y La nouvelle valeur du deuxi\xE8me \xE9lement (peut \xEAtre null).
+ */
+ public void CY(Double CY) {
+ CY_=CY;
+ }
+ /**
+ * Initialise le deuxi\xE8me \xE9lement de coordon\xE9e.
+ * @param y La nouvelle valeur du deuxi\xE8me \xE9lement.
+ */
+ public void Cy(double Cy) {
+ CY_= doubleValue(Cy);
+ }
+
+ /**
* @return true si le point est nul (une de ses coordonnees n'est pas renseigne).
*/
public boolean isNull() {
@@ -118,7 +185,7 @@
}
public Object clone() {
- Hydraulique1dPoint clone = new Hydraulique1dPoint(X_, Y_);
+ Hydraulique1dPoint clone = new Hydraulique1dPoint(X_, Y_,CX_, CY_);
return clone;
}
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-07 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -10,8 +10,9 @@
import java.util.*;
-import org.fudaa.fudaa.hydraulique1d.metier.geometrie.MetierPoint2D;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierProfil;
+import org.fudaa.dodico.hydraulique1d.metier.MetierProfil;
+import org.fudaa.dodico.hydraulique1d.metier.evenement.Notifieur;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint2D;
import jxl.*;
import jxl.write.Label;
@@ -80,6 +81,9 @@
/** Les auditeurs pour la selection modifi\xE9e. */
private HashSet hsellisteners_=new HashSet();
+ private boolean avecGeoreferencement_;
+
+
// constructeurs
public Hydraulique1dProfilModel() {
numero_ = ord++;
@@ -89,6 +93,7 @@
ptLitMinGa_ = null;
ptLitMajDr_ = null;
ptLitMajGa_ = null;
+ avecGeoreferencement_ = false;
}
public Hydraulique1dProfilModel(MetierProfil iprofil) {
@@ -100,6 +105,7 @@
setIndiceLitMinGa(iprofil.indiceLitMinGa());
setIndiceLitMinDr(iprofil.indiceLitMinDr());
setIndiceLitMajDr(iprofil.indiceLitMajDr());
+ avecGeoreferencement_= iprofil.avecGeoreferencement();
}
public Object clone() {
@@ -116,6 +122,7 @@
clone.setIndiceLitMinGa(getIndiceLitMinGa());
clone.setIndiceLitMinDr(getIndiceLitMinDr());
clone.setIndiceLitMajDr(getIndiceLitMajDr());
+ clone.avecGeoreferencement(avecGeoreferencement_);
return clone;
}
@@ -174,6 +181,15 @@
}
numero_ = s;
}
+
+ public boolean avecGeoreferencement() {
+ return avecGeoreferencement_;
+ }
+
+ public void avecGeoreferencement(boolean b) {
+ if (avecGeoreferencement_==b) return;
+ avecGeoreferencement_= b;
+ }
public String nom() {
return nom_;
@@ -934,7 +950,7 @@
// Nouveaux points.
for (int i=0; i<vclip_.size(); i++) {
Hydraulique1dPoint pi=(Hydraulique1dPoint)vclip_.get(i);
- listePoints_.add(indDest+1+i,new Hydraulique1dPoint(pi.X()==null? null:new Double(pi.x()+dx),pi.Y()));
+ listePoints_.add(indDest+1+i,new Hydraulique1dPoint(pi.X()==null? null:new Double(pi.x()+dx),pi.Y(),pi.CX(),pi.CY()));
}
// Selection de ces nouveaux points
@@ -1433,6 +1449,7 @@
double dst=Math.abs(aa*pi.x()+bb*pi.y()+cc)/Math.sqrt(aa*aa+bb*bb);
hdst2pts.put(new Double(dst),new Integer(i));
}
+
// Suppression de tous les points dont la distance est inf\xE9rieure \xE0 _dst
bsup=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-07 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -40,14 +40,14 @@
import org.fudaa.ctulu.CtuluLibMessage;
import org.fudaa.dodico.boony.BoonyXmlDeserializer;
import org.fudaa.dodico.boony.BoonyXmlSerializer;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierBief;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierEtude1d;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierExtremite;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLiaison;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierNoeud;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierReseau;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierSingularite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
+import org.fudaa.dodico.hydraulique1d.metier.MetierCasier;
+import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
+import org.fudaa.dodico.hydraulique1d.metier.MetierExtremite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLiaison;
+import org.fudaa.dodico.hydraulique1d.metier.MetierNoeud;
+import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
+import org.fudaa.dodico.hydraulique1d.metier.MetierSingularite;
import org.fudaa.fudaa.hydraulique1d.ihmhelper.Hydraulique1dIHMRepository;
import org.fudaa.fudaa.hydraulique1d.reseau.Hydraulique1dReseauBarragePrincipal;
import org.fudaa.fudaa.hydraulique1d.reseau.Hydraulique1dReseauBiefCourbe;
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 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/CConversionHydraulique1d.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -7,11 +7,6 @@
* @mail de...@fu...
*/
package org.fudaa.fudaa.hydraulique1d.conv;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierCalculHydraulique1d;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierEtude1d;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresTailleMaxFichier;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierResultatsGeneraux;
-import org.fudaa.fudaa.hydraulique1d.metier.calageauto.MetierResultatsCalageAuto;
import org.fudaa.dodico.corba.mascaret.ICalculMascaret;
import org.fudaa.dodico.corba.mascaret.ICalculMascaretHelper;
import org.fudaa.dodico.corba.mascaret.IParametresMascaret;
@@ -23,6 +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.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 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -12,89 +12,6 @@
import java.util.List;
import java.util.Vector;
-import org.fudaa.fudaa.hydraulique1d.metier.geometrie.MetierPoint;
-import org.fudaa.fudaa.hydraulique1d.metier.geometrie.MetierPoint2D;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierBarragePrincipal;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierBief;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierConditionsInitiales;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierDefinitionSectionsParSections;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierDefinitionSectionsParSeries;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierDescriptionVariable;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierDonneesHydrauliques;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierEtude1d;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierExtremite;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLiaison;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLigneEauInitiale;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLigneEauPoint;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLimite;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierLoiHydraulique;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierMaillage;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierNoeud;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresGeneraux;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresGenerauxCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresReprise;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresResultats;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierParametresTemporels;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierProfil;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierReseau;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierResultatsTemporelSpatial;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierResultatsTemporelSpatialBief;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierSite;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierZone;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierZoneFrottement;
-import org.fudaa.fudaa.hydraulique1d.metier.MetierZonePlanimetrage;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierCondLimiteImposee;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierCritereArret;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierLimiteCalcule;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierMethodeMaillage;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierRegime;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierTypeFrottement;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierTypeNombre;
-import org.fudaa.fudaa.hydraulique1d.metier.EnumMetierUnite;
-import org.fudaa.fudaa.hydraulique1d.metier.calageauto.MetierApportCrueCalageAuto;
-import org.fudaa.fudaa.hydraulique1d.metier.calageauto.MetierCrueCalageAuto;
-import org.fudaa.fudaa.hydraulique1d.metier.calageauto.MetierMesureCrueCalageAuto;
-import org.fudaa.fudaa.hydraulique1d.metier.calageauto.MetierParametresCalageAuto;
-import org.fudaa.fudaa.hydraulique1d.metier.calageauto.EnumMetierMethodeOpt;
-import org.fudaa.fudaa.hydraulique1d.metier.calageauto.EnumMetierTypeLit;
-import org.fudaa.fudaa.hydraulique1d.metier.casier.MetierGeometrieCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.casier.MetierPlanimetrageCasier;
-import org.fudaa.fudaa.hydraulique1d.metier.evenement.Notifieur;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiHydrogramme;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiLimniHydrogramme;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiLimnigramme;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiOuvertureVanne;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiRegulation;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiSeuil;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiTarage;
-import org.fudaa.fudaa.hydraulique1d.metier.loi.MetierLoiTracer;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.MetierConcentrationInitiale;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.MetierLimiteQualiteDEau;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.MetierOptionTraceur;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.MetierParamPhysTracer;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.MetierParametresQualiteDEau;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.EnumMetierModeleQualiteDEau;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.EnumMetierOptionConvec;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.EnumMetierOptionDiffus;
-import org.fudaa.fudaa.hydraulique1d.metier.qualitedeau.EnumMetierTypeCondLimiteTracer;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierApport;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierBarrage;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierDeversoir;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierDeversoirComportementLoi;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierDeversoirComportementZCoefQ;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierPerteCharge;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuil;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilDenoye;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilGeometrique;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilLimniAmont;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilLoi;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilNoye;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilTarageAmont;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilTarageAval;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSeuilVanne;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.MetierSource;
-import org.fudaa.fudaa.hydraulique1d.metier.singularite.EnumMetierTypeSource;
import org.fudaa.dodico.corba.mascaret.SGeoCasier;
import org.fudaa.dodico.corba.mascaret.SGeoCasiers;
import org.fudaa.dodico.corba.mascaret.SLoiHydraulique;
@@ -182,6 +99,89 @@
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.EnumMetierCondLimiteImposee;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierCritereArret;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierLimiteCalcule;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierMethodeMaillage;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierRegime;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierTypeFrottement;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierTypeNombre;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierUnite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierBarragePrincipal;
+import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
+import org.fudaa.dodico.hydraulique1d.metier.MetierCasier;
+import org.fudaa.dodico.hydraulique1d.metier.MetierConditionsInitiales;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSections;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSeries;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDescriptionVariable;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDonneesHydrauliques;
+import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
+import org.fudaa.dodico.hydraulique1d.metier.MetierExtremite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLiaison;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLigneEauInitiale;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLigneEauPoint;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLimite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLoiHydraulique;
+import org.fudaa.dodico.hydraulique1d.metier.MetierMaillage;
+import org.fudaa.dodico.hydraulique1d.metier.MetierNoeud;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresGeneraux;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresGenerauxCasier;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresReprise;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresResultats;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresTemporels;
+import org.fudaa.dodico.hydraulique1d.metier.MetierProfil;
+import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatial;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatialBief;
+import org.fudaa.dodico.hydraulique1d.metier.MetierSite;
+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;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint;
+import org.fudaa.dodico.hydraulique1d.metier.geometrie.MetierPoint2D;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiHydrogramme;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiLimniHydrogramme;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiLimnigramme;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiOuvertureVanne;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiRegulation;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiSeuil;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiTarage;
+import org.fudaa.dodico.hydraulique1d.metier.loi.MetierLoiTracer;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.EnumMetierModeleQualiteDEau;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.EnumMetierOptionConvec;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.EnumMetierOptionDiffus;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.EnumMetierTypeCondLimiteTracer;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.MetierConcentrationInitiale;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.MetierLimiteQualiteDEau;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.MetierOptionTraceur;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.MetierParamPhysTracer;
+import org.fudaa.dodico.hydraulique1d.metier.qualitedeau.MetierParametresQualiteDEau;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.EnumMetierTypeSource;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierApport;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierBarrage;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierDeversoir;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierDeversoirComportementLoi;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierDeversoirComportementZCoefQ;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierPerteCharge;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuil;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilDenoye;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilGeometrique;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilLimniAmont;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilLoi;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilNoye;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilTarageAmont;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilTarageAval;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSeuilVanne;
+import org.fudaa.dodico.hydraulique1d.metier.singularite.MetierSource;
import org.fudaa.dodico.mascaret.DescriptionVariables;
/**
* Classe qui contient les m\xE9thodes statiques permettant de convertir le mod\xE8le
@@ -2588,6 +2588,7 @@
geoMas.biefs[i].profils[j].absc = biefs[i].profils()[j].abscisse();
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].pts =
new SParametresPt[biefs[i].profils()[j].points().length];
for (int k = 0; k < biefs[i].profils()[j].points().length; k++) {
@@ -2596,6 +2597,10 @@
biefs[i].profils()[j].points()[k].x;
geoMas.biefs[i].profils[j].pts[k].y =
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 =
+ biefs[i].profils()[j].points()[k].cy;
if ( (biefs[i].profils()[j].indiceLitMinGa() <= k)
&& (k <= biefs[i].profils()[j].indiceLitMinDr())) {
geoMas.biefs[i].profils[j].pts[k].lit = "B";
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 14:42:27 UTC (rev 3730)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java 2008-08-07 14:48:20 UTC (rev 3731)
@@ -93,100 +93,100 @@
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.EnumMetierCondLimiteImposee;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierCritereArret;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierLimiteCalcule;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierMethodeMaillage;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierOptionStockage;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierRegime;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierSensDebitLiaison;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierTypeCompositionLits;
+import org.fudaa.dodico.hydraulique1d.metier.EnumMetierTypeFrottement;
+import org.fudaa.dodico.hydraulique1d.metier.MetierBarragePrincipal;
+import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
+import org.fudaa.dodico.hydraulique1d.metier.MetierCasier;
+import org.fudaa.dodico.hydraulique1d.metier.MetierConditionsInitiales;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSections;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSeries;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDefinitionSectionsParSeriesUnitaire;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDescriptionVariable;
+import org.fudaa.dodico.hydraulique1d.metier.MetierDonneesHydrauliques;
+import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
+import org.fudaa.dodico.hydraulique1d.metier.MetierExtremite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLiaison;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLigneEauInitiale;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLigneEauPoint;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLimite;
+import org.fudaa.dodico.hydraulique1d.metier.MetierLoiHydraulique;
+import org.fudaa.dodico.hydraulique1d.metier.MetierMaillage;
+import org.fudaa.dodico.hydraulique1d.metier.MetierNoeud;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresGeneraux;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresGenerauxCasier;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresReprise;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresResultats;
+import org.fudaa.dodico.hydraulique1d.metier.MetierParametresTemporels;
+import org.fudaa.dodico.hydraulique1d.metier.MetierProfil;
+import org.fudaa.dodico.hydraulique1d.metier.MetierReseau;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatial;
+import org.fudaa.dodico.hydraulique1d.metier.MetierResultatsTemporelSpatialBief;
+import org.fudaa.dodico.hydraulique1d.metier.MetierSite;
+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.hydrau...
[truncated message content] |
|
From: <opa...@us...> - 2008-08-07 14:42:18
|
Revision: 3730
http://fudaa.svn.sourceforge.net/fudaa/?rev=3730&view=rev
Author: opasteur
Date: 2008-08-07 14:42:27 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/fudaa_devel/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml
Modified: trunk/fudaa_devel/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml 2008-08-07 14:41:35 UTC (rev 3729)
+++ trunk/fudaa_devel/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml 2008-08-07 14:42:27 UTC (rev 3730)
@@ -1,110 +1,112 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<!--
- A sample installation file.
- Use it as a base for your own installers :-)
-
- To compile it :
- - go in the bin directory where you installed IzPack
- - call "compile ../sample/install.xml -b ../sample"
-
- -->
-<installation version="1.0">
- <!--
- The info section.
- The meaning of the tags should be natural ...
-
- -->
-<info>
- <appname>Fudaa-Mascaret</appname>
- <appversion>3.1 alpha 1</appversion>
- <variable name="released-on" value="13/12/2007" />
- <authors>
- <author name="EDF Recherche et Développement" email="" />
- <author name="CETMEF" email="" />
- </authors>
- <url>http://rd.edf.com</url>
- </info>
-<native type="izpack" name="ShellLink.dll" />
- <!--
- The gui preferences indication.
- Sets the installer window to 800x420. It will be able to change the size.
-
- -->
- <guiprefs width="800" height="420" resizable="yes" />
- <!--
- The locale section.
- Asks here to include the French langpacks.
-
- -->
- <locale>
- <langpack iso3="fra" />
- </locale>
- <!--
- The resources section.
- The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
-
- -->
- <resources>
- <res src="izpack/shortcutSpec.xml" id="shortcutSpec.xml" />
- <res src="Licence.txt" id="LicencePanel.licence"/>
- <res src="Readme.txt" id="InfoPanel.info" />
- <res src="fudaamascaret.jpg" id="Installer.image"/>
- <!-- res src="izpack/RegistrySpec.xml" id="RegistrySpec.xml"/ -->
- </resources>
-
- <!--
- The panels section.
- We indicate here which panels we want to use. The order will be respected.
-
- -->
- <panels>
- <panel classname="HelloPanel" />
- <panel classname="InfoPanel" />
- <panel classname="LicencePanel" />
- <panel classname="TargetPanel" />
- <panel classname="PacksPanel" />
- <panel classname="InstallPanel" />
- <panel classname="ShortcutPanel" />
- <panel classname="FinishPanel" />
- </panels>
- <!--
- The packs section.
- We specify here our packs.
- -->
- <packs>
- <pack name="Core" required="yes">
- <description>L'application de base intégrant l'interface graphique Fudaa-Mascaret et le code de calcul Mascaret</description>
- <file src="../../../distrib/build/jar/mascaret/fudaa-mascaret.jar" targetdir="$INSTALL_PATH" />
- <file src="../../fudaa/serveurs" targetdir="$INSTALL_PATH" />
- <file src="fudaa-mascaret.bat" targetdir="$INSTALL_PATH" />
- <file src="icons" targetdir="$INSTALL_PATH" />
- <parsable targetfile="$INSTALL_PATH/fudaa-mascaret.bat" /> <!-- The file will be parsed -->
- </pack>
- <pack name="Exemples" required="no">
- <description>Quelques exemples de fichiers d'entrée de Fudaa-Mascaret</description>
- <file src="exemples" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
- </pack>
- <pack name="Docs" required="no">
- <description>Le guide de prise en main de Fudaa-Mascaret</description>
- <file src="doc" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
- </pack>
- <pack name="Sources" required="no">
- <description>Le code source du projet Fudaa</description>
- <fileset dir="../.." targetdir="$INSTALL_PATH/src">
- <include name="ctulu/src/**/*.*" />
- <include name="dodico/idl/**/*.*" />
- <include name="dodico/src/**/*.*" />
- <include name="ebli/src/**/*.*" />
- <include name="fudaa/src/**/*.*" />
- </fileset>
- </pack>
- </packs>
-
- <!-- The native libraries to add -->
- <native type="izpack" name="ShellLink.dll" />
- <native type="3rdparty" name="COIOSHelper.dll" stage="both">
- <os family="windows"/>
- </native>
-
-
- </installation>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<!--
+ A sample installation file.
+ Use it as a base for your own installers :-)
+
+ To compile it :
+ - go in the bin directory where you installed IzPack
+ - call "compile ../sample/install.xml -b ../sample"
+
+ -->
+<installation version="1.0">
+ <!--
+ The info section.
+ The meaning of the tags should be natural ...
+
+ -->
+<info>
+ <appname>Fudaa-Mascaret</appname>
+ <appversion>3.0.3</appversion>
+ <variable name="released-on" value="14/05/2008" />
+ <authors>
+ <author name="EDF Recherche et D�veloppement" email="http://rd.edf.com" />
+ <author name="CETMEF" email="http://www.cetmef.equipement.gouv.fr" />
+ </authors>
+ <url>http://rd.edf.com</url>
+ </info>
+<native type="izpack" name="ShellLink.dll" />
+ <!--
+ The gui preferences indication.
+ Sets the installer window to 800x420. It will be able to change the size.
+
+ -->
+ <guiprefs width="800" height="420" resizable="yes" />
+ <!--
+ The locale section.
+ Asks here to include the French langpacks.
+
+ -->
+ <locale>
+ <langpack iso3="fra" />
+ </locale>
+ <!--
+ The resources section.
+ The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
+
+ -->
+ <resources>
+ <res src="izpack/shortcutSpec.xml" id="shortcutSpec.xml" />
+ <res src="Licence.txt" id="LicencePanel.licence"/>
+ <res src="Readme.txt" id="InfoPanel.info" />
+ <res src="fudaamascaret.jpg" id="Installer.image"/>
+ <!-- res src="izpack/RegistrySpec.xml" id="RegistrySpec.xml"/ -->
+ </resources>
+
+ <!--
+ The panels section.
+ We indicate here which panels we want to use. The order will be respected.
+
+ -->
+ <panels>
+ <panel classname="HelloPanel" />
+ <panel classname="InfoPanel" />
+ <panel classname="LicencePanel" />
+ <panel classname="TargetPanel" />
+ <panel classname="PacksPanel" />
+ <panel classname="InstallPanel" />
+ <panel classname="ShortcutPanel" />
+ <panel classname="FinishPanel" />
+ </panels>
+ <!--
+ The packs section.
+ We specify here our packs.
+ -->
+ <packs>
+ <pack name="Core" required="yes">
+ <description>L'application de base int�grant l'interface graphique Fudaa-Mascaret et le code de calcul Mascaret</description>
+ <file src="../../../distrib/build/jar/mascaret/fudaa-mascaret.jar" targetdir="$INSTALL_PATH" />
+ <file src="../../fudaa/serveurs" targetdir="$INSTALL_PATH" />
+ <file src="../../aide/src/mascaret" targetdir="$INSTALL_PATH" /aide/src/mascaret>
+
+ <file src="fudaa-mascaret.bat" targetdir="$INSTALL_PATH" />
+ <file src="icons" targetdir="$INSTALL_PATH" />
+ <parsable targetfile="$INSTALL_PATH/fudaa-mascaret.bat" /> <!-- The file will be parsed -->
+ </pack>
+ <pack name="Exemples" required="no">
+ <description>Quelques exemples de fichiers d'entr�e de Fudaa-Mascaret</description>
+ <file src="exemples" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
+ </pack>
+ <pack name="Docs" required="no">
+ <description>Le guide de prise en main de Fudaa-Mascaret</description>
+ <file src="doc" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
+ </pack>
+ <pack name="Sources" required="no">
+ <description>Le code source du projet Fudaa</description>
+ <fileset dir="../.." targetdir="$INSTALL_PATH/src">
+ <include name="ctulu/src/**/*.*" />
+ <include name="dodico/idl/**/*.*" />
+ <include name="dodico/src/**/*.*" />
+ <include name="ebli/src/**/*.*" />
+ <include name="fudaa/src/**/*.*" />
+ </fileset>
+ </pack>
+ </packs>
+
+ <!-- The native libraries to add -->
+ <native type="izpack" name="ShellLink.dll" />
+ <native type="3rdparty" name="COIOSHelper.dll" stage="both">
+ <os family="windows"/>
+ </native>
+
+
+ </installation>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <opa...@us...> - 2008-08-07 14:41:29
|
Revision: 3729
http://fudaa.svn.sourceforge.net/fudaa/?rev=3729&view=rev
Author: opasteur
Date: 2008-08-07 14:41:35 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
deplacement fudaa.hydraulique1d.metier vers dodico.hydraulique1d.metier
Modified Paths:
--------------
trunk/fudaa_devel/dodico/idl/code/mascaret.idl
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DParametresMascaret.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/MascaretClient.java
Added Paths:
-----------
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/DeserializerHandlerVersion04.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierCondLimiteImposee.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierCritereArret.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierFormatFichier.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierLimiteCalcule.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierMethodeMaillage.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierOptionStockage.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierRegime.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierSensDebitLiaison.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierTypeCompositionLits.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierTypeFrottement.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierTypeNombre.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/EnumMetierUnite.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/Identifieur.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierBarragePrincipal.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierBief.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierCalculHydraulique1d.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierCasier.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierConditionsInitiales.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierDefinitionSections.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierDefinitionSectionsParSections.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierDefinitionSectionsParSeries.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierDefinitionSectionsParSeriesUnitaire.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierDescriptionVariable.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierDonneesHydrauliques.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierEtude1d.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierExtremite.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierHydraulique1d.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierInformationTemps.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLaisse.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLiaison.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLigneEauInitiale.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLigneEauPoint.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLimite.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierLoiHydraulique.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierMaillage.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierNoeud.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierOptionsListing.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierOptionsListingTracer.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierParametresGeneraux.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierParametresGenerauxCasier.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierParametresReprise.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierParametresResultats.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierParametresStockage.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierParametresTailleMaxFichier.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierParametresTemporels.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierProfil.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierReseau.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsBief.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsBiefPasTemps.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsGeneraux.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsTemporelSpatial.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierResultatsTemporelSpatialBief.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierSectionCalculee.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierSectionCalculeePasTemps.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierSingularite.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierSite.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierZone.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierZoneFrottement.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/MetierZonePlanimetrage.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/SMetierIdentifieur.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/SMetierIndiceZoneStockage.java
Modified: trunk/fudaa_devel/dodico/idl/code/mascaret.idl
===================================================================
--- trunk/fudaa_devel/dodico/idl/code/mascaret.idl 2008-08-07 14:36:55 UTC (rev 3728)
+++ trunk/fudaa_devel/dodico/idl/code/mascaret.idl 2008-08-07 14:41:35 UTC (rev 3729)
@@ -1,1123 +1,1126 @@
-/*
- * @file mascaret.idl
- * @creation 2000-04-11
- * @modification $Date: 2008-02-29 16:47:08 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 EDF/LNHE
- * @mail de...@fu...
- */
-
-#ifndef _MASCARET_IDL
-#define _MASCARET_IDL
-
-
-#include "general/calcul.idl"
-
-/**
- * @version $Revision: 1.25 $ $Date: 2008-02-29 16:47:08 $ by $Author: opasteur $
- * @author Jean-Marc Lacombe
- */
-module mascaret {
-
- //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-++-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- //+-+-+-+-+-+-+-+-+-+-+-+-+-+ ENTREE +-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-++-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
- //-----------RUBRIQUE PARAMETRES GENERAUX-------------------------
- // Parametres bibliotheques
- struct SParametresBiblio {
- chaine bibliotheques; // bibliotheques *.a utilisees
- };
-
- // Parametres g\xE9n\xE9raux
- struct SParametresGen {
- entier versionCode; // version du code
- entier code; // noyau code : 1->SARAP, 2->REZO, 3->MASCARET
- // Si 3 alors Froude limite pour les condLim, pas de temps variable,
- // nombre courant souhait\xE9, frottement
- chaine fichMotsCles; // nom du fichier des mots cl\xE9s (fichier .cas)
- chaine dictionaire; // nom du fichier dictionnaire
- chaine progPrincipal; // nom de fichier du programme principale fortran
- booleen sauveModele; // sauvegarde du modele
- chaine fichSauvModele; // nom du fichier de sauvegarde du mod\xE8le (temporaire)
- booleen validationCode; // calcul pour validation du code
- entier typeValidation; // type de calcul de validation effectue
- booleen presenceCasiers; // presence de casiers
- SParametresBiblio bibliotheques; // bibliotheques *.a utilisees
- };
- //-----------FIN RUBRIQUE PARAMETRES GENERAUX-------------------------
-
- //-----------RUBRIQUE MODELISATION PHYSIQUE-------------------------
-
- // Parametres debordement progressif
- struct SParametresDebordProgr {
- booleen litMajeur; // debordement progressif lit majeur
- booleen zoneStock; // debordement progressif zones de stockage
- };
-
- // Param\xE8tres mod\xE9lisation physique
- struct SParametresModelPhy {
- booleen perteChargeConf; // pertes de charge automatique aux confluents
- entier compositionLits; // composition des lits : 1->DEBORD, 2->FOND/BERGE
- booleen conservFrotVertical; // conservation du frottement sur les parois verticales
- reel elevCoteArrivFront; // elevation de cote arrivee du front
- booleen interpolLinStrickler; // interpolation lin\xE9aire des strickler
- SParametresDebordProgr debordement; // les parametres du debordement progressif
- };
- //-----------FIN RUBRIQUE MODELISATION PHYSIQUE-------------------------
-
- //-----------RUBRIQUE PARAMETRES NUMERIQUES-------------------------
- // Param\xE8tres num\xE9riques utilis\xE9 par casier
- struct SParametresNumCasier {
- reel coefImplicationSystemeCasiers; // coefficient d'implicitation du systeme des casiers
- reel coefImplicationDansCouplage; // coefficient d'implicitation dans le couplage
- entier nbMaxIterationDansCouplage; // nombre maximum d'iteration dans le couplage
- };
-
- // Param\xE8tres num\xE9rique
- struct SParametresNum {
- booleen calcOndeSubmersion; // calcul d'une onde de submersion => "BARRAGE PRINCIPAL"
- reel froudeLimCondLim; // Froude limite pour les conditions limites si code Mascaret
- booleen traitImplicitFrot; // traitement implicite du frottement
- reel hauteurEauMini; // hauteur d'eau minimale
- booleen implicitNoyauTrans; // implicitation noyau transcritique
- booleen optimisNoyauTrans; // optimisation noyau transcritique
- booleen perteChargeAutoElargissement; // pertes de charge automatique noyau transcritique
- SParametresNumCasier parametresNumeriqueCasier; // param\xE8tres num\xE9riques utilis\xE9 par casier
- };
- //-----------FIN RUBRIQUE PARAMETRES NUMERIQUES-------------------------
-
- //-----------RUBRIQUE PARAMETRES TEMPORELS-------------------------
- // Param\xE8tres temporels
- struct SParametresTemp {
- reel pasTemps; // pas de temps
- reel tempsInit; // temps initial
- entier critereArret; // crit\xE8re d'arret du calcul :1-> temps max, 2-> nb temps max
- entier nbPasTemps; // nombre de pas de temps Si critereArret==2
- reel tempsMax; // temps maximum Si critereArret==1
- booleen pasTempsVar; // pas de temps variable suivant nombre de courant
- reel nbCourant; // nombre de courant souhait\xE9
- reel coteMax; // cote max de controle
- reel abscisseControle; // abscisse du point de controle
- entier biefControle; // numero de bief du point de controle
- };
- //-----------FIN RUBRIQUE PARAMETRES TEMPORELS-------------------------
-
- //-----------RUBRIQUE GEOMETRIE-RESEAU-------------------------
- // Param\xE8tres geometrie
- struct SParametresGeom {
- chaine fichier; // fichier de geometrie
- entier format; // format du fichier geometrie : 1->lidoV2.2, 2->mascaretV5
- booleen profilsAbscAbsolu; // profils en abscisse absolue
- };
-
- // Param\xE8tres Branches
- struct SParametresBranches {
- entier nb; // nombre de branches
- ventier numeros; // numeros de branche
- vreel abscDebut; // abscisse debut
- vreel abscFin; // abscisse fin
- ventier numExtremDebut; // numero de l'extremite de debut
- ventier numExtremFin; // numero de l'extremite de fin
- };
-
- // Description d'un noeud
- struct SNoeud {
- ventier num; // numeros des extremites corespondant a un noeud
- };
- typedef sequence <SNoeud> VSNoeud;
-
- // Param\xE8tres noeuds
- struct SParametresNoeuds {
- entier nb; // nombre de noeuds
- VSNoeud noeuds; // les noeuds
- };
-
- // Param\xE8tres extremites libres
- struct SParametresExtrLibres {
- entier nb; // nombre d'extremites libres
- ventier num; // numeros d'extremite libre
- ventier numExtrem; // numeros d'extremite 2
- vchaine Nom; // nom de l'extremite
- ventier typeCond; // type condition : 1-> debit impose, 2-> cote impose, 3-> loi Z(Q), 4-> loi Q(Z),
- // 5-> regulation : Zav(Qam), 6-> sortie libre, 7-> Hauteur normale
- ventier numLoi; // numero de la loi
- };
-
- // Param\xE8tres geometrie-reseau
- struct SParametresGeoReseau {
- SParametresGeom geometrie; // nom fichier et type du fichier geometrie
- SParametresBranches branches; // les branches
- SParametresNoeuds noeuds; // les noeuds
- SParametresExtrLibres extrLibres; // les extremites libres
- };
- //-----------FIN RUBRIQUE GEOMETRIE-RESEAU-------------------------
-
- //-----------RUBRIQUE CONFLUENTS-------------------------
- // Description d'un confluent
- struct SParametresConfluent {
- entier nbAffluent; // nombre d'affluent = 3
- chaine nom; // nom du confluent
- vreel abscisses; // les 3 abscisses du confluent
- vreel ordonnees; // les 3 ordonnees du confluent
- vreel angles; // les 3 angles du confluent
- };
- typedef sequence <SParametresConfluent> VSParametresConfluent;
-
- // Param\xE8tres confluents
- struct SParametresConfluents {
- entier nbConfluents; // nombre de confluents
- VSParametresConfluent confluents; // les confluents
- };
- //-----------FIN RUBRIQUE CONFLUENTS-------------------------
-
- //-----------RUBRIQUE PLANIMETRAGE ET MAILLAGE-----------
- // Param\xE8tres Planimetrage
- struct SParametresPlanim {
- entier nbPas; // nombre de pas de planimetrage
- entier nbZones; // nombre de zones de planimetrage
- vreel valeursPas; // valeurs du pas (1 par zone)
- ventier num1erProf; // numeros du premier profil (1 par zone)
- ventier numDerProf; // numeros du dernier profil (1 par zone)
- };
-
- // Param\xE8tres Maillage par Clavier
- struct SParametresMaillageClavier {
- entier nbSections; // nombre de sections de calcul SI methodeMaillage==Section par Section
- ventier numSection; // les numeros des sections de calcul SI methodeMaillage==Section par Section
- ventier branchesSection; // les branches des sections de calculs SI methodeMaillage==Section par Section
- vreel absSection; // les abscisses des sections de calculs SI methodeMaillage==Section par Section
- entier nbPlages; // nombre de plages de discretisation SI methodeMaillage==Par serie dont les profils
- ventier num1erProfPlage; // les numeros des premiers profil de la plage SI methodeMaillage==Par serie dont les profils
- ventier numDerProfPlage; // les numeros des derniers profil de la plage SI methodeMaillage==Par serie dont les profils
- vreel pasEspacePlage; // les pas d'espace de la plage SI methodeMaillage==Par serie dont les profils
- entier nbZones; // nombre de zones de discretisation SI methodeMaillage==Par serie
- ventier numBrancheZone; // les numeros de branche de zone SI methodeMaillage==Par serie
- vreel absDebutZone; // les abscisses de debut de zone SI methodeMaillage==Par serie
- vreel absFinZone; // les abscisses de fin de zone SI methodeMaillage==Par serie
- ventier nbSectionZone; // les nombres de sections de la zone SI methodeMaillage==Par serie
- };
-
- // Param\xE8tres Maillage
- struct SParametresMaillage {
- entier modeSaisie; // mode de saisie du maillage :
- // 1-> entree par clavier, 2-> entree par fichier
- chaine fichMaillage; // nom du fichier du maillage
- booleen sauvMaillage; // fichier de sauvegarde du maillage
- chaine fichSauvMaillage; // nom du fichier de sauvegarde du maillage
- SParametresMaillageClavier maillageClavier; // le maillage decris dans le fichier cas
- };
-
- // Param\xE8tres Planimetrage et Maillage
- struct SParametresPlanimMaillage {
- entier methodeMaillage; // methode de calcul du maillage : 1-> aux profils, 2-> par serie,
- // 3-> section par section, 4->repris de la ligne d'eau initiales,
- // 5-> par serie dont les profils
- SParametresPlanim planim; // le planimetrage
- SParametresMaillage maillage; // le maillage
- };
- //-----------FIN RUBRIQUE PLANIMETRAGE ET MAILLAGE-----------
-
- //-----------RUBRIQUE SINGULARITE (BARRAGE-SEUIL) ------------
- // Param\xE8tres barrage principal
- struct SParametresBarrPrincip {
- entier numBranche; // numero branche du barrage principal SI calcul onde de submersion == Vrai
- reel abscisse; // abscisse du barrage principal SI calcul onde de submersion == Vrai
- entier typeRupture; // type de rupture du barrage principal SI calcul onde de submersion == Vrai
- // 1->rupture progressive, 2->rupture instantanee
- reel coteCrete; // cote de crete du barrage principal SI calcul onde de submersion == Vrai
- // SI rupture instantanee == Vrai
- };
-
- // Param\xE8tres seuil
- struct SParametresSeuil {
- chaine nom; // nom du seuil
- entier type; // type du seuil : 1->Zam=f(Zav,Q), 2->Zam=f(Q),
- // 3->Profil de crete, 4->Zam=f(Cote Crete , Coeff Debit),
- // 5->Zam=f(t), 6->Q=f(Zam), 7->Q=f(Zav), 8->Vanne
- entier numBranche; // numero de branche du seuil
- reel abscisse; // abscisse du seuil
- reel coteCrete; // cote de crete du seuil
- reel coteCreteMoy; // cote de crete moyenne
- reel coteRupture; // cote de rupture du seuil
- reel coeffDebit; // coefficient de debit du seuil
- reel largVanne; // largeur de la vanne du seuil
- entier numLoi; // numero de la loi de seuil
- entier nbPtLoiSeuil; // nombre de points de la loi de seuil
- vreel abscTravCrete;// abscisse en travers crete
- vreel cotesCrete; // cotes de la crete
- entier epaisseur; // epaisseur seuil
- reel gradient; // gradient de descente
- };
- typedef sequence <SParametresSeuil> VSParametresSeuil;
-
- // Param\xE8tres pertes de charges
- struct SParametresPerteCharge {
- entier nbPerteCharge; // nombre de pertes de charge singulieres
- ventier numBranche; // numeros de branche des pertes de charges singulieres
- vreel abscisses; // abscisses des pertes de charges singulieres
- vreel coefficients; // coefficients des pertes de charges singulieres
- };
-
- // Param\xE8tres singularite (barrage-seuil)
- struct SParametresSingularite {
- entier nbSeuils; // nombre de seuils
- SParametresBarrPrincip barragePrincipal; // le barrage principal Si == calcul onde de submersion == Vrai
- VSParametresSeuil seuils; // les seuils
- SParametresPerteCharge pertesCharges; // les pertes de charges
- };
- //-----------FIN RUBRIQUE SINGULARITE (BARRAGE-SEUIL) ------------
-
- //-----------RUBRIQUE CASIER -----------------------------------------------
- // Param\xE8tres liaisons
- struct SParametresLiaisons {
- entier nbLiaisons; // nombre de liaisons
- ventier types; // liaison type : 1->liaison seuil, 2-> liaison chenal, 3-> liaison siphon, 4-> liaison orifice
- ventier nature; // liaison nature : 1->"liaison rivi\xE8re-casier", 2->"liaison casier-casier"
- vreel cote; // liaison cote (valeur de la cote de chaques liaisons )
- vreel largeur; // liaison largeur (largeur pour les liaisons de type chenal ou seuil ou orifice, -1 pour un siphon)
- vreel longueur; // liaison longueur (longueur pour les liaisons de type chenal ou siphon, -1 pour un seuil ou un orifice)
- vreel rugosite; // liaison rugosite (coefficients de Strickler pour les liaisons de type chenal,
- // -1 pour les seuils et siphons et orifice)
- vreel section; // liaison section (sections transverse pour les liaisons de type siphon ou orifice, -1 pour les seuils
- // et chenals)
- vreel coefPerteCharge; // liaison coefficient perte de charge (coefficients pertes de charge pour les liaisons de
- // type siphon, -1 pour les seuils et chenals)
- vreel coefDebitSeuil; // liaison coefficient de debit (coefficients de d\xE9bit pour les liaisons de type seuil ou orifice,
- // -1 pour les siphons et chenals)
- vreel coefActivation; // liaison coefficient d'activation (coefficients d'activation pour les liaisons de type seuil,
- // -1 pour les siphons et chenals et orifices)
- vreel coefDebitOrifice; // liaison coefficient de debit orifice (coefficient de debit pour les liaisons de type orifice,
- // -1 pour les autres)
- ventier typeOrifice; // liaison type orifice : 1->d\xE9bit possible dans les 2 sens, 2-> d\xE9bit possible uiniquement dans le sens casier origine vers casier fin,
- // 3-> d\xE9bit possible uniquement dans le sens inverse. Type de l'orifice pour les liaisons de type orifice,
- // -1 pour les autres.
- ventier numCasierOrigine; // liaison numero casier origine (les num\xE9ros du casier amont pour une liaison de type "casier-casier"
- // ou les num\xE9ros du casier associ\xE9 pour une liaison "rivi\xE8re-casier")
- ventier numCasierFin; // liaison numero casier fin (les num\xE9ros du casier aval pour une liaison de type "casier-casier"
- // ou -1 pour les liaisons "rivi\xE8re-casier")
- ventier numBiefAssocie; // liaison numero du bief associe (les num\xE9ros du bief auquel est reli\xE9 le casier dans le cas d'une
- // liaison "rivi\xE8re-casier" ou -1 pour les liaisons de type "casier-casier")
- vreel abscBief; // liaison abscisse correspondante (les abscisses du bief \xE0 laquelle est reli\xE9e le casier dans le cas
- // d'une liaison "rivi\xE8re-casier" ou ou -1 pour les liaisons de type "casier-casier")
- };
-
- // Param\xE8tres casiers
- struct SParametresCasier {
- entier nbCasiers; // nombre de casiers
- ventier optionPlanimetrage; // option de planimetrage : 1-> planim\xE9trage manuel, 2-> planim\xE9trage automatique
- ventier optionCalcul; // option de calcul (si optionPlanimetrage == 2) : 1-> planim\xE9trage \xE0 surface constante,
- // 2-> surface d\xE9pendant de la cote
- chaine fichierGeomCasiers; // fichier geometrie casiers
- vreel cotesInitiale; // casiers cote initiale (valeurs des cotes initiles de chaque casier)
- vreel pasPlanimetrage; // casiers pas de planimetrage (si optionPlanimetrage == 2)
- ventier nbCotesPlanimetrage; // casiers nombre de cotes de planimetrage (si optionPlanimetrage == 2)
- SParametresLiaisons liaisons; // param\xE8tres liaisons
- };
-
-
- //-----------FIN RUBRIQUE CASIER -------------------------------------------
-
- //-----------RUBRIQUE APPORTS ET DEVERSOIRS ----------------------
- // Param\xE8tres debits d'apports
- struct SParametresQApport {
- entier nbQApport; // nombre de debits d'apports
- vchaine noms; // nom des apports
- ventier numBranche; // numeros de branche des apports
- vreel abscisses; // abscisses des apports
- vreel longueurs; // longueurs des apports
- ventier numLoi; // numeros de loi des apports
- };
-
- // Param\xE8tres deversoirs
- struct SParametresDeversoirsV5P2 {
- chaine nom; // nom du deversoir
- entier type; // type du deversoir : 1->"Cote Crete , Coeff Debit", 2->"Loi de seuil"
- entier numBranche; // numero de branche du deversoir
- reel abscisse; // abscisse du deversoir
- reel longueur; // longueur du deversoir
- reel coteCrete; // cote crete du deversoir Si type=="Cote Crete , Coeff Debit"
- reel coeffDebit; // coefficient de debit du deversoir Si type=="Cote Crete , Coeff Debit"
- entier numLoi; // numero de la loi du deversoir Si type==Loi de seuil
- };
- typedef sequence <SParametresDeversoirsV5P2> VSParametresDeversoirsV5P2;
-
-
- // Param\xE8tres deversoirs lateraux
- struct SParametresDeversLateraux {
- entier nbDeversoirs; // nombre de deversoirs
- vchaine nom; // nom du deversoir
- ventier type; // type du deversoir : 1->"Cote Crete , Coeff Debit", 2->"Loi de seuil"
- ventier numBranche; // numero de branche du deversoir
- vreel abscisse; // abscisse du deversoir
- vreel longueur; // longueur du deversoir
- vreel coteCrete; // cote crete du deversoir Si type=="Cote Crete , Coeff Debit"
- vreel coeffDebit; // coefficient de debit du deversoir Si type=="Cote Crete , Coeff Debit"
- ventier numLoi; // numero de la loi du deversoir Si type==Loi de seuil
- VSParametresDeversoirsV5P2 deversoirsV5P2; // les deversoirs avec noyau V5P2
- };
-
- // Param\xE8tres apports de pluies dans les casiers
- struct SParametresApportCasier {
- entier nbApportPluie; // nombre d'apport de pluie
- ventier numCasier; // numero du casier associe (les num\xE9ros du casier associer)
- ventier numLoi; // numero de la loi associee (les num\xE9ros de la loi de type Hydrogramme)
- };
-
- // Param\xE8tres apports et deversoirs
- struct SParametresApporDeversoirs {
- SParametresQApport debitsApports; // les debits d'apports
- SParametresDeversLateraux deversLate; // les deversoirs lateraux
- SParametresApportCasier apportCasier; // les apports de pluies dans les casiers
- };
- //-----------FIN RUBRIQUE APPORTS ET DEVERSOIRS ----------------------
-
- //-----------RUBRIQUE CALAGE -----------------------------------------
- // Param\xE8tres frottement
- struct SParametresFrottement {
- entier loi; // loi de frottement : 1->STRICKLER, 2->CHEZY,
- // 3->COLEBROOK, 4->BAZIN
- entier nbZone; // nombre de zone de frottement
- ventier numBranche; // numeros de branche des zones de frottement
- vreel absDebZone; // abscisse de debut des zones de frottement
- vreel absFinZone; // abscisse de fin des zones de frottement
- vreel coefLitMin; // valeurs du coefficient du lit mineur
- vreel coefLitMaj; // valeurs du coefficient du lit majeur
- };
-
- // Param\xE8tres zone de stockage
- struct SParametresZoneStockage {
- entier nbProfils; // nombre de profils comportant des zones de stockage
- ventier numProfil; // numeros des profils comportant des zones de stockage
- vreel limGauchLitMaj; // limite gauche lit majeur
- vreel limDroitLitMaj; // limite droite lit majeur
- };
-
- // Param\xE8tres calage
- struct SParametresCalage {
- SParametresFrottement frottement; // les frottements
- SParametresZoneStockage zoneStockage; // les zones de stockage
- };
- //-----------FIN RUBRIQUE CALAGE -----------------------------------------
-
- //-----------RUBRIQUE LOIS HYDRAULIQUES-----------------------------------
- // Param\xE8tres donnees de la loi
- struct SParametresDonneesLoi {
- entier modeEntree; // mode d'entree : 1->"entr\xE9e par fichier", 2->"entr\xE9e par clavier"
- chaine fichier; // nom du fichier Si modeEntree=="entr\xE9e par fichier"
- entier uniteTps; // unite de temps : 1->seconde, 2->minute, 3->heure, 4->jour Si modeEntree=="entr\xE9e par clavier"
- entier nbPoints; // nombre de points Si modeEntree=="entr\xE9e par clavier"
- vreel tps; // les temps de la loi Si modeEntree=="entr\xE9e par clavier"
- vreel cote; // les cotes de la loi Si modeEntree=="entr\xE9e par clavier"
- vreel cote2; // les cotes de la loi Si modeEntree=="entr\xE9e par clavier" et type de loi ==5 ou 6
- vreel debit; // les debits de la loi Si modeEntree=="entr\xE9e par clavier"
- entier nbDebitsDifferents; // le nombre de debits different Si "=="entr\xE9e par clavier" et type de loi ==5
- };
-
- // Param\xE8tres loi
- struct SParametresLoi {
- chaine nom; // nom de la loi
- entier type; // type de la loi : 1->"HYDROGRAMME Q(T)", 2->"LIMNIGRAMME Z(T)",
- // 3->"LIMNHYDROGRAMME Z,Q(T)", 4->"COURBE DE TARAGE Z=f(Q)", 5->"COURBE DE TARAGE Q=f(Z)",
- // 5->"SEUIL Zam=f(Zav,Q)", 6->"OUVERTURE VANNE Zinf,Zsup=f(T)"
- SParametresDonneesLoi donnees; // les donnees de la loi
- };
- typedef sequence <SParametresLoi> VSParametresLoi;
-
- // Param\xE8tres lois hydrauliques
- struct SParametresLoisHydrau {
- entier nb; // nombre de lois hydrauliques
- VSParametresLoi lois; // les lois
- };
- //-----------FIN RUBRIQUE LOIS HYDRAULIQUES-----------------------------------
-
- //-----------RUBRIQUE CONDITIONS INITIALES-----------------------------------
- // Param\xE8tres reprise etude
- struct SParametresReprEtude {
- booleen repriseCalcul; // reprise de calcul
- chaine fichRepriseLec; // nom du fichier de reprise en lecture
- chaine formatBinFich; // format binaire du fichier de reprise en lecture
- // STD->standard, IBM, I3E->IEEE
- };
-
- // Param\xE8tres ligne d'eau initiale
- struct SParametresLigEau {
- booleen LigEauInit; // presence ligne d'eau initiale
- entier modeEntree; // mode d'entree de la ligne d'eau : 1->"entr\xE9e par fichier", 2->"entr\xE9e par clavier"
- chaine fichLigEau; // nom du fichier ligne d'eau initiale Si modeEntree==1
- entier formatFichLig; // format du fichier ligne d'eau : 1->OPTHYCA, 2->LIDOP Si modeEntree==1
- entier nbPts; // nombre de points decrivant la ligne d'eau Si modeEntree==2
- ventier branche; // numeros de branches de la ligne d'eau Si modeEntree==2
- vreel abscisse; // abscisse de la ligne d'eau Si modeEntree==2
- vreel cote; // cote de la ligne d'eau Si modeEntree==2
- vreel debit; // debit de la ligne d'eau Si modeEntree==2
- vreel coefMin; // coefficient de frottement lit Mineur de la ligne d'eau Si modeEntree==2
- vreel coefMaj; // coefficient de frottement lit Majeur de la ligne d'eau Si modeEntree==2
-
- };
-
- // Param\xE8tres zones seches
- struct SParametresZoneSeche {
- entier nb; // nombre de zones seches
- ventier branche; // numeros de branches des zones seches
- vreel absDebut; // abscisse de debut des zones seches
- vreel absFin; // abscisse de fin des zones seches
- };
-
- // Param\xE8tres conditions initiales
- struct SParametresCondInit {
- SParametresReprEtude repriseEtude; // reprise etude
- SParametresLigEau ligneEau; // ligne d'eau initiale
- SParametresZoneSeche zonesSeches; // les zones seches
- };
- //-----------FIN RUBRIQUE CONDITIONS INITIALES-----------------------------------
-
- //-----------RUBRIQUE TRACEURS-----------------------------------
-
-
- // Parametres de convection et diffusion des traceurs
- struct SParametresConvecDiffu {
- vbooleen convectionTraceurs; // convection des traceurs
- entier optionConvection; // option de convection pour les traceurs : option 2->"Convection faible, non conservatrice (HYP1FA)",4->"Convection faible, conservatrice" ,5->"Volumes finis"
- entier ordreSchemaConvec; // ordre du schema de convection volumes finis
- reel paramW; // parametre W du schema de convection volumes finis
- booleen LimitPente; // limiteur de pente du schema volumes finis
- vbooleen diffusionTraceurs; // diffusion des traceurs
- entier optionCalculDiffusion; // option de calcul de la diffusion pour les traceurs : option 1->forme K=C1.U+C2, 2->formule d'Isawa & Aga
- reel coeffDiffusion1; // coefficient de diffusion 1 pour les traceurs
- reel coeffDiffusion2; // coefficient de diffusion 2 pour les traceurs
- };
-
- // Parametres num\xE9riques de la qualit\xE9 d'eau
- struct SParametresNumQualiteEau {
- entier modeleQualiteEau; // type de la loi : 1->"AUCUN_MODELE", 2->"O2",
- // 3->"BIOMASS", 4->"EUTRO", 5->"MICROPOL",
- // 6->"THERMIC"
- chaine fichParamPhysiqueTracer; // Nom du fichier des parametres physiques pour la qualite d'eau
- chaine fichMeteoTracer; // Nom du fichier meteo pour la qualite d'eau
- entier frequenceCouplHydroTracer; // frequence de couplage entre hydraulique et Tracer
-
- };
-
-
-
- // Parametres d'impression de la qualit\xE9 d'eau
- struct SParametresImpressResultTracer {
- chaine fichListTracer; // nom du fichier listing tracer
- booleen concentInit; // impression des concentrations initiales
- booleen loiTracer; // impression des lois tracer
- booleen concentrations; // impression des concentrations
- booleen bilanTracer; // impression du bilan Tracer
- chaine fichResultTracer; // nom du fichier resultat Tracer
- entier formatFichResultat; // format du fichier resultat tracer 1->RUBENS, 2->OPTHYCA
- };
-
-
-
- // Param\xE8tres conditions limites Tracer
- struct SParametresCondLimTracer {
- ventier typeCondLimTracer; // type de condition limite pour chaque extr\xE9mit\xE9 libre: 1->Neumann, 2->Dirichlet
- ventier numLoiCondLimTracer; // numero de la loi tracer pour chaque extr\xE9mit\xE9 libre
-
- };
-
- // Param\xE8tres concentrations
- struct SParametresConcentrations {
- vreel concentrations; // concentrations pour chaque tracer
- };
-
- typedef sequence <SParametresConcentrations> VSParametresConcentrations;
-
- // Param\xE8tres concentrations initiales Tracer
- struct SParametresConcInitTracer {
- booleen presenceConcInit; // presence des concentrations initiales
- entier modeEntree; // mode d'entree des concentrations initiales Tracer : 1->"entr\xE9e par fichier", 2->"entr\xE9e par clavier"
- chaine fichConcInit; // nom du fichier des concentrations initiales Tracer Si modeEntree==1 (format OPTHYCA)
- entier nbPts; // nombre de points decrivant des concentrations initiales Tracer Si modeEntree==2
- ventier branche; // numeros de branches des concentrations initiales Tracer Si modeEntree==2
- vreel abscisse; // abscisses des concentrations initiales Tracer Si modeEntree==2
- VSParametresConcentrations concentrations; //concentrations initiales Tracer Si modeEntree==2
- };
-
-
-
- // Param\xE8tres sources de traceurs
- struct SParametresSourcesTraceurs {
- entier nbSources; // nombre de sources de traceurs
- vchaine noms; // nom des sources
- ventier typeSources; // type des sources
- ventier numBranche; // numeros de branche des sources
- vreel abscisses; // abscisses des sources
- vreel longueurs; // longueurs des sources
- ventier numLoi; // numeros de loi tracer pour les sources
- };
-
-
- // Param\xE8tres d'une loi Tracer
- struct SParametresLoiTracer {
- chaine nom; // nom de la loi
- entier modeEntree; // mode d'entree : 1->"entr\xE9e par fichier", 2->"entr\xE9e par clavier"
- chaine fichier; // nom du fichier Si modeEntree=="entr\xE9e par fichier"
- entier uniteTps; // unite de temps : 1->seconde, 2->minute, 3->heure, 4->jour Si modeEntree=="entr\xE9e par clavier"
- entier nbPoints; // nombre de points Si modeEntree=="entr\xE9e par clavier"
- vreel tps; // les temps de la loi Si modeEntree=="entr\xE9e par clavier"
- VSParametresConcentrations concentrations; // les concentrations de la loi pour chaque traceur et chaque point Si modeEntree=="entr\xE9e par clavier"
-
- };
- typedef sequence <SParametresLoiTracer> VSParametresLoiTracer;
-
- // Param\xE8tres des lois Tracer
- struct SParametresLoisTracer {
- entier nbLoisTracer; // nombre de lois Tracer
- VSParametresLoiTracer loisTracer; // les lois Tracer
- };
-
- // Parametres Traceur
- struct SParametresTraceur {
- booleen presenceTraceurs; // presence de traceurs
- entier nbTraceur; // nombre de traceur
- SParametresConvecDiffu parametresConvecDiffu; // Parametres de convection et diffusion des traceurs
- SParametresNumQualiteEau parametresNumQualiteEau; // Parametres num\xE9riques de la qualit\xE9 d'eau
- SParametresImpressResultTracer parametresImpressTracer; // Parametres d'impression et de resultat de la qualit\xE9 d'ea
- SParametresCondLimTracer parametresCondLimTracer; // Param\xE8tres condition limite Tracer
- SParametresConcInitTracer parametresConcInitTracer; // Param\xE8tres concentrations initiales Tracer
- SParametresSourcesTraceurs parametresSourcesTraceurs; // Param\xE8tres sources de traceurs
- SParametresLoisTracer parametresLoisTracer; // Param\xE8tres des lois Tracer
- };
-
- //-----------FIN RUBRIQUE TRACEURS-----------------------------------
-
- //-----------RUBRIQUE IMPRESSIONS - RESULTATS-----------------------------------
- // Param\xE8tres impressions
- struct SParametresImpress {
- booleen geometrie; // impression de la geometrie
- booleen planimetrage; // impression du planimetrage
- booleen reseau; // impression du reseau
- booleen loiHydrau; // impression des lois hydrauliques
- booleen ligneEauInit; // impression de la ligne d'eau initiale
- booleen calcul; // impression du calcul
- };
-
- // Param\xE8tres pas de stockage et impression
- struct SParametresPasStock {
- entier premPasTpsStock; // premier pas de temps a stocker
- entier pasStock; // pas de stockage
- entier pasImpression; // pas d'impression
- };
-
- // Param\xE8tres resultats
- struct SParametresResult {
- chaine fichResultat; // nom du fichier resultat
- chaine fichResultat2; // nom du fichier resultat
- chaine formatBinFich; // format binaire du fichier resultat
- // STD->standard, IBM, I3E->IEEE
- entier postProcesseur; // post-processeur : 1->RUBENS, 2->OPTHYCA
- };
-
- // Param\xE8tres listing
- struct SParametresListing {
- chaine fichListing; // nom du fichier listing
- };
-
- // Param\xE8tres fichier reprise en ecriture
- struct SParametresFichReprise {
- chaine fichRepriseEcr; // nom du fichier de reprise en ecriture
- chaine formatBinFich; // format binaire du fichier de reprise en ecriture
- // STD->standard, IBM, I3E->IEEE
- };
-
- // Param\xE8tres rubens
- struct SParametresRubens {
- reel ecartInterBranch; // ecart entre branche
- };
-
- // Param\xE8tres stockage
- struct SParametresStockage {
- entier option; // option de stockage : 1->"Toutes les sections",
- // 2->"A certains sites"
- entier nbSite; // nombre de sites Si option==2
- ventier branche; // numeros de branches des sites Si option==2
- vreel abscisse; // abscisse de branches des sites Si option==2
- };
-
- // Param\xE8tres noms fichiers resultats casiers
- struct SParametresFichResCasier {
- chaine resultatCasier; // fichier resultats casiers
- chaine listingCasier; // fichier listing casiers
- chaine resultatLiaison; // fichier resultats liaisons
- chaine listingLiaison; // fichier listing liaisons
- };
-
- // Param\xE8tres impressions - resultats
- struct SParametresImpressResult {
- chaine titreCalcul; // titre du calcul
- SParametresImpress impression; // impression
- SParametresPasStock pasStockage; // pas de stockage et impression
- SParametresResult resultats; // resultat
- SParametresListing listing; // listing
- SParametresFichReprise fichReprise; // fichier reprise en ecriture
- SParametresRubens rubens; // Rubens
- SParametresStockage stockage; // stockage
- SParametresFichResCasier casier; // noms fichiers resultats casiers
- };
- //-----------FIN RUBRIQUE IMPRESSIONS - RESULTATS-----------------------------------
-
- //-----------RUBRIQUE VARIABLES CALCULEES-----------------------------------
- // Param\xE8tres variables calculees
- struct SParametresVarCalc {
- vbooleen varCalculees; // les variables a calculer
- /*
- booleen largMirLiMin; // Largeur au miroir lit mineur
- booleen largMirLiMaj; // Largeur au miroir lit majeur
- booleen largMirZoStoc; // Largeur au miroir zone de stockage
- booleen periMouLiMin; // perimetre mouille lit mineur
- booleen periMouLiMaj; // perimetre mouille lit majeur
- booleen rayHydrLiMin; // Rayon hydraulique lit mineur
- booleen rayHydrLiMaj; // Rayon hydraulique lit majeur
- booleen vitLiMin; // Vitesse dans le lit mineur
- booleen vitLiMaj; // Vitesse dans le lit majeur
- booleen contraintFon; // Contrainte au fond
- booleen hautEau; // Hauteur d'eau
- booleen hautEauMoy; // Hauteur d'eau moyenne
- booleen QLiMajGauch; // Debit lit majeur gauche
- booleen QLiMajDroit; // Debit lit majeur droit
- booleen chargeHydr; // Charge hydraulique
- */
- };
- //-----------FIN RUBRIQUE VARIABLES CALCULEES-----------------------------------
-
- //-----------RUBRIQUE VARIABLES STOCKEES-----------------------------------
- // Param\xE8tres variables stockees
- struct SParametresVarStock {
- vbooleen varStockees; // les variables a stocker
- /*
- booleen coteFond; // Cote du fond 1
- booleen coteRivGauch; // Cote rive gauche 2
- booleen coteRivDroit; // Cote rive droite 3
- booleen frotLiMin; // Frottement lit mineur 4
- booleen frotLiMaj; // Frottement lit majeur 5
- booleen coteEau; // Cote de l'eau 6
- booleen QLiMin; // Debit lit mineur 7
- booleen QLiMaj; // Debit lit majeur 8
- booleen secMouLiMin; // Section mouillee lit mineur 9
- booleen secMouLiMaj; // Section mouillee lit majeur 10
- booleen nbFroude; // Nombre de Froude 11
- booleen betaDebord; // Coefficient Beta de la formule de Debord 12
- booleen largMirLiMin; // Largeur au miroir lit mineur 13
- booleen largMirLiMaj; // Largeur au miroir lit majeur 14
- booleen largMirZoStoc; // Largeur au miroir zone de stockage 15
- booleen periMouLiMin; // perimetre mouille lit mineur 16
- booleen periMouLiMaj; // perimetre mouille lit majeur 17
- booleen rayHydrLiMin; // Rayon hydraulique lit mineur 18
- booleen rayHydrLiMaj; // Rayon hydraulique lit majeur 19
- booleen vitLiMin; // Vitesse dans le lit mineur 20
- booleen vitLiMaj; // Vitesse dans le lit majeur 21
- booleen contraintFon; // Contrainte au fond 22
- booleen hautEau; // Hauteur d'eau 23
- booleen hautEauMoy; // Hauteur d'eau moyenne 24
- booleen QLiMajGauch; // Debit lit majeur gauche 25
- booleen QLiMajDroit; // Debit lit majeur droit 26
- booleen secMouZoStoc; // Section mouillee des zones de stockage 27
- booleen volLiActif; // Volume du lit actif 28
- booleen volZoStoc; // Volume des zones de stockage 29
- booleen chargeHydr; // Charge hydraulique 30
- booleen coteMaxSimu; // Cote maximale au cours de la simulation 31
- booleen tpsObtCoteMax; // Temps d'obtention de la cote maximale 32
- booleen vitCoteMax; // Vitesse a la cote maximale 33
- booleen coteMinSimu; // Cote minimale au cours de la simulation 34
- booleen tpsObtCoteMin; // Temps d'obtention de la cote minimale 35
- booleen vitLiMinMin; // Vitesse lit mineur minimale 36
- booleen vitLiMinMax; // Vitesse lit mineur maximale 37
- booleen largMirMax; // Largeur au miroir maximale 38
- booleen tpsArrivOnde; // Temps d arrivee de l'onde 39
- booleen QMax; // Debit maximal 40
- booleen tpsObtQMax; // Temps d obtention du debit maximal 41
- booleen energieMax; // Energie maximale 42
- */
- };
- //-----------FIN RUBRIQUE VARIABLES STOCKEES-----------------------------------
-
- //-----------RUBRIQUE CALAGE AUTOMATIQUE-----------------------------------
-
- // Parametres g\xE9n\xE9raux pour le calage automatique
- struct SParametresParamsCalageAuto {
- booleen modeCalageAuto; // Calcul lanc\xE9 en mode calage si true.
- reel pasGradient; // Le pas du gradient de calcul.
- entier nbMaxIterations; // Nombre maxi d'it\xE9rations.
- entier typeLit; // 1:Lit mineur, 2:Lit majeur.
- reel precision; // Pr\xE9cision pour la convergence du calcul.
- reel roInit; // Ro initial.
- entier methOptimisation; // La m\xE9thode d'optimisation. 1:Descente optimale, 2:Casier Newton, 3:Algo g\xE9n\xE9tique.
- chaine nomFichResult; // Nom du fichier r\xE9sultat de calage.
- chaine nomFichListing; // Nom du fichier listing de calage.
- };
-
- // Zones de frottement \xE0 caler
- struct SParametresZonesCalageAuto {
- entier nbZones; // Nombre de zones \xE0 caler.
- vreel absDebZone; // Abscisses de d\xE9but des zones.
- vreel absFinZone; // Abscisses de fin des zones.
- vreel coefLitMin; // valeur des coefficients du lit mineur.
- vreel coefLitMaj; // valeur des coefficients du lit majeur.
- };
-
- // D\xE9finition d'une crue pour le calage
- struct SParametresCrueCalageAuto {
- reel debitAmont; // Valeur du d\xE9bit amont du bief.
- reel coteAval; // Valeur de la cote aval du bief.
- entier nbMesures; // Nombre de mesures relev\xE9es.
- vreel absMesures; // Abscisses des mesures.
- vreel coteMesures; // Valeurs des mesures.
- vreel pondMesures; // Pond\xE9rations pour les mesures.
- entier nbApports; // Nombre d'apports sur le bief.
- vreel absApports; // Abscisses des apports.
- vreel debitApports; // Valeurs des apports.
- };
- typedef sequence <SParametresCrueCalageAuto> VSParametresCrueCalageAuto;
-
- // Les crues de calage
- struct SParametresCruesCalageAuto {
- entier nbCrues; // Le nombre de crue.
- VSParametresCrueCalageAuto crues; // La d\xE9finition des crues.
- };
-
- // Param\xE8tres calage automatique
- struct SParametresCalageAuto {
- SParametresParamsCalageAuto parametres; // Les parametres pour le calage auto.
- SParametresZonesCalageAuto zones; // Les zones de frottement pour le calage auto.
- SParametresCruesCalageAuto crues; // Les crues pour le calage auto.
- };
-
- //-----------FIN RUBRIQUE CALAGE AUTOMATIQUE-----------------------------------
-
- //-----------CONTENU DU FICHIER CAS MASCARET -------------------------------------------
- // Param\xE8tres du fichier cas
- struct SParametresCAS {
- SParametresGen parametresGen; // parametres generaux
- SParametresModelPhy parametresModelPhy; // parametres modelisation physiques
- SParametresNum parametresNum; // parametres num\xE9riques
- SParametresTemp parametresTemp; // parametres temporels
- SParametresGeoReseau parametresGeoReseau; // parametres geometrie-reseau
- SParametresConfluents parametresConfluents; // parametres confluents
- SParametresPlanimMaillage parametresPlanimMaillage; // parametres planimetrage-maillage
- SParametresSingularite parametresSingularite; // parametres singularite
- SParametresCasier parametresCasier; // parametres casiers
- SParametresApporDeversoirs parametresApporDeversoirs; // parametres apports et deversoirs
- SParametresCalage parametresCalage; // parametres calage
- SParametresLoisHydrau parametresLoisHydrau; // parametres lois hydrauliques
- SParametresCondInit parametresCondInit; // parametres conditions initiales
- SParametresImpressResult parametresImpressResult; // parametres impression resultat
- SParametresVarCalc parametresVarCalc; // parametres variables calculees
- SParametresVarStock parametresVarStock; // parametres variables stockees
- SParametresCalageAuto parametresCalageAuto; // parametres calage automatique
- SParametresTraceur parametresTracer; // parametres de la qualit\xE9 d'eau
-
- };
- //-----------FIN CONTENU DU FICHIER CAS MASCARET -----------------------------------
-
-
- //-----------CONTENU DU FICHIER GEOMETRIE -----------------------------------
- // Parametres point d'un profil
- struct SParametresPt {
- reel x; // abscisse du point
- reel y; // ordonnee du point
- chaine lit; // le lit auquel appartient le point : "B"->bathy, "T"->topo
- };
- typedef sequence <SParametresPt> VSParametresPt;
-
- // Parametres profil
- struct SParametresProfil {
- chaine nom; // nom du profil
- reel absc; // abscisse utilisateur du profil
- VSParametresPt pts; // les points du profil
- };
- typedef sequence <SParametresProfil> VSParametresProfil;
-
- // Parametres bief
- struct SParametresBief {
- chaine nom; // nom du bief
- VSParametresProfil profils; // les profils du bief
- };
- typedef sequence <SParametresBief> VSParametresBief;
-
- struct SParametresGEO {
- VSParametresBief biefs; // les biefs du fichier geometrie
- };
- //-----------FIN CONTENU DU FICHIER GEOMETRIE -----------------------------------
-
- //-----------CONTENU DU FICHIER GEOMETRIE CASIER -----------------------------------
- // Parametres point d'une g\xE9om\xE9trie casier
- struct SPtCasier {
- reel x; // si format "manuel" cote du casier, si format "automatique" abscisse du point
- reel y; // si format "manuel" surface du casier, si format "automatique" ordonnee du point
- reel z; // si format "manuel" volume du casier, si format "automatique" hauteur du point
- chaine typePoint; // si format "manuel" chaine vide, si format "automatique" : "F"->point fronti\xE8re, "I"->point int\xE9rieur
- };
- typedef sequence <SPtCasier> VSPtCasier;
-
- // G\xE9om\xE9trie d'un casier
- struct SGeoCasier {
- chaine nom; // nom du casier
- VSPtCasier pts; // les points du casier
- };
- typedef sequence <SGeoCasier> VSGeoCasier;
-
- // G\xE9om\xE9trie des casiers
- struct SGeoCasiers {
- VSGeoCasier casiers; // la g\xE9om\xE9trie de tous les casiers
- };
- //-----------FIN CONTENU DU FICHIER GEOMETRIE -----------------------------------
-
- //-----------CONTENU DU FICHIER "Fichiercas.txt" --------------------------------
- struct SParametresNCA {
- chaine nom; // le nom du fichier cas
- };
- //-----------FIN CONTENU DU FICHIER "Fichiercas.txt" -----------------------------------
-
- // ++++++++++++++++++++++++++++++++++ Extensions Dodico ++++++++++++++++++++++++++++++++++++
- struct SParametresLaisseLigneEXT {
- chaine titre;
- reel abscisse;
- reel cote;
- };
- typedef sequence <SParametresLaisseLigneEXT> VSParametresLaisseLigneEXT;
-
- struct SParametresEXT {
- VSParametresLaisseLigneEXT laisses;
- };
- // ++++++++++++++++++++++++++++++++++ fin Extensions Dodico ++++++++++++++++++++++++++++++++
-
- // ++++++++++++++++++++++++++++++++++ Taille max des fichiers ++++++++++++++++++++++++++++++
- struct SParametresTailleMaxFichier {
- reel maxListingMascaret;
- reel maxListingDamocles;
- reel maxListingCalage;
- reel maxListingTracer;
- reel maxResultatRubens;
- reel maxResultatOpthyca;
- reel maxResultatReprise;
- reel maxResultatRubensTracer;
- reel maxResultatOpthycaTracer;
- };
- // ++++++++++++++++++++++++++++++++++ fin Taille max des fichiers +++++++++++++++++++++++++++
-
- // ++++++++++++++++++++++++++++++++++CONTENU DU FICHIER LOI HYDRAULIQUE++++++++++++++++++++++++++++++
- struct SLoiHydraulique {
- chaine nom;
- vchaine entetesColonnes;
- chaine unitee;
- vreel x;
- vreel y;
- vreel z;
- };
- typedef sequence <SLoiHydraulique> VSLoiHydraulique;
- // ++++++++++++++++++++++++++++++++++ fin fichier loi hydraulique +++++++++++++++++++++++++++
-
- // ++++++++++++++++++++++++++++++++++CONTENU DU FICHIER LOI TRACER++++++++++++++++++++++++++++++
-
- struct SLoiTracer {
- chaine nom; // nom de la loi
- vchaine entetesColonnes;
- chaine unitee;
- vreel tps; // les temps de la loi
- vvreel concentrations; // concentration[point de la loi][numero de tracer] les concentrations de la loi pour chaque traceur et chaque point
-
- };
- typedef sequence <SLoiTracer> VSLoiTracer;
-
- // ++++++++++++++++++++++++++++++++++CONTENU DU FICHIER METEO TRACER++++++++++++++++++++++++++++++
-
- // Parametres meteo du modele de qualit\xE9 d'eau
- struct SParamMeteoTracer {
- binaire paramMeteoTracer; // contenu du fichier meteo Tracer
- };
-
-
-
- // ++++++++++++++++++++++++++++++++++Fichier des param\xE9tres physiques de la qualit\xE9 d'eau ++++++++++++++++++++++++++++++
-
- // Parametres Physique du modele de qualit\xE9 d'eau
- struct SParamPhysTracer {
- chaine nomParamPhys; // nom du parametre physique
- reel valeurParamPhys; // valeur du parametre physique
- };
-
- typedef sequence <SParamPhysTracer> VSParamPhysTracer;
-
- // ++++++++++++++++++++++++++++++++++ fin fichier loi hydraulique +++++++++++++++++++++++++++
-
- //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- //+-+-+-+-+-+-+-+-+-+-+-+-+-+- FIN ENTREE +-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
- //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- //+-+-+-+-+-+-+-+-+-+-+-+ ENTREE-SORTIE +-+-+-+-+-+-+-+-+-+-+-+-+
- //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//--------- CONTENU DU FICHIER DE REPRISE ----------------------------------------------
- struct SParametresREP {
- binaire contenu; // contenu du fichier texte de reprise
- };
-
-//--------- FIN CONTENU DU FICHIER DE REPRISE ------------------------------------------
- //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- //+-+-+-+-+-+-+-+-+-+-+-+ FIN ENTREE-SORTIE +-+-+-+-+-+-+-+-+-+-*
- //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
- //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- //+-+-+-+-+-+-+-+-+-+-+-+-+- SORTIE +-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- //+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//--------- CONTENU DU FICHIER Resultat FORMAT OPTYCA --------------------
- struct SResultatsVariable {
- chaine nomLong; // nom long de la variable
- chaine nomCourt; // nom court de la variable
- chaine unite; // unite de la variable
- entier nbDecimal; // nombre de decimal de la variable
- };
- typedef sequence <SResultatsVariable> VSResultatsVariable;
-
- struct SResultatSection {
- vreel valeurs; // les valeurs de toutes les variables r\xE9sultat pour une section donn\xE9e et un temps donn\xE9
- reel absc; // l'abscisse de la section
- };
- typedef sequence <SResultatSection> VSResultatSection;
-
- struct SResultatBief {
- VSResultatSection resultatsSection; // les resultats par section pour un bief \xE0 un pas de temps
- };
- typedef sequence <SResultatBief> VSResultatBief;
-
- struct SResultatPasTemps {
- VSResultatBief resultatsBief; // les resultats par bief \xE0 un pas de temps
- reel t; // le temps
- };
- typedef sequence <SResultatPasTemps> VSResultatPasTemps;
-
- struct SResultatsOPT {
- VSResultatsVariable variables; // listes des variables definit en plus du temps, code bief, code section, abscisse
- VSResultatPasTemps resultatsPasTemps; // les resultats par pas de temps
-
- };
-
- struct SResultatsTemporelSpatialBief {
- vvvreel valeursVariables; // valeursVariables[iVariable][iPasTemps][iSection]
- vreel abscissesSections;
- };
- typedef sequence <SResultatsTemporelSpatialBief> VSResultatsTemporelSpatialBief;
-
- struct SResultatsTemporelSpatial {
- VSResultatsVariable variables; // listes des variables definit en plus du temps, code bief, code section, abscisse
- vreel pasTemps;
- VSResultatsTemporelSpatialBief resultatsBiefs;
- booleen resultatsLiaison;
- booleen resultatsCasier;
- booleen resultatsPermanent;
- booleen resultatsCalageAuto;
- booleen resultatsTracer;
-
- };
-
-//--------- FIN CONTENU DU FICHIER FORMAT OPTYCA ------------------------------
-//++++++++++++++++++++++++++++...
[truncated message content] |
|
From: <opa...@us...> - 2008-08-07 14:36:49
|
Revision: 3728
http://fudaa.svn.sourceforge.net/fudaa/?rev=3728&view=rev
Author: opasteur
Date: 2008-08-07 14:36:55 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
branches/Fudaa_Mascaret_3_0/fudaa_devel/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml
Modified: branches/Fudaa_Mascaret_3_0/fudaa_devel/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml
===================================================================
--- branches/Fudaa_Mascaret_3_0/fudaa_devel/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml 2008-08-07 14:09:09 UTC (rev 3727)
+++ branches/Fudaa_Mascaret_3_0/fudaa_devel/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml 2008-08-07 14:36:55 UTC (rev 3728)
@@ -1,110 +1,112 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<!--
- A sample installation file.
- Use it as a base for your own installers :-)
-
- To compile it :
- - go in the bin directory where you installed IzPack
- - call "compile ../sample/install.xml -b ../sample"
-
- -->
-<installation version="1.0">
- <!--
- The info section.
- The meaning of the tags should be natural ...
-
- -->
-<info>
- <appname>Fudaa-Mascaret</appname>
- <appversion>3.0.3</appversion>
- <variable name="released-on" value="14/05/2008" />
- <authors>
- <author name="EDF Recherche et D�veloppement" email="http://rd.edf.com" />
- <author name="CETMEF" email="http://www.cetmef.equipement.gouv.fr" />
- </authors>
- <url>http://rd.edf.com</url>
- </info>
-<native type="izpack" name="ShellLink.dll" />
- <!--
- The gui preferences indication.
- Sets the installer window to 800x420. It will be able to change the size.
-
- -->
- <guiprefs width="800" height="420" resizable="yes" />
- <!--
- The locale section.
- Asks here to include the French langpacks.
-
- -->
- <locale>
- <langpack iso3="fra" />
- </locale>
- <!--
- The resources section.
- The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
-
- -->
- <resources>
- <res src="izpack/shortcutSpec.xml" id="shortcutSpec.xml" />
- <res src="Licence.txt" id="LicencePanel.licence"/>
- <res src="Readme.txt" id="InfoPanel.info" />
- <res src="fudaamascaret.jpg" id="Installer.image"/>
- <!-- res src="izpack/RegistrySpec.xml" id="RegistrySpec.xml"/ -->
- </resources>
-
- <!--
- The panels section.
- We indicate here which panels we want to use. The order will be respected.
-
- -->
- <panels>
- <panel classname="HelloPanel" />
- <panel classname="InfoPanel" />
- <panel classname="LicencePanel" />
- <panel classname="TargetPanel" />
- <panel classname="PacksPanel" />
- <panel classname="InstallPanel" />
- <panel classname="ShortcutPanel" />
- <panel classname="FinishPanel" />
- </panels>
- <!--
- The packs section.
- We specify here our packs.
- -->
- <packs>
- <pack name="Core" required="yes">
- <description>L'application de base int�grant l'interface graphique Fudaa-Mascaret et le code de calcul Mascaret</description>
- <file src="../../../distrib/build/jar/mascaret/fudaa-mascaret.jar" targetdir="$INSTALL_PATH" />
- <file src="../../fudaa/serveurs" targetdir="$INSTALL_PATH" />
- <file src="fudaa-mascaret.bat" targetdir="$INSTALL_PATH" />
- <file src="icons" targetdir="$INSTALL_PATH" />
- <parsable targetfile="$INSTALL_PATH/fudaa-mascaret.bat" /> <!-- The file will be parsed -->
- </pack>
- <pack name="Exemples" required="no">
- <description>Quelques exemples de fichiers d'entr�e de Fudaa-Mascaret</description>
- <file src="exemples" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
- </pack>
- <pack name="Docs" required="no">
- <description>Le guide de prise en main de Fudaa-Mascaret</description>
- <file src="doc" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
- </pack>
- <pack name="Sources" required="no">
- <description>Le code source du projet Fudaa</description>
- <fileset dir="../.." targetdir="$INSTALL_PATH/src">
- <include name="ctulu/src/**/*.*" />
- <include name="dodico/idl/**/*.*" />
- <include name="dodico/src/**/*.*" />
- <include name="ebli/src/**/*.*" />
- <include name="fudaa/src/**/*.*" />
- </fileset>
- </pack>
- </packs>
-
- <!-- The native libraries to add -->
- <native type="izpack" name="ShellLink.dll" />
- <native type="3rdparty" name="COIOSHelper.dll" stage="both">
- <os family="windows"/>
- </native>
-
-
- </installation>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<!--
+ A sample installation file.
+ Use it as a base for your own installers :-)
+
+ To compile it :
+ - go in the bin directory where you installed IzPack
+ - call "compile ../sample/install.xml -b ../sample"
+
+ -->
+<installation version="1.0">
+ <!--
+ The info section.
+ The meaning of the tags should be natural ...
+
+ -->
+<info>
+ <appname>Fudaa-Mascaret</appname>
+ <appversion>3.0.3</appversion>
+ <variable name="released-on" value="14/05/2008" />
+ <authors>
+ <author name="EDF Recherche et D�veloppement" email="http://rd.edf.com" />
+ <author name="CETMEF" email="http://www.cetmef.equipement.gouv.fr" />
+ </authors>
+ <url>http://rd.edf.com</url>
+ </info>
+<native type="izpack" name="ShellLink.dll" />
+ <!--
+ The gui preferences indication.
+ Sets the installer window to 800x420. It will be able to change the size.
+
+ -->
+ <guiprefs width="800" height="420" resizable="yes" />
+ <!--
+ The locale section.
+ Asks here to include the French langpacks.
+
+ -->
+ <locale>
+ <langpack iso3="fra" />
+ </locale>
+ <!--
+ The resources section.
+ The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
+
+ -->
+ <resources>
+ <res src="izpack/shortcutSpec.xml" id="shortcutSpec.xml" />
+ <res src="Licence.txt" id="LicencePanel.licence"/>
+ <res src="Readme.txt" id="InfoPanel.info" />
+ <res src="fudaamascaret.jpg" id="Installer.image"/>
+ <!-- res src="izpack/RegistrySpec.xml" id="RegistrySpec.xml"/ -->
+ </resources>
+
+ <!--
+ The panels section.
+ We indicate here which panels we want to use. The order will be respected.
+
+ -->
+ <panels>
+ <panel classname="HelloPanel" />
+ <panel classname="InfoPanel" />
+ <panel classname="LicencePanel" />
+ <panel classname="TargetPanel" />
+ <panel classname="PacksPanel" />
+ <panel classname="InstallPanel" />
+ <panel classname="ShortcutPanel" />
+ <panel classname="FinishPanel" />
+ </panels>
+ <!--
+ The packs section.
+ We specify here our packs.
+ -->
+ <packs>
+ <pack name="Core" required="yes">
+ <description>L'application de base int�grant l'interface graphique Fudaa-Mascaret et le code de calcul Mascaret</description>
+ <file src="../../../distrib/build/jar/mascaret/fudaa-mascaret.jar" targetdir="$INSTALL_PATH" />
+ <file src="../../fudaa/serveurs" targetdir="$INSTALL_PATH" />
+ <file src="../../aide/src/mascaret" targetdir="$INSTALL_PATH" /aide/src/mascaret>
+
+ <file src="fudaa-mascaret.bat" targetdir="$INSTALL_PATH" />
+ <file src="icons" targetdir="$INSTALL_PATH" />
+ <parsable targetfile="$INSTALL_PATH/fudaa-mascaret.bat" /> <!-- The file will be parsed -->
+ </pack>
+ <pack name="Exemples" required="no">
+ <description>Quelques exemples de fichiers d'entr�e de Fudaa-Mascaret</description>
+ <file src="exemples" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
+ </pack>
+ <pack name="Docs" required="no">
+ <description>Le guide de prise en main de Fudaa-Mascaret</description>
+ <file src="doc" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
+ </pack>
+ <pack name="Sources" required="no">
+ <description>Le code source du projet Fudaa</description>
+ <fileset dir="../.." targetdir="$INSTALL_PATH/src">
+ <include name="ctulu/src/**/*.*" />
+ <include name="dodico/idl/**/*.*" />
+ <include name="dodico/src/**/*.*" />
+ <include name="ebli/src/**/*.*" />
+ <include name="fudaa/src/**/*.*" />
+ </fileset>
+ </pack>
+ </packs>
+
+ <!-- The native libraries to add -->
+ <native type="izpack" name="ShellLink.dll" />
+ <native type="3rdparty" name="COIOSHelper.dll" stage="both">
+ <os family="windows"/>
+ </native>
+
+
+ </installation>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2008-08-07 14:09:00
|
Revision: 3727
http://fudaa.svn.sourceforge.net/fudaa/?rev=3727&view=rev
Author: hadouxad
Date: 2008-08-07 14:09:09 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
AFFECT?\195?\137 - # 40: L?\195?\169gende pour les courbe 1d
http://mantis.genesis-groupe.com//view.php?id=40
- les widget fleches directionnelle et bi directionnelle (a ameliorer)
- les classes modeles et tree
- les methodes de gestion des listener eblinodelistener pour la scene
- la classe exemple testGraphe
- exemple testgraphe pour voir le fonctionnement du lien tree scene
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ctulu/lib/org-netbeans-api-visual.jar
branches/Prepro-0.92-SNAPSHOT/ctulu/lib/org-openide-util.jar
branches/Prepro-0.92-SNAPSHOT/ctulu/lib/swingx-0.9.3.jar
Property changes on: branches/Prepro-0.92-SNAPSHOT/ctulu/lib/org-netbeans-api-visual.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: branches/Prepro-0.92-SNAPSHOT/ctulu/lib/org-openide-util.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: branches/Prepro-0.92-SNAPSHOT/ctulu/lib/swingx-0.9.3.jar
___________________________________________________________________
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-07 13:58:35
|
Revision: 3726
http://fudaa.svn.sourceforge.net/fudaa/?rev=3726&view=rev
Author: hadouxad
Date: 2008-08-07 13:58:44 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
AFFECT?\195?\137 - # 40: L?\195?\169gende pour les courbe 1d
http://mantis.genesis-groupe.com//view.php?id=40
- les widget fleches directionnelle et bi directionnelle (a ameliorer)
- les classes modeles et tree
- les methodes de gestion des listener eblinodelistener pour la scene
- la classe exemple testGraphe
- exemple testgraphe pour voir le fonctionnement du lien tree scene
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 13:56:12 UTC (rev 3725)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-07 13:58:44 UTC (rev 3726)
@@ -7,6 +7,7 @@
*/
package org.fudaa.ebli.all;
+import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
@@ -28,6 +29,7 @@
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.gui.CtuluLibSwing;
@@ -49,13 +51,19 @@
import org.fudaa.ebli.trace.TraceLigneModel;
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.netbeans.api.visual.action.ActionFactory;
import org.netbeans.api.visual.border.BorderFactory;
import org.netbeans.api.visual.graph.GraphScene;
@@ -164,14 +172,42 @@
Box boxEast = Box.createVerticalBox();
boxEast.add(new BuScrollPane(t));
- p.add(boxEast, BuBorderLayout.EAST);
- p.doLayout();
+ 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();
+
+
+
+
+
+
+
+ //-- 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);
+
+
+ p.add(tree,BuBorderLayout.WEST);
+
+
+
+
+
+
+
// ajout graphe
// GrapheWidget graphe=new GrapheWidget(scene,null,g);
// graphe.setPreferredSize(new Dimension(300, 300));
@@ -181,15 +217,17 @@
//-- 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);
//-- creation d un noeud legende --//
- node = new EbliNodeDefault();
- node.setCreator(new EbliWidgetCreatorLegende(g));
- node.setD(new Dimension(100, 100));
- scene.addNode(node);
+ EbliNodeDefault nodeLegende = new EbliNodeDefault();
+ nodeLegende.setTitle("Legende");
+ nodeLegende.setCreator(new EbliWidgetCreatorLegende(g));
+ nodeLegende.setD(new Dimension(100, 100));
+ scene.addNode(nodeLegende);
@@ -197,6 +235,7 @@
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);
@@ -205,18 +244,49 @@
//-- 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);
+
+
+ //-- ajout du fleche double sens diagonale--//
node = new EbliNodeDefault();
- node.setCreator(new EbliWidgetCreatorRectangle("Test recangle"));
-// node.setD(new Dimension(100, 100));
- node.setP(new Point(350,125));
+ 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);
+
+
+
+
// WidgetLegendeManagerOLD.createWidgetLegendeGraphe(this, visu, courbe,
// graphe.getClientArea());
- scene.addChild(WidgetLegendeManager.createLegende(g, scene, null));
-
+ /*
// ajout iconenode
IconNodeWidget iconNode = new IconNodeWidget(scene);
iconNode.setImage(CtuluResource.CTULU.getImage("crystal_non"));
@@ -232,7 +302,7 @@
// 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" },
@@ -250,8 +320,9 @@
widgetJtable.setBorder(BorderFactory.createResizeBorder(10));
widgetJtable.setPreferredLocation(new Point(500, 300));
widgetJtable.getActions().addAction(ActionFactory.createResizeAction());
- scene.addChild(widgetJtable);
- // scene.addNode(new Object());
+ //scene.addChild(widgetJtable);
+
+
// fin
p.add(new JScrollPane(scene.createView()), BuBorderLayout.CENTER);
@@ -272,6 +343,22 @@
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();
}
}
\ 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-07 13:56:07
|
Revision: 3725
http://fudaa.svn.sourceforge.net/fudaa/?rev=3725&view=rev
Author: hadouxad
Date: 2008-08-07 13:56:12 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
AFFECT?\195?\137 - # 40: L?\195?\169gende pour les courbe 1d
http://mantis.genesis-groupe.com//view.php?id=40
- les widget fleches directionnelle et bi directionnelle (a ameliorer)
- les classes modeles et tree
- les methodes de gestion des listener eblinodelistener pour la scene
- la classe exemple testGraphe
- exemple testgraphe pour voir le fonctionnement du lien tree scene
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/EbliWidgetCreator.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorGraphe.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorLegende.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorRectangle.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorVue2d.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeListener.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorDblFleche.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorFleche.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetDBLFleche.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetFleche.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTree.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTreeModel.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-06 22:00:30 UTC (rev 3724)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNode.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -14,5 +14,7 @@
EbliNode duplicate(Map options);
Point getLocation();
+
+ 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-06 22:00:30 UTC (rev 3724)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -5,6 +5,8 @@
import java.util.Map;
public class EbliNodeDefault implements EbliNode {
+
+
EbliWidgetCreator creator;
Point p;
Dimension d;
@@ -52,5 +54,10 @@
// TODO Auto-generated method stub
return d;
}
+
+ public String toString() {
+ // TODO Auto-generated method stub
+ return title;
+ }
}
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeListener.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeListener.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeListener.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -0,0 +1,9 @@
+package org.fudaa.ebli.visuallibrary;
+
+public interface EbliNodeListener {
+
+ void nodeAdded(EbliNode node);
+
+ void noderemoved(EbliNode node);
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeListener.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-06 22:00:30 UTC (rev 3724)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -4,6 +4,10 @@
import java.awt.Point;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
import javax.swing.JComponent;
import javax.swing.JMenuItem;
@@ -33,6 +37,12 @@
*/
private LayerWidget visu_;
+
+ /**
+ * la liste des listener associes a la scene
+ */
+ List<EbliNodeListener> listenerList ;
+
public EbliScene() {
super();
@@ -45,6 +55,7 @@
// -- ajouter le menu popup de base
setMenuBase();
+
}
@@ -58,7 +69,8 @@
@Override
protected void notifyNodeAdded(EbliNode node, Widget widget) {
- // node.widgetCreated((EbliWidget)widget);
+ //-- notifier tous les listener que le noeud a ete attache --//
+ notifyAllListenerNodeAdded(node);
}
@Override
@@ -94,6 +106,8 @@
// -- ajout dans la vue layer --//
visu_.addChild(res);
+
+
return res;
}
@@ -181,5 +195,49 @@
}
}));
}
+
+
+ /**
+ * Methode qui permet d ajouter un listener
+ * @param listener
+ */
+ public void addEbliNodeListener(EbliNodeListener listener){
+ // init si necessaire
+ if(listenerList==null)
+ listenerList= new ArrayList<EbliNodeListener>();
+ //ajout
+ listenerList.add(listener);
+ }
+ /**
+ * Methode qui permet d envoyer le signal du node ajout\xE9 a tous les listener
+ * @param listener
+ */
+ public void notifyAllListenerNodeAdded(EbliNode node){
+ if(listenerList==null)
+ return;
+
+ for(Iterator<EbliNodeListener> it=listenerList.iterator();it.hasNext();){
+ EbliNodeListener listener=it.next();
+ listener.nodeAdded(node);
+ }
+
+ }
+
+ /**
+ * Methode qui permet d envoyer le signal du node retir\xE9 a tous les listener
+ * @param listener
+ */
+ public void notifyAllListenerNodeRemoved(EbliNode node){
+ if(listenerList==null)
+ return;
+
+ for(Iterator<EbliNodeListener> it=listenerList.iterator();it.hasNext();){
+ EbliNodeListener listener=it.next();
+ listener.noderemoved(node);
+ }
+
+ }
+
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreator.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreator.java 2008-08-06 22:00:30 UTC (rev 3724)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreator.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -5,6 +5,8 @@
EbliWidget create(EbliScene _scene);
+ EbliWidget getWidget();
+
// void widgetCreated(EbliWidget w);
//void nodeRemoved();
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorDblFleche.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorDblFleche.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorDblFleche.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -0,0 +1,36 @@
+package org.fudaa.ebli.visuallibrary;
+
+public class EbliWidgetCreatorDblFleche implements EbliWidgetCreator {
+
+
+ int orientation;
+
+ EbliWidgetDBLFleche res;
+
+ public EbliWidgetCreatorDblFleche(int orientation) {
+ super();
+ this.orientation = orientation;
+
+ }
+
+ public int getG() {
+ return orientation;
+ }
+
+ public void setG(int orientation) {
+ this.orientation = orientation;
+ }
+
+ public EbliWidget create(EbliScene _scene) {
+ res= new EbliWidgetDBLFleche(_scene, orientation);
+
+ return res;
+ }
+
+ public EbliWidget getWidget() {
+ // TODO Auto-generated method stub
+ return res;
+ }
+
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorDblFleche.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorFleche.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorFleche.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorFleche.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -0,0 +1,34 @@
+package org.fudaa.ebli.visuallibrary;
+
+public class EbliWidgetCreatorFleche implements EbliWidgetCreator {
+
+ int orientation;
+
+ EbliWidgetFleche res;
+
+ public EbliWidgetCreatorFleche(int orientation) {
+ super();
+ this.orientation = orientation;
+
+ }
+
+ public int getG() {
+ return orientation;
+ }
+
+ public void setG(int orientation) {
+ this.orientation = orientation;
+ }
+
+ public EbliWidget create(EbliScene _scene) {
+ res= new EbliWidgetFleche(_scene, orientation);
+
+ return res;
+ }
+
+ public EbliWidget getWidget() {
+ // TODO Auto-generated method stub
+ return res;
+ }
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorFleche.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorGraphe.java 2008-08-06 22:00:30 UTC (rev 3724)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorGraphe.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -9,6 +9,7 @@
public class EbliWidgetCreatorGraphe implements EbliWidgetCreator {
EGGraphe g;
+ EbliWidgetGraphe res;
public EbliWidgetCreatorGraphe(EGGraphe g) {
super();
@@ -18,7 +19,7 @@
public EbliWidget create(EbliScene _scene) {
// TODO Auto-generated method stub
// creation de la widget correspondante
- EbliWidgetGraphe res= new EbliWidgetGraphe(_scene, null, g);
+ res= new EbliWidgetGraphe(_scene, null, g);
// ajout des listener d ecoute du graphe
new EbliWidgetGrapheController(res);
@@ -26,5 +27,10 @@
return res;
}
+ public EbliWidget getWidget() {
+ // TODO Auto-generated method stub
+ return res;
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorLegende.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorLegende.java 2008-08-06 22:00:30 UTC (rev 3724)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorLegende.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -5,7 +5,7 @@
public class EbliWidgetCreatorLegende implements EbliWidgetCreator {
EGGraphe g;
-
+ EbliWidget res;
public EbliWidgetCreatorLegende(EGGraphe g) {
super();
this.g = g;
@@ -20,7 +20,13 @@
}
public EbliWidget create(EbliScene _scene) {
- return WidgetLegendeManager.createLegende(g, _scene, null);
+ res= WidgetLegendeManager.createLegende(g, _scene, null);
+ return res;
}
+ public EbliWidget getWidget() {
+ // TODO Auto-generated method stub
+ return res;
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorRectangle.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorRectangle.java 2008-08-06 22:00:30 UTC (rev 3724)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorRectangle.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -6,7 +6,8 @@
public class EbliWidgetCreatorRectangle implements EbliWidgetCreator {
String label_;
-
+ EbliWidgetRectangle res;
+
public EbliWidgetCreatorRectangle(String g) {
super();
this.label_ = g;
@@ -21,9 +22,14 @@
}
public EbliWidget create(EbliScene _scene) {
- EbliWidgetRectangle res= new EbliWidgetRectangle(_scene, getG());
+ res= new EbliWidgetRectangle(_scene, getG());
return res;
}
+ public EbliWidget getWidget() {
+ // TODO Auto-generated method stub
+ return res;
+ }
+
}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorVue2d.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorVue2d.java 2008-08-06 22:00:30 UTC (rev 3724)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorVue2d.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -6,14 +6,21 @@
public class EbliWidgetCreatorVue2d implements EbliWidgetCreator {
ZEbliCalquesPanel calque;
-
+ EbliWidgetVue2D res;
+
public EbliWidgetCreatorVue2d(ZEbliCalquesPanel calque) {
super();
this.calque = calque;
}
public EbliWidget create(EbliScene _scene) {
- return new EbliWidgetVue2D(_scene, calque);
+ res= new EbliWidgetVue2D(_scene, calque);
+ return res;
}
+ public EbliWidget getWidget() {
+ // TODO Auto-generated method stub
+ return res;
+ }
+
}
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetDBLFleche.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetDBLFleche.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetDBLFleche.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -0,0 +1,112 @@
+package org.fudaa.ebli.visuallibrary;
+
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.geom.GeneralPath;
+import java.util.ArrayList;
+
+import org.fudaa.ebli.courbe.EGCourbe;
+import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.ebli.trace.TraceLigne;
+import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.ConnectProvider;
+import org.netbeans.api.visual.action.TextFieldInplaceEditor;
+import org.netbeans.api.visual.action.WidgetAction;
+import org.netbeans.api.visual.anchor.AnchorFactory;
+import org.netbeans.api.visual.anchor.AnchorShape;
+import org.netbeans.api.visual.anchor.AnchorShapeFactory;
+import org.netbeans.api.visual.layout.LayoutFactory.SerialAlignment;
+import org.netbeans.api.visual.widget.ConnectionWidget;
+import org.netbeans.api.visual.widget.LabelWidget;
+import org.netbeans.api.visual.widget.Scene;
+import org.netbeans.api.visual.widget.Widget;
+import org.netbeans.api.visual.widget.LabelWidget.VerticalAlignment;
+import org.netbeans.modules.visual.layout.FlowLayout;
+import org.netbeans.modules.visual.layout.OverlayLayout;
+
+/**
+ * Legende Widget qui permet de construire une fleche double
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class EbliWidgetDBLFleche extends EbliWidget {
+
+
+ Insets inGaps_;
+ int largeurFleche = 15;
+
+ public final static int ORIENTATION_NORTH=0;
+ public final static int ORIENTATION_SOUTH=1;
+ public final static int ORIENTATION_EAST=2;
+ public final static int ORIENTATION_WEST=3;
+ public final static int ORIENTATION_DIAG1=4;
+ public final static int ORIENTATION_DIAG2=5;
+ public final static int ORIENTATION_DIAG3=6;
+ public final static int ORIENTATION_DIAG4=7;
+
+
+ Point positionInit;
+ Point positionDest;
+
+ ConnectionWidget shapeWidget;
+ AnchorShape shape;
+
+ /**
+ * @param _scene
+ */
+ public EbliWidgetDBLFleche(EbliScene _scene, int orientation) {
+ super(_scene);
+
+
+ //-- creation de la fleche --//
+ shapeWidget = new ConnectionWidget (_scene);
+ shape = AnchorShapeFactory.createTriangleAnchorShape(largeurFleche, true, false, 0);
+ //shape = AnchorShapeFactory.createArrowAnchorShape(45, 17);
+
+ determinePosition(orientation);
+
+
+ shapeWidget.setSourceAnchor (AnchorFactory.createFixedAnchor(positionInit));
+ shapeWidget.setTargetAnchor (AnchorFactory.createFixedAnchor(positionDest));
+ shapeWidget.setSourceAnchorShape (shape);
+ shapeWidget.setTargetAnchorShape (shape);
+ addChild(shapeWidget);
+
+ }
+
+
+
+
+ public void determinePosition(int orientation){
+ positionInit=new Point();
+ positionDest=new Point();
+
+ switch(orientation){
+ case ORIENTATION_NORTH: positionInit.x=25;positionInit.y=0;positionDest.x=25;positionDest.y=50;break;
+ case ORIENTATION_SOUTH: positionInit.x=25;positionInit.y=0;positionDest.x=25;positionDest.y=50;break;
+ case ORIENTATION_WEST: positionInit.x=0;positionInit.y=25;positionDest.x=50;positionDest.y=25;break;
+ case ORIENTATION_EAST: positionInit.x=0;positionInit.y=25;positionDest.x=50;positionDest.y=25;break;
+ case ORIENTATION_DIAG1: positionInit.x=0;positionInit.y=0;positionDest.x=50;positionDest.y=50;break;
+ case ORIENTATION_DIAG2: positionInit.x=0;positionInit.y=0;positionDest.x=50;positionDest.y=50;break;
+ case ORIENTATION_DIAG3: positionInit.x=0;positionInit.y=50;positionDest.x=50;positionDest.y=50;break;
+ case ORIENTATION_DIAG4: positionInit.x=0;positionInit.y=50;positionDest.x=50;positionDest.y=0;break;
+
+ }
+ }
+
+
+
+
+
+
+
+
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetDBLFleche.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetFleche.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -0,0 +1,113 @@
+package org.fudaa.ebli.visuallibrary;
+
+
+
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Polygon;
+import java.awt.Rectangle;
+import java.awt.geom.GeneralPath;
+import java.util.ArrayList;
+
+import org.fudaa.ebli.courbe.EGCourbe;
+import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.ebli.trace.TraceLigne;
+import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.ConnectProvider;
+import org.netbeans.api.visual.action.TextFieldInplaceEditor;
+import org.netbeans.api.visual.action.WidgetAction;
+import org.netbeans.api.visual.anchor.AnchorFactory;
+import org.netbeans.api.visual.anchor.AnchorShape;
+import org.netbeans.api.visual.anchor.AnchorShapeFactory;
+import org.netbeans.api.visual.layout.LayoutFactory.SerialAlignment;
+import org.netbeans.api.visual.widget.ConnectionWidget;
+import org.netbeans.api.visual.widget.LabelWidget;
+import org.netbeans.api.visual.widget.Scene;
+import org.netbeans.api.visual.widget.Widget;
+import org.netbeans.api.visual.widget.LabelWidget.VerticalAlignment;
+import org.netbeans.modules.visual.layout.FlowLayout;
+import org.netbeans.modules.visual.layout.OverlayLayout;
+
+/**
+ * Legende Widget qui permet de construire une fleche
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class EbliWidgetFleche extends EbliWidget {
+
+
+ Insets inGaps_;
+ int largeurBorder = 15;
+ int espaceInterieur = 5;
+ public static int ORIENTATION_NORTH=0;
+ public static int ORIENTATION_SOUTH=1;
+ public static int ORIENTATION_EAST=2;
+ public static int ORIENTATION_WEST=3;
+
+
+
+ /**
+ * @param _scene
+ */
+ public EbliWidgetFleche(EbliScene _scene, int orientation) {
+ super(_scene);
+ inGaps_ = new Insets(largeurBorder + espaceInterieur, largeurBorder
+ + espaceInterieur, largeurBorder + espaceInterieur,
+ largeurBorder + espaceInterieur);
+ // Ce layout permet de placer le texte
+
+ setLayout(new OverlayLayoutGap(inGaps_));
+
+
+
+ }
+
+
+
+
+ /*protected Rectangle calculateClientArea() {
+ Rectangle res = this.getPreferredBounds();
+ // TODO Auto-generated method stub
+ return new Rectangle(0, 0, 2 * (largeurBorder + espaceInterieur)
+ + res.width, 2 * (largeurBorder + espaceInterieur) + res.height);
+ }*/
+
+ protected void paintWidget() {
+ Graphics2D g = getGraphics();
+
+ Rectangle rec = getClientArea();
+ g.translate(rec.x, rec.y);
+ // la ligne
+
+ TraceLigne l = new TraceLigne();
+
+ l.setEpaisseur(largeurBorder);
+
+
+ //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));
+
+
+
+
+
+ g.translate(-rec.x, -rec.y);
+
+
+
+
+ }
+
+
+
+
+
+
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetFleche.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTree.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTree.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTree.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -0,0 +1,40 @@
+package org.fudaa.ebli.visuallibrary;
+
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.TreeModel;
+
+import org.jdesktop.swingx.JXTree;
+
+public class EbliWidgetJXTree extends JXTree implements TreeSelectionListener{
+
+ // modele du tree
+ private EbliWidgetJXTreeModel model_;
+
+
+
+ public EbliWidgetJXTree(EbliWidgetJXTreeModel newModel) {
+ super(newModel.getModeleTree());
+ // TODO Auto-generated constructor stub
+ model_=newModel;
+
+ //-- selection unique des elments du
+
+ }
+
+ public EbliWidgetJXTreeModel getModel_() {
+ return model_;
+ }
+
+ public void setModel_(EbliWidgetJXTreeModel model_) {
+ this.model_ = model_;
+ }
+
+ public void valueChanged(TreeSelectionEvent e) {
+ // TODO Auto-generated method stub
+
+ }
+
+
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTree.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTreeModel.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTreeModel.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTreeModel.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -0,0 +1,111 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.swing.event.TreeModelListener;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.MutableTreeNode;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreePath;
+
+
+/**
+ * Modele du Jxtree:
+ * contient l'ensemble des infos du tree
+ * les infos sont des node referencant les widgets
+ * @author Adrien Hadoux
+ *
+ */
+public class EbliWidgetJXTreeModel implements EbliNodeListener{
+
+public static String NAMELAYER="Layer";
+
+//-- noeud aui se trouve au sommet --//
+DefaultMutableTreeNode nodeRoot_;
+
+//-- modele du tree --//
+DefaultTreeModel modeleTree;
+
+//-- scene principale pour recuperer la liste des noeuds --//
+//EbliScene scene;
+
+public EbliWidgetJXTreeModel(int numLayer/*, EbliScene scene*/) {
+
+ // TODO Auto-generated constructor stub
+
+ nodeRoot_=new DefaultMutableTreeNode(NAMELAYER+numLayer);
+
+ //this.scene=scene;
+
+ //-- construction de la hierarchie des nodes a partir des nodes de la scene --//
+ //constructModelNode();
+
+
+ modeleTree=new DefaultTreeModel(nodeRoot_);
+}
+
+
+public DefaultTreeModel getModeleTree() {
+ return modeleTree;
+}
+
+
+public void setModeleTree(DefaultTreeModel modeleTree) {
+ this.modeleTree = modeleTree;
+}
+
+
+public void setNodeRoot_(DefaultMutableTreeNode nodeRoot_) {
+ this.nodeRoot_ = nodeRoot_;
+}
+
+
+/**
+ * methode qui construit la hierarchie des nodes a partir de la scene
+ */
+/*
+ public DefaultMutableTreeNode constructModelNode(){
+
+ //-- 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));
+ }
+ return nodeRoot_;
+ }
+*/
+
+public DefaultMutableTreeNode getNodeRoot_() {
+ return nodeRoot_;
+}
+
+public void addNode(EbliNode node){
+nodeRoot_.add(new DefaultMutableTreeNode(node));
+
+//-- rafraichissement du modele --//
+modeleTree.reload();
+
+}
+
+
+public void nodeAdded(EbliNode node) {
+ addNode(node);
+
+
+}
+
+
+public void noderemoved(EbliNode node) {
+ // TODO Auto-generated method stub
+
+}
+
+
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetJXTreeModel.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-06 22:00:30 UTC (rev 3724)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java 2008-08-07 13:56:12 UTC (rev 3725)
@@ -45,11 +45,15 @@
+ espaceInterieur, largeurBorder + espaceInterieur,
largeurBorder + espaceInterieur);
// Ce layout permet de placer le texte
+
setLayout(new OverlayLayoutGap(inGaps_));
+
intern = new LabelWidget(_scene);
intern.setVerticalAlignment(VerticalAlignment.CENTER);
+
intern.setLabel(label);
-
+
+ //-- layout du texte --//
addChild(intern);
// -- ajouter l option de remplacer le text dans le label --//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2008-08-06 22:00:23
|
Revision: 3724
http://fudaa.svn.sourceforge.net/fudaa/?rev=3724&view=rev
Author: deniger
Date: 2008-08-06 22:00:30 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.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-06 22:00:03 UTC (rev 3723)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java 2008-08-06 22:00:30 UTC (rev 3724)
@@ -94,9 +94,6 @@
l.dessineRectangle(g, l.getEpaisseur() / 2, l.getEpaisseur() / 2,
rec.width - l.getEpaisseur(), rec.height - l.getEpaisseur());
g.translate(-rec.x, -rec.y);
- g.setColor(Color.RED);
- g.draw(getBounds());
- g.draw(getClientArea());
}
public String getText(Widget widget) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2008-08-06 21:59:54
|
Revision: 3723
http://fudaa.svn.sourceforge.net/fudaa/?rev=3723&view=rev
Author: deniger
Date: 2008-08-06 22:00:03 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
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-06 21:59:10 UTC (rev 3722)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-06 22:00:03 UTC (rev 3723)
@@ -72,7 +72,7 @@
// setBorder(lookFeel.getMiniBorder(newState));
- if (!newState.isHovered() || !newState.isSelected()) {
+ if (!newState.isHovered() && !newState.isSelected()) {
setBorder(DEFAULT_BORDER);
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2008-08-06 21:59:00
|
Revision: 3722
http://fudaa.svn.sourceforge.net/fudaa/?rev=3722&view=rev
Author: deniger
Date: 2008-08-06 21:59:10 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
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-06 21:58:30 UTC (rev 3721)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-06 21:59:10 UTC (rev 3722)
@@ -207,7 +207,7 @@
//-- ajout du rectangle --//
node = new EbliNodeDefault();
node.setCreator(new EbliWidgetCreatorRectangle("Test recangle"));
- node.setD(new Dimension(100, 100));
+// node.setD(new Dimension(100, 100));
node.setP(new Point(350,125));
scene.addNode(node);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2008-08-06 21:58:27
|
Revision: 3721
http://fudaa.svn.sourceforge.net/fudaa/?rev=3721&view=rev
Author: deniger
Date: 2008-08-06 21:58:30 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
maj test sur les widgets
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/EbliWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/OverlayLayoutGap.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-06 21:57:43 UTC (rev 3720)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2008-08-06 21:58:30 UTC (rev 3721)
@@ -55,25 +55,24 @@
public void setVisu_(LayerWidget visu_) {
this.visu_ = visu_;
}
+
@Override
protected void notifyNodeAdded(EbliNode node, Widget widget) {
-// node.widgetCreated((EbliWidget)widget);
+ // node.widgetCreated((EbliWidget)widget);
}
-
-
@Override
protected void attachEdgeSourceAnchor(EbliEdge edge,
EbliNode oldSourceNode, EbliNode sourceNode) {
// TODO Auto-generated method stub
-
+
}
@Override
protected void attachEdgeTargetAnchor(EbliEdge edge,
EbliNode oldTargetNode, EbliNode targetNode) {
// TODO Auto-generated method stub
-
+
}
@Override
@@ -83,18 +82,19 @@
}
@Override
- protected Widget attachNodeWidget(EbliNode node ) {
-
- //-- creation de la widget ici --//
- EbliWidget res= node.getCreator().create(this);
-
- //-- remplissage des proprietes
+ protected Widget attachNodeWidget(EbliNode node) {
+
+ // -- creation de la widget ici --//
+ EbliWidget res = node.getCreator().create(this);
+
+ // -- remplissage des proprietes
res.setPreferredLocation(node.getLocation());
- res.setPreferredSize(node.getPreferedDimension());
-
- //-- ajout dans la vue layer --//
+ if (node.getPreferedDimension() != null)
+ res.setPreferredSize(node.getPreferedDimension());
+
+ // -- ajout dans la vue layer --//
visu_.addChild(res);
-
+
return res;
}
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-06 21:57:43 UTC (rev 3720)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-06 21:58:30 UTC (rev 3721)
@@ -19,139 +19,152 @@
import org.netbeans.api.visual.widget.Scene;
import org.netbeans.api.visual.widget.Widget;
-
/**
* Widget version EBLI
+ *
* @author Adrien Hadoux
- *
+ *
*/
class EbliWidget extends Widget {
+ private static final Border RESIZE_BORDER = BorderFactory
+ .createResizeBorder(8, Color.blue.brighter().brighter(), true);
+ private static final Border DEFAULT_BORDER = BorderFactory
+ .createEmptyBorder(8);
- private static final Border RESIZE_BORDER = BorderFactory.createResizeBorder(8,Color.blue.brighter().brighter(),true);
- private static final Border DEFAULT_BORDER =BorderFactory.createEmptyBorder(8);
-
- private EbliScene scene_;
-
- public EbliScene getScene_() {
- return scene_;
- }
+ private EbliScene scene_;
- public void setScene_(EbliScene scene_) {
- this.scene_ = scene_;
- }
-
+ public EbliScene getScene_() {
+ return scene_;
+ }
+
+ public void setScene_(EbliScene scene_) {
+ this.scene_ = scene_;
+ }
+
/**
* @param scene
- * @param Point : indiaue la location preferentiel. peut etre nul
+ * @param Point
+ * : indiaue la location preferentiel. peut etre nul
*/
public EbliWidget(EbliScene scene) {
super(scene);
setScene_(scene);
- getActions().addAction( ActionFactory.createResizeAction());
+ getActions().addAction(ActionFactory.createResizeAction());
getActions().addAction(ActionFactory.createMoveAction());
getActions().addAction(scene.createWidgetHoverAction());
- //getActions().addAction( scene.createSelectAction());
+ // getActions().addAction( scene.createSelectAction());
- setBorder(getScene().getLookFeel().getMiniBorder(ObjectState.createNormal()));
+ setBorder(DEFAULT_BORDER);
// positionnement de la widget si precise
-// if(preferredLocation!=null)
-// setPreferredLocation(preferredLocation);
+ // if(preferredLocation!=null)
+ // setPreferredLocation(preferredLocation);
- //menu clic droit basique (fermeture, duplication)
+ // menu clic droit basique (fermeture, duplication)
setMenu();
}
@Override
- public void notifyStateChanged(ObjectState previousState, ObjectState newState) {
+ public void notifyStateChanged(ObjectState previousState,
+ ObjectState newState) {
LookFeel lookFeel = getScene().getLookFeel();
// setBorder(lookFeel.getMiniBorder(newState));
-
- setBorder( newState.isSelected() ? (
- newState.isHovered() ? RESIZE_BORDER : lookFeel.getMiniBorder(newState)) : (
- newState.isHovered() ? RESIZE_BORDER : lookFeel.getMiniBorder(newState)));
+ if (!newState.isHovered() || !newState.isSelected()) {
+ setBorder(DEFAULT_BORDER);
+ return;
+ }
+ setBorder(newState.isSelected() ? (newState.isHovered() ? RESIZE_BORDER
+ : lookFeel.getMiniBorder(newState))
+ : (newState.isHovered() ? RESIZE_BORDER : lookFeel
+ .getMiniBorder(newState)));
}
-
/**
- * Methode generique qui fait apparaitre un menuItem propre au composant et offre les op\xE9rations de base
- * on ouvre le menu via le clic droit ou le raccourcis shift+F10
+ * Methode generique qui fait apparaitre un menuItem propre au composant et
+ * offre les op\xE9rations de base on ouvre le menu via le clic droit ou le
+ * raccourcis shift+F10
*/
public void setMenu() {
- getActions ().addAction (ActionFactory.createPopupMenuAction (new PopupMenuProvider() {
- public JPopupMenu getPopupMenu (Widget widget, Point localLocation) {
- JPopupMenu popup = new JPopupMenu ();
+ getActions().addAction(
+ ActionFactory.createPopupMenuAction(new PopupMenuProvider() {
+ public JPopupMenu getPopupMenu(Widget widget,
+ Point localLocation) {
+ JPopupMenu popup = new JPopupMenu();
- //-- creation du menu commun a tous les widgets
- constructPopupMenuBase(popup);
-
-
- return popup;
- }
- }));
+ // -- creation du menu commun a tous les widgets
+ constructPopupMenuBase(popup);
+
+ return popup;
+ }
+ }));
}
-
/**
* Methode de construction des menus de base
+ *
* @param _popup
*/
- public void constructPopupMenuBase(JPopupMenu _popup){
- JMenuItem menuItem1=_popup.add ("Dupliquer l'objet");
+ public void constructPopupMenuBase(JPopupMenu _popup) {
+ JMenuItem menuItem1 = _popup.add("Dupliquer l'objet");
menuItem1.setIcon(CtuluResource.CTULU.getIcon("crystal22_cascade"));
- menuItem1.addActionListener(new ActionListener(){
+ menuItem1.addActionListener(new ActionListener() {
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));
+ // 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));
EbliWidget duplique;
try {
- //clonage de l'objet
- duplique=(EbliWidget)EbliWidget.this.clone();
- duplique.setPreferredSize(EbliWidget.this.getScene().getPreferredSize());
+ // 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){
+
+ // -- 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?
+ // TODO que fqire si ca pete? une peite fenetre d'erreur,
+ // widget pas duplicable? ou alors surcharger la methode
+ // dans les filles?
e1.printStackTrace();
}
}
});
- JMenuItem menuItem2=_popup.add ("Fermer l'objet");
+ JMenuItem menuItem2 = _popup.add("Fermer l'objet");
menuItem2.setIcon(CtuluResource.CTULU.getIcon("crystal_non"));
- menuItem2.addActionListener(new ActionListener(){
+ menuItem2.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
EbliWidget.this.setVisible(false);
- EbliNode n=(EbliNode)EbliWidget.this.getScene_().findObject(EbliWidget.this);
+ EbliNode n = (EbliNode) EbliWidget.this.getScene_().findObject(
+ EbliWidget.this);
EbliWidget.this.getScene_().removeNode(n);
-
+
// NE PAS DECOCHER CES ELEMENTS
- //fermeture des widgets children
- //EbliWidget.this.removeChildren();
- //fermeture du widget donne
- //EbliWidget.this.removeFromParent();
-
+ // fermeture des widgets children
+ // EbliWidget.this.removeChildren();
+ // fermeture du widget donne
+ // EbliWidget.this.removeFromParent();
}
});
}
-
-
}
\ 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-06 21:57:43 UTC (rev 3720)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java 2008-08-06 21:58:30 UTC (rev 3721)
@@ -1,7 +1,8 @@
package org.fudaa.ebli.visuallibrary;
-
+import java.awt.Color;
import java.awt.Graphics2D;
+import java.awt.Insets;
import java.awt.Point;
import java.awt.Rectangle;
@@ -17,84 +18,100 @@
import org.netbeans.api.visual.widget.LabelWidget;
import org.netbeans.api.visual.widget.Scene;
import org.netbeans.api.visual.widget.Widget;
+import org.netbeans.api.visual.widget.LabelWidget.VerticalAlignment;
import org.netbeans.modules.visual.layout.FlowLayout;
+import org.netbeans.modules.visual.layout.OverlayLayout;
-
-
/**
- * Legende
- * Widget qui permet de construire des rectangles avec du texte
+ * Legende Widget qui permet de construire des rectangles avec du texte
+ *
* @author Adrien Hadoux
- *
+ *
*/
-public class EbliWidgetRectangle extends EbliWidget implements TextFieldInplaceEditor{
+public class EbliWidgetRectangle extends EbliWidget implements
+ TextFieldInplaceEditor {
-
+ LabelWidget intern;
+ Insets inGaps_;
+ int largeurBorder = 15;
+ int espaceInterieur = 5;
- LabelWidget intern;
+ /**
+ * @param _scene
+ */
+ public EbliWidgetRectangle(EbliScene _scene, String label) {
+ super(_scene);
+ inGaps_ = new Insets(largeurBorder + espaceInterieur, largeurBorder
+ + espaceInterieur, largeurBorder + espaceInterieur,
+ largeurBorder + espaceInterieur);
+ // Ce layout permet de placer le texte
+ setLayout(new OverlayLayoutGap(inGaps_));
+ intern = new LabelWidget(_scene);
+ intern.setVerticalAlignment(VerticalAlignment.CENTER);
+ intern.setLabel(label);
- /**
- * @param _scene
- */
- public EbliWidgetRectangle(EbliScene _scene, String label) {
- super(_scene);
- setLayout(new FlowLayout(true, SerialAlignment.CENTER, 23));
- intern = new LabelWidget(_scene);
- intern.setLabel(label);
-
- addChild(intern);
-
- //-- ajouter l option de remplacer le text dans le label --//
-
- //-- creation de l action --//
- WidgetAction editorAction = ActionFactory.createInplaceEditorAction (this);
-
- //-- ajout de l action au label correspondant --//
- intern.getActions ().addAction (editorAction);
-
- intern.getActions ().addAction( ActionFactory.createResizeAction());
-
-
- //setEnabled(false);
- }
-
- public void majLabel(String label){
- //intern.setForeground();
- intern.setLabel(label);
- }
-
+ addChild(intern);
- protected void paintWidget() {
- Graphics2D g = getGraphics();
- Rectangle rec = getClientArea();
- g.translate(rec.x, rec.y);
- //la ligne
-
- TraceLigne l = new TraceLigne();
- l.setEpaisseur(5);
- //l.dessineTrait(g, 0, 0, rec.width, rec.height / 2);
- l.dessineRectangle(g, 0, 0, rec.width, rec.height);
- g.translate(-rec.x, -rec.y);
- }
+ // -- ajouter l option de remplacer le text dans le label --//
+ // -- creation de l action --//
+ WidgetAction editorAction = ActionFactory
+ .createInplaceEditorAction(this);
+ // -- ajout de l action au label correspondant --//
+ intern.getActions().addAction(editorAction);
+ intern.getActions().addAction(ActionFactory.createResizeAction());
+ // setEnabled(false);
+ }
+
+ public void majLabel(String label) {
+ // intern.setForeground();
+ intern.setLabel(label);
+ revalidate();
+ }
+
+ @Override
+ protected Rectangle calculateClientArea() {
+ Rectangle res = intern.getPreferredBounds();
+ // TODO Auto-generated method stub
+ return new Rectangle(0, 0, 2 * (largeurBorder + espaceInterieur)
+ + res.width, 2 * (largeurBorder + espaceInterieur) + res.height);
+ }
+
+ protected void paintWidget() {
+ Graphics2D g = getGraphics();
+
+ Rectangle rec = getClientArea();
+ g.translate(rec.x, rec.y);
+ // la ligne
+
+ TraceLigne l = new TraceLigne();
+
+ l.setEpaisseur(largeurBorder);
+ // l.dessineTrait(g, 0, 0, rec.width, rec.height / 2);
+ l.dessineRectangle(g, l.getEpaisseur() / 2, l.getEpaisseur() / 2,
+ rec.width - l.getEpaisseur(), rec.height - l.getEpaisseur());
+ g.translate(-rec.x, -rec.y);
+ g.setColor(Color.RED);
+ g.draw(getBounds());
+ g.draw(getClientArea());
+ }
+
public String getText(Widget widget) {
- return ((LabelWidget) widget).getLabel ();
+ return ((LabelWidget) widget).getLabel();
}
public boolean isEnabled(Widget widget) {
// TODO Auto-generated method stub
- return true;
+ return true;
}
public void setText(Widget widget, String text) {
- ((LabelWidget) widget).setLabel (text);
-
+ ((LabelWidget) widget).setLabel(text);
+ revalidate();
+
}
-
-
-
}
\ No newline at end of file
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/OverlayLayoutGap.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/OverlayLayoutGap.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/OverlayLayoutGap.java 2008-08-06 21:58:30 UTC (rev 3721)
@@ -0,0 +1,62 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.Dimension;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
+
+import org.netbeans.api.visual.layout.Layout;
+import org.netbeans.api.visual.widget.Widget;
+
+public class OverlayLayoutGap implements Layout {
+
+ Insets inGaps_;
+
+ public OverlayLayoutGap(Insets _inGaps) {
+ super();
+ inGaps_ = _inGaps;
+ }
+
+ public void layout(Widget widget) {
+ Dimension total = new Dimension();
+ for (Widget child : widget.getChildren()) {
+ if (!child.isVisible())
+ continue;
+ Dimension size = child.getPreferredBounds().getSize();
+ if (size.width > total.width)
+ total.width = size.width;
+ if (size.height > total.height)
+ total.height = size.height;
+ }
+ total.width -= inGaps_.left + inGaps_.right;
+ total.height -= inGaps_.top + inGaps_.bottom;
+ for (Widget child : widget.getChildren()) {
+ Point location = child.getPreferredBounds().getLocation();
+ child.resolveBounds(new Point(-location.x+inGaps_.left, -location.y+inGaps_.top),
+ new Rectangle(location, total));
+ }
+ }
+
+ public boolean requiresJustification(Widget widget) {
+ return true;
+ }
+
+ public void justify(Widget widget) {
+ Rectangle clientArea = widget.getClientArea();
+ clientArea.x+=inGaps_.left;
+ clientArea.y+=inGaps_.top;
+ clientArea.width -= inGaps_.left + inGaps_.right;
+ clientArea.height -= inGaps_.top + inGaps_.bottom;
+ for (Widget child : widget.getChildren()) {
+ if (child.isVisible()) {
+ Point location = child.getPreferredBounds().getLocation();
+ child.resolveBounds(new Point(clientArea.x - location.x,
+ clientArea.y - location.y), new Rectangle(location,
+ clientArea.getSize()));
+ } else {
+ child.resolveBounds(clientArea.getLocation(), new Rectangle());
+ }
+ }
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2008-08-06 21:57:34
|
Revision: 3720
http://fudaa.svn.sourceforge.net/fudaa/?rev=3720&view=rev
Author: deniger
Date: 2008-08-06 21:57:43 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
maj calcul repere
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGraphe.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGRepere.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGraphe.java 2008-08-06 21:57:11 UTC (rev 3719)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGraphe.java 2008-08-06 21:57:43 UTC (rev 3720)
@@ -248,16 +248,15 @@
public void componentShown(final ComponentEvent _e) {}
- public EGMarges computeMarges() {
- final Graphics2D gr = (Graphics2D) getGraphics();
+ public EGMarges computeMarges(Graphics2D _gr ) {
final EGMarges m = new EGMarges();
final EGAxeHorizontal xaxe = transformer_.getXAxe();
if (xaxe == null) {
m.setBas(5);
m.setDroite(5);
} else {
- m.setBas(xaxe.getBottomHeightNeeded(gr));
- m.setDroite(xaxe.getRightWidthNeeded(gr));
+ m.setBas(xaxe.getBottomHeightNeeded(_gr));
+ m.setDroite(xaxe.getRightWidthNeeded(_gr));
}
m.setGauche(0);
m.setHaut(0);
@@ -274,15 +273,15 @@
axeSet.add(axe);
if (axe.isDroite()) {
- m.ajouteMargesDroite(axe.getWidthNeeded(gr));
+ m.ajouteMargesDroite(axe.getWidthNeeded(_gr));
// on recupere le dernier pour enlever la partie qui sera dessin\xE9 dans le graphe
/* if (lastRight == null) */lastRight = axe;
} else {
- m.ajouteMargesGauche(axe.getWidthNeeded(gr));
+ m.ajouteMargesGauche(axe.getWidthNeeded(_gr));
// meme combat
/* if (last == null) */last = axe;
}
- temp = o.getMargeHautNeeded(gr);
+ temp = o.getMargeHautNeeded(_gr);
if (temp > m.getHaut()) {
m.setHaut(temp);
}
@@ -291,11 +290,11 @@
}
// on enleve les parties dessin\xE9es dans le graphe
if (last != null) {
- m.setGauche(m.getGauche() - last.getWidthDrawnInGraphe(gr));
+ m.setGauche(m.getGauche() - last.getWidthDrawnInGraphe(_gr));
}
// on enleve les parties dessin\xE9es dans le graphe
if (lastRight != null) {
- m.setDroite(m.getDroite() - lastRight.getWidthDrawnInGraphe(gr));
+ m.setDroite(m.getDroite() - lastRight.getWidthDrawnInGraphe(_gr));
}
if (m.getGauche() <= 0) {
m.setGauche(15);
@@ -331,7 +330,7 @@
structureChanged(_mustRestore);
}
- private void dessine(final Graphics _g, final int _w, final int _h, final boolean _fill) {
+ public void dessine(final Graphics _g, final int _w, final int _h, final boolean _fill) {
if (!isVisible()) {
return;
}
@@ -350,7 +349,7 @@
g2d.setColor(Color.black);
final EGGrapheModel model = getModel();
final int nbElement = model.getNbEGObject();
- transformer_.initFor(this);
+ transformer_.initFor(g2d,this);
// dessine axe horizontal
final Shape oldClip = g2d.getClip();
// g2d.clip(new Rectangle(xMarge, yMarge, wMarge, hMarge));
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGRepere.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGRepere.java 2008-08-06 21:57:11 UTC (rev 3719)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGRepere.java 2008-08-06 21:57:43 UTC (rev 3720)
@@ -7,6 +7,7 @@
*/
package org.fudaa.ebli.courbe;
+import java.awt.Graphics2D;
import java.awt.geom.Point2D;
/**
@@ -15,98 +16,102 @@
*/
public class EGRepere {
- private EGAxeHorizontal xAxe_;
- private EGMarges marges_;
- private int w_;
- private int h_;
+ private EGAxeHorizontal xAxe_;
+ private EGMarges marges_;
+ private int w_;
+ private int h_;
- public EGRepere() {
- super();
- marges_ = new EGMarges();
- }
-
+ public EGRepere() {
+ super();
+ marges_ = new EGMarges();
+ }
- public int getMargesGauche(){
- return marges_.getGauche();
- }
+ public int getMargesGauche() {
+ return marges_.getGauche();
+ }
- public int getMargesDroite(){
- return marges_.getDroite();
- }
+ public int getMargesDroite() {
+ return marges_.getDroite();
+ }
- public int getMargesBas(){
- return marges_.getBas();
- }
+ public int getMargesBas() {
+ return marges_.getBas();
+ }
- public void initFor(final EGGraphe _g){
- w_ = _g.getWidth();
- h_ = _g.getHeight();
- marges_ = _g.computeMarges();
- marges_.ajouteEmptyBorder(3);
- xAxe_=_g.getModel().getAxeX();
- }
+ public void initFor(final Graphics2D _g2d, final EGGraphe _g) {
+ w_ = _g.getWidth();
+ h_ = _g.getHeight();
+ marges_ = _g.computeMarges(_g2d);
+ marges_.ajouteEmptyBorder(3);
+ xAxe_ = _g.getModel().getAxeX();
+ }
- public void setXAxe(final EGAxeHorizontal _axe){
- xAxe_ = _axe;
- }
+ public void setXAxe(final EGAxeHorizontal _axe) {
+ xAxe_ = _axe;
+ }
- public int getMaxEcranY(){
- return h_ - marges_.getBas();
- }
+ public int getMaxEcranY() {
+ return h_ - marges_.getBas();
+ }
- public int getMinEcranY(){
- return marges_.getHaut();
- }
+ public int getMinEcranY() {
+ return marges_.getHaut();
+ }
- public int getMaxEcranX(){
- return w_ - marges_.getDroite();
- }
+ public int getMaxEcranX() {
+ return w_ - marges_.getDroite();
+ }
- public int getMinEcranX(){
- return marges_.getGauche();
- }
+ public int getMinEcranX() {
+ return marges_.getGauche();
+ }
- public EGAxeHorizontal getXAxe(){
- return xAxe_;
- }
+ public EGAxeHorizontal getXAxe() {
+ return xAxe_;
+ }
- public int getWSansMarges(){
- return w_ - marges_.getHorizontalMarges();
- }
+ public int getWSansMarges() {
+ return w_ - marges_.getHorizontalMarges();
+ }
- public int getHSansMarges(){
- return h_ - marges_.getVerticalMarges();
- }
+ public int getHSansMarges() {
+ return h_ - marges_.getVerticalMarges();
+ }
- public void versReel(final int _xEcran,final int _yEcran,final Point2D.Double _ptReel,final EGAxeVertical _yAxe){
- _ptReel.setLocation(getXReel(_xEcran), getYReel(_yEcran, _yAxe));
- }
+ public void versReel(final int _xEcran, final int _yEcran,
+ final Point2D.Double _ptReel, final EGAxeVertical _yAxe) {
+ _ptReel.setLocation(getXReel(_xEcran), getYReel(_yEcran, _yAxe));
+ }
- public double getXReel(final int _xEcran){
- return xAxe_.getValueFromPosition(xAxe_.getMinimum() + (_xEcran - marges_.getGauche())
- * xAxe_.getEcart() / (getWSansMarges()));
- }
+ public double getXReel(final int _xEcran) {
+ return xAxe_.getValueFromPosition(xAxe_.getMinimum()
+ + (_xEcran - marges_.getGauche()) * xAxe_.getEcart()
+ / (getWSansMarges()));
+ }
- public double getYReel(final int _yEcran,final EGAxeVertical _yAxe){
- return _yAxe.getValueFromPosition(_yAxe.getMinimum()
- + ((-_yEcran + h_ - marges_.getBas()) * (_yAxe.getEcart()))
- / (getHSansMarges()));
- }
+ public double getYReel(final int _yEcran, final EGAxeVertical _yAxe) {
+ return _yAxe.getValueFromPosition(_yAxe.getMinimum()
+ + ((-_yEcran + h_ - marges_.getBas()) * (_yAxe.getEcart()))
+ / (getHSansMarges()));
+ }
- public int getXEcran(final double _x){
- final double x = xAxe_.getPositionFromValue(_x);
- return marges_.getGauche()
- + (int) (getWSansMarges() * ((x - xAxe_.getMinimum()) / xAxe_.getEcart()));
- }
+ public int getXEcran(final double _x) {
+ final double x = xAxe_.getPositionFromValue(_x);
+ return marges_.getGauche()
+ + (int) (getWSansMarges() * ((x - xAxe_.getMinimum()) / xAxe_
+ .getEcart()));
+ }
- public int getYEcran(final double _y,final EGAxeVertical _axeY){
- final double y = _axeY.getPositionFromValue(_y);
- return -marges_.getBas() + h_
- - (int) (getHSansMarges() * ((y - _axeY.getMinimum()) / _axeY.getEcart()));
- }
+ public int getYEcran(final double _y, final EGAxeVertical _axeY) {
+ final double y = _axeY.getPositionFromValue(_y);
+ return -marges_.getBas()
+ + h_
+ - (int) (getHSansMarges() * ((y - _axeY.getMinimum()) / _axeY
+ .getEcart()));
+ }
- public int getH() {
- return h_;
- }
+ public int getH() {
+ return h_;
+ }
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2008-08-06 21:57:02
|
Revision: 3719
http://fudaa.svn.sourceforge.net/fudaa/?rev=3719&view=rev
Author: deniger
Date: 2008-08-06 21:57:11 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
rendering hints
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java 2008-08-06 19:46:00 UTC (rev 3718)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java 2008-08-06 21:57:11 UTC (rev 3719)
@@ -391,7 +391,7 @@
RenderingHints old = null;
if (isRapide()) {
old = graphics2D.getRenderingHints();
- final RenderingHints newRenderer = new RenderingHints(old);
+ final RenderingHints newRenderer = (RenderingHints)old.clone();
newRenderer.put(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
newRenderer.put(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
newRenderer.put(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_SPEED);
@@ -403,7 +403,7 @@
graphics2D.setRenderingHints(newRenderer);
} else if (isAntialiasSupported() && antialiasing_) {
old = graphics2D.getRenderingHints();
- final RenderingHints newRenderer = new RenderingHints(old);
+ final RenderingHints newRenderer = (RenderingHints)old.clone();
newRenderer.put(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
newRenderer.put(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
graphics2D.setRenderingHints(newRenderer);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2008-08-06 19:45:55
|
Revision: 3718
http://fudaa.svn.sourceforge.net/fudaa/?rev=3718&view=rev
Author: deniger
Date: 2008-08-06 19:46:00 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
Removed Paths:
-------------
branches/Prepro-0.92-SNAPSHOT/vide.txt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2008-08-06 17:24:29
|
Revision: 3717
http://fudaa.svn.sourceforge.net/fudaa/?rev=3717&view=rev
Author: hadouxad
Date: 2008-08-06 17:24:35 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
AFFECT?\195?\137 - # 40: L?\195?\169gende pour les courbe 1d
http://mantis.genesis-groupe.com//view.php?id=40
-commit de lq visual library remani?\195?\169e
- ajout de la classe rectangle
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.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/EbliWidgetCreatorRectangle.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.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-06 15:03:18 UTC (rev 3716)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-06 17:24:35 UTC (rev 3717)
@@ -51,7 +51,7 @@
getActions().addAction( ActionFactory.createResizeAction());
getActions().addAction(ActionFactory.createMoveAction());
getActions().addAction(scene.createWidgetHoverAction());
- getActions().addAction( scene.createSelectAction());
+ //getActions().addAction( scene.createSelectAction());
setBorder(getScene().getLookFeel().getMiniBorder(ObjectState.createNormal()));
@@ -137,6 +137,8 @@
public void actionPerformed(ActionEvent e) {
EbliWidget.this.setVisible(false);
+ EbliNode n=(EbliNode)EbliWidget.this.getScene_().findObject(EbliWidget.this);
+ EbliWidget.this.getScene_().removeNode(n);
// NE PAS DECOCHER CES ELEMENTS
//fermeture des widgets children
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorRectangle.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorRectangle.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorRectangle.java 2008-08-06 17:24:35 UTC (rev 3717)
@@ -0,0 +1,29 @@
+package org.fudaa.ebli.visuallibrary;
+
+import org.fudaa.ebli.courbe.EGGraphe;
+
+
+public class EbliWidgetCreatorRectangle implements EbliWidgetCreator {
+
+ String label_;
+
+ public EbliWidgetCreatorRectangle(String g) {
+ super();
+ this.label_ = g;
+ }
+
+ public String getG() {
+ return label_;
+ }
+
+ public void setG(String g) {
+ this.label_ = g;
+ }
+
+ public EbliWidget create(EbliScene _scene) {
+ EbliWidgetRectangle res= new EbliWidgetRectangle(_scene, getG());
+
+ return res;
+ }
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorRectangle.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java 2008-08-06 15:03:18 UTC (rev 3716)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java 2008-08-06 17:24:35 UTC (rev 3717)
@@ -115,7 +115,7 @@
//getScene_().addChild(new EbliWidget(getScene_(),null));
//addChild (WidgetLegendeManager.createLegende(GrapheWidget.this.getGraphe(), GrapheWidget.this.getScene_(),null));
- if(nodeLegende==null){
+ if(!EbliWidgetGraphe.this.getScene_().isObject(nodeLegende)){
//-- creation d'un node legende --//
nodeLegende = new EbliNodeDefault();
Added: 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 (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java 2008-08-06 17:24:35 UTC (rev 3717)
@@ -0,0 +1,100 @@
+package org.fudaa.ebli.visuallibrary;
+
+
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+
+import org.fudaa.ebli.courbe.EGCourbe;
+import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.ebli.trace.TraceLigne;
+import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.ConnectProvider;
+import org.netbeans.api.visual.action.TextFieldInplaceEditor;
+import org.netbeans.api.visual.action.WidgetAction;
+import org.netbeans.api.visual.layout.LayoutFactory.SerialAlignment;
+import org.netbeans.api.visual.widget.LabelWidget;
+import org.netbeans.api.visual.widget.Scene;
+import org.netbeans.api.visual.widget.Widget;
+import org.netbeans.modules.visual.layout.FlowLayout;
+
+
+
+/**
+ * Legende
+ * Widget qui permet de construire des rectangles avec du texte
+ * @author Adrien Hadoux
+ *
+ */
+public class EbliWidgetRectangle extends EbliWidget implements TextFieldInplaceEditor{
+
+
+
+ LabelWidget intern;
+
+ /**
+ * @param _scene
+ */
+ public EbliWidgetRectangle(EbliScene _scene, String label) {
+ super(_scene);
+ setLayout(new FlowLayout(true, SerialAlignment.CENTER, 23));
+ intern = new LabelWidget(_scene);
+ intern.setLabel(label);
+
+ addChild(intern);
+
+ //-- ajouter l option de remplacer le text dans le label --//
+
+ //-- creation de l action --//
+ WidgetAction editorAction = ActionFactory.createInplaceEditorAction (this);
+
+ //-- ajout de l action au label correspondant --//
+ intern.getActions ().addAction (editorAction);
+
+ intern.getActions ().addAction( ActionFactory.createResizeAction());
+
+
+ //setEnabled(false);
+ }
+
+ public void majLabel(String label){
+ //intern.setForeground();
+ intern.setLabel(label);
+ }
+
+
+ protected void paintWidget() {
+ Graphics2D g = getGraphics();
+ Rectangle rec = getClientArea();
+ g.translate(rec.x, rec.y);
+ //la ligne
+
+ TraceLigne l = new TraceLigne();
+ l.setEpaisseur(5);
+ //l.dessineTrait(g, 0, 0, rec.width, rec.height / 2);
+ l.dessineRectangle(g, 0, 0, rec.width, rec.height);
+ g.translate(-rec.x, -rec.y);
+ }
+
+
+
+
+ public String getText(Widget widget) {
+ return ((LabelWidget) widget).getLabel ();
+ }
+
+ public boolean isEnabled(Widget widget) {
+ // TODO Auto-generated method stub
+ return true;
+ }
+
+ public void setText(Widget widget, String text) {
+ ((LabelWidget) widget).setLabel (text);
+
+ }
+
+
+
+
+}
\ No newline at end of file
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetRectangle.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java 2008-08-06 15:03:18 UTC (rev 3716)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java 2008-08-06 17:24:35 UTC (rev 3717)
@@ -45,7 +45,7 @@
//-- ajout de l action au label correspondant --//
intern.getActions ().addAction (editorAction);
- setEnabled(false);
+ //setEnabled(false);
}
public void majLabel(){
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-06 15:03:18 UTC (rev 3716)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-06 17:24:35 UTC (rev 3717)
@@ -51,6 +51,7 @@
import org.fudaa.ebli.visuallibrary.EbliScene;
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.EbliWidgetGraphe;
import org.fudaa.ebli.visuallibrary.WidgetLegendeManager;
@@ -201,6 +202,16 @@
// scene.addNode(node);
//scene.addChild(new ComponentWidget(scene, test.getVisuPanel().getVueCalque()));
+
+
+ //-- ajout du rectangle --//
+ node = new EbliNodeDefault();
+ node.setCreator(new EbliWidgetCreatorRectangle("Test recangle"));
+ node.setD(new Dimension(100, 100));
+ node.setP(new Point(350,125));
+ scene.addNode(node);
+
+
// WidgetLegendeManagerOLD.createWidgetLegendeGraphe(this, visu, courbe,
// graphe.getClientArea());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2008-08-06 15:03:15
|
Revision: 3716
http://fudaa.svn.sourceforge.net/fudaa/?rev=3716&view=rev
Author: hadouxad
Date: 2008-08-06 15:03:18 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
AFFECT?\195?\137 - # 40: L?\195?\169gende pour les courbe 1d
http://mantis.genesis-groupe.com//view.php?id=40
mise en forme des donnees
- ajout des nodes pour les elements
- implementation dans EbliScene
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-06 14:53:07 UTC (rev 3715)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-06 15:03:18 UTC (rev 3716)
@@ -23,8 +23,10 @@
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JScrollPane;
+import javax.swing.JTable;
import javax.swing.JTree;
import javax.swing.WindowConstants;
+import javax.swing.table.DefaultTableModel;
import javax.swing.text.Utilities;
import org.fudaa.ctulu.CtuluResource;
@@ -42,17 +44,24 @@
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.EbliGraphScene;
-import org.fudaa.ebli.visuallibrary.GrapheWidget;
+import org.fudaa.ebli.visuallibrary.EbliNodeDefault;
+import org.fudaa.ebli.visuallibrary.EbliScene;
+import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorGraphe;
+import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorLegende;
+import org.fudaa.ebli.visuallibrary.EbliWidgetCreatorVue2d;
+import org.fudaa.ebli.visuallibrary.EbliWidgetGraphe;
import org.fudaa.ebli.visuallibrary.WidgetLegendeManager;
import org.fudaa.ebli.visuallibrary.WidgetLegendeManagerOLD;
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;
@@ -142,7 +151,7 @@
grapheModel.add(gr);
final JFrame f = new JFrame();
f.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
- f.setSize(new Dimension(1024,768));
+ f.setSize(new Dimension(1024, 768));
final BuPanel p = new BuPanel();
p.setLayout(new BuBorderLayout());
@@ -151,55 +160,93 @@
final JTree t = new JTree(grapheModel);
t.setSelectionModel(grapheModel.getSelectionModel());
t.setRootVisible(false);
-
- Box boxEast=Box.createVerticalBox();
+
+ Box boxEast = Box.createVerticalBox();
boxEast.add(new BuScrollPane(t));
p.add(boxEast, BuBorderLayout.EAST);
p.doLayout();
f.setContentPane(p);
final EGFillePanel pn = new EGFillePanel(g);
-
-
+
// creation de la scene EBLI
- EbliGraphScene scene = new EbliGraphScene();
+ EbliScene scene = new EbliScene();
+ // ajout graphe
+ // GrapheWidget graphe=new GrapheWidget(scene,null,g);
+ // graphe.setPreferredSize(new Dimension(300, 300));
+ // scene.addWidget(graphe);
-
- //ajout graphe
- GrapheWidget graphe=new GrapheWidget(scene,null,g);
- graphe.setPreferredSize(new Dimension(300, 300));
- scene.addChild(graphe);
-
+ //-- creation d un noeud Graphe --//
+ EbliNodeDefault node = new EbliNodeDefault();
+ node.setCreator(new EbliWidgetCreatorGraphe(g));
+ node.setD(new Dimension(300, 300));
+ node.setP(new Point(4, 4));
+ scene.addNode(node);
+ //-- creation d un noeud legende --//
+ node = new EbliNodeDefault();
+ node.setCreator(new EbliWidgetCreatorLegende(g));
+ node.setD(new Dimension(100, 100));
+ scene.addNode(node);
+
- //WidgetLegendeManagerOLD.createWidgetLegendeGraphe(this, visu, courbe, graphe.getClientArea());
- scene.addChild (WidgetLegendeManager.createLegende(g, scene,null));
-
- //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 ());
+ //-- creation de la vue calque
+ TestZCalquePoint test = new TestZCalquePoint();
+ test.getVueCalque().setPreferredSize(new Dimension(200, 200));
+ node = new EbliNodeDefault();
+ node.setCreator(new EbliWidgetCreatorVue2d(test.getVisuPanel()));
+ node.setD(new Dimension(200, 200));
+ // scene.addNode(node);
+ //scene.addChild(new ComponentWidget(scene, test.getVisuPanel().getVueCalque()));
+
+ // WidgetLegendeManagerOLD.createWidgetLegendeGraphe(this, visu, courbe,
+ // graphe.getClientArea());
+
+ scene.addChild(WidgetLegendeManager.createLegende(g, scene, null));
+
+ // 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 ());
+ 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));
- scene.addChild(iconNode);
+ // otherwise MoveAction will always consume the event and HoverAction
+ // will never be invoked
+ iconNode.getActions().addAction(ActionFactory.createMoveAction());
+ iconNode.setPreferredLocation(new Point(400, 150));
+
- //scene.addNode(new Object());
+ 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();
+
+ setBorder(BorderFactory.createResizeBorder(10));
+
+ }
+ };
+ widgetJtable.setBorder(BorderFactory.createResizeBorder(10));
+ widgetJtable.setPreferredLocation(new Point(500, 300));
+ widgetJtable.getActions().addAction(ActionFactory.createResizeAction());
+ scene.addChild(widgetJtable);
+ // scene.addNode(new Object());
// fin
p.add(new JScrollPane(scene.createView()), BuBorderLayout.CENTER);
-
- //ajout de la vue sattelite en bas \xE4 gauche
+
+ // ajout de la vue sattelite en bas \xE4 gauche
boxEast.add(scene.createSatelliteView());
-
-
+
final JMenu menu = new JMenu();
menu.setName("essai");
menu.setText("essai");
@@ -209,7 +256,7 @@
f.setJMenuBar(b);
f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- //f.pack();
+ // f.pack();
f.show();
scene.setFont(CtuluLibSwing.getMiniFont());
g.computeMarges(scene.getGraphics());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <had...@us...> - 2008-08-06 14:53:02
|
Revision: 3715
http://fudaa.svn.sourceforge.net/fudaa/?rev=3715&view=rev
Author: hadouxad
Date: 2008-08-06 14:53:07 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
AFFECT?\195?\137 - # 40: L?\195?\169gende pour les courbe 1d
http://mantis.genesis-groupe.com//view.php?id=40
mise en forme des donnees
- ajout des nodes pour les elements
- implementation dans EbliScene
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManager.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliEdge.java
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/EbliWidgetCreator.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorGraphe.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorLegende.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorVue2d.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGrapheController.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetLine.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetVue2D.java
Removed Paths:
-------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliGraphScene.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/GrapheWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/LineWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/TitleWidget.java
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliEdge.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliEdge.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliEdge.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -0,0 +1,5 @@
+package org.fudaa.ebli.visuallibrary;
+
+public interface EbliEdge {
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliEdge.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliGraphScene.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliGraphScene.java 2008-08-05 15:42:58 UTC (rev 3714)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliGraphScene.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -1,166 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JComponent;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-
-import org.netbeans.api.visual.action.ActionFactory;
-import org.netbeans.api.visual.action.PopupMenuProvider;
-import org.netbeans.api.visual.graph.GraphScene;
-import org.netbeans.api.visual.widget.LayerWidget;
-import org.netbeans.api.visual.widget.Widget;
-
-
-/**
- * clqsse de gestion de la scene principale
- * @author Adrien Hadoux
- *
- */
-public class EbliGraphScene extends GraphScene{
-
- /**
- * la visu du graphscene
- */
- private LayerWidget visu_;
-
- public EbliGraphScene() {
- super();
-
- // creation du layer de mise en page
- visu_ = new LayerWidget(this);
- addChild(visu_);
-
- //-- ajoute l'action du zoom ( ctrl + clic)
- getActions ().addAction (ActionFactory.createCenteredZoomAction (1.1));
-
- //-- ajouter le menu popup de base
- setMenuBase();
-
- }
-
- public LayerWidget getVisu_() {
- return visu_;
- }
-
- public void setVisu_(LayerWidget visu_) {
- this.visu_ = visu_;
- }
-
- @Override
- protected void attachEdgeSourceAnchor(Object edge, Object oldSourceNode,
- Object sourceNode) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- protected void attachEdgeTargetAnchor(Object edge, Object oldTargetNode,
- Object targetNode) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- protected Widget attachEdgeWidget(Object edge) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- protected Widget attachNodeWidget(Object node) {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * methode qui permet d'ajouter une widget dans la vue principale
- */
- public void addWidget(EbliWidget widget){
-
- addWidget(widget, null,null);
-
- }
-
- public void addWidget(EbliWidget widget,Point preferredLocation, Dimension preferedSize){
-
- if(preferedSize!=null){
- widget.setPreferredSize(preferedSize);
- }
- if(preferredLocation !=null){
- widget.setPreferredLocation(preferredLocation);
- }
-
- getVisu_().addChild(widget);
-
-
- }
-
-
- /**
- * recupere une version miniature de la vue aui se rafraichit simultanement avec la scene
- * @return
- */
- public JComponent getSatteliteView(){
- return this.createSatelliteView();
- }
-
- /**
- * retourne la vue Jcomponent associ\xE9
- * Utile pour l'integration dans les components existants
- */
- public JComponent getSwingView(){
- return this.getView();
- }
-
- public void setMenuBase() {
- getActions ().addAction (ActionFactory.createPopupMenuAction (new PopupMenuProvider() {
- public JPopupMenu getPopupMenu (Widget widget, Point localLocation) {
- JPopupMenu popup = new JPopupMenu ();
-
-
-
- JMenuItem menuItem1=popup.add ("Ajouter Graphe");
- menuItem1.addActionListener(new ActionListener(){
-
- public void actionPerformed(ActionEvent e) {
-
-
- }
-
- });
-
- JMenuItem menuItem2=popup.add ("Ajouter Maillage");
- menuItem2.addActionListener(new ActionListener(){
-
- public void actionPerformed(ActionEvent e) {
-
-
- }
-
- });
-
- JMenuItem menuItem3=popup.add ("Fermer l'objet");
- menuItem3.addActionListener(new ActionListener(){
-
- public void actionPerformed(ActionEvent e) {
-
- //fermeture des widgets children
- EbliGraphScene.this.removeChildren();
- //fermeture du widget donne
- EbliGraphScene.this.removeFromParent();
-
- }
-
- });
- return popup;
- }
- }));
- }
-
-
- }
Added: 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 (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNode.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -0,0 +1,18 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.Dimension;
+import java.awt.Point;
+import java.util.Map;
+
+public interface EbliNode {
+ String getTitle();
+
+ EbliWidgetCreator getCreator();
+
+ Dimension getPreferedDimension();
+
+ EbliNode duplicate(Map options);
+
+ Point getLocation();
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNode.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -0,0 +1,56 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.Dimension;
+import java.awt.Point;
+import java.util.Map;
+
+public class EbliNodeDefault implements EbliNode {
+ EbliWidgetCreator creator;
+ Point p;
+ Dimension d;
+ String title;
+ public String getTitle() {
+ return title;
+ }
+
+
+
+ public EbliNode duplicate(Map options) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public void setP(Point p) {
+ this.p = p;
+ }
+
+ public void setD(Dimension d) {
+ this.d = d;
+ }
+
+
+
+ public void setCreator(EbliWidgetCreator creator) {
+ this.creator = creator;
+ }
+
+ public EbliWidgetCreator getCreator() {
+ return creator;
+ }
+
+ public Point getLocation() {
+ return p;
+ }
+
+ public Dimension getPreferedDimension() {
+ // TODO Auto-generated method stub
+ return d;
+ }
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java (from rev 3714, branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliGraphScene.java)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -0,0 +1,185 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JComponent;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+
+import org.fudaa.ctulu.CtuluResource;
+import org.fudaa.ebli.courbe.EGGraphe;
+import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.PopupMenuProvider;
+import org.netbeans.api.visual.graph.GraphScene;
+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 org.netbeans.modules.visual.layout.OverlayLayout;
+
+/**
+ * classe de gestion de la scene principale
+ *
+ * @author Adrien Hadoux
+ *
+ */
+public class EbliScene extends GraphScene<EbliNode, EbliEdge> {
+
+ /**
+ * la visu du graphscene
+ */
+ private LayerWidget visu_;
+
+ public EbliScene() {
+ super();
+
+ // creation du layer de mise en page
+ visu_ = new LayerWidget(this);
+ addChild(visu_);
+
+ // -- ajoute l'action du zoom ( ctrl + clic)
+ getActions().addAction(ActionFactory.createCenteredZoomAction(1.1));
+
+ // -- ajouter le menu popup de base
+ setMenuBase();
+
+ }
+
+ public LayerWidget getVisu_() {
+ return visu_;
+ }
+
+ public void setVisu_(LayerWidget visu_) {
+ this.visu_ = visu_;
+ }
+ @Override
+ protected void notifyNodeAdded(EbliNode node, Widget widget) {
+// node.widgetCreated((EbliWidget)widget);
+ }
+
+
+
+ @Override
+ protected void attachEdgeSourceAnchor(EbliEdge edge,
+ EbliNode oldSourceNode, EbliNode sourceNode) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ protected void attachEdgeTargetAnchor(EbliEdge edge,
+ EbliNode oldTargetNode, EbliNode targetNode) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ protected Widget attachEdgeWidget(EbliEdge edge) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ protected Widget attachNodeWidget(EbliNode node ) {
+
+ //-- creation de la widget ici --//
+ EbliWidget res= node.getCreator().create(this);
+
+ //-- remplissage des proprietes
+ res.setPreferredLocation(node.getLocation());
+ res.setPreferredSize(node.getPreferedDimension());
+
+ //-- ajout dans la vue layer --//
+ visu_.addChild(res);
+
+ return res;
+ }
+
+ /**
+ * methode qui permet d'ajouter une widget dans la vue principale
+ */
+ public void addWidget(EbliWidget widget) {
+
+ addWidget(widget, null, null);
+
+ }
+
+ public void addWidget(EbliWidget widget, Point preferredLocation,
+ Dimension preferedSize) {
+
+ if (preferedSize != null) {
+ widget.setPreferredSize(preferedSize);
+ }
+ if (preferredLocation != null) {
+ widget.setPreferredLocation(preferredLocation);
+ }
+
+ getVisu_().addChild(widget);
+
+ }
+
+ /**
+ * recupere une version miniature de la vue aui se rafraichit simultanement
+ * avec la scene
+ *
+ * @return
+ */
+ public JComponent getSatteliteView() {
+ return this.createSatelliteView();
+ }
+
+ /**
+ * retourne la vue Jcomponent associ\xE9 Utile pour l'integration dans les
+ * components existants
+ */
+ public JComponent getSwingView() {
+ return this.getView();
+ }
+
+ public void setMenuBase() {
+ getActions().addAction(
+ ActionFactory.createPopupMenuAction(new PopupMenuProvider() {
+ public JPopupMenu getPopupMenu(Widget widget,
+ Point localLocation) {
+ JPopupMenu popup = new JPopupMenu();
+
+ JMenuItem menuItem1 = popup.add("Ajouter Graphe");
+ menuItem1.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+
+ }
+
+ });
+
+ JMenuItem menuItem2 = popup.add("Ajouter Maillage");
+ menuItem2.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+
+ }
+
+ });
+
+ JMenuItem menuItem3 = popup.add("Fermer l'objet");
+ menuItem3.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e) {
+
+ // fermeture des widgets children
+ EbliScene.this.removeChildren();
+ // fermeture du widget donne
+ EbliScene.this.removeFromParent();
+
+ }
+
+ });
+ return popup;
+ }
+ }));
+ }
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-05 15:42:58 UTC (rev 3714)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -8,6 +8,7 @@
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
+import org.fudaa.ctulu.CtuluResource;
import org.netbeans.api.visual.action.ActionFactory;
import org.netbeans.api.visual.action.PopupMenuProvider;
import org.netbeans.api.visual.border.Border;
@@ -21,96 +22,134 @@
/**
* Widget version EBLI
- * @author genesis
+ * @author Adrien Hadoux
*
*/
class EbliWidget extends Widget {
+
+ private static final Border RESIZE_BORDER = BorderFactory.createResizeBorder(8,Color.blue.brighter().brighter(),true);
+ private static final Border DEFAULT_BORDER =BorderFactory.createEmptyBorder(8);
- private static final Border RESIZE_BORDER = BorderFactory.createResizeBorder(8,Color.blue.brighter().brighter(),true);
- private static final Border DEFAULT_BORDER =BorderFactory.createEmptyBorder(8);
- /**
- * @param scene
- * @param Point : indiaue la location preferentiel. peut etre nul
- */
- public EbliWidget(Scene scene, Point preferredLocation) {
- super(scene);
- getActions().addAction( ActionFactory.createResizeAction());
+ private EbliScene scene_;
+
+ public EbliScene getScene_() {
+ return scene_;
+ }
+
+ public void setScene_(EbliScene scene_) {
+ this.scene_ = scene_;
+ }
+
+ /**
+ * @param scene
+ * @param Point : indiaue la location preferentiel. peut etre nul
+ */
+ public EbliWidget(EbliScene scene) {
+ super(scene);
+ setScene_(scene);
+ getActions().addAction( ActionFactory.createResizeAction());
getActions().addAction(ActionFactory.createMoveAction());
- getActions().addAction(scene.createWidgetHoverAction());//a voir pour que le parent soit
- //aussi en hover : a voir apr\xE8s.
-
- setBorder(getScene().getLookFeel().getMiniBorder(ObjectState.createNormal()));
-
- // positionnement de la widget si precise
- if(preferredLocation!=null)
- setPreferredLocation(preferredLocation);
-
- //menu clic droit basique (fermeture, duplication)
- setMenuBase();
- }
+ getActions().addAction(scene.createWidgetHoverAction());
+ getActions().addAction( scene.createSelectAction());
- @Override
- public void notifyStateChanged(ObjectState previousState, ObjectState newState) {
- LookFeel lookFeel = getScene().getLookFeel();
-
- // setBorder(lookFeel.getMiniBorder(newState));
-
-
- setBorder( newState.isSelected() ? (
- newState.isHovered() ? RESIZE_BORDER : DEFAULT_BORDER) : (
- newState.isHovered() ? RESIZE_BORDER : DEFAULT_BORDER));
- }
+ setBorder(getScene().getLookFeel().getMiniBorder(ObjectState.createNormal()));
-
- /**
- * Methode generique qui fait apparaitre un menuItem propre au composant et offre les op\xE9rations de base
- * on ouvre le menu via le clic droit ou le raccourcis shift+F10
- */
-
- public void setMenuBase() {
- getActions ().addAction (ActionFactory.createPopupMenuAction (new PopupMenuProvider() {
- public JPopupMenu getPopupMenu (Widget widget, Point localLocation) {
- JPopupMenu popup = new JPopupMenu ();
-
- JMenuItem menuItem1=popup.add ("Dupliquer l'objet");
- menuItem1.addActionListener(new ActionListener(){
+ // positionnement de la widget si precise
+// if(preferredLocation!=null)
+// setPreferredLocation(preferredLocation);
- 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));
-
- EbliWidget duplique;
-
- try {
- //clonage de l'objet
- duplique=(EbliWidget)EbliWidget.this.clone();
- duplique.setPreferredSize(EbliWidget.this.getScene().getPreferredSize());
-
- } catch (CloneNotSupportedException e1) {
- // TODO que fqire si cq pete? une peite fenetre d'erreur, widget pas duplicable? ou alors surcharger la methode dans les filles?
- e1.printStackTrace();
- }
+ //menu clic droit basique (fermeture, duplication)
+ setMenu();
+ }
+
+ @Override
+ public void notifyStateChanged(ObjectState previousState, ObjectState newState) {
+ LookFeel lookFeel = getScene().getLookFeel();
+
+ // setBorder(lookFeel.getMiniBorder(newState));
+
+
+ setBorder( newState.isSelected() ? (
+ newState.isHovered() ? RESIZE_BORDER : lookFeel.getMiniBorder(newState)) : (
+ newState.isHovered() ? RESIZE_BORDER : lookFeel.getMiniBorder(newState)));
+ }
+
+
+ /**
+ * Methode generique qui fait apparaitre un menuItem propre au composant et offre les op\xE9rations de base
+ * on ouvre le menu via le clic droit ou le raccourcis shift+F10
+ */
+
+ public void setMenu() {
+ getActions ().addAction (ActionFactory.createPopupMenuAction (new PopupMenuProvider() {
+ public JPopupMenu getPopupMenu (Widget widget, Point localLocation) {
+ JPopupMenu popup = new JPopupMenu ();
+
+ //-- creation du menu commun a tous les widgets
+ constructPopupMenuBase(popup);
+
+
+ return popup;
+ }
+ }));
+ }
+
+
+ /**
+ * Methode de construction des menus de base
+ * @param _popup
+ */
+ public void constructPopupMenuBase(JPopupMenu _popup){
+ JMenuItem menuItem1=_popup.add ("Dupliquer l'objet");
+ menuItem1.setIcon(CtuluResource.CTULU.getIcon("crystal22_cascade"));
+ menuItem1.addActionListener(new ActionListener(){
+
+ 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));
+
+ EbliWidget duplique;
+
+ 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);
}
-
- });
- JMenuItem menuItem2=popup.add ("Fermer l'objet");
- menuItem2.addActionListener(new ActionListener(){
+
+ } 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();
+ }
+ }
- public void actionPerformed(ActionEvent e) {
-
- //fermeture des widgets children
- EbliWidget.this.removeChildren();
- //fermeture du widget donne
- EbliWidget.this.removeFromParent();
-
- }
-
- });
- return popup;
- }
- }));
- }
-
+ });
+ JMenuItem menuItem2=_popup.add ("Fermer l'objet");
+ menuItem2.setIcon(CtuluResource.CTULU.getIcon("crystal_non"));
+ menuItem2.addActionListener(new ActionListener(){
+
+ public void actionPerformed(ActionEvent e) {
+
+ EbliWidget.this.setVisible(false);
+
+ // NE PAS DECOCHER CES ELEMENTS
+ //fermeture des widgets children
+ //EbliWidget.this.removeChildren();
+ //fermeture du widget donne
+ //EbliWidget.this.removeFromParent();
+
+
+ }
+
+ });
+ }
+
+
+
}
\ No newline at end of file
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreator.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreator.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreator.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -0,0 +1,11 @@
+package org.fudaa.ebli.visuallibrary;
+
+
+public interface EbliWidgetCreator {
+
+ EbliWidget create(EbliScene _scene);
+
+// void widgetCreated(EbliWidget w);
+ //void nodeRemoved();
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorGraphe.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorGraphe.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -0,0 +1,30 @@
+package org.fudaa.ebli.visuallibrary;
+
+import org.fudaa.ebli.courbe.EGGraphe;
+/**
+ * interface qui permet de creer un widget
+ * @author genesis
+ *
+ */
+public class EbliWidgetCreatorGraphe implements EbliWidgetCreator {
+
+ EGGraphe g;
+
+ public EbliWidgetCreatorGraphe(EGGraphe g) {
+ super();
+ this.g = g;
+ }
+
+ public EbliWidget create(EbliScene _scene) {
+ // TODO Auto-generated method stub
+ // creation de la widget correspondante
+ EbliWidgetGraphe res= new EbliWidgetGraphe(_scene, null, g);
+
+ // ajout des listener d ecoute du graphe
+ new EbliWidgetGrapheController(res);
+
+ return res;
+ }
+
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorGraphe.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorLegende.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorLegende.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorLegende.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -0,0 +1,26 @@
+package org.fudaa.ebli.visuallibrary;
+
+import org.fudaa.ebli.courbe.EGGraphe;
+
+public class EbliWidgetCreatorLegende implements EbliWidgetCreator {
+
+ EGGraphe g;
+
+ public EbliWidgetCreatorLegende(EGGraphe g) {
+ super();
+ this.g = g;
+ }
+
+ public EGGraphe getG() {
+ return g;
+ }
+
+ public void setG(EGGraphe g) {
+ this.g = g;
+ }
+
+ public EbliWidget create(EbliScene _scene) {
+ return WidgetLegendeManager.createLegende(g, _scene, null);
+ }
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorLegende.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorVue2d.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorVue2d.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorVue2d.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -0,0 +1,19 @@
+package org.fudaa.ebli.visuallibrary;
+
+import org.fudaa.ebli.calque.BVueCalque;
+import org.fudaa.ebli.calque.ZEbliCalquesPanel;
+
+public class EbliWidgetCreatorVue2d implements EbliWidgetCreator {
+
+ ZEbliCalquesPanel calque;
+
+ public EbliWidgetCreatorVue2d(ZEbliCalquesPanel calque) {
+ super();
+ this.calque = calque;
+ }
+
+ public EbliWidget create(EbliScene _scene) {
+ return new EbliWidgetVue2D(_scene, calque);
+ }
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorVue2d.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java (from rev 3714, branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/GrapheWidget.java)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -0,0 +1,146 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JMenuItem;
+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.EGGraphe;
+import org.fudaa.ebli.courbe.EGGrapheModelListener;
+import org.fudaa.ebli.courbe.EGObject;
+import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.PopupMenuProvider;
+import org.netbeans.api.visual.laf.LookFeel;
+import org.netbeans.api.visual.model.ObjectState;
+import org.netbeans.api.visual.widget.Widget;
+
+import com.sun.org.apache.xerces.internal.impl.xs.opti.DefaultNode;
+
+
+/**
+ * widget qui contient un objet graphe
+ * @author adrien hadoux
+ *
+ */
+public class EbliWidgetGraphe extends EbliWidget{
+
+ private EGGraphe graphe;
+ private EbliNodeDefault nodeLegende=null;
+
+ public EGGraphe getGraphe() {
+ return graphe;
+ }
+
+ public void setGraphe(EGGraphe graphe) {
+ this.graphe = graphe;
+ }
+
+ public EbliWidgetGraphe(EbliScene scene, Point preferredLocation, EGGraphe _graphe) {
+ super(scene);
+ // TODO Auto-generated constructor stub
+ setGraphe(_graphe);
+
+
+ }
+
+ public void notifyStateChanged(ObjectState previousState,
+ ObjectState newState) {
+ LookFeel lookFeel = getScene().getLookFeel();
+
+ setBorder(lookFeel.getBorder(newState));
+
+
+ }
+
+ protected void paintWidget() {
+ Rectangle rec = getClientArea();
+
+ // BufferedImage image = courbe.produceImage(
+ // rec.width - 1, rec.height - 1,
+ // Collections.EMPTY_MAP);
+ getGraphics().translate(rec.x, rec.y);
+ graphe.setSize(rec.width - 1,
+ rec.height - 1);
+ graphe.computeMarges(getGraphics());
+ graphe.dessine(getGraphics(), rec.width - 1,
+ rec.height - 1, false );
+ }
+
+
+
+ /**
+ * Surcharge de la creation du menu de base en ajoutant les menus specifiques
+ */
+ public void setMenu() {
+ getActions ().addAction (ActionFactory.createPopupMenuAction (new PopupMenuProvider() {
+ public JPopupMenu getPopupMenu (Widget widget, Point localLocation) {
+ JPopupMenu popup = new JPopupMenu ();
+
+ //-- creation du menu commun a tous les widgets
+ constructPopupMenuBase(popup);
+
+ //-- Menu sp\xF6cifiques a l'application--//
+ constructPopupMenuSpecifique(popup);
+ return popup;
+ }
+ }));
+ }
+
+ /**
+ * ajoutant la possibilit\xE9 de configurer la courbe ainsi que la l\xE9gende
+ * @param _popup
+ */
+ private void constructPopupMenuSpecifique(JPopupMenu _popup){
+
+
+
+ JMenuItem menuItem=_popup.add ("Ajouter la l\xE9gende");
+ menuItem.setIcon(CtuluResource.CTULU.getIcon("crystal22_commentaire"));
+ menuItem.addActionListener(new ActionListener(){
+
+ public void actionPerformed(ActionEvent e) {
+
+ //-- creation de la l\xE9gende --//
+ if(EbliWidgetGraphe.this.getScene_()!=null){
+
+ //position a cote de la widget graphe
+ Point nouvellePosition=new Point((int)(EbliWidgetGraphe.this.getLocation().x),(int)(EbliWidgetGraphe.this.getLocation().y+EbliWidgetGraphe.this.getBounds().height*1.2));
+
+ //getScene_().addChild(new EbliWidget(getScene_(),null));
+ //addChild (WidgetLegendeManager.createLegende(GrapheWidget.this.getGraphe(), GrapheWidget.this.getScene_(),null));
+ if(nodeLegende==null){
+
+ //-- creation d'un node legende --//
+ nodeLegende = new EbliNodeDefault();
+
+ nodeLegende.setCreator(new EbliWidgetCreatorLegende(getGraphe()));
+ nodeLegende.setP(nouvellePosition);
+ nodeLegende.setD(new Dimension(100, 100));
+ EbliWidgetGraphe.this.getScene_().addNode(nodeLegende);
+
+ //widgetLegende=WidgetLegendeManager.createLegende(EbliWidgetGraphe.this.getGraphe(), EbliWidgetGraphe.this.getScene_(),nouvellePosition);
+
+ }
+
+ //GrapheWidget.this.addChild(widgetLegende);
+ }
+ }
+
+ });
+
+
+ //-- creation du menu config de la courbe
+ _popup.add(new EGConfigureActionPalette(graphe.getModel()));
+
+
+
+ }
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGraphe.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGrapheController.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGrapheController.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGrapheController.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -0,0 +1,42 @@
+package org.fudaa.ebli.visuallibrary;
+
+import org.fudaa.ebli.courbe.EGAxe;
+import org.fudaa.ebli.courbe.EGGrapheModelListener;
+import org.fudaa.ebli.courbe.EGObject;
+
+public class EbliWidgetGrapheController implements EGGrapheModelListener {
+ EbliWidgetGraphe w;
+
+ public EbliWidgetGrapheController(EbliWidgetGraphe w) {
+ super();
+ this.w = w;
+ }
+
+ public void structureChanged() {
+ w.repaint();
+
+ }
+
+ public void courbeContentChanged(EGObject _c, boolean restore) {
+ w.repaint();
+
+ }
+
+ public void courbeAspectChanged(EGObject _c, boolean _visibil) {
+ // graphe.paint();
+ w.repaint();
+ // TODO Auto-generated method stub
+
+ }
+
+ public void axeContentChanged(EGAxe _c) {
+ w.repaint();
+
+ }
+
+ public void axeAspectChanged(EGAxe _c) {
+ w.repaint();
+
+ }
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGrapheController.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetLine.java (from rev 3714, branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/LineWidget.java)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetLine.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetLine.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -0,0 +1,58 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+
+import org.fudaa.ebli.courbe.EGCourbe;
+import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.ebli.trace.TraceLigne;
+import org.netbeans.api.visual.widget.Scene;
+
+
+/**
+ * Legende
+ * Widget qui contient le trac\xE9 de la ligne de la l\xE9gende courbe
+ * @author genesis
+ *
+ */
+public class EbliWidgetLine extends EbliWidget {
+
+ EGCourbe cb_;
+
+ /**
+ * @param _scene
+ */
+ public EbliWidgetLine(EbliScene _scene, EGCourbe _cb, Point preferedLocation) {
+ super(_scene);
+ cb_ = _cb;
+ setMinimumSize(new Dimension(30, 10));
+ setPreferredSize(new Dimension(40, 10));
+
+ setEnabled(false);
+
+ }
+
+ /**
+ *
+ */
+ @Override
+ protected void paintWidget() {
+ Graphics2D g = getGraphics();
+ Rectangle rec = getClientArea();
+ g.translate(rec.x, rec.y);
+ //la ligne
+ TraceLigne l = new TraceLigne(cb_.getLigneModel());
+ l.dessineTrait(g, 0, rec.height / 2, rec.width, rec.height / 2);
+ //l'icone
+ TraceIconModel icm = new TraceIconModel(cb_.getIconModel());
+ icm.setTaille(Math.min(rec.width / 2, rec.height));//a voir
+ TraceIcon ic = new TraceIcon(icm);
+ ic.paintIconCentre(g, rec.width / 2, rec.height / 2);
+ g.translate(-rec.x, -rec.y);
+ }
+
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetLine.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java (from rev 3714, branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/TitleWidget.java)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -0,0 +1,91 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.Point;
+
+import org.fudaa.ebli.courbe.EGCourbe;
+import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.TextFieldInplaceEditor;
+import org.netbeans.api.visual.action.WidgetAction;
+import org.netbeans.api.visual.layout.LayoutFactory.SerialAlignment;
+import org.netbeans.api.visual.widget.LabelWidget;
+import org.netbeans.api.visual.widget.Scene;
+import org.netbeans.api.visual.widget.Widget;
+import org.netbeans.modules.visual.layout.FlowLayout;
+
+
+
+/**
+ * Legende
+ * Widget qui contient le titre de la ligne de la l\xE9gende courbe
+ * @author genesis
+ *
+ */
+public class EbliWidgetTitle extends EbliWidget implements TextFieldInplaceEditor{
+
+ EGCourbe cb_;
+
+ LabelWidget intern;
+
+ /**
+ * @param _scene
+ */
+ public EbliWidgetTitle(EbliScene _scene, EGCourbe _cb,Point preferedLocation) {
+ super(_scene);
+ setLayout(new FlowLayout(true, SerialAlignment.LEFT_TOP, 0));
+ intern = new LabelWidget(_scene);
+ intern.setForeground(_cb.getAspectContour());
+ addChild(intern);
+ setCourbe(_cb);
+
+ //-- ajouter l option de remplacer le text dans le label --//
+
+ //-- creation de l action --//
+ WidgetAction editorAction = ActionFactory.createInplaceEditorAction (this);
+
+ //-- ajout de l action au label correspondant --//
+ intern.getActions ().addAction (editorAction);
+
+ setEnabled(false);
+ }
+
+ public void majLabel(){
+ intern.setForeground(cb_.getAspectContour());
+ intern.setLabel(cb_.getTitle());
+ }
+
+
+ /**
+ * @return the cb_
+ */
+ public EGCourbe getCourbe() {
+ return cb_;
+ }
+
+ /**
+ * @param _cb the cb_ to set
+ */
+ public void setCourbe(EGCourbe _cb) {
+ this.cb_ = _cb;
+ if (cb_ != null) {
+ intern.setLabel(cb_.getTitle());
+ }
+ }
+
+ public String getText(Widget widget) {
+ return ((LabelWidget) widget).getLabel ();
+ }
+
+ public boolean isEnabled(Widget widget) {
+ // TODO Auto-generated method stub
+ return true;
+ }
+
+ public void setText(Widget widget, String text) {
+ ((LabelWidget) widget).setLabel (text);
+ cb_.setTitle(text);
+ }
+
+
+
+
+}
\ No newline at end of file
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTitle.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetVue2D.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetVue2D.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetVue2D.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -0,0 +1,34 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.util.Collections;
+
+import org.fudaa.ebli.calque.BVueCalque;
+import org.fudaa.ebli.calque.ZEbliCalquesPanel;
+
+public class EbliWidgetVue2D extends EbliWidget {
+
+ ZEbliCalquesPanel vue_;
+
+ public EbliWidgetVue2D(EbliScene scene, ZEbliCalquesPanel vue) {
+ super(scene);
+ vue_ = vue;
+ // TODO Auto-generated constructor stub
+ }
+
+ @Override
+ protected void paintWidget() {
+ Rectangle rec = getClientArea();
+ Graphics2D g = getGraphics();
+
+ g.translate(rec.x, rec.y);
+ vue_.setSize(rec.width, rec.height);
+ vue_.restaurer();
+ vue_.paint(g);
+ // TODO Auto-generated method stub
+ super.paintWidget();
+ g.translate(-rec.x, -rec.y);
+ }
+
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetVue2D.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/GrapheWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/GrapheWidget.java 2008-08-05 15:42:58 UTC (rev 3714)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/GrapheWidget.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -1,104 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-import java.awt.Point;
-import java.awt.Rectangle;
-
-import org.fudaa.ebli.courbe.EGAxe;
-import org.fudaa.ebli.courbe.EGGraphe;
-import org.fudaa.ebli.courbe.EGGrapheModelListener;
-import org.fudaa.ebli.courbe.EGObject;
-import org.netbeans.api.visual.laf.LookFeel;
-import org.netbeans.api.visual.model.ObjectState;
-import org.netbeans.api.visual.widget.Scene;
-
-
-/**
- * widget aui contient un objet courbe
- * @author adrien hadoux
- *
- */
-public class GrapheWidget extends EbliWidget{
-
- private EGGraphe graphe;
-
- public EGGraphe getGraphe() {
- return graphe;
- }
-
- public void setGraphe(EGGraphe graphe) {
- this.graphe = graphe;
- }
-
- public GrapheWidget(Scene scene, Point preferredLocation, EGGraphe _graphe) {
- super(scene, preferredLocation);
- // TODO Auto-generated constructor stub
- setGraphe(_graphe);
-
-
- //prise en compte du listener d'\xE9coute des modif du graphe
- listenGraphe();
-
- }
-
- public void notifyStateChanged(ObjectState previousState,
- ObjectState newState) {
- LookFeel lookFeel = getScene().getLookFeel();
- // setBorder(lookFeel.getBorder(newState));
- // setForeground(lookFeel.getForeground(newState));
- setBorder(lookFeel.getBorder(newState));
- // setBorder(newState.isSelected() ?
- // (DEFAULT_SELECTED_BORDER) :
- // (newState.isHovered() ? RESIZE_BORDER
- // : DEFAULT_BORDER));
-
- }
-
- protected void paintWidget() {
- Rectangle rec = getClientArea();
-
- // BufferedImage image = courbe.produceImage(
- // rec.width - 1, rec.height - 1,
- // Collections.EMPTY_MAP);
- getGraphics().translate(rec.x, rec.y);
- graphe.setSize(rec.width - 1,
- rec.height - 1);
- graphe.computeMarges(getGraphics());
- graphe.dessine(getGraphics(), rec.width - 1,
- rec.height - 1, false );
- }
-
- /**
- * methode aui permet d ajouter les fonctions de redessin du graphe
- */
- private void listenGraphe(){
- graphe.getModel().addModelListener(new EGGrapheModelListener() {
-
- public void structureChanged() {
- repaint();
-
- }
-
- public void courbeContentChanged(EGObject _c, boolean restore) {
- repaint();
-
- }
-
- public void courbeAspectChanged(EGObject _c, boolean _visibil) {
- //graphe.paint();
- repaint();
- // TODO Auto-generated method stub
-
- }
-
- public void axeContentChanged(EGAxe _c) {
- repaint();
-
- }
-
- public void axeAspectChanged(EGAxe _c) {
- repaint();
-
- }
- });
- }
-}
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/LineWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/LineWidget.java 2008-08-05 15:42:58 UTC (rev 3714)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/LineWidget.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -1,53 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
-
-import org.fudaa.ebli.courbe.EGCourbe;
-import org.fudaa.ebli.trace.TraceIcon;
-import org.fudaa.ebli.trace.TraceIconModel;
-import org.fudaa.ebli.trace.TraceLigne;
-import org.netbeans.api.visual.widget.Scene;
-
-
-/**
- * Legende
- * Widget qui contient le trac\xE9 de la ligne de la l\xE9gende courbe
- * @author genesis
- *
- */
-public class LineWidget extends EbliWidget {
-
- EGCourbe cb_;
-
- /**
- * @param _scene
- */
- public LineWidget(Scene _scene, EGCourbe _cb, Point preferedLocation) {
- super(_scene,preferedLocation);
- cb_ = _cb;
- setMinimumSize(new Dimension(30, 10));
- setPreferredSize(new Dimension(40, 10));
- }
-
- /**
- *
- */
- @Override
- protected void paintWidget() {
- Graphics2D g = getGraphics();
- Rectangle rec = getClientArea();
- g.translate(rec.x, rec.y);
- //la ligne
- TraceLigne l = new TraceLigne(cb_.getLigneModel());
- l.dessineTrait(g, 0, rec.height / 2, rec.width, rec.height / 2);
- //l'icone
- TraceIconModel icm = new TraceIconModel(cb_.getIconModel());
- icm.setTaille(Math.min(rec.width / 2, rec.height));//a voir
- TraceIcon ic = new TraceIcon(icm);
- ic.paintIconCentre(g, rec.width / 2, rec.height / 2);
- g.translate(-rec.x, -rec.y);
- }
-}
Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/TitleWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/TitleWidget.java 2008-08-05 15:42:58 UTC (rev 3714)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/TitleWidget.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -1,59 +0,0 @@
-package org.fudaa.ebli.visuallibrary;
-
-import java.awt.Point;
-
-import org.fudaa.ebli.courbe.EGCourbe;
-import org.netbeans.api.visual.layout.LayoutFactory.SerialAlignment;
-import org.netbeans.api.visual.widget.LabelWidget;
-import org.netbeans.api.visual.widget.Scene;
-import org.netbeans.modules.visual.layout.FlowLayout;
-
-
-/**
- * Legende
- * Widget qui contient le titre de la ligne de la l\xE9gende courbe
- * @author genesis
- *
- */
-public class TitleWidget extends EbliWidget {
-
- EGCourbe cb_;
-
- LabelWidget intern;
-
- /**
- * @param _scene
- */
- public TitleWidget(Scene _scene, EGCourbe _cb,Point preferedLocation) {
- super(_scene,preferedLocation);
- setLayout(new FlowLayout(true, SerialAlignment.LEFT_TOP, 0));
- intern = new LabelWidget(_scene);
- intern.setForeground(_cb.getAspectContour());
- addChild(intern);
- setCourbe(_cb);
- }
-
- public void majLabel(){
- intern.setForeground(cb_.getAspectContour());
- intern.setLabel(cb_.getTitle());
- }
-
-
- /**
- * @return the cb_
- */
- public EGCourbe getCourbe() {
- return cb_;
- }
-
- /**
- * @param _cb the cb_ to set
- */
- public void setCourbe(EGCourbe _cb) {
- this.cb_ = _cb;
- if (cb_ != null) {
- intern.setLabel(cb_.getTitle());
- }
- }
-
-}
\ No newline at end of file
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManager.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManager.java 2008-08-05 15:42:58 UTC (rev 3714)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManager.java 2008-08-06 14:53:07 UTC (rev 3715)
@@ -43,6 +43,7 @@
import org.netbeans.api.visual.widget.Scene;
import org.netbeans.api.visual.widget.Widget;
import org.netbeans.modules.visual.layout.FlowLayout;
+import org.netbeans.modules.visual.layout.OverlayLayout;
/**
* @author denf01a adrien hadoux
@@ -61,20 +62,22 @@
* @param PreferredLocation peut etre null
* @return
*/
- public static EbliWidget createLegende(EGGraphe g, Scene scene, Point PreferredLocation) {
- EGCourbe[] cs = g.getModel().getCourbes();
- final EbliWidget res = new EbliWidget(scene,PreferredLocation);
- res.setLayout(new FlowLayout(true, SerialAlignment.LEFT_TOP, 10));// a modifier pour setter le gap
+ public static EbliWidget createLegende(final EGGraphe g, final EbliScene scene,final Point PreferredLocation) {
+ final EGCourbe[] cs = g.getModel().getCourbes();
+ final EbliWidget res = new EbliWidget(scene);
+ res.setLayout(new FlowLayout(true, SerialAlignment.LEFT_TOP, 5));// a modifier pour setter le gap
+ //res.setLayout(new OverlayLayout());
for (int i = 0; i < cs.length; i++) {
- final EbliWidget line = new EbliWidget(scene,PreferredLocation);
- line.setLayout(new FlowLayout(false, SerialAlignment.CENTER, 5));
-
+ final EbliWidget line = new EbliWidget(scene);
+ line.setLayout(new FlowLayout(false, SerialAlignment.JUSTIFY, 5));
+
//creation de la widget titre
- final TitleWidget tw=new TitleWidget(scene, cs[i],null);
+ final EbliWidgetTitle tw=new EbliWidgetTitle(scene, cs[i],null);
//creation de la widget ligne
- LineWidget lw=new LineWidget(scene, cs[i],null);
-
+ EbliWidgetLine lw=new EbliWidgetLine(scene, cs[i],null);
+
+ lw.setEnabled(false);
line.addChild(lw);
line.addChild(tw);
res.addChild(line);
@@ -114,6 +117,8 @@
}
+
+
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-05 15:42:58
|
Revision: 3714
http://fudaa.svn.sourceforge.net/fudaa/?rev=3714&view=rev
Author: hadouxad
Date: 2008-08-05 15:42:58 +0000 (Tue, 05 Aug 2008)
Log Message:
-----------
AFFECT?\195?\137 - # 40: L?\195?\169gende pour les courbe 1d
http://mantis.genesis-groupe.com//view.php?id=40
- creation de la classe GrapheWidget aui dessine un graphe
- creation de la classe scene principale
fonctions:
- menu popup accessible par clic droit ( ffermer l objet graphique)
- fonction de zoom (ctrl + clic)
- resolution des bugs rafraichissement simultan?\195?\169 des graphes et legende
- recuperation de la vue sattelite de la scene principale
reste a extendre d image producer
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/LineWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/TitleWidget.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManager.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/EbliGraphScene.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/GrapheWidget.java
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliGraphScene.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliGraphScene.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliGraphScene.java 2008-08-05 15:42:58 UTC (rev 3714)
@@ -0,0 +1,166 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JComponent;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+
+import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.PopupMenuProvider;
+import org.netbeans.api.visual.graph.GraphScene;
+import org.netbeans.api.visual.widget.LayerWidget;
+import org.netbeans.api.visual.widget.Widget;
+
+
+/**
+ * clqsse de gestion de la scene principale
+ * @author Adrien Hadoux
+ *
+ */
+public class EbliGraphScene extends GraphScene{
+
+ /**
+ * la visu du graphscene
+ */
+ private LayerWidget visu_;
+
+ public EbliGraphScene() {
+ super();
+
+ // creation du layer de mise en page
+ visu_ = new LayerWidget(this);
+ addChild(visu_);
+
+ //-- ajoute l'action du zoom ( ctrl + clic)
+ getActions ().addAction (ActionFactory.createCenteredZoomAction (1.1));
+
+ //-- ajouter le menu popup de base
+ setMenuBase();
+
+ }
+
+ public LayerWidget getVisu_() {
+ return visu_;
+ }
+
+ public void setVisu_(LayerWidget visu_) {
+ this.visu_ = visu_;
+ }
+
+ @Override
+ protected void attachEdgeSourceAnchor(Object edge, Object oldSourceNode,
+ Object sourceNode) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ protected void attachEdgeTargetAnchor(Object edge, Object oldTargetNode,
+ Object targetNode) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ protected Widget attachEdgeWidget(Object edge) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ protected Widget attachNodeWidget(Object node) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * methode qui permet d'ajouter une widget dans la vue principale
+ */
+ public void addWidget(EbliWidget widget){
+
+ addWidget(widget, null,null);
+
+ }
+
+ public void addWidget(EbliWidget widget,Point preferredLocation, Dimension preferedSize){
+
+ if(preferedSize!=null){
+ widget.setPreferredSize(preferedSize);
+ }
+ if(preferredLocation !=null){
+ widget.setPreferredLocation(preferredLocation);
+ }
+
+ getVisu_().addChild(widget);
+
+
+ }
+
+
+ /**
+ * recupere une version miniature de la vue aui se rafraichit simultanement avec la scene
+ * @return
+ */
+ public JComponent getSatteliteView(){
+ return this.createSatelliteView();
+ }
+
+ /**
+ * retourne la vue Jcomponent associ\xE9
+ * Utile pour l'integration dans les components existants
+ */
+ public JComponent getSwingView(){
+ return this.getView();
+ }
+
+ public void setMenuBase() {
+ getActions ().addAction (ActionFactory.createPopupMenuAction (new PopupMenuProvider() {
+ public JPopupMenu getPopupMenu (Widget widget, Point localLocation) {
+ JPopupMenu popup = new JPopupMenu ();
+
+
+
+ JMenuItem menuItem1=popup.add ("Ajouter Graphe");
+ menuItem1.addActionListener(new ActionListener(){
+
+ public void actionPerformed(ActionEvent e) {
+
+
+ }
+
+ });
+
+ JMenuItem menuItem2=popup.add ("Ajouter Maillage");
+ menuItem2.addActionListener(new ActionListener(){
+
+ public void actionPerformed(ActionEvent e) {
+
+
+ }
+
+ });
+
+ JMenuItem menuItem3=popup.add ("Fermer l'objet");
+ menuItem3.addActionListener(new ActionListener(){
+
+ public void actionPerformed(ActionEvent e) {
+
+ //fermeture des widgets children
+ EbliGraphScene.this.removeChildren();
+ //fermeture du widget donne
+ EbliGraphScene.this.removeFromParent();
+
+ }
+
+ });
+ return popup;
+ }
+ }));
+ }
+
+
+ }
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliGraphScene.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-05 15:13:59 UTC (rev 3713)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-08-05 15:42:58 UTC (rev 3714)
@@ -1,7 +1,19 @@
package org.fudaa.ebli.visuallibrary;
+import java.awt.Color;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+
import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.PopupMenuProvider;
+import org.netbeans.api.visual.border.Border;
+import org.netbeans.api.visual.border.BorderFactory;
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.Scene;
import org.netbeans.api.visual.widget.Widget;
@@ -14,22 +26,91 @@
*/
class EbliWidget extends Widget {
+
+ private static final Border RESIZE_BORDER = BorderFactory.createResizeBorder(8,Color.blue.brighter().brighter(),true);
+ private static final Border DEFAULT_BORDER =BorderFactory.createEmptyBorder(8);
/**
* @param scene
+ * @param Point : indiaue la location preferentiel. peut etre nul
*/
- public EbliWidget(Scene scene) {
+ public EbliWidget(Scene scene, Point preferredLocation) {
super(scene);
getActions().addAction( ActionFactory.createResizeAction());
getActions().addAction(ActionFactory.createMoveAction());
getActions().addAction(scene.createWidgetHoverAction());//a voir pour que le parent soit
//aussi en hover : a voir apr\xE8s.
+
setBorder(getScene().getLookFeel().getMiniBorder(ObjectState.createNormal()));
+
+ // positionnement de la widget si precise
+ if(preferredLocation!=null)
+ setPreferredLocation(preferredLocation);
+
+ //menu clic droit basique (fermeture, duplication)
+ setMenuBase();
}
@Override
public void notifyStateChanged(ObjectState previousState, ObjectState newState) {
LookFeel lookFeel = getScene().getLookFeel();
- setBorder(lookFeel.getMiniBorder(newState));
+
+ // setBorder(lookFeel.getMiniBorder(newState));
+
+
+ setBorder( newState.isSelected() ? (
+ newState.isHovered() ? RESIZE_BORDER : DEFAULT_BORDER) : (
+ newState.isHovered() ? RESIZE_BORDER : DEFAULT_BORDER));
}
+
+ /**
+ * Methode generique qui fait apparaitre un menuItem propre au composant et offre les op\xE9rations de base
+ * on ouvre le menu via le clic droit ou le raccourcis shift+F10
+ */
+
+ public void setMenuBase() {
+ getActions ().addAction (ActionFactory.createPopupMenuAction (new PopupMenuProvider() {
+ public JPopupMenu getPopupMenu (Widget widget, Point localLocation) {
+ JPopupMenu popup = new JPopupMenu ();
+
+ JMenuItem menuItem1=popup.add ("Dupliquer l'objet");
+ menuItem1.addActionListener(new ActionListener(){
+
+ 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));
+
+ EbliWidget duplique;
+
+ try {
+ //clonage de l'objet
+ duplique=(EbliWidget)EbliWidget.this.clone();
+ duplique.setPreferredSize(EbliWidget.this.getScene().getPreferredSize());
+
+ } catch (CloneNotSupportedException e1) {
+ // TODO que fqire si cq pete? une peite fenetre d'erreur, widget pas duplicable? ou alors surcharger la methode dans les filles?
+ e1.printStackTrace();
+ }
+ }
+
+ });
+ JMenuItem menuItem2=popup.add ("Fermer l'objet");
+ menuItem2.addActionListener(new ActionListener(){
+
+ public void actionPerformed(ActionEvent e) {
+
+ //fermeture des widgets children
+ EbliWidget.this.removeChildren();
+ //fermeture du widget donne
+ EbliWidget.this.removeFromParent();
+
+ }
+
+ });
+ return popup;
+ }
+ }));
+ }
+
}
\ No newline at end of file
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/GrapheWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/GrapheWidget.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/GrapheWidget.java 2008-08-05 15:42:58 UTC (rev 3714)
@@ -0,0 +1,104 @@
+package org.fudaa.ebli.visuallibrary;
+
+import java.awt.Point;
+import java.awt.Rectangle;
+
+import org.fudaa.ebli.courbe.EGAxe;
+import org.fudaa.ebli.courbe.EGGraphe;
+import org.fudaa.ebli.courbe.EGGrapheModelListener;
+import org.fudaa.ebli.courbe.EGObject;
+import org.netbeans.api.visual.laf.LookFeel;
+import org.netbeans.api.visual.model.ObjectState;
+import org.netbeans.api.visual.widget.Scene;
+
+
+/**
+ * widget aui contient un objet courbe
+ * @author adrien hadoux
+ *
+ */
+public class GrapheWidget extends EbliWidget{
+
+ private EGGraphe graphe;
+
+ public EGGraphe getGraphe() {
+ return graphe;
+ }
+
+ public void setGraphe(EGGraphe graphe) {
+ this.graphe = graphe;
+ }
+
+ public GrapheWidget(Scene scene, Point preferredLocation, EGGraphe _graphe) {
+ super(scene, preferredLocation);
+ // TODO Auto-generated constructor stub
+ setGraphe(_graphe);
+
+
+ //prise en compte du listener d'\xE9coute des modif du graphe
+ listenGraphe();
+
+ }
+
+ public void notifyStateChanged(ObjectState previousState,
+ ObjectState newState) {
+ LookFeel lookFeel = getScene().getLookFeel();
+ // setBorder(lookFeel.getBorder(newState));
+ // setForeground(lookFeel.getForeground(newState));
+ setBorder(lookFeel.getBorder(newState));
+ // setBorder(newState.isSelected() ?
+ // (DEFAULT_SELECTED_BORDER) :
+ // (newState.isHovered() ? RESIZE_BORDER
+ // : DEFAULT_BORDER));
+
+ }
+
+ protected void paintWidget() {
+ Rectangle rec = getClientArea();
+
+ // BufferedImage image = courbe.produceImage(
+ // rec.width - 1, rec.height - 1,
+ // Collections.EMPTY_MAP);
+ getGraphics().translate(rec.x, rec.y);
+ graphe.setSize(rec.width - 1,
+ rec.height - 1);
+ graphe.computeMarges(getGraphics());
+ graphe.dessine(getGraphics(), rec.width - 1,
+ rec.height - 1, false );
+ }
+
+ /**
+ * methode aui permet d ajouter les fonctions de redessin du graphe
+ */
+ private void listenGraphe(){
+ graphe.getModel().addModelListener(new EGGrapheModelListener() {
+
+ public void structureChanged() {
+ repaint();
+
+ }
+
+ public void courbeContentChanged(EGObject _c, boolean restore) {
+ repaint();
+
+ }
+
+ public void courbeAspectChanged(EGObject _c, boolean _visibil) {
+ //graphe.paint();
+ repaint();
+ // TODO Auto-generated method stub
+
+ }
+
+ public void axeContentChanged(EGAxe _c) {
+ repaint();
+
+ }
+
+ public void axeAspectChanged(EGAxe _c) {
+ repaint();
+
+ }
+ });
+ }
+}
Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/GrapheWidget.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/LineWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/LineWidget.java 2008-08-05 15:13:59 UTC (rev 3713)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/LineWidget.java 2008-08-05 15:42:58 UTC (rev 3714)
@@ -2,6 +2,7 @@
import java.awt.Dimension;
import java.awt.Graphics2D;
+import java.awt.Point;
import java.awt.Rectangle;
import org.fudaa.ebli.courbe.EGCourbe;
@@ -24,8 +25,8 @@
/**
* @param _scene
*/
- public LineWidget(Scene _scene, EGCourbe _cb) {
- super(_scene);
+ public LineWidget(Scene _scene, EGCourbe _cb, Point preferedLocation) {
+ super(_scene,preferedLocation);
cb_ = _cb;
setMinimumSize(new Dimension(30, 10));
setPreferredSize(new Dimension(40, 10));
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/TitleWidget.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/TitleWidget.java 2008-08-05 15:13:59 UTC (rev 3713)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/TitleWidget.java 2008-08-05 15:42:58 UTC (rev 3714)
@@ -1,5 +1,7 @@
package org.fudaa.ebli.visuallibrary;
+import java.awt.Point;
+
import org.fudaa.ebli.courbe.EGCourbe;
import org.netbeans.api.visual.layout.LayoutFactory.SerialAlignment;
import org.netbeans.api.visual.widget.LabelWidget;
@@ -22,8 +24,8 @@
/**
* @param _scene
*/
- public TitleWidget(Scene _scene, EGCourbe _cb) {
- super(_scene);
+ public TitleWidget(Scene _scene, EGCourbe _cb,Point preferedLocation) {
+ super(_scene,preferedLocation);
setLayout(new FlowLayout(true, SerialAlignment.LEFT_TOP, 0));
intern = new LabelWidget(_scene);
intern.setForeground(_cb.getAspectContour());
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManager.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManager.java 2008-08-05 15:13:59 UTC (rev 3713)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/WidgetLegendeManager.java 2008-08-05 15:42:58 UTC (rev 3714)
@@ -6,10 +6,15 @@
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
+import java.awt.Point;
import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import javax.swing.JFrame;
+import javax.swing.JMenuItem;
import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
import org.fudaa.ctulu.iterator.LogarithmicNumberIterator;
import org.fudaa.ebli.courbe.EGAxe;
@@ -28,6 +33,7 @@
import org.fudaa.ebli.trace.TraceLigne;
import org.fudaa.ebli.trace.TraceLigneModel;
import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.PopupMenuProvider;
import org.netbeans.api.visual.graph.GraphScene;
import org.netbeans.api.visual.laf.LookFeel;
import org.netbeans.api.visual.layout.LayoutFactory.SerialAlignment;
@@ -39,7 +45,7 @@
import org.netbeans.modules.visual.layout.FlowLayout;
/**
- * @author denf01a adrien hadous
+ * @author denf01a adrien hadoux
* @creation 5 ao\xFBt 2008
* @version
*
@@ -48,20 +54,26 @@
- //exemple a ameliorer
- public static EbliWidget createLegende(EGGraphe g, Scene scene) {
+ /**
+ * Creation de la legende
+ * @param g
+ * @param scene
+ * @param PreferredLocation peut etre null
+ * @return
+ */
+ public static EbliWidget createLegende(EGGraphe g, Scene scene, Point PreferredLocation) {
EGCourbe[] cs = g.getModel().getCourbes();
- EbliWidget res = new EbliWidget(scene);
+ final EbliWidget res = new EbliWidget(scene,PreferredLocation);
res.setLayout(new FlowLayout(true, SerialAlignment.LEFT_TOP, 10));// a modifier pour setter le gap
for (int i = 0; i < cs.length; i++) {
- final EbliWidget line = new EbliWidget(scene);
+ final EbliWidget line = new EbliWidget(scene,PreferredLocation);
line.setLayout(new FlowLayout(false, SerialAlignment.CENTER, 5));
//creation de la widget titre
- final TitleWidget tw=new TitleWidget(scene, cs[i]);
+ final TitleWidget tw=new TitleWidget(scene, cs[i],null);
//creation de la widget ligne
- LineWidget lw=new LineWidget(scene, cs[i]);
+ LineWidget lw=new LineWidget(scene, cs[i],null);
line.addChild(lw);
line.addChild(tw);
@@ -100,6 +112,8 @@
});
}
+
+
return res;
}
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-05 15:13:59 UTC (rev 3713)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/test/org/fudaa/ebli/all/TestGraphe2.java 2008-08-05 15:42:58 UTC (rev 3714)
@@ -11,6 +11,7 @@
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;
@@ -43,11 +44,14 @@
import org.fudaa.ebli.courbe.EGObject;
import org.fudaa.ebli.trace.TraceLigne;
import org.fudaa.ebli.trace.TraceLigneModel;
+import org.fudaa.ebli.visuallibrary.EbliGraphScene;
+import org.fudaa.ebli.visuallibrary.GrapheWidget;
import org.fudaa.ebli.visuallibrary.WidgetLegendeManager;
import org.fudaa.ebli.visuallibrary.WidgetLegendeManagerOLD;
import org.netbeans.api.visual.action.ActionFactory;
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.ImageWidget;
import org.netbeans.api.visual.widget.LabelWidget;
@@ -154,240 +158,41 @@
p.doLayout();
f.setContentPane(p);
final EGFillePanel pn = new EGFillePanel(g);
- final GraphScene scene = new GraphScene() {
- LayerWidget visu;
+
+
+ // creation de la scene EBLI
+ EbliGraphScene scene = new EbliGraphScene();
- {
- visu = new LayerWidget(this);
- addChild(visu);
- }
-
- @Override
- protected Widget attachNodeWidget(Object arg0) {
- final EGGraphe courbe = (EGGraphe) arg0;
- final Widget graphe = new Widget(this) {
- public void notifyStateChanged(ObjectState previousState,
- ObjectState newState) {
- LookFeel lookFeel = getScene().getLookFeel();
- // setBorder(lookFeel.getBorder(newState));
- // setForeground(lookFeel.getForeground(newState));
- setBorder(lookFeel.getBorder(newState));
- // setBorder(newState.isSelected() ?
- // (DEFAULT_SELECTED_BORDER) :
- // (newState.isHovered() ? RESIZE_BORDER
- // : DEFAULT_BORDER));
-
- }
-
- @Override
- protected void paintWidget() {
- Rectangle rec = getClientArea();
-
- // BufferedImage image = courbe.produceImage(
- // rec.width - 1, rec.height - 1,
- // Collections.EMPTY_MAP);
- getGraphics().translate(rec.x, rec.y);
- courbe.setSize(rec.width - 1,
- rec.height - 1);
- courbe.computeMarges(getGraphics());
- courbe.dessine(getGraphics(), rec.width - 1,
- rec.height - 1, false );
- }
- // }
- };
- courbe.getModel().addModelListener(new EGGrapheModelListener() {
-
- public void structureChanged() {
- repaint();
-
- }
-
- public void courbeContentChanged(EGObject _c, boolean restore) {
- repaint();
-
- }
-
- public void courbeAspectChanged(EGObject _c, boolean _visibil) {
- graphe.paint();
- paint();
- // TODO Auto-generated method stub
-
- }
-
- public void axeContentChanged(EGAxe _c) {
- repaint();
-
- }
-
- public void axeAspectChanged(EGAxe _c) {
- repaint();
-
- }
- });
- graphe.setPreferredSize(new Dimension(100, 100));
- visu.addChild(graphe);
-
-
-// //creation d un label widget
-// LabelWidget labelWidget=new LabelWidget(this, "test") {
-// public void notifyStateChanged(ObjectState previousState,
-// ObjectState newState) {
-// LookFeel lookFeel = getScene().getLookFeel();
-// // setBorder(lookFeel.getBorder(newState));
-// // setForeground(lookFeel.getForeground(newState));
-//
-// setBorder(lookFeel.getBorder(newState));
-// // recuperation du rectangle contour
-// Rectangle rec = getClientArea();
-// //setFont(new Font("Times New Roman", Font.PLAIN,rec.width ));
-// repaint();
-//
-// // setBorder(newState.isSelected() ?
-// // (DEFAULT_SELECTED_BORDER) :
-// // (newState.isHovered() ? RESIZE_BORDER
-// // : DEFAULT_BORDER));
-//
-// }
-//
-//
-//
-//
-//
-//
-//
-// };
-//
-//
-// //marche pas il faut un container jscrollpane
-// //graphe.getActions().addAction(ActionFactory.createCenteredZoomAction (500));
-//
-//
-// labelWidget.getActions().addAction(ActionFactory.createResizeAction());
-// labelWidget.getActions().addAction(ActionFactory.createMoveAction());
-// labelWidget.getActions().addAction(this.createWidgetHoverAction());
-// //zoom de la scene en maintenant ctrl + molette
-// labelWidget.getActions().addAction(ActionFactory.createZoomAction());
-//
-//
-// //
-// labelWidget.getActions().addAction(ActionFactory.createPanAction());
-//
-// //-- ajout du labelWidget dans le visuel --//
-// visu.addChild(labelWidget);
-//
-//
-// //creation d un image widget
- ImageWidget imageWidget=new ImageWidget (this,CtuluResource.CTULU.getImage("crystal_oui")){
- public void notifyStateChanged(ObjectState previousState,
- ObjectState newState) {
- LookFeel lookFeel = getScene().getLookFeel();
- // setBorder(lookFeel.getBorder(newState));
- // setForeground(lookFeel.getForeground(newState));
-
- setBorder(lookFeel.getBorder(newState));
- // setBorder(newState.isSelected() ?
- // (DEFAULT_SELECTED_BORDER) :
- // (newState.isHovered() ? RESIZE_BORDER
- // : DEFAULT_BORDER));
- repaint();
-
- }
-
- //-- redessinne la l\xE9gende
- protected void paintWidget() {
-
- // recuperation du rectangle contour
- Rectangle rec = getClientArea();
- Graphics2D g=getGraphics();
-
- g.translate(rec.x, rec.y);
-
-
- //dimension du cadre de la l\xE9gende //
- int widthCadre=rec.width;
- int heightCadre=rec.height;
-
- //cas initial: dessin vide
- if(widthCadre==0)
- widthCadre=10;
- if(heightCadre==0)
- heightCadre=10;
-
-
- g.fillRect(rec.x, rec.y,widthCadre - 1, heightCadre - 1);
- //courbe.setSize(rec.width - 1,rec.height - 1);
- //courbe.computeMarges(getGraphics());
- //courbe.dessine(getGraphics(), rec.width - 1,rec.height - 1, false );
-
-
- }
-
- };
-
-
- //WidgetLegendeManagerOLD.createWidgetLegendeGraphe(this, visu, courbe, graphe.getClientArea());
-
- visu.addChild (WidgetLegendeManager.createLegende(courbe, this));
-
- //ajout des resize et drag
- imageWidget.getActions().addAction( ActionFactory.createResizeAction());
- imageWidget.getActions().addAction(ActionFactory.createMoveAction());
- imageWidget.getActions().addAction(this.createWidgetHoverAction());
- //ajout du label widget
- visu.addChild (imageWidget);
-
-
- //test avec iconwidget
- IconNodeWidget iconNode = new IconNodeWidget (this);
- iconNode.setImage (CtuluResource.CTULU.getImage("crystal_non"));
- iconNode.setLabel ("MyIconNode");
- this.addChild (iconNode);
- this.getActions ().addAction (ActionFactory.createCenteredZoomAction (1.1));
- this.getActions ().addAction (ActionFactory.createPanAction ());
- // assign HoverAction - the actual hovered widget is held by the scene
- iconNode.getActions ().addAction (this.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 ());
-
-
- // proprietes graphes
- graphe.getActions().addAction(
- ActionFactory.createResizeAction());
- graphe.getActions().addAction(ActionFactory.createMoveAction());
- graphe.getActions().addAction(this.createWidgetHoverAction());
- return graphe;
- }
-
- @Override
- protected Widget attachEdgeWidget(Object arg0) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- protected void attachEdgeTargetAnchor(Object arg0, Object arg1,
- Object arg2) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- protected void attachEdgeSourceAnchor(Object arg0, Object arg1,
- Object arg2) {
- // TODO Auto-generated method stub
-
- }
- };
-
+
+
+ //ajout graphe
+ GrapheWidget graphe=new GrapheWidget(scene,null,g);
+ graphe.setPreferredSize(new Dimension(300, 300));
+ scene.addChild(graphe);
+
+ //WidgetLegendeManagerOLD.createWidgetLegendeGraphe(this, visu, courbe, graphe.getClientArea());
+ scene.addChild (WidgetLegendeManager.createLegende(g, scene,null));
- // debut
- // scene.addNode(g);
- scene.addNode(g);
+ //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));
+ scene.addChild(iconNode);
+
+ //scene.addNode(new Object());
// fin
p.add(new JScrollPane(scene.createView()), BuBorderLayout.CENTER);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <opa...@us...> - 2008-08-05 15:13:51
|
Revision: 3713
http://fudaa.svn.sourceforge.net/fudaa/?rev=3713&view=rev
Author: opasteur
Date: 2008-08-05 15:13:59 +0000 (Tue, 05 Aug 2008)
Log Message:
-----------
Modified Paths:
--------------
branches/Fudaa_Mascaret_3_0/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java
Modified: branches/Fudaa_Mascaret_3_0/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java
===================================================================
--- branches/Fudaa_Mascaret_3_0/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2008-08-05 15:12:56 UTC (rev 3712)
+++ branches/Fudaa_Mascaret_3_0/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java 2008-08-05 15:13:59 UTC (rev 3713)
@@ -243,6 +243,7 @@
removeAction("DUPLIQUER");
removeAction("CREER");
removeAction("INDEX_THEMA");
+ removeAction("POINTEURAIDE");
//fred inutile fait par FudaaCommonImplementation
((BuMenu)mb.getMenu("MENU_EDITION")).addMenuItem(
"Console",
@@ -2063,6 +2064,29 @@
}
+///On surcharge displayHelp pour pouvoir modifier le nom de l'application,
+//le nom utilis\xE9 \xE9tant celui fournit dans isApp_.name
+ public void displayHelp(final String _url) {
+ super.displayHelp(FuLib.replace(_url,"fudaa-mascaret","src\\mascaret"));
+ }
+
+
+ public void contextHelp(String _url) {
+ System.err.println("MascaretImplementation contextHelp called"+_url);
+
+ try {
+
+ if (_url==null || _url.length()==0) _url ="mascaret/index.html";
+
+ _url= "aide\\src\\"+_url;
+ System.err.println(_url);
+ displayURL(_url);
+
+ } catch (Exception ex) {
+
+ ex.printStackTrace();
+ }
+ }
/* private void setEtat(int etat_) {
etat= etat_;
}*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <opa...@us...> - 2008-08-05 15:12:51
|
Revision: 3712
http://fudaa.svn.sourceforge.net/fudaa/?rev=3712&view=rev
Author: opasteur
Date: 2008-08-05 15:12:56 +0000 (Tue, 05 Aug 2008)
Log Message:
-----------
Added Paths:
-----------
trunk/fudaa_devel/aide/src/mascaret/alphabetique.html
trunk/fudaa_devel/aide/src/mascaret/choix_noyau.html
trunk/fudaa_devel/aide/src/mascaret/index.html
trunk/fudaa_devel/aide/src/mascaret/p-rapport.html
Added: trunk/fudaa_devel/aide/src/mascaret/alphabetique.html
===================================================================
--- trunk/fudaa_devel/aide/src/mascaret/alphabetique.html (rev 0)
+++ trunk/fudaa_devel/aide/src/mascaret/alphabetique.html 2008-08-05 15:12:56 UTC (rev 3712)
@@ -0,0 +1,33 @@
+<HTML>
+<HEAD>
+ <TITLE>Alphabetique</TITLE>
+ <META NAME="Author" CONTENT="Guillaume Desnoix">
+ <LINK REL="StyleSheet" HREF="/style/aide.css" TITLE="Style">
+</HEAD>
+<BODY>
+<P ALIGN=RIGHT>[ <A HREF="../">Accueil</A>
+| <A HREF="./">Sommaire</A>
+| <A HREF="alphabetique.html">Index</A> ]</P>
+
+<A NAME="index-alphabetique">
+<H1>Index alphabétique</H1>
+<BR><BR>
+<BR>alphabétique:
+<A HREF="alphabetique.html#index-alphabetique">1</A>
+<BR>boutons:
+<A HREF="p-rapport.html#boutons-specifiques">1</A>
+<BR>enregistrement:
+<A HREF="p-rapport.html#enregistrement">1</A>
+<BR>format:
+<A HREF="p-rapport.html#menu-format">1</A>
+<BR>index:
+<A HREF="alphabetique.html#index-alphabetique">1</A>
+<BR>menu:
+<A HREF="p-rapport.html#menu-format">1</A>
+<BR>rapport:
+<A HREF="p-rapport.html#rapport">1</A>
+<BR>spécifiques:
+<A HREF="p-rapport.html#boutons-specifiques">1</A>
+<BR><BR>
+</BODY>
+</HTML>
Property changes on: trunk/fudaa_devel/aide/src/mascaret/alphabetique.html
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/fudaa_devel/aide/src/mascaret/choix_noyau.html
===================================================================
--- trunk/fudaa_devel/aide/src/mascaret/choix_noyau.html (rev 0)
+++ trunk/fudaa_devel/aide/src/mascaret/choix_noyau.html 2008-08-05 15:12:56 UTC (rev 3712)
@@ -0,0 +1,62 @@
+<!-- HEADER - begin -->
+<html>
+<head>
+ <title>Aide Oscar</title>
+ <link rel="StyleSheet" href="style.css" title="Style">
+</head>
+<body bgcolor="white" leftmargin="10" topmargin="10" marginwidth="10" marginheight="10">
+<hr>
+<table border="0" bgcolor="#DDDDDD" width="100%" cellspacing="0" cellpadding="3">
+ <tr>
+ <td width="40"><img alt="Centre d'Etudes Techniques Maritimes et Fluviales" src="images/cetmef-logo.gif" border="1"></td>
+ <td width="40"><a name="top"><img alt="Logiciel Oscar" src="images/oscar-logo.gif" border="1"></a></td>
+ <td align="center"><h1>Aide <i>Oscar</i></h1></td>
+ <td width="60" align="center">[<a href="p-parametres.html"><b>Donn\xE9es</b></a>]</td>
+ <td width="70" align="center">[<a href="p-resultats.html"><b>R\xE9sultats</b></a>]</td>
+ <td bgcolor="white" width="50" align="center">[<a href="index.html"><b>Accueil</b></a>]</td>
+ </tr>
+</table>
+<hr>
+<!-- HEADER - end -->
+
+<p class="titre1">Logiciel OSCAR - Page d'accueil de l'aide</p>
+
+<table width="100%"><tr><td>
+
+<p>Le logiciel OSCAR a pour principal objectif de permettre au projeteur de pr\xE9dimensionner un mur de sout\xE8nement souple (rideau de palplanches, paroi moul\xE9e) selon la m\xE9thode de calcul \xE0 la rupture.</p>
+
+<p>Il permet \xE9galement de d\xE9terminer uniquement les pressions horizontales s'exer\xE7ant en arri\xE8re d'un \xE9cran de sout\xE8nement (souple ou rigide), phase pr\xE9liminaire de la v\xE9rification de la stabilit\xE9 d'un tel ouvrage, sans forc\xE9ment aller jusqu'au bout du pr\xE9dimensionnement (d\xE9terminer la fiche et les efforts subis par le rideau et la nappe d'ancrage \xE9ventuelle).</p>
+
+<p>Le projeteur doit commencer par d\xE9finir les donn\xE9es de son projet (menu Fichier/Nouveau ou Fichier/Ouvrir) : </p>
+
+<ul>
+ <li><a href="p-parametres-sol.html">Caract\xE9ristiques des sols</a></li>
+ <li><a href="p-parametres-eau.html">Action de l'eau</a></li>
+ <li><a href="p-parametres-surcharges.html">Action \xE9ventuelle de surcharges</a> et/ou <a href="p-parametres-efforts.html">d'autres efforts</a></li>
+ <li><a href="p-parametres-ouvrage.html">Informations relatives \xE0 l'ouvrage</a></li>
+</ul>
+
+</td><td valign="top">
+
+<img class="img" src="images/img-01.jpg">
+
+</td></tr></table>
+
+<p>Une fois les donn\xE9es entr\xE9es et valid\xE9es, le projeteur pourra lancer les calculs (menu Calculs/Lancer les calculs) et enfin visualiser les r\xE9sultats (<a href="p-resultats.html">menu R\xE9sultats</a>). Une <a href="p-notedecalculs2.html">note de calcul</a> compl\xE8te est automatiquement g\xE9n\xE9r\xE9e par le logiciel.</p>
+
+<p>L'aide technique sera constamment accessible avec la touche " F1 " de votre clavier. Elle explique les diff\xE9rentes fonctionnalit\xE9s des \xE9crans successifs et donne des recommandations pour choisir certains param\xE8tres. Pour imprimer l'int\xE9gralit\xE9 de l'aide technique, veuillez <a href="notice.html">lire cette page</a>.</p>
+
+<!-- FOOTER - begin -->
+<br><br>
+<hr>
+<table border="0" bgcolor="#DDDDDD" width="100%" cellspacing="0" cellpadding="3">
+ <tr>
+ <td><b><i>Tous droits r\xE9serv\xE9s. CETMEF (c)2003<i></b></td>
+ <td width="200" align="center">r\xE9dacteur : <a href="mailto:man...@eq...">Manuel Le Moine</a></td>
+ <td width="40" align="center">[<a href="#top">haut</a>]</td>
+ </tr>
+</table>
+<hr>
+</body>
+</html>
+<!-- FOOTER - end -->
Property changes on: trunk/fudaa_devel/aide/src/mascaret/choix_noyau.html
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/fudaa_devel/aide/src/mascaret/index.html
===================================================================
--- trunk/fudaa_devel/aide/src/mascaret/index.html (rev 0)
+++ trunk/fudaa_devel/aide/src/mascaret/index.html 2008-08-05 15:12:56 UTC (rev 3712)
@@ -0,0 +1,25 @@
+<html>
+<head>
+<title>Aide en-ligne (Fudaa)</title>
+<meta NAME="Author" CONTENT="Guillaume Desnoix">
+<link REL="StyleSheet" HREF="../aide.css" TITLE="Style">
+</head>
+<body>
+<p ALIGN=RIGHT>[ <a HREF="../">Accueil</a>
+| <a HREF="./">Sommaire</a>
+| <a HREF="alphabetique.html">Index</a> ]</p>
+<h1>Aide en-ligne de FUDAA</h1>
+
+<small>
+<b>Créé le :</b> 2000-07-04<br>
+<b>Modifié le :</b> 2000-10-10<br>
+</small>
+<ul>
+<li><a HREF="alphabetique.html">alphabetique</a></li>
+<li><a HREF="p-rapport.html">p-rapport</a></li>
+</ul>
+<br><br>
+</body>
+</html>
+
+
Property changes on: trunk/fudaa_devel/aide/src/mascaret/index.html
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/fudaa_devel/aide/src/mascaret/p-rapport.html
===================================================================
--- trunk/fudaa_devel/aide/src/mascaret/p-rapport.html (rev 0)
+++ trunk/fudaa_devel/aide/src/mascaret/p-rapport.html 2008-08-05 15:12:56 UTC (rev 3712)
@@ -0,0 +1,34 @@
+<HTML>
+<HEAD>
+ <TITLE>Rapport</TITLE>
+ <META NAME="Author" CONTENT="Guillaume Desnoix">
+ <LINK REL="StyleSheet" HREF="/style/aide.css" TITLE="Style">
+</HEAD>
+<BODY>
+<P ALIGN=RIGHT>[ <A HREF="../">Accueil</A>
+| <A HREF="./">Sommaire</A>
+| <A HREF="alphabetique.html">Index</A> ]</P>
+<A NAME="rapport">
+<H1>Rapport</H1>
+
+<A NAME="menu-format">
+<H2>Menu Format</H2>
+
+<P>...</P>
+
+<A NAME="boutons-specifiques">
+<H2>Boutons spécifiques</H2>
+
+<P>...</P>
+
+<A NAME="enregistrement">
+<H2>Enregistrement</H2>
+
+<P>RTF, HTML, TXT</P>
+
+<BR><BR>
+</BODY>
+</HTML>
+<BR><BR>
+</BODY>
+</HTML>
Property changes on: trunk/fudaa_devel/aide/src/mascaret/p-rapport.html
___________________________________________________________________
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-05 15:09:44
|
Revision: 3711
http://fudaa.svn.sourceforge.net/fudaa/?rev=3711&view=rev
Author: opasteur
Date: 2008-08-05 15:09:52 +0000 (Tue, 05 Aug 2008)
Log Message:
-----------
Added Paths:
-----------
trunk/fudaa_devel/fudaa/Ant_BuildAll.bat
Added: trunk/fudaa_devel/fudaa/Ant_BuildAll.bat
===================================================================
--- trunk/fudaa_devel/fudaa/Ant_BuildAll.bat (rev 0)
+++ trunk/fudaa_devel/fudaa/Ant_BuildAll.bat 2008-08-05 15:09:52 UTC (rev 3711)
@@ -0,0 +1,4 @@
+set PATH=F:\Program Files\Java\jdk1.5.0_09\jre\bin;%PATH%
+set JAVA_HOME=F:\Program Files\Java\jdk1.5.0_09
+ant buildAll
+pause
\ No newline at end of file
Property changes on: trunk/fudaa_devel/fudaa/Ant_BuildAll.bat
___________________________________________________________________
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
