Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[4422] branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ ebli
|
From: <had...@us...> - 2009-01-28 19:17:31
|
Revision: 4422
http://fudaa.svn.sourceforge.net/fudaa/?rev=4422&view=rev
Author: hadouxad
Date: 2009-01-28 19:17:26 +0000 (Wed, 28 Jan 2009)
Log Message:
-----------
lot 3 EDF POST
- Legendes graphes: edition blind?\195?\169e
- Correction du bug de d?\195?\169centrage des mode ?\195?\169dition!!
- suite de calcul modifi?\195?\169e
Modified Paths:
--------------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCalqueLegende.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetTitle.java
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/WidgetLegendeManager.java
Added Paths:
-----------
branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java
Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGPaletteLegendeGraphe.java 2009-01-28 19:17:26 UTC (rev 4422)
@@ -0,0 +1,430 @@
+package org.fudaa.ebli.courbe;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GridLayout;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.image.BufferedImage;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JColorChooser;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+import javax.swing.ListCellRenderer;
+import javax.swing.ListModel;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
+import javax.swing.event.ListDataListener;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import jxl.Image;
+
+import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.CtuluNumberFormatDefault;
+import org.fudaa.ctulu.CtuluNumberFormatI;
+import org.fudaa.ctulu.CtuluRange;
+import org.fudaa.ctulu.gui.CtuluDecimalFormatEditPanel;
+import org.fudaa.ctulu.gui.CtuluDialogPanel;
+import org.fudaa.ctulu.gui.CtuluPopupMenu;
+import org.fudaa.ebli.calque.CalqueGISTreeModel.CellRenderer;
+import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.controle.BConfigurePalette;
+import org.fudaa.ebli.palette.BPalettePlageLegende;
+import org.fudaa.ebli.palette.BPalettePlageTarget;
+import org.fudaa.ebli.palette.BPlageAbstract;
+import org.fudaa.ebli.ressource.EbliResource;
+import org.fudaa.ebli.trace.BPlageInterface;
+import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.ebli.trace.TraceLigne;
+
+import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuBorders;
+import com.memoire.bu.BuButton;
+import com.memoire.bu.BuButtonLayout;
+import com.memoire.bu.BuCheckBox;
+import com.memoire.bu.BuEmptyList;
+import com.memoire.bu.BuGridLayout;
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuLib;
+import com.memoire.bu.BuMenuItem;
+import com.memoire.bu.BuPanel;
+import com.memoire.bu.BuResource;
+import com.memoire.bu.BuScrollPane;
+import com.memoire.bu.BuTextField;
+import com.memoire.bu.BuToolButton;
+import com.memoire.bu.BuVerticalLayout;
+
+
+/**
+ * Palette de l\xE9gende des graphes.
+ * Utilis\xE9e pour \xE9diter les l\xE9gendes des graphes
+ * @author Adrien Hadoux
+ *
+ */
+public class EGPaletteLegendeGraphe extends BuPanel implements ActionListener,ListSelectionListener,BuBorders{
+
+ /**
+ * Graphe associ\xE9 a la palette
+ */
+ EGGraphe graphe_;
+
+ //Map<BuTextField,EGCourbe > mapTitles_;
+
+ /**
+ * Bouton qui applique les changements
+ */
+ JButton btApply_;
+
+ BuToolButton btAssombrir_;
+
+ JButton btColor_;
+
+ BuToolButton btEcl_;
+
+ BuButton btFormat_;
+
+ JButton btRefresh_;
+
+ BuCheckBox cbChangedLeg_;
+
+ CtuluRange dataBoite_;
+
+ TraceIcon ic_;
+
+ boolean isAdjusting_;
+
+ BuMenuItem itemRemove_;
+
+ BuMenuItem itemSplit_;
+
+ JLabel lbGrapheTitle_;
+
+
+ /**
+ * Format des nombres des l\xE9gendes
+ */
+ CtuluNumberFormatI format_ =CtuluNumberFormatDefault.DEFAULT_FMT;
+
+ /**
+ * S\xE9parateur entre les formats
+ */
+ String separatorFormat_="-";
+
+ /**
+ * La liste des cournes
+ */
+ JList list_;
+
+ CtuluPopupMenu menu_;
+
+
+ /**
+ * Panel des donn\xE9es qui se met a jour automatiquement lors du clic dans la liste des courbes.
+ */
+ JPanel panelData_;
+
+ BPlageAbstract plageEnCours_;
+
+ List plages_;
+
+ /**
+ * LE scroll de la liste des courbe
+ */
+ BuScrollPane sp_;
+
+ BPalettePlageTarget target_;
+
+ JTextField tfPlageLeg_;
+ /**
+ * Textfield du contenu du titre de la courbe
+ */
+ JTextField tfTitleCourbeTop_;
+
+
+ //BuTextField txtTitleCourbe_=new BuTextField(10);
+
+
+
+
+
+ private class PlageTableModel implements ListModel{
+ EGCourbe[] liste_;
+ public PlageTableModel(EGCourbe[] list){
+ super();
+ liste_=list;
+ }
+
+ public void addListDataListener(ListDataListener l) {
+ }
+
+ public Object getElementAt(int index) {
+ return liste_[index];
+ }
+
+ public int getSize() {
+ return liste_.length;
+ }
+
+ public void removeListDataListener(ListDataListener l) {
+ }
+ }
+
+ /**
+ * Renderer qui affiche la courbe sous forme de sa courbe miniature et son libell\xE9 \xE0 cot\xE9
+ * @author Adrien Hadoux
+ *
+ */
+ private class LegendeRenderer implements ListCellRenderer{
+
+ private final Color HIGHLIGHT_COLOR = UIManager.getColor("Tree.selectionBackground");
+ public LegendeRenderer(){
+
+ }
+
+ @Override
+ public Component getListCellRendererComponent(JList list, Object value,
+ int index, boolean isSelected, boolean cellHasFocus) {
+ EGCourbe cb=(EGCourbe) value;
+ JLabel resultat=new JLabel();
+
+ BufferedImage image=new BufferedImage(20,20,BufferedImage.TYPE_INT_RGB);
+ Graphics2D g = image.createGraphics();
+ final Rectangle rec = new Rectangle(20,20);
+ //g.translate(rec.x, rec.y);
+ // la ligne
+ g.setColor(Color.white);
+ g.fillRect(0, 0, 20, 20);
+ final TraceLigne l = new TraceLigne(cb.getLigneModel());
+ l.dessineTrait(g, 0, rec.height / 2, rec.width, rec.height / 2);
+ // l'icone
+ final TraceIconModel icm = new TraceIconModel(cb.getIconModel());
+ icm.setTaille(Math.min(rec.width / 3, rec.height/3));// a voir
+ final TraceIcon ic = new TraceIcon(icm);
+ ic.paintIconCentre(g, rec.width / 2, rec.height / 2);
+ //g.translate(-rec.x, -rec.y);
+
+ resultat.setIcon(new ImageIcon(image));
+ resultat.setText(cb.getTitle());
+ resultat.setOpaque(true);
+ //resultat.setIconTextGap(12);
+ if (isSelected) {
+ resultat.setBackground(HIGHLIGHT_COLOR);
+ resultat.setForeground(Color.white);
+ }
+
+ return resultat;
+ }
+
+ }
+
+ PlageTableModel model_;
+
+ public EGPaletteLegendeGraphe(EGGraphe graphe){
+ graphe_=graphe;
+ //mapTitles_=new HashMap<BuTextField, EGCourbe>();
+ //-- construction du panel des l\xE9gendes --//
+ buildContent();
+ }
+
+
+ private EGCourbe getSelectedCourbe(){
+ int select=this.list_.getSelectedIndex();
+ if(select==-1)
+ return null;
+ EGCourbe courbe=graphe_.getModel().getCourbes()[select];
+ return courbe;
+ }
+
+
+ BConfigurePalette paletteConf_=new BConfigurePalette(true);
+ /**
+ * Met a jour le panneau des donn\xE9es.
+ */
+ private void updatePanelData() {
+ //-- on r\xE9cup\xE8re la courbe selectionnee --//
+ EGCourbe courbe=getSelectedCourbe();
+ if(courbe!=null)
+ paletteConf_.setPalettePanelTarget(courbe);
+ }
+
+
+ private void buildContent(){
+
+ final EGCourbe[] cs = graphe_.getModel().getCourbes();
+
+ final BuBorderLayout lay = new BuBorderLayout(2, 2);
+ setLayout(lay);
+
+ //-- liste des courbes --//
+ list_ = new BuEmptyList();
+ model_ = new PlageTableModel(cs);
+ list_.setModel(model_);
+ list_.setCellRenderer(new LegendeRenderer());
+ list_.getSelectionModel().addListSelectionListener(this);
+ list_.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+
+ //list_.setFocusable(false);
+ sp_ = new BuScrollPane(list_);
+ sp_.setPreferredSize(new Dimension(150,100));
+ sp_.setBorder(BorderFactory.createTitledBorder(EbliResource.EBLI.getString("Liste des courbes")));
+ add(sp_, BuBorderLayout.NORTH);
+
+ final BuPanel pnColor = new BuPanel();
+ pnColor.setLayout(new BuButtonLayout(1, SwingConstants.LEFT));
+
+ //-- update le panel des donn\xE9es
+ updatePanelData();
+
+
+ //paletteConf_.setPreferredSize(new Dimension(300,300));
+ paletteConf_.setBorder(BorderFactory.createTitledBorder(EbliResource.EBLI.getString("Param\xE9trage")));
+
+ JScrollPane peast=new JScrollPane(paletteConf_);
+ peast.setPreferredSize(new Dimension(150,200));
+
+ add(peast, BorderLayout.CENTER);
+ btApply_ = new BuButton(BuResource.BU.getIcon("appliquer"));
+ btApply_.setText(BuResource.BU.getString("Appliquer"));
+ btApply_.setToolTipText(EbliLib.getS("Appliquer les modifications"));
+ btApply_.addActionListener(this);
+ btRefresh_ = new BuButton(BuResource.BU.getIcon("rafraichir"));
+ btRefresh_.setText(EbliLib.getS("initialiser"));
+ btRefresh_.setToolTipText(EbliLib.getS("Initialiser les plages des couleurs"));
+ btRefresh_.addActionListener(this);
+ btRefresh_.setEnabled(true);
+// btFormat_ = new BuButton();
+// btFormat_.setText(EbliLib.getS("Format des labels"));
+// btFormat_.setToolTipText(EbliLib.getS("Permet de modifier le formattage des nombres et le s\xE9parateur de valeurs"));
+// btFormat_.addActionListener(this);
+// btFormat_.setEnabled(false);
+ final BuPanel btpn = new BuPanel();
+ btpn.setLayout(new BuButtonLayout(1, SwingConstants.RIGHT));
+
+ //btpn.add(btFormat_);
+ btpn.add(btRefresh_);
+ //btpn.add(btApply_);
+ add(btpn, BuBorderLayout.SOUTH);
+
+ this.setPreferredSize(new Dimension(300,300));
+ this.setMinimumSize(new Dimension(300,300));
+
+ this.setBorder(BorderFactory.createTitledBorder(EbliResource.EBLI.getString("Edition de la l\xE9gende des courbes")));
+ //-- initialise au premier courbe --//
+ list_.setSelectedIndex(0);
+ }
+
+
+
+ public void actionPerformed(ActionEvent _e) {
+
+ EGCourbe courbe=getSelectedCourbe();
+ if(courbe==null)return;
+
+ final Object s = _e.getSource();
+ if ((s == btColor_) ) {
+ final Color n = JColorChooser.showDialog(this, EbliResource.EBLI.getString("Couleur"), ic_.getCouleur());
+ if ((n != null) && (n != ic_.getCouleur())) {
+ // setModified();
+ ic_.setCouleur(n);
+ if(courbe!=null)
+ courbe.setAspectContour(n);
+ }
+ } else if (s == btApply_) {
+ actionApply();
+ } else if (s == btRefresh_) {
+ reinitPlages();
+ } else if (btFormat_ == _e.getSource()) {
+ actionFormat();
+ }
+
+
+ }
+
+
+ /**
+ * Appelee lorsqu'on appuie sur le bouton appliquer
+ */
+ private void actionApply() {
+
+ }
+
+ /**
+ * Reinitialise les titres des courbes avec les donn\xE9es initiales.
+ */
+ private void reinitPlages() {
+
+ }
+
+ /**
+ * Methode qui ajuste toutes les l\xE9gendes en fonction du format choisi et du separator.
+ */
+ protected void ajusteAllLegendes() {
+
+ }
+
+
+
+ public void valueChanged(ListSelectionEvent e) {
+
+ updatePanelData();
+ }
+
+
+
+ private void actionFormat() {
+ CtuluNumberFormatI ctuluNumberFormatI =format_;
+ /*
+ * CtuluNumberFormatI fmt = getDefaultFormat(); if (fmt == null) { fmt = CtuluLib.DEFAULT_NUMBER_FORMAT; }
+ */
+ final CtuluDecimalFormatEditPanel fmtSelect = new CtuluDecimalFormatEditPanel(ctuluNumberFormatI);
+ fmtSelect.setErrorTextUnable();
+ final CtuluDialogPanel pn = new CtuluDialogPanel() {
+ public boolean valide() {
+ return fmtSelect.valide();
+ }
+ };
+ pn.setLayout(new BuVerticalLayout(4));
+ final JPanel pnSep = new BuPanel(new BuGridLayout(2, 2, 2));
+ pnSep.add(new BuLabel(EbliLib.getS("S\xE9parateur")));
+ final BuTextField tf = new BuTextField();
+ tf.setText(separatorFormat_);
+ pnSep.add(tf);
+ pn.add(pnSep);
+
+ if (ctuluNumberFormatI == null || ctuluNumberFormatI.isDecimal()) {
+ fmtSelect.setBorder(BorderFactory.createTitledBorder(EbliLib.getS("Format d\xE9cimal")));
+ pn.add(fmtSelect);
+ }
+ if (CtuluDialogPanel.isOkResponse(pn.afficheModale(this, EbliLib.getS("Format")))) {
+ format_= fmtSelect.getCurrentFmt();
+ separatorFormat_= tf.getText();
+ ajusteAllLegendes();
+
+ }
+ }
+
+
+}
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCalqueLegende.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCalqueLegende.java 2009-01-28 19:16:56 UTC (rev 4421)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCalqueLegende.java 2009-01-28 19:17:26 UTC (rev 4422)
@@ -13,6 +13,8 @@
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ebli.calque.BCalqueLegendePanel;
+import org.fudaa.ebli.courbe.EGFillePanel;
+import org.fudaa.ebli.courbe.EGGraphe;
import org.fudaa.ebli.palette.PaletteSelecteurCouleurPlage;
import org.fudaa.ebli.visuallibrary.EbliScene;
import org.fudaa.ebli.visuallibrary.EbliWidget;
@@ -43,10 +45,11 @@
// Font oldFont_;
boolean mustUpdateFont_ = false;
-
+
public EbliWidgetCalqueLegende(final EbliScene _scene, final boolean _controller/* , BArbreCalqueModel model */,
final BCalqueLegendePanel _legendePanel) {
super(_scene, _controller);
+
setCheckClipping(true);
// oldFont_ = getFormeFont();
// -- la legende est un listener des modifs de son calque --//
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2009-01-28 19:16:56 UTC (rev 4421)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2009-01-28 19:17:26 UTC (rev 4422)
@@ -203,7 +203,7 @@
public Rectangle getInitialEditorComponentBounds(
final org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, final Widget widget,
final BuPanel editor, final Rectangle viewBounds) {
- return convertLocalToScene(getClientArea());
+ return null;// convertLocalToScene(getClientArea());
}
public void notifyOpened(final org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java 2009-01-28 19:16:56 UTC (rev 4421)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java 2009-01-28 19:17:26 UTC (rev 4422)
@@ -245,10 +245,10 @@
public Rectangle getInitialEditorComponentBounds(
final org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller, final Widget widget,
final BuPanel editor, final Rectangle viewBounds) {
- final Rectangle rec = convertLocalToScene(getClientArea());
- rec.width -= 1;
- rec.height -= 1;
- return rec;
+// final Rectangle rec = convertLocalToScene(getClientArea());
+// rec.width -= 1;
+// rec.height -= 1;
+ return null;//rec;
}
public void notifyOpened(final org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetTitle.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetTitle.java 2009-01-28 19:16:56 UTC (rev 4421)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetTitle.java 2009-01-28 19:17:26 UTC (rev 4422)
@@ -47,10 +47,10 @@
// -- ajouter l option de remplacer le text dans le label --//
// -- creation de l action --//
- final WidgetAction editorAction = ActionFactory.createInplaceEditorAction(this);
+ //final WidgetAction editorAction = ActionFactory.createInplaceEditorAction(this);
// -- ajout de l action au label correspondant --//
- intern_.getActions().addAction(editorAction);
+// intern_.getActions().addAction(editorAction);
// setEnabled(false);
}
Modified: 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/WidgetLegendeManager.java 2009-01-28 19:16:56 UTC (rev 4421)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/WidgetLegendeManager.java 2009-01-28 19:17:26 UTC (rev 4422)
@@ -1,24 +1,36 @@
package org.fudaa.ebli.visuallibrary.graphe;
+import java.awt.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Point;
import java.awt.Rectangle;
+import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
+import javax.swing.JComponent;
+
import org.fudaa.ebli.courbe.EGAxe;
import org.fudaa.ebli.courbe.EGCourbe;
+import org.fudaa.ebli.courbe.EGFillePanel;
import org.fudaa.ebli.courbe.EGGraphe;
import org.fudaa.ebli.courbe.EGGrapheModelListener;
import org.fudaa.ebli.courbe.EGObject;
+import org.fudaa.ebli.courbe.EGPaletteLegendeGraphe;
import org.fudaa.ebli.visuallibrary.EbliScene;
import org.fudaa.ebli.visuallibrary.EbliWidget;
import org.fudaa.ebli.visuallibrary.EbliWidgetControllerMenuOnly;
+import org.netbeans.api.visual.action.ActionFactory;
+import org.netbeans.api.visual.action.InplaceEditorProvider;
+import org.netbeans.api.visual.action.WidgetAction;
import org.netbeans.api.visual.layout.LayoutFactory.SerialAlignment;
import org.netbeans.api.visual.widget.Widget;
import org.netbeans.modules.visual.layout.FlowLayout;
+import org.netbeans.modules.visual.util.GeomUtil;
+import com.memoire.bu.BuPanel;
+
/**
* @author denf01a adrien hadoux
* @creation 5 ao\xFBt 2008
@@ -39,13 +51,20 @@
/**
* Creation de la classe widget specifique au calque. Permet de gerer le resize via le changement de font
*/
- public static class WidgetCalqueLegende extends EbliWidget {
+ public static class WidgetCalqueLegende extends EbliWidget implements InplaceEditorProvider<BuPanel> {
Font oldFont_;
-
- public WidgetCalqueLegende(final EbliScene scene, final boolean _controller) {
+ EGGraphe graphe_;
+ public WidgetCalqueLegende(EGGraphe graphe,final EbliScene scene, final boolean _controller) {
super(scene, _controller);
+ graphe_=graphe;
oldFont_ = getFormeFont();
+ // -- creation de l action --//
+ final WidgetAction editorAction = ActionFactory.createInplaceEditorAction(this);
+
+ // -- ajout de l action au label correspondant --//
+ this.getActions().addAction(editorAction);
+
}
protected Rectangle resizeMaxLegende() {
@@ -193,6 +212,80 @@
return true;
}
+
+ public BuPanel createEditorComponent(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget) {
+ EGPaletteLegendeGraphe palette =new EGPaletteLegendeGraphe(this.graphe_);
+ palette.setPreferredSize(new Dimension(300,300));
+
+ return palette;
+ }
+
+ private void updateRectangleToFitToView(final Rectangle rectangle) {
+ final JComponent component = this.getScene().getView();
+ if (rectangle.x + rectangle.width > component.getWidth()) rectangle.x = component.getWidth() - rectangle.width;
+ if (rectangle.y + rectangle.height > component.getHeight()) rectangle.y = component.getHeight() - rectangle.height;
+ if (rectangle.x < 0) rectangle.x = 0;
+ if (rectangle.y < 0) rectangle.y = 0;
+ }
+
+ public EnumSet<org.netbeans.api.visual.action.InplaceEditorProvider.ExpansionDirection> getExpansionDirections(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, BuPanel editor) {
+ return null;
+ }
+
+
+ public Rectangle getInitialEditorComponentBounds(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, BuPanel editor, Rectangle viewBounds) {
+
+ Rectangle rectangle = widget.getScene().convertSceneToView(widget.convertLocalToScene(widget.getBounds()));
+
+
+ final Point center = GeomUtil.center(rectangle);
+ final Dimension size = editor.getMinimumSize();
+ if (rectangle.width > size.width) size.width = rectangle.width;
+ if (rectangle.height > size.height) size.height = rectangle.height;
+ final int x = center.x - size.width / 2;
+ final int y = center.y - size.height / 2;
+ rectangle = new Rectangle(x, y, size.width, size.height);
+ updateRectangleToFitToView(rectangle);
+
+ //-- pour que ce soit clairment visible --//
+ int tailleMinW=400;
+ int tailleMinH=500;
+ if( rectangle.width<tailleMinW){
+ int dim=tailleMinW-rectangle.width;
+ rectangle.width+=dim;
+ rectangle.x=rectangle.x-dim/2;
+ }
+ if( rectangle.height<tailleMinH){
+ int dim=tailleMinH-rectangle.height;
+ rectangle.height+=dim;
+ rectangle.y=rectangle.y-dim/2;
+ }
+
+ return rectangle;
+ }
+
+
+ public void notifyClosing(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, BuPanel editor, boolean commit) {
+ // TODO Auto-generated method stub
+
+ }
+
+
+ public void notifyOpened(
+ org.netbeans.api.visual.action.InplaceEditorProvider.EditorController controller,
+ Widget widget, BuPanel editor) {
+ // TODO Auto-generated method stub
+
+ }
+
}
/**
@@ -205,7 +298,7 @@
*/
public static EbliWidget createLegende(final EGGraphe g, final EbliScene scene, final Point PreferredLocation) {
final EGCourbe[] cs = g.getModel().getCourbes();
- final WidgetCalqueLegende res = new WidgetCalqueLegende(scene, false);
+ final WidgetCalqueLegende res = new WidgetCalqueLegende(g,scene, false);
res.setLayout(new FlowLayout(true, SerialAlignment.CENTER, 5));// a
// modifier
// pour
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
