Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2012-09-25 13:34:41
|
Revision: 7658
http://fudaa.svn.sourceforge.net/fudaa/?rev=7658&view=rev
Author: deniger
Date: 2012-09-25 13:34:35 +0000 (Tue, 25 Sep 2012)
Log Message:
-----------
la molette du milieu d?\195?\169place la vue
Modified Paths:
--------------
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/repere/RepereMouseKeyController.java
trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/repere/RepereMouseKeyController.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/repere/RepereMouseKeyController.java 2012-09-25 13:34:05 UTC (rev 7657)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/repere/RepereMouseKeyController.java 2012-09-25 13:34:35 UTC (rev 7658)
@@ -23,9 +23,7 @@
public class RepereMouseKeyController extends MouseAdapter implements KeyListener, MouseWheelListener {
long nextTime_;
-
long nextTimeRapide_;
-
final RepereMouseKeyTarget target_;
public RepereMouseKeyController(final RepereMouseKeyTarget _target) {
@@ -38,12 +36,12 @@
public void mouseReleased(final MouseEvent _evt) {
if (SwingUtilities.isMiddleMouseButton(_evt)) {
- target_.zoomOnMouse(_evt, _evt.isShiftDown());
+// target_.zoomOnMouse(_evt, _evt.isShiftDown());
}
}
-
+
public void mouseClicked(final MouseEvent _e) {
- target_.requestFocus();
+ target_.requestFocus();
}
public void keyPressed(final KeyEvent _e) {
@@ -75,12 +73,13 @@
}
public void keyReleased(final KeyEvent _e) {
- nextTime_ = 0;
- target_.setRapide(false);
-
+ nextTime_ = 0;
+ target_.setRapide(false);
+
}
- public void keyTyped(final KeyEvent _e) {}
+ public void keyTyped(final KeyEvent _e) {
+ }
public void mouseWheelMoved(final MouseWheelEvent _e) {
if (_e.isConsumed()) {
Modified: trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
===================================================================
--- trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2012-09-25 13:34:05 UTC (rev 7657)
+++ trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2012-09-25 13:34:35 UTC (rev 7658)
@@ -849,4 +849,5 @@
Ins\xE9rer une vue 2D=Insert a 2D view
L\xE9gende calque=Layer legend
S\xE9lectionnez l'emplacement de votre projet=Select the location of your project
-Configurer les courbes=Configure curves
\ No newline at end of file
+Configurer les courbes=Configure curves
+Ajouter des points=Add points
\ 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...> - 2012-10-04 22:36:04
|
Revision: 7704
http://fudaa.svn.sourceforge.net/fudaa/?rev=7704&view=rev
Author: deniger
Date: 2012-10-04 22:35:58 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
am?\195?\169lioration des courbes: labels verticaux, banni?\195?\168res...
Modified Paths:
--------------
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/trace/TraceBox.java
trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/trace/TraceBox.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/trace/TraceBox.java 2012-10-04 21:32:58 UTC (rev 7703)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/trace/TraceBox.java 2012-10-04 22:35:58 UTC (rev 7704)
@@ -9,9 +9,11 @@
import com.memoire.fu.FuLib;
import java.awt.Color;
+import java.awt.Dimension;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.Rectangle;
+import java.awt.geom.AffineTransform;
import javax.swing.SwingConstants;
@@ -22,12 +24,13 @@
* @author Fred Deniger
* @version $Id: TraceBox.java,v 1.5 2006-09-19 14:55:49 deniger Exp $
*/
-public class TraceBox extends AbstractTraceBoxedData{
+public class TraceBox extends AbstractTraceBoxedData {
private Color colorFond_;
private Color colorBoite_;
private Color colorText_;
private boolean drawBox_;
+ private boolean vertical;
private boolean drawFond_;
private int hMargin_;
private TraceLigne traceLigne_;
@@ -51,6 +54,14 @@
return colorFond_;
}
+ public boolean isVertical() {
+ return vertical;
+ }
+
+ public void setVertical(boolean vertical) {
+ this.vertical = vertical;
+ }
+
public Color getColorBoite() {
if (colorBoite_ == null) {
colorBoite_ = Color.BLACK;
@@ -69,7 +80,6 @@
return hMargin_;
}
-
public TraceLigne getTraceLigne() {
return traceLigne_;
}
@@ -78,7 +88,6 @@
return vMargin_;
}
-
public boolean isDrawBox() {
return drawBox_;
}
@@ -92,26 +101,45 @@
paintBox(_g2d, _x, _y, _s, null);
}
+ public int getTotalHeightMargin() {
+ return 2 * hMargin_ + (int) (2 * traceLigne_.getEpaisseur());
+ }
+
+ public int getTotalWidthMargin() {
+ return 2 * hMargin_ + (int) (2 * traceLigne_.getEpaisseur());
+ }
+
+ public Dimension getDimension(final Graphics2D _g2d, final String _s) {
+ if (traceLigne_ == null) {
+ traceLigne_ = new TraceLigne();
+ }
+ final FontMetrics fm = _g2d.getFontMetrics();
+ String[] lines = FuLib.split(_s, '\n');
+ final int fontHeight = fm.getHeight();
+ final int hString = (fontHeight) * lines.length + (lines.length - 1) * vMargin_;
+ int wString = getMaxStringWith(fm, lines);
+ int hOuter = hString + getTotalHeightMargin();
+ int wOuter = wString + getTotalWidthMargin();
+ if (vertical) {
+ int tmp = hOuter;
+ hOuter = wOuter;
+ wOuter = tmp;
+ }
+ return new Dimension(wOuter, hOuter);
+ }
+
public void paintBox(final Graphics2D _g2d, final int _x, final int _y, final String _s, Rectangle view) {
+ Dimension dimension = getDimension(_g2d, _s);
+ int hOuter = dimension.height;
+ int wOuter = dimension.width;
if (traceLigne_ == null) {
traceLigne_ = new TraceLigne();
}
final FontMetrics fm = _g2d.getFontMetrics();
String[] lines = FuLib.split(_s, '\n');
final int fontHeight = fm.getHeight();
-// int[] width = new int[lines.length];
final int hString = (fontHeight) * lines.length + (lines.length - 1) * vMargin_;
- int wString = fm.stringWidth(lines[0]);
-// width[0] = wString;
- for (int i = 0; i < lines.length; i++) {
- final int stringWidth = fm.stringWidth(lines[i]);
-// width[i] = stringWidth;
- wString = Math.max(stringWidth, wString);
- }
- final int hInner = hString + 2 * hMargin_;
- final int wInner = wString + 2 * vMargin_;
- final int hOuter = hInner + (int) (2 * traceLigne_.getEpaisseur());
- final int wOuter = wInner + (int) (2 * traceLigne_.getEpaisseur());
+ int wString = getMaxStringWith(fm, lines);
int xTopLeft = _x;
if (hPosition_ == SwingConstants.CENTER) {
xTopLeft -= wOuter / 2;
@@ -142,10 +170,17 @@
_g2d.setColor(getColorText());
final int x = xTopLeft + wOuter / 2 - wString / 2;
final int stringTopLeft = yTopLeft + hOuter / 2 - hString / 2;
+ AffineTransform save = null;
+ if (vertical) {
+ save = _g2d.getTransform();
+ _g2d.rotate(-Math.PI / 2, xTopLeft + wOuter / 2, yTopLeft + hOuter / 2);
+ }
for (int i = 0; i < lines.length; i++) {
_g2d.drawString(lines[i], x, stringTopLeft + (i + 1) * fontHeight + (i - 1) * vMargin_ - fm.getDescent());
-
}
+ if (save != null) {
+ _g2d.setTransform(save);
+ }
}
@@ -173,7 +208,6 @@
hMargin_ = _margin;
}
-
public void setTraceLigne(final TraceLigne _traceLigne) {
traceLigne_ = _traceLigne;
}
@@ -182,7 +216,6 @@
vMargin_ = _margin;
}
-
public TraceBox duplicate() {
TraceBox duplic = new TraceBox();
duplic.colorBoite_ = this.colorBoite_;
@@ -198,4 +231,13 @@
return duplic;
}
-}
\ No newline at end of file
+
+ private int getMaxStringWith(final FontMetrics fm, String[] lines) {
+ int wString = fm.stringWidth(lines[0]);
+ for (int i = 0; i < lines.length; i++) {
+ final int stringWidth = fm.stringWidth(lines[i]);
+ wString = Math.max(stringWidth, wString);
+ }
+ return wString;
+ }
+}
Modified: trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
===================================================================
--- trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2012-10-04 21:32:58 UTC (rev 7703)
+++ trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2012-10-04 22:35:58 UTC (rev 7704)
@@ -850,4 +850,6 @@
L\xE9gende calque=Layer legend
S\xE9lectionnez l'emplacement de votre projet=Select the location of your project
Configurer les courbes=Configure curves
-Ajouter des points=Add points
\ No newline at end of file
+Ajouter des points=Add points
+Afficher les labels des points=Display points label
+Labels verticaux=Vertical labels
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-01-10 14:12:03
|
Revision: 8193
http://fudaa.svn.sourceforge.net/fudaa/?rev=8193&view=rev
Author: deniger
Date: 2013-01-10 14:11:56 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigurableComposite.java
trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigurableComposite.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigurableComposite.java 2013-01-08 10:11:22 UTC (rev 8192)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BConfigurableComposite.java 2013-01-10 14:11:56 UTC (rev 8193)
@@ -28,7 +28,7 @@
public BConfigurableComposite(final BConfigurableInterface _childs, final String _title) {
super();
- childs_ = new BConfigurableInterface[] { _childs };
+ childs_ = new BConfigurableInterface[]{_childs};
title_ = _title;
}
@@ -38,23 +38,23 @@
}
public BConfigurableComposite(final BConfigurableInterface _child1, final BConfigurableInterface _child2,
- final String _title) {
+ final String _title) {
super();
- childs_ = new BConfigurableInterface[] { _child1, _child2 };
+ childs_ = new BConfigurableInterface[]{_child1, _child2};
title_ = _title;
}
public BConfigurableComposite(final BConfigurableInterface _child1, final BConfigurableInterface _child2,
- final BConfigurableInterface _child3, final String _title) {
+ final BConfigurableInterface _child3, final String _title) {
super();
- childs_ = new BConfigurableInterface[] { _child1, _child2, _child3 };
+ childs_ = new BConfigurableInterface[]{_child1, _child2, _child3};
title_ = _title;
}
public BConfigurableComposite(final BConfigurableInterface _child1, final BConfigurableInterface _child2,
- final BConfigurableInterface _child3, final BConfigurableInterface _child4, final String _title) {
+ final BConfigurableInterface _child3, final BConfigurableInterface _child4, final String _title) {
super();
- childs_ = new BConfigurableInterface[] { _child1, _child2, _child3, _child4 };
+ childs_ = new BConfigurableInterface[]{_child1, _child2, _child3, _child4};
title_ = _title;
}
@@ -77,9 +77,10 @@
public void stopConfiguration() {
if (childs_ != null) {
for (int i = 0; i < childs_.length; i++) {
- childs_[i].stopConfiguration();
+ if (childs_[i] != null) {
+ childs_[i].stopConfiguration();
+ }
}
}
}
-
}
Modified: trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
===================================================================
--- trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2013-01-08 10:11:22 UTC (rev 8192)
+++ trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2013-01-10 14:11:56 UTC (rev 8193)
@@ -1,3 +1,5 @@
+Afficher les labels=Display Labels
+Labels=Labels
Arri\xE8re plan=Background
Bloqu\xE9=Blocked
Fl\xE8che=Arrow
@@ -708,6 +710,8 @@
Tester Java 3D=Test Java 3D
Texte {0}=Text {0}
Texte=Text
+Couleur fond=Background color
+Couleur texte=Text color
Texture=Texture
Titre centr\xE9=Center title
Titre de la courbe=Curve title
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-02-14 09:50:07
|
Revision: 8619
http://sourceforge.net/p/fudaa/svn/8619
Author: deniger
Date: 2014-02-14 09:50:02 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BSelecteurCheckBox.java
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/repere/RepereMouseKeyController.java
trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BSelecteurCheckBox.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BSelecteurCheckBox.java 2014-02-14 08:34:06 UTC (rev 8618)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/controle/BSelecteurCheckBox.java 2014-02-14 09:50:02 UTC (rev 8619)
@@ -25,6 +25,7 @@
JToggleButton cb_;
public static final String PROP_VISIBLE = "visible";
+ public static final String PROP_USER_VISIBLE = "userVisible";
private boolean inverseResult_;
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/repere/RepereMouseKeyController.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/repere/RepereMouseKeyController.java 2014-02-14 08:34:06 UTC (rev 8618)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/repere/RepereMouseKeyController.java 2014-02-14 09:50:02 UTC (rev 8619)
@@ -90,9 +90,9 @@
}
if (_e.isControlDown()) {
if (_e.getWheelRotation() > 0) {
- target_.zoomOut();
+ target_.zoomOnMouse(_e, true);
} else {
- target_.zoomIn();
+ target_.zoomOnMouse(_e, false);
}
} else {
if (_e.getWheelRotation() < 0) {
Modified: trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
===================================================================
--- trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2014-02-14 08:34:06 UTC (rev 8618)
+++ trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2014-02-14 09:50:02 UTC (rev 8619)
@@ -227,6 +227,7 @@
D\xE9placer s\xE9lection=Move selection
D\xE9placer un point=Move a point
D\xE9truire=Destroy
+Supprimer=Delete
Ecart minimal entre 2 graduations successives=Minimal increment between 2 scale marks
Ecart=Variation
Echelle des vecteurs=Vectors scale
@@ -887,4 +888,5 @@
Raffinement\: {0} point(s) ajout\xE9(s)=Refinement\: {0} points{s) added
D\xE9cimation\: {0} point(s) enlev\xE9(s)=Decimation\: {0} point(s) removed
{0} objet(s) d\xE9plac\xE9(s)={0} object{s) moved
-Ajouter un sommet=Add a vertex
\ No newline at end of file
+Ajouter un sommet=Add a vertex
+{0} obj. s\xE9lect.={0} selected obj.
\ 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...> - 2015-09-10 14:41:02
|
Revision: 9163
http://sourceforge.net/p/fudaa/svn/9163
Author: deniger
Date: 2015-09-10 14:41:00 +0000 (Thu, 10 Sep 2015)
Log Message:
-----------
CRUE-657
Modified Paths:
--------------
trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java
trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
Modified: trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java
===================================================================
--- trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java 2015-09-10 14:23:32 UTC (rev 9162)
+++ trunk/framework/ebli-common/src/main/java/org/fudaa/ebli/commun/EbliComponentFactory.java 2015-09-10 14:41:00 UTC (rev 9163)
@@ -18,16 +18,21 @@
import com.memoire.bu.BuButton;
import com.memoire.bu.BuCheckBoxMenuItem;
+import com.memoire.bu.BuColorIcon;
+import com.memoire.bu.BuComposedIcon;
import com.memoire.bu.BuMenuItem;
import com.memoire.bu.BuToggleButton;
+import java.awt.Color;
/**
* @author deniger
* @version $Id: EbliComponentFactory.java,v 1.12 2006-09-19 14:55:55 deniger Exp $
*/
public final class EbliComponentFactory {
-
+
public final static EbliComponentFactory INSTANCE = new EbliComponentFactory();
+
+ private Color useSelectedIcon;
/**
*
@@ -36,12 +41,20 @@
super();
}
+ public Color getUseSelectedIcon() {
+ return useSelectedIcon;
+ }
+
+ public void setUseSelectedIcon(Color useSelectedIcon) {
+ this.useSelectedIcon = useSelectedIcon;
+ }
+
private void decoreStateButton(final AbstractButton _r, final EbliActionChangeState _a) {
_r.setAction(_a);
_r.setSelected(_a.isSelected());
_a.addPropertyChangeListener(new EbliSelectedChangeListener(_r));
}
-
+
public void addActionsToMenu(final EbliActionInterface[] _acs, final JMenu _dest) {
if ((_acs != null) && (_dest != null)) {
final int n = _acs.length;
@@ -55,7 +68,7 @@
}
}
}
-
+
public void addActionsToMenu(final EbliActionInterface[] _acs, final JPopupMenu _dest) {
if ((_acs != null) && (_dest != null)) {
final int n = _acs.length;
@@ -69,31 +82,35 @@
}
}
}
-
+
public AbstractButton buildButton(final EbliActionChangeState _a) {
final JToggleButton r = new BuToggleButton();
decoreStateButton(r, _a);
+ if (useSelectedIcon != null && _a.getIcon() != null) {
+ BuComposedIcon selectedIcon = new BuComposedIcon(_a.getIcon(), new BuColorIcon(useSelectedIcon));
+ r.setSelectedIcon(selectedIcon);
+ }
return r;
}
-
+
public AbstractButton buildButton(final EbliActionSimple _a) {
final AbstractButton r = new BuButton();
r.setAction(_a);
return r;
}
-
+
public JMenuItem buildMenuItem(final EbliActionChangeState _a) {
final BuCheckBoxMenuItem r = new BuCheckBoxMenuItem();
decoreStateButton(r, _a);
return r;
}
-
+
public JMenuItem buildMenuItem(final EbliActionSimple _a) {
final JMenuItem r = new BuMenuItem();
r.setAction(_a);
return r;
}
-
+
public AbstractButton buildToolButton(final EbliActionChangeState _a) {
final AbstractButton r = new BuToggleButton();
decoreStateButton(r, _a);
@@ -108,23 +125,23 @@
r.setText(_a.getTitle());
return r;
}
-
+
public AbstractButton buildToolButton(final EbliActionPaletteAbstract _a) {
final AbstractButton r = new EbliPaletteButton(_a);
decoreStateButton(r, _a);
decoreToolBarButton(r);
return r;
}
-
+
public AbstractButton buildToolButton(final EbliActionSimple _a) {
final AbstractButton r = new EbliButtonTool(_a);
decoreToolBarButton(r);
return r;
}
-
+
public void decoreToolBarButton(final AbstractButton _r) {
_r.setText("");
_r.setRolloverEnabled(true);
_r.setBorderPainted(false);
}
-}
\ No newline at end of file
+}
Modified: trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt
===================================================================
--- trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2015-09-10 14:23:32 UTC (rev 9162)
+++ trunk/framework/ebli-common/src/main/resources/org/fudaa/ebli/ressource/ebli_en.fr_txt 2015-09-10 14:41:00 UTC (rev 9163)
@@ -907,4 +907,5 @@
Type Nuage de points=Points fog type
Mode contour=Contour mode
Mode densit\xE9=Density mode
-Un calque \xE9ditable doit \xEAtre selectionn\xE9=An editable layer must be selected
\ No newline at end of file
+Un calque \xE9ditable doit \xEAtre selectionn\xE9=An editable layer must be selected
+Autom. zoom=Zoom auto
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X