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: <emm...@us...> - 2008-11-06 10:57:10
|
Revision: 4179
http://fudaa.svn.sourceforge.net/fudaa/?rev=4179&view=rev
Author: emmanuel_martin
Date: 2008-11-06 10:56:59 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
tache #93 : "Undo sur g?\195?\169om?\195?\169tries d?\195?\169truites : Les attributs ne sont pas correctement restitu?\195?\169s."
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListObject.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListObject.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListObject.java 2008-11-06 10:20:31 UTC (rev 4178)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListObject.java 2008-11-06 10:56:59 UTC (rev 4179)
@@ -196,11 +196,25 @@
}
public void redo() {
- remove(idx_);
+ /*
+ * Losqu'on supprime un indice de la liste, \xE7a d\xE9cale tout les indices
+ * suivants de -1. Donc pour pouvoir supprimer plusieurs indices de fa\xE7on
+ * coh\xE9rente, il faut commencer par la fin de la liste. Contrairement \xE0
+ * l'ajout.
+ */
+ for(int i=idx_.length-1;i>=0;i--)
+ internalRemove(idx_[i]);
}
public void undo() {
- insertDangerous(idx_, oldValues_);
+ /*
+ * Losqu'on ajoute un indice de la liste, \xE7a d\xE9cale tout les indices
+ * suivants de +1. Donc pour pouvoir ajouter plusieurs indices de fa\xE7on
+ * coh\xE9rente, il faut commencer par la d\xE9but de la liste. Contrairement \xE0
+ * la supression.
+ */
+ for(int i=0;i<idx_.length;i++)
+ internalAdd(idx_[i], oldValues_[i]);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-11-06 10:20:37
|
Revision: 4178
http://fudaa.svn.sourceforge.net/fudaa/?rev=4178&view=rev
Author: bmarchan
Date: 2008-11-06 10:20:31 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
Nettoyage pour que la palette info se base sur les ZSelectionEvent en provenance de la scene.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePaletteInfo.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZSelectionListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleGeometryDefault.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteInfo.java
Property Changed:
----------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePaletteInfo.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZSelectionListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteInfo.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePaletteInfo.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePaletteInfo.java 2008-11-05 16:59:14 UTC (rev 4177)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePaletteInfo.java 2008-11-06 10:20:31 UTC (rev 4178)
@@ -1,6 +1,6 @@
/**
* @creation 8 d\xE9c. 2003
- * @modification $Date: 2007-05-04 13:49:43 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -8,58 +8,47 @@
package org.fudaa.ebli.calque;
import java.util.ArrayList;
+import java.util.HashSet;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import org.fudaa.ctulu.CtuluCommandManager;
import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.CtuluListSelection;
+import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.gis.GISAttributeInterface;
import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface;
import org.fudaa.ebli.palette.BPaletteInfo;
import com.vividsolutions.jts.geom.Geometry;
/**
* Un panel affichant les infos envoyes par TrPanelInfoSender.
* @author deniger
- * @version $Id: BCalquePaletteInfo.java,v 1.7 2007-05-04 13:49:43 deniger Exp $
+ * @version $Id$
*/
public class BCalquePaletteInfo extends BPaletteInfo implements TreeSelectionListener, ZSelectionListener, ZModelGeometryListener {
private ArrayList<ZCalqueAffichageDonneesInterface> calqueWithGeometriesSelected_;
private BArbreCalqueModel treeModel_;
+ private ZScene scene_;
- private class CalqueVisitor implements BCalqueVisitor {
- private ArrayList<ZCalqueAffichageDonneesInterface> calques=new ArrayList<ZCalqueAffichageDonneesInterface>();
- public boolean visit(BCalque _cq) {
- if(_cq instanceof ZCalqueAffichageDonneesInterface)
- calques.add((ZCalqueAffichageDonneesInterface)_cq);
- return true;
- }
- public ZCalqueAffichageDonneesInterface[] getCalques(){
- return calques.toArray(new ZCalqueAffichageDonneesInterface[0]);
- }
- }
-
- public BCalquePaletteInfo(final BArbreCalqueModel _m, CtuluCommandManager _cmd) {
+ /**
+ * Cr\xE9ation de la palette.
+ * @param _scene La scene, pour r\xE9cup\xE9rer tous les calques de donn\xE9es.
+ * @param _m Le modele d'arbre, pour en r\xE9cup\xE9rer les evenements.
+ * @param _cmd Le manager de commande.
+ */
+ public BCalquePaletteInfo(final ZScene _scene, final BArbreCalqueModel _m, CtuluCommandManager _cmd) {
super(_cmd);
treeModel_ = _m;
treeModel_.addTreeSelectionListener(this);
+ scene_=_scene;
+ scene_.addSelectionListener(this);
calqueWithGeometriesSelected_=new ArrayList<ZCalqueAffichageDonneesInterface>();
- ZCalqueAffichageDonneesInterface[] calques = getCalques();
- for(int i=0;i<calques.length;i++)
- calques[i].addSelectionListener(this);
}
-
- /**
- * @return les calques de type ZCalqueAffichageDonneesInterface contenus dans l'arbre de calque.
- */
- private ZCalqueAffichageDonneesInterface[] getCalques(){
- CalqueVisitor visitor=new CalqueVisitor();
- treeModel_.getRootCalque().apply(visitor);
- return visitor.getCalques();
- }
/**
* Met \xE0 jour les informations contenues dans le tableau.
@@ -69,15 +58,10 @@
txtTitle_.setText(CtuluLibString.EMPTY_STRING);
tableModel_.clear();
// Ajout des nouvelles informations \\
+
// Informations g\xE9n\xE9rales
- ZCalqueAffichageDonneesInterface[] calques = getCalques();
- int nbGeom=0;
- int nbGeomSelected=0;
- for(int i=0;i<calques.length;i++){
- nbGeom+=calques[i].modeleDonnees().getNombre();
- if(calques[i].getLayerSelection()!=null)
- nbGeomSelected+=calques[i].getLayerSelection().getNbSelectedIndex();
- }
+ int nbGeom=scene_.getNombre();
+ int nbGeomSelected=scene_.getLayerSelection().getNbSelectedIndex();
if(nbGeomSelected>0)
tableModel_.put(EbliLib.getS("Nombre total de s\xE9lections"), Integer.toString(nbGeomSelected)+"/"+Integer.toString(nbGeom));
// Informations relatives aux calques
@@ -91,62 +75,34 @@
tableModel_.fireTableDataChanged();
break;
default:
- tableModel_.setTitle(EbliLib.getS("Selection Multiple"));
+ tableModel_.setTitle(EbliLib.getS("S\xE9lection multicalques"));
}
updateSize();
}
public void selectionChanged(final ZSelectionEvent _evt) {
if (isAvailable()) {
- if (_evt.getSource().getLayerSelection()!=null&&_evt.getSource().getLayerSelection().getNbSelectedIndex()>0
- ||_evt.getSource().getLayerSelectionMulti()!=null&&_evt.getSource().getLayerSelectionMulti().getNbSelectedItem()>0) {
- if (!calqueWithGeometriesSelected_.contains(_evt.getSource())){
- calqueWithGeometriesSelected_.add(_evt.getSource());
- ZModeleDonnees model=_evt.getSource().modeleDonnees();
- if(model instanceof ZModeleGeometry)
- ((ZModeleGeometry)model).addModelListener(this);
+ // Nombre de calques ayant des selections (atomiques ou globales)
+ calqueWithGeometriesSelected_.clear();
+ ZCalqueAffichageDonneesInterface[] cqs=scene_.getAllLayers();
+ for (ZCalqueAffichageDonneesInterface cq: cqs) {
+ if (cq.getLayerSelection()!=null && cq.getLayerSelection().getNbSelectedIndex()>0 ||
+ cq.getLayerSelectionMulti()!=null && cq.getLayerSelectionMulti().getNbSelectedItem()>0) {
+ if (!calqueWithGeometriesSelected_.contains(cq)) calqueWithGeometriesSelected_.add(cq);
}
}
- else {
- if (calqueWithGeometriesSelected_.contains(_evt.getSource())){
- calqueWithGeometriesSelected_.remove(_evt.getSource());
- ZModeleDonnees model=_evt.getSource().modeleDonnees();
- if(model instanceof ZModeleGeometry)
- ((ZModeleGeometry)model).removeModelListener(this);
- }
- }
updateTableModel();
}
}
public void updateState() {
- if (isAvailable()) {
- // Supression des \xE9coutes sur les calques et des calques
- for(int i=0;i<calqueWithGeometriesSelected_.size();i++){
- ZModeleDonnees model=calqueWithGeometriesSelected_.get(i).modeleDonnees();
- if(model instanceof ZModeleGeometry)
- ((ZModeleGeometry)model).removeModelListener(this);
- }
- calqueWithGeometriesSelected_.clear();
- // R\xE9cup\xE9ration des calques ayant une selection et ajout des \xE9coutes
- ZCalqueAffichageDonneesInterface[] calques=getCalques();
- for (int i=0; i<calques.length; i++)
- if (calques[i].getLayerSelection()!=null&&calques[i].getLayerSelection().getNbSelectedIndex()>0){
- calqueWithGeometriesSelected_.add(calques[i]);
- ZModeleDonnees model=calques[i].modeleDonnees();
- if(model instanceof ZModeleGeometry)
- ((ZModeleGeometry)model).addModelListener(this);
- }
- // Mise \xE0 jour du tableau des informations
+ if (isAvailable())
updateTableModel();
- }
}
-
-
public void valueChanged(final TreeSelectionEvent _e) {
- if (isAvailable()&&calqueWithGeometriesSelected_.size()==0)
+ if (isAvailable()&& calqueWithGeometriesSelected_.size()==0) // Seulement pour l'info sur calque.
updateTableModel();
}
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePaletteInfo.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java 2008-11-05 16:59:14 UTC (rev 4177)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java 2008-11-06 10:20:31 UTC (rev 4178)
@@ -1,6 +1,6 @@
/*
* @creation 19 sept. 2005
- * @modification $Date: 2008-05-13 12:10:37 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -61,7 +61,7 @@
* Ce controleur peut \xE9galement g\xE9rer des actions exclusives sp\xE9cifiques.
*
* @author Fred Deniger
- * @version $Id: ZEbliCalquePanelController.java,v 1.25.4.3 2008-05-13 12:10:37 bmarchan Exp $
+ * @version $Id$
*/
public class ZEbliCalquePanelController implements TreeSelectionListener, PropertyChangeListener {
@@ -360,7 +360,7 @@
}
public JComponent buildContentPane() {
- return new BCalquePaletteInfo(pn_.getArbreCalqueModel(), pn_.gisEditor_.getMng());
+ return new BCalquePaletteInfo(pn_.getScene(),pn_.getArbreCalqueModel(), pn_.gisEditor_.getMng());
}
};
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZSelectionListener.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZSelectionListener.java 2008-11-05 16:59:14 UTC (rev 4177)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZSelectionListener.java 2008-11-06 10:20:31 UTC (rev 4178)
@@ -1,7 +1,7 @@
/*
* @file ZSelectionListener.java
* @creation 2002-10-02
- * @modification $Date: 2005-08-16 13:02:10 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -9,11 +9,17 @@
package org.fudaa.ebli.calque;
import java.util.EventListener;
/**
- * Interface auditeur de l'evenement <I>SelectionEvent</I>.
+ * Une interface auditeur des changements de selections d'objets sur un calque. La classe qui l'implemente ecoute l'evenement
+ * {@link SelectionEvent}.
*
- * @version $Id: ZSelectionListener.java,v 1.4 2005-08-16 13:02:10 deniger Exp $
+ * @version $Id$
* @author Bertrand Marchand
*/
public interface ZSelectionListener extends EventListener {
+
+ /**
+ * Methode appel\xE9e lors d'un changement de selection d'objet sur un calque.
+ * @param _evt L'evenement de selection.
+ */
void selectionChanged(ZSelectionEvent _evt);
}
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZSelectionListener.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleGeometryDefault.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleGeometryDefault.java 2008-11-05 16:59:14 UTC (rev 4177)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleGeometryDefault.java 2008-11-06 10:20:31 UTC (rev 4178)
@@ -154,7 +154,7 @@
else {
_d.setOnlyOneGeometry(false);
// Informations sur les g\xE9om\xE9tries selectionn\xE9es
- _d.setTitle(EbliLib.getS("Selection Multiple"));
+ _d.setTitle(EbliLib.getS("S\xE9lection multiple"));
// Informations sur le calque
_d.put(EbliLib.getS("Calque"), _layer.getTitle());
// Ajout des attributs et des valeurs de la g\xE9om\xE9trie selectionn\xE9e
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteInfo.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteInfo.java 2008-11-05 16:59:14 UTC (rev 4177)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteInfo.java 2008-11-06 10:20:31 UTC (rev 4178)
@@ -1,6 +1,6 @@
/*
* @creation 8 d\xE9c. 2003
- * @modification $Date: 2006-09-19 14:55:51 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -39,13 +39,13 @@
* Un panel affichant les infos envoyes.
*
* @author deniger
- * @version $Id: BPaletteInfo.java,v 1.9 2006-09-19 14:55:51 deniger Exp $
+ * @version $Id$
*/
public abstract class BPaletteInfo extends BuPanel {
/**
* @author fred deniger
- * @version $Id: BPaletteInfo.java,v 1.9 2006-09-19 14:55:51 deniger Exp $
+ * @version $Id$
*/
public interface InfoData {
@@ -104,7 +104,7 @@
/**
* @author Fred Deniger, Emmanuel Martin
- * @version $Id: BPaletteInfo.java,v 1.9 2006-09-19 14:55:51 deniger Exp $
+ * @version $Id$
*/
public final class PanelTableModel extends AbstractTableModel implements InfoData {
@@ -357,6 +357,10 @@
}
}
+ /**
+ * Retourne la validit\xE9 de la palette.
+ * @return True si la palette est visible.
+ */
public final boolean isAvailable() {
return isAvailable_;
}
@@ -365,6 +369,9 @@
isAvailable_=_isAvailable;
}
+ /**
+ * Mise a jour de la palette lorsqu'elle est r\xE9affich\xE9e.
+ */
public abstract void updateState();
}
\ No newline at end of file
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteInfo.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2008-11-05 16:59:16
|
Revision: 4177
http://fudaa.svn.sourceforge.net/fudaa/?rev=4177&view=rev
Author: emmanuel_martin
Date: 2008-11-05 16:59:14 +0000 (Wed, 05 Nov 2008)
Log Message:
-----------
tache #94 : "Duplication de g?\195?\169om?\195?\169trie lors d'un d?\195?\169placement vers un calque."
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java 2008-11-05 16:46:58 UTC (rev 4176)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java 2008-11-05 16:59:14 UTC (rev 4177)
@@ -377,6 +377,7 @@
* tableau.
*/
protected void fillTableGeometry(){
+ listenSelection=false;
// Remplissage du tableau
ArrayList<Object[]> rows=new ArrayList<Object[]>();
for(int i=0;i<calques_.length;i++){
@@ -397,6 +398,9 @@
table_.getColumnModel().getColumn(1).setCellRenderer(new GeomTableRenderer());
table_.getColumnModel().getColumn(1).setPreferredWidth(25);
table_.getColumnModel().getColumn(1).setCellEditor(new GeomTableEditor());
+ // Mise \xE0 jour de la selection
+ updateTableSelection();
+ listenSelection=true;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2008-11-05 16:47:01
|
Revision: 4176
http://fudaa.svn.sourceforge.net/fudaa/?rev=4176&view=rev
Author: emmanuel_martin
Date: 2008-11-05 16:46:58 +0000 (Wed, 05 Nov 2008)
Log Message:
-----------
Fusion de GEOMETRY_ACTION_REPLACE et GEOMETRY_ACTION_STRUCTURE_CHANGE en GEOMETRY_ACTION_MODIFY dans ZModelListener et GISZoneListener
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListBoolean.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListObject.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCollection.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParallelogrammeManager.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutes.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageMng.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilMng.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSourceMng.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModelListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepCalageLogic.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListBoolean.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListBoolean.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListBoolean.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -207,7 +207,7 @@
// System.err.println("overload " + getClass().getName() + ".firePointRemoved");
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
+ protected void fireObjectModified(int _idx, Object _geom) {
// System.err.println("overload " + getClass().getName() + ".firePointStructureChanged");
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListObject.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListObject.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/collection/CtuluListObject.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -291,7 +291,7 @@
// System.err.println("overload " + getClass().getName() + ".firePointRemoved");
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
+ protected void fireObjectModified(int _idx, Object _geom) {
// System.err.println("overload " + getClass().getName() + ".firePointStructureChanged");
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCollection.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCollection.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCollection.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -44,9 +44,9 @@
GISCollection.this.fireGeometryAdded(_newIdx, (Geometry) _newGeom);
}
- protected void fireObjectChanged(int _oldIdx, Object _oldGeom) {
+ protected void fireObjectModified(int _oldIdx, Object _oldGeom) {
GISCollection.this.geometryChanged();
- GISCollection.this.fireGeometryReplaced(_oldIdx, (Geometry) _oldGeom);
+ GISCollection.this.fireGeometryModified(_oldIdx, (Geometry) _oldGeom);
}
protected void fireObjectRemoved(int _oldIdx, Object _oldGeom) {
@@ -54,11 +54,6 @@
GISCollection.this.fireGeometryRemoved(_oldIdx, (Geometry) _oldGeom);
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
- GISCollection.this.geometryChanged();
- GISCollection.this.fireGeometryStructureChanged(_idx, (Geometry) _geom);
- }
-
protected List getList() {
return list_;
}
@@ -163,15 +158,10 @@
listener_.objectAction(this, _oldIdx, _oldGeom, GISZoneListener.OBJECT_ACTION_REMOVE);
}
- protected void fireGeometryReplaced(int _oldIdx, Geometry _oldGeom) {
+ protected void fireGeometryModified(int _oldIdx, Geometry _oldGeom) {
if (listener_!=null)
- listener_.objectAction(this, _oldIdx, _oldGeom, GISZoneListener.OBJECT_ACTION_REPLACE);
+ listener_.objectAction(this, _oldIdx, _oldGeom, GISZoneListener.OBJECT_ACTION_MODIFY);
}
-
- protected void fireGeometryStructureChanged(int _idx, Geometry _geom) {
- if (listener_!=null)
- listener_.objectAction(this, _idx, _geom, GISZoneListener.OBJECT_ACTION_STRUCTURE_CHANGE);
- }
protected Envelope computeEnvelopeInternal() {
final Envelope e = new Envelope();
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneListener.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneListener.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneListener.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -12,9 +12,7 @@
* Cette interface permet l'\xE9coute des changements concernant les objets et les
* attributs (si existant). Les changements sont : l'ajout d'un attribut, la
* suppression d'un attribut, le changement d'une valeur d'un attribut, l'ajout
- * d'un objet, la supression d'un objet, le remplacement d'un objet par une
- * autre et la modification interne d'un objet (g\xE9n\xE9ralement l'ajout ou la
- * suppression de points).
+ * d'un objet, la supression d'un objet et la modification d'un objet.
*
* @author Emmanuel MARTIN
* @version $Id: AttributeListener.java 4103 2008-10-28 15:55:12Z
@@ -34,16 +32,8 @@
* Action indiquant la supression d'un objet dans le conteneur de g\xE9om\xE9tries.
*/
public static final int OBJECT_ACTION_REMOVE=3;
- /**
- * Action indiquant la remplacement d'un objet dans le conteneur de
- * g\xE9om\xE9tries.
- */
- public static final int OBJECT_ACTION_REPLACE=4;
- /**
- * Action indiquant la modification des donn\xE9es internes \xE0 l'objet.
- * G\xE9n\xE9ralement une modification de ses sommets.
- */
- public static final int OBJECT_ACTION_STRUCTURE_CHANGE=5;
+ /** Action indiquant la modification d'un objet. */
+ public static final int OBJECT_ACTION_MODIFY=4;
/**
* M\xE9thode appel\xE9e lorsqu'une action d'ajout ou de suppression est effectu\xE9e
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParallelogrammeManager.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParallelogrammeManager.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParallelogrammeManager.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -42,7 +42,7 @@
fireSupportAddOrRemoved();
}
- protected void fireObjectStructureChanged(int _idx, Object _geom){
+ protected void fireObjectModified(int _idx, Object _geom){
fireSupportAddOrRemoved();
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutes.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutes.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutes.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -358,7 +358,7 @@
}
public void objectAction(Object _source, int geom, Object _obj, int _action) {
- if (_action == OBJECT_ACTION_REPLACE) {
+ if (_action == OBJECT_ACTION_MODIFY) {
fireDonneesBrutesNuageSupportChanged();
} else {
fireDonneesBrutesNuageSupportAddOrRemoved();
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrage.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrage.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrage.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -172,7 +172,7 @@
H2dRubarOuvrage.this.mng_.fireOuvrageChanged(H2dRubarOuvrage.this, true);
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
+ protected void fireObjectModified(int _idx, Object _geom) {
H2dRubarOuvrage.this.mng_.fireOuvrageChanged(H2dRubarOuvrage.this, true);
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageMng.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageMng.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageMng.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -62,7 +62,7 @@
H2dRubarOuvrageMng.this.fireOuvrageRemoved();
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
+ protected void fireObjectModified(int _idx, Object _geom) {
H2dRubarOuvrageMng.this.fireOuvrageRemoved();
}
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilMng.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilMng.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilMng.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -58,7 +58,7 @@
super(_nb);
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
+ protected void fireObjectModified(int _idx, Object _geom) {
p_.setValue(nbSeuilKw_, CtuluLibString.getString(getNbSeuil()));
H2dTelemacSeuilMng.this.fireSeuilAdded();
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSourceMng.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSourceMng.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSourceMng.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -97,7 +97,7 @@
majTaille();
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
+ protected void fireObjectModified(int _idx, Object _geom) {
majTaille();
}
}
@@ -1049,7 +1049,7 @@
fireCulvertRemoved();
}
- protected void fireObjectStructureChanged(int _idx, Object _geom) {
+ protected void fireObjectModified(int _idx, Object _geom) {
new Throwable().printStackTrace();
fireCulvertRemoved();
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModelListener.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModelListener.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModelListener.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -12,11 +12,10 @@
/**
* Cette interface permet l'\xE9coute des changements concernant les g\xE9om\xE9tries.
* Les changements sont : l'ajout d'une g\xE9om\xE9trie, la supression d'une
- * g\xE9om\xE9trie, le remplacement d'une g\xE9om\xE9trie par une autre et la modification
- * interne d'une g\xE9om\xE9trie (g\xE9n\xE9ralement l'ajout ou la suppression de points).
+ * g\xE9om\xE9trie et la modification d'une g\xE9om\xE9trie.
*
* @author Emmanuel MARTIN
- * @version $Id:$
+ * @version $Id$
*/
public interface ZModelListener {
/** Action indiquant l'ajout d'une g\xE9om\xE9trie dans le conteneur de g\xE9om\xE9tries. */
@@ -26,16 +25,8 @@
* g\xE9om\xE9tries.
*/
public static final int GEOMETRY_ACTION_REMOVE=3;
- /**
- * Action indiquant la remplacement d'une g\xE9om\xE9trie dans le conteneur de
- * g\xE9om\xE9tries.
- */
- public static final int GEOMETRY_ACTION_REPLACE=4;
- /**
- * Action indiquant la modification des donn\xE9es internes \xE0 la g\xE9om\xE9trie.
- * G\xE9n\xE9ralement une modification de ses sommets.
- */
- public static final int GEOMETRY_ACTION_STRUCTURE_CHANGE=5;
+ /** Action indiquant la modification d'une g\xE9om\xE9trie */
+ public static final int GEOMETRY_ACTION_MODIFY=4;
/**
* M\xE9thode appel\xE9e lorsqu'une action est effectu\xE9e sur une g\xE9om\xE9trie.
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepCalageLogic.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepCalageLogic.java 2008-11-05 16:29:35 UTC (rev 4175)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigImageWizardStepCalageLogic.java 2008-11-05 16:46:58 UTC (rev 4176)
@@ -75,7 +75,7 @@
public void objectAction(Object _source, int geom, Object _obj, int _action) {
logic_.tableModel_.updateError();
- if (_action == OBJECT_ACTION_REPLACE||_action==OBJECT_ACTION_STRUCTURE_CHANGE) {
+ if (_action == OBJECT_ACTION_MODIFY) {
logic_.tableModel_.fireTableRowsUpdated(0, logic_.tableModel_.getRowCount() - 1);
logic_.majTextFields();
} else if (_action == OBJECT_ACTION_REMOVE && logic_.tableModel_.getRowCount() > 0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-11-05 16:29:37
|
Revision: 4175
http://fudaa.svn.sourceforge.net/fudaa/?rev=4175&view=rev
Author: bmarchan
Date: 2008-11-05 16:29:35 +0000 (Wed, 05 Nov 2008)
Log Message:
-----------
Passage par ZScene pour declenchement des ZSelectionEvent en cas de selectPrevious ou selectNext
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMulti.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZSceneEditor.java
Property Changed:
----------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMulti.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java 2008-11-05 16:12:55 UTC (rev 4174)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java 2008-11-05 16:29:35 UTC (rev 4175)
@@ -1,7 +1,7 @@
/**
* @file ZCalqueAffichageDonneesInterface.java
* @creation 24 oct. 2003
- * @modification $Date: 2008-02-21 15:16:09 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -31,7 +31,7 @@
* pouvant etre une cible d'une palette de couleurs.
*
* @author deniger
- * @version $Id: ZCalqueAffichageDonneesInterface.java,v 1.27.6.2 2008-02-21 15:16:09 bmarchan Exp $
+ * @version $Id$
*/
public interface ZCalqueAffichageDonneesInterface extends EbliFindableItem, BPalettePlageTarget, EbliTableInfoTarget,
ZCalqueAffichageInterface {
@@ -55,6 +55,19 @@
boolean setSelection(int[] _idx);
/**
+ * Selectionne l'objet suivant de l'objet en cours.
+ * @return true si la selection a \xE9t\xE9 modifi\xE9e.
+ */
+ public boolean selectNext();
+
+
+ /**
+ * Selectionne l'objet suivant de l'objet en cours.
+ * @return true si la selection a \xE9t\xE9 modifi\xE9e.
+ */
+ public boolean selectPrevious();
+
+ /**
* Inverser la selection.
*/
void inverseSelection();
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMulti.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMulti.java 2008-11-05 16:12:55 UTC (rev 4174)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMulti.java 2008-11-05 16:29:35 UTC (rev 4175)
@@ -1,6 +1,6 @@
/*
* @creation 24 oct. 2003
- * @modification $Date: 2007-05-04 13:49:43 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
*/
@@ -17,7 +17,7 @@
/**
* @author deniger
- * @version $Id: ZCalqueAffichageDonneesMulti.java,v 1.15 2007-05-04 13:49:43 deniger Exp $
+ * @version $Id$
*/
public abstract class ZCalqueAffichageDonneesMulti extends ZCalqueAffichageDonneesAbstract {
@@ -143,6 +143,14 @@
return false;
}
+ public boolean selectPrevious() {
+ return false;
+ }
+
+ public boolean selectNext() {
+ return false;
+ }
+
public boolean isSelectionEmpty() {
return selection_ == null ? true : selection_.isEmpty();
}
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMulti.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java 2008-11-05 16:12:55 UTC (rev 4174)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java 2008-11-05 16:29:35 UTC (rev 4175)
@@ -390,6 +390,24 @@
fireSelectionEvent();
}
+ public boolean selectNext() {
+ if (isSelectionEmpty()) return false;
+ int idx=getSelectionHelper().getUniqueSelectedIdx();
+ ZCalqueAffichageDonneesInterface cq=getLayerForId(idx);
+ boolean b=cq.selectNext();
+ if (b) fireSelectionEvent();
+ return b;
+ }
+
+ public boolean selectPrevious() {
+ if (isSelectionEmpty()) return false;
+ int idx=getSelectionHelper().getUniqueSelectedIdx();
+ ZCalqueAffichageDonneesInterface cq=getLayerForId(idx);
+ boolean b=cq.selectPrevious();
+ if (b) fireSelectionEvent();
+ return b;
+ }
+
/**
* Inverser la selection.
*/
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZSceneEditor.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZSceneEditor.java 2008-11-05 16:12:55 UTC (rev 4174)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZSceneEditor.java 2008-11-05 16:29:35 UTC (rev 4175)
@@ -156,19 +156,13 @@
* Selectionne l'objet suivant celui selectionn\xE9.
*/
public void selectNextObject() {
- int idx=getScene().getSelectionHelper().getUniqueSelectedIdx();
- ZCalqueAffichageDonnees cq=(ZCalqueAffichageDonnees)getScene().getLayerForId(idx);
-
- cq.selectNext();
+ scene_.selectNext();
}
/**
* Selectionne l'objet pr\xE9c\xE9dent celui selectionn\xE9.
*/
public void selectPreviousObject() {
- int idx=getScene().getSelectionHelper().getUniqueSelectedIdx();
- ZCalqueAffichageDonnees cq=(ZCalqueAffichageDonnees)getScene().getLayerForId(idx);
-
- cq.selectPrevious();
+ scene_.selectPrevious();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2008-11-05 16:13:03
|
Revision: 4174
http://fudaa.svn.sourceforge.net/fudaa/?rev=4174&view=rev
Author: emmanuel_martin
Date: 2008-11-05 16:12:55 +0000 (Wed, 05 Nov 2008)
Log Message:
-----------
Utilisation de la scene ?\195?\160 la place des calques dans le panel de visibilit?\195?\169.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EditVisibilityAction.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EditVisibilityAction.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EditVisibilityAction.java 2008-11-05 14:56:59 UTC (rev 4173)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EditVisibilityAction.java 2008-11-05 16:12:55 UTC (rev 4174)
@@ -11,6 +11,7 @@
import org.fudaa.ctulu.CtuluCommandManager;
import org.fudaa.ebli.calque.BArbreCalqueModel;
+import org.fudaa.ebli.calque.ZScene;
import org.fudaa.ebli.calque.edition.BPaletteEditVisibility;
import org.fudaa.ebli.commun.EbliActionPaletteAbstract;
import org.fudaa.ebli.ressource.EbliResource;
@@ -28,11 +29,13 @@
protected BPaletteEditVisibility palette_;
protected final BArbreCalqueModel treeModel_;
+ protected final ZScene scene_;
protected CtuluCommandManager cmd_;
- public EditVisibilityAction(BArbreCalqueModel _treeModel, CtuluCommandManager _cmd) {
+ public EditVisibilityAction(BArbreCalqueModel _treeModel, ZScene _scene, CtuluCommandManager _cmd) {
super(EbliResource.EBLI.getString("Edition visibilit\xE9"), BuResource.BU.getIcon("visibilite"), "VISIBILITY_EDITION", true);
treeModel_=_treeModel;
+ scene_=_scene;
cmd_=_cmd;
}
@@ -44,7 +47,7 @@
@Override
public JComponent buildContentPane() {
if(palette_==null)
- palette_=new BPaletteEditVisibility(treeModel_, cmd_);
+ palette_=new BPaletteEditVisibility(treeModel_, scene_, cmd_);
return palette_.getComponent();
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java 2008-11-05 14:56:59 UTC (rev 4173)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java 2008-11-05 16:12:55 UTC (rev 4174)
@@ -15,13 +15,9 @@
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.EventObject;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import javax.swing.AbstractCellEditor;
import javax.swing.BorderFactory;
@@ -39,7 +35,6 @@
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableModel;
import org.fudaa.ctulu.CtuluCommandManager;
import org.fudaa.ctulu.gis.GISAttributeConstants;
@@ -47,18 +42,12 @@
import org.fudaa.ctulu.gis.GISZoneCollection;
import org.fudaa.ctulu.gui.CtuluTable;
import org.fudaa.ebli.calque.BArbreCalqueModel;
-import org.fudaa.ebli.calque.BCalque;
-import org.fudaa.ebli.calque.CalqueSelectorVisitor;
-import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
-import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
import org.fudaa.ebli.calque.ZModelGeometryListener;
-import org.fudaa.ebli.calque.ZModeleDonnees;
-import org.fudaa.ebli.calque.ZModeleGeometry;
+import org.fudaa.ebli.calque.ZScene;
import org.fudaa.ebli.calque.ZSelectionEvent;
import org.fudaa.ebli.calque.ZSelectionListener;
import org.fudaa.ebli.commun.BPalettePanelInterface;
import org.fudaa.ebli.commun.EbliLib;
-import org.jfree.util.ArrayUtilities;
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuButton;
@@ -76,15 +65,19 @@
* ou d\xE9cocher une checkbox correspondant \xE0 la valeur de visibilit\xE9 de la
* g\xE9om\xE9trie et r\xE9percute imm\xE9diatement le changement effectu\xE9.
*
+ * De plus deux boutons permettent de changer l'ordre des g\xE9om\xE9tries dans le
+ * tableau et dans le model les contenant.
+ *
* @author Emmanuel MARTIN
- * @version $Id$
+ * @version $Id: BPaletteEditVisibility.java 4172 2008-11-05 14:49:55Z
+ * emmanuel_martin $
*/
public class BPaletteEditVisibility extends BuPanel implements ListSelectionListener, ZSelectionListener, ZModelGeometryListener, TreeModelListener, BPalettePanelInterface, ActionListener, ChangeListener {
- // Attributs de fonctionnement
- protected final BArbreCalqueModel treeModel_;
- protected ZCalqueAffichageDonneesInterface[] calques_;
- protected ZCalqueAffichageDonneesInterface[] listenCalques_;
+ /** Calques disponible pour l'utilisateur. */
+ protected ZCalqueEditable[] calques_;
+ /** Models en cours d'\xE9coute. */
+ protected ZModeleEditable[] listenModels_;
protected final String allCalquesEntry_=EbliLib.getS("Tous les calques");
/**
* vrai quand une modification de la selection dans le tableau ou dans le
@@ -95,26 +88,29 @@
/** Vrai quand la visibilit\xE9 n'est pas en train d'\xEAtre chang\xE9 par le panel. */
protected boolean listenVisibility=true;
protected CtuluCommandManager cmd_;
+ protected ZScene scene_;
// Composants graphiques
protected final BuComboBox calque_;
protected boolean onlyInvisible_;
protected final CtuluTable table_;
- protected TableModel geomTableModel_;
protected BuButton btUp_;
protected BuButton btDown_;
/**
* @param _treeModel
- * utile pour r\xE9cup\xE9rer la liste des calques contenant les
- * g\xE9om\xE9tries et pour avoir connaissance de la cr\xE9ation et de la
- * suppression de calque.
+ * utile pour avoir connaissance de la cr\xE9ation et de la suppression
+ * de calque.
+ * @param _scene
+ * utile pour l'\xE9coute des selections.
*/
- public BPaletteEditVisibility(BArbreCalqueModel _treeModel, CtuluCommandManager _cmd){
+ public BPaletteEditVisibility(BArbreCalqueModel _treeModel, ZScene _scene, CtuluCommandManager _cmd){
cmd_=_cmd;
- calques_=new ZCalqueAffichageDonneesInterface[0];
- listenCalques_=new ZCalqueAffichageDonneesInterface[0];
- treeModel_=_treeModel;
- treeModel_.addTreeModelListener(this);
+ scene_=_scene;
+ calques_=new ZCalqueEditable[0];
+ listenModels_=new ZModeleEditable[0];
+ _treeModel.addTreeModelListener(this);
+ scene_.addSelectionListener(this);
+ // Configuration du panel \\
setLayout(new BuBorderLayout());
setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
setPreferredSize(new Dimension(210, 350));
@@ -148,7 +144,9 @@
Container btCont=new Container();
btCont.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
btUp_=new BuButton(BuResource.BU.getIcon("crystal22_monter"));
+ btUp_.setToolTipText(EbliLib.getS("D\xE9cr\xE9menter l'index de la g\xE9om\xE9trie"));
btDown_=new BuButton(BuResource.BU.getIcon("crystal22_descendre"));
+ btDown_.setToolTipText(EbliLib.getS("Incr\xE9menter l'index de la g\xE9om\xE9trie"));
btUp_.addActionListener(this);
btDown_.addActionListener(this);
btCont.add(btUp_);
@@ -210,7 +208,7 @@
}
public boolean isCellEditable(int rowIndex, int columnIndex) {
- return columnIndex==1&&((ZCalqueAffichageDonneesInterface) rows_[rowIndex][2]).isEditable();
+ return columnIndex==1;
}
public void setValueAt(Object value, int rowIndex, int columnIndex) {
@@ -223,7 +221,7 @@
}
else if(columnIndex==1){
rows_[rowIndex][columnIndex]=value;
- changeVisibility((Integer) rows_[rowIndex][3], (ZCalqueAffichageDonneesInterface) rows_[rowIndex][2], (Boolean) rows_[rowIndex][1]);
+ changeVisibility((Integer) rows_[rowIndex][3], (ZModeleEditable) rows_[rowIndex][2], (Boolean) rows_[rowIndex][1]);
// Dans le cas o\xF9 on n'affiche que les g\xE9om\xE9tries invisibles, on enl\xE8ve celle qu'on passe \xE0 visible.
if(onlyInvisible_&&((Boolean) rows_[rowIndex][1])==true){
Object[][] newRows=new Object[rows_.length-1][];
@@ -327,9 +325,7 @@
Object selectedItem=calque_.getSelectedItem();
calque_.removeAllItems();
// R\xE9cup\xE9ration des calques
- CalqueSelectorVisitor visitor = new CalqueSelectorVisitor(ZModeleGeometry.class);
- ((BCalque)treeModel_.getRoot()).apply(visitor);
- calques_=visitor.getSelectedCalques();
+ calques_=scene_.getEditableLayers();
// Ajout des noms dans le comboBox
calque_.addItem(allCalquesEntry_);
for(int i=0;i<calques_.length;i++)
@@ -338,38 +334,36 @@
calque_.setSelectedItem(selectedItem);
else
calque_.setSelectedIndex(0);
- updateListenAndMoveBt();
+ updateListen();
}
/**
- * Met \xE0 jour l'\xE9coute des calques et de leurs model
+ * Met \xE0 jour l'\xE9coute des models
*/
- protected void updateListenAndMoveBt(){
- // Suppression de l'\xE9coute de tout les calques
- for(int i=0;i<listenCalques_.length;i++){
- listenCalques_[i].removeSelectionListener(this);
- ((ZModeleGeometry) listenCalques_[i].modeleDonnees()).removeModelListener(this);
+ protected void updateListen(){
+ // Suppression de l'\xE9coute de tout les models
+ for(int i=0;i<listenModels_.length;i++)
+ listenModels_[i].removeModelListener(this);
+ // Mise a jour du tableau de listeners
+ if(calque_.getSelectedItem()==allCalquesEntry_){
+ listenModels_=new ZModeleEditable[calques_.length];
+ for(int i=0;i<calques_.length;i++)
+ listenModels_[i]=calques_[i].getModelEditable();
}
- // Mise a jour du tableau
- if(calque_.getSelectedItem()==allCalquesEntry_)
- listenCalques_=calques_;
else{
boolean found=false;
int i=-1;
while(!found&&++i<calques_.length)
found=calques_[i].getTitle().equals(calque_.getSelectedItem());
if(found)
- listenCalques_=new ZCalqueAffichageDonneesInterface[]{calques_[i]};
+ listenModels_=new ZModeleEditable[]{calques_[i].getModelEditable()};
else
- listenCalques_=new ZCalqueAffichageDonneesInterface[0];
+ listenModels_=new ZModeleEditable[0];
}
// Ajout de l'\xE9coute de tout les calques
- for(int i=0;i<listenCalques_.length;i++){
- listenCalques_[i].addSelectionListener(this);
- ((ZModeleGeometry) listenCalques_[i].modeleDonnees()).addModelListener(this);
+ for(int i=0;i<listenModels_.length;i++){
+ listenModels_[i].addModelListener(this);
}
- // Mise \xE0 jour des boutons de d\xE9placement
- updateBtMovement();
}
/**
@@ -387,7 +381,7 @@
ArrayList<Object[]> rows=new ArrayList<Object[]>();
for(int i=0;i<calques_.length;i++){
if(calques_[i].getTitle().equals(calque_.getSelectedItem())||calque_.getSelectedItem()==allCalquesEntry_){
- ZModeleGeometry model = (ZModeleGeometry)calques_[i].modeleDonnees();
+ ZModeleEditable model = calques_[i].getModelEditable();
// Extraction des donn\xE9es utiles
GISZoneCollection zone=model.getGeomData();
int indexTitre=zone.getIndiceOf(GISAttributeConstants.TITRE);
@@ -395,11 +389,10 @@
if(indexTitre!=-1&&indexVisibility!=-1)
for(int j=0;j<zone.getNbGeometries();j++)
if(!onlyInvisible_||zone.getValue(indexVisibility, j)==GISAttributeConstants.ATT_VAL_FALSE)
- rows.add(new Object[]{zone.getValue(indexTitre, j), zone.getValue(indexVisibility, j).equals(GISAttributeConstants.ATT_VAL_TRUE)?true:false, calques_[i], j});
+ rows.add(new Object[]{zone.getValue(indexTitre, j), zone.getValue(indexVisibility, j).equals(GISAttributeConstants.ATT_VAL_TRUE)?true:false, model, scene_.layerId2SceneId(calques_[i], j)});
}
}
- geomTableModel_=new GeomTableModel(new String[]{EbliLib.getS("Nom"), EbliLib.getS("Visibilit\xE9")}, rows.toArray(new Object[0][]));
- table_.setModel(geomTableModel_);
+ table_.setModel(new GeomTableModel(new String[]{EbliLib.getS("Nom"), EbliLib.getS("Visibilit\xE9")}, rows.toArray(new Object[0][])));
table_.getColumnModel().getColumn(0).setCellRenderer(new GeomTableRenderer());
table_.getColumnModel().getColumn(1).setCellRenderer(new GeomTableRenderer());
table_.getColumnModel().getColumn(1).setPreferredWidth(25);
@@ -417,9 +410,9 @@
* @param _visibility
* la nouvelle valeur de visibilit\xE9
*/
- protected void changeVisibility(int _numGeom, ZCalqueAffichageDonneesInterface _calque, boolean _visibility) {
+ protected void changeVisibility(int _numGeom, ZModeleEditable _model, boolean _visibility) {
listenVisibility=false;
- GISZoneCollection zone=((ZModeleGeometry)_calque.modeleDonnees()).getGeomData();
+ GISZoneCollection zone=_model.getGeomData();
int indexVisibility=zone.getIndiceOf(GISAttributeConstants.VISIBILITE);
if (indexVisibility!=-1)
zone.getModel(indexVisibility).setObject(_numGeom, _visibility==true ? GISAttributeConstants.ATT_VAL_TRUE:GISAttributeConstants.ATT_VAL_FALSE, cmd_);
@@ -427,75 +420,46 @@
}
/**
- * Met \xE0 jour la selection dans le tableau pour qu'elle corresponde \xE0 la selection dans le calque.
- * @param _calque le calque dans lequel la selection a \xE9t\xE9 modifi\xE9.
+ * Met \xE0 jour la selection dans le tableau pour qu'elle corresponde \xE0 la selection dans les calques.
*/
- protected void updateTableSelection(ZCalqueAffichageDonneesInterface _calque) {
- if (_calque.getTitle().equals(calque_.getSelectedItem())||calque_.getSelectedItem()==allCalquesEntry_) {
- // Construction de l'ensemble de selection
- List<Integer> selection=new ArrayList<Integer>();
- int[] selectionTmp=_calque.getLayerSelection().getSelectedIndex();
- if (selectionTmp!=null)
- for (int i=0; i<selectionTmp.length; i++)
- selection.add(selectionTmp[i]);
- // Selection des lignes correspondantes dans le tableau
- for (int i=0; i<table_.getModel().getRowCount(); i++) {
- ZCalqueAffichageDonneesInterface calque=(ZCalqueAffichageDonneesInterface)table_.getModel().getValueAt(i, 2);
- if (calque==_calque) {
- int indexGeom=(Integer)table_.getModel().getValueAt(i, 3);
- if (selection.contains(indexGeom)&&!table_.getSelectionModel().isSelectedIndex(i))
- table_.getSelectionModel().addSelectionInterval(i, i);
- else
- if(!selection.contains(indexGeom)&&table_.getSelectionModel().isSelectedIndex(i))
- table_.getSelectionModel().removeSelectionInterval(i, i);
- }
- }
- }
+ protected void updateTableSelection() {
+ int[] selection=scene_.getLayerSelection().getSelectedIndex();
+ for(int i=0;i<table_.getRowCount();i++)
+ // Si la g\xE9om\xE9trie n'est pas s\xE9lectionn\xE9e dans le calque mais dans le tableau => d\xE9s\xE9lectionne
+ if(!in(((Integer) table_.getModel().getValueAt(i, 3)).intValue(), selection)&&table_.getSelectionModel().isSelectedIndex(i))
+ table_.getSelectionModel().removeSelectionInterval(i, i);
+ // Si la g\xE9om\xE9trie est selectionn\xE9 dans le calque mais pas dans le tableau => s\xE9lection
+ else if(in(((Integer) table_.getModel().getValueAt(i, 3)).intValue(), selection)&&!table_.getSelectionModel().isSelectedIndex(i))
+ table_.getSelectionModel().addSelectionInterval(i, i);
}
/**
* Met \xE0 jour la selection dans le(s) calque(s) pour qu'elle corresponde \xE0 la selection dans le tableau.
*/
protected void updateCalqueSelection() {
- // Suppression de la selection dans tout les calques
- for (int i=0; i<calques_.length; i++)
- if (!calques_[i].isSelectionEmpty()&&calques_[i] instanceof ZCalqueAffichageDonnees)
- ((ZCalqueAffichageDonnees)calques_[i]).setSelection(new int[0]);
- // R\xE9cup\xE9ration des index de g\xE9om\xE9tries selectionn\xE9s dans le tableau
- HashMap<ZCalqueAffichageDonneesInterface, ArrayList<Integer>> completeSelection=new HashMap<ZCalqueAffichageDonneesInterface, ArrayList<Integer>>();
- int[] selectedRows=table_.getSelectedRows();
- for (int i=0; i<selectedRows.length; i++) {
- ZCalqueAffichageDonneesInterface calque=((ZCalqueAffichageDonneesInterface)table_.getModel().getValueAt(selectedRows[i], 2));
- if (!completeSelection.containsKey(calque))
- completeSelection.put(calque, new ArrayList<Integer>());
- completeSelection.get(calque).add((Integer)table_.getModel().getValueAt(selectedRows[i], 3));
- }
- // R\xE9percution de la selection du tableau sur les calques correspondants
- for (Map.Entry<ZCalqueAffichageDonneesInterface, ArrayList<Integer>> entry : completeSelection.entrySet()) {
- if (entry.getValue().size()>0&&entry.getKey() instanceof ZCalqueAffichageDonnees) {
- int[] selection=new int[entry.getValue().size()];
- for (int i=0; i<selection.length; i++)
- selection[i]=entry.getValue().get(i);
- ((ZCalqueAffichageDonnees)entry.getKey()).setSelection(selection);
- }
- }
+ // Conversion des indices de lignes selectionn\xE9es en index globals de g\xE9om\xE9tries
+ int[] selection=table_.getSelectedRows();
+ int[] selectedIdx=new int[selection.length];
+ for(int i=0;i<selectedIdx.length;i++)
+ selectedIdx[i]=((Integer) table_.getModel().getValueAt(selection[i], 3)).intValue();
+ scene_.setSelection(selectedIdx);
}
+ /**
+ * Active ou d\xE9active les deux boutons de mouvement
+ */
protected void updateBtMovement(){
- boolean base=calque_.getSelectedItem()!=allCalquesEntry_&&table_.getSelectedRowCount()>0;
boolean enableUp=false;
boolean enableDown=false;
- if(base){
- boolean prob=false;
+ if(calque_.getSelectedItem()!=allCalquesEntry_&&table_.getSelectedRowCount()>0){
+ // Verification qu'il est possible de d\xE9placer la s\xE9lection vers le haut
int i=0;
- while(!prob&&++i<table_.getRowCount())
- prob=!table_.getSelectionModel().isSelectedIndex(i-1)&&table_.getSelectionModel().isSelectedIndex(i);
- enableUp=prob;
- prob=false;
+ while(!enableUp&&++i<table_.getRowCount())
+ enableUp=!table_.getSelectionModel().isSelectedIndex(i-1)&&table_.getSelectionModel().isSelectedIndex(i);
+ // V\xE9rification qu'il est possible de d\xE9placer la selection vers le bas
i=table_.getRowCount()-1;
- while(!prob&&--i>=0)
- prob=!table_.getSelectionModel().isSelectedIndex(i+1)&&table_.getSelectionModel().isSelectedIndex(i);
- enableDown=prob;
+ while(!enableDown&&--i>=0)
+ enableDown=!table_.getSelectionModel().isSelectedIndex(i+1)&&table_.getSelectionModel().isSelectedIndex(i);
}
btUp_.setEnabled(enableUp);
btDown_.setEnabled(enableDown);
@@ -526,12 +490,13 @@
Arrays.sort(selection);
int lastIndexCompute=-1;
for(int i=0;i<selection.length;i++){
+ // Si la place du dessus est libre, on monte
if(selection[i]>0&&(!in(selection[i]-1, selection)||selection[i]-1==lastIndexCompute)){
newSelection.add(selection[i]-1);
lastIndexCompute=selection[i];
- ZModeleGeometry model=(ZModeleGeometry) ((ZCalqueAffichageDonneesInterface) table_.getModel().getValueAt(selection[i], 2)).modeleDonnees();
+ ZModeleEditable model=(ZModeleEditable) table_.getModel().getValueAt(selection[i], 2);
int indexGeom=((Integer) table_.getModel().getValueAt(selection[i], 3)).intValue();
- model.getGeomData().switchGeometries(indexGeom, indexGeom-1, cmd_);
+ model.getGeomData().switchGeometries(scene_.sceneId2LayerId(indexGeom), scene_.sceneId2LayerId(indexGeom-1), cmd_);
}
else
newSelection.add(selection[i]);
@@ -553,12 +518,13 @@
Arrays.sort(selection);
int lastIndexCompute=-1;
for(int i=selection.length-1;i>=0;i--){
+ // Si la place du dessous est libre, on descend
if(selection[i]<(table_.getRowCount()-1)&&(!in(selection[i]+1, selection)||selection[i]+1==lastIndexCompute)){
newSelection.add(selection[i]+1);
lastIndexCompute=selection[i];
- ZModeleGeometry model=(ZModeleGeometry) ((ZCalqueAffichageDonneesInterface) table_.getModel().getValueAt(selection[i], 2)).modeleDonnees();
+ ZModeleEditable model=(ZModeleEditable) table_.getModel().getValueAt(selection[i], 2);
int indexGeom=((Integer) table_.getModel().getValueAt(selection[i], 3)).intValue();
- model.getGeomData().switchGeometries(indexGeom, indexGeom+1, cmd_);
+ model.getGeomData().switchGeometries(scene_.sceneId2LayerId(indexGeom), scene_.sceneId2LayerId(indexGeom+1), cmd_);
}
else
newSelection.add(selection[i]);
@@ -573,7 +539,10 @@
* Est appel\xE9e par EditVisibilityAction quand la palette est d\xE9couverte.
*/
public void doShow(){
- updateListenAndMoveBt();
+ updateListen();
+ fillCalqueComboBox();
+ fillTableGeometry();
+ updateBtMovement();
}
/**
@@ -581,12 +550,10 @@
*/
public void doHide(){
// Suppression de l'\xE9coute de tout les calques
- for(int i=0;i<listenCalques_.length;i++){
- listenCalques_[i].removeSelectionListener(this);
- ((ZModeleGeometry) listenCalques_[i].modeleDonnees()).removeModelListener(this);
- }
- // Mise a jour du tableau
- listenCalques_=new ZCalqueAffichageDonneesInterface[0];
+ for(int i=0;i<listenModels_.length;i++)
+ listenModels_[i].removeModelListener(this);
+ // Mise a jour du tableau de listeners
+ listenModels_=new ZModeleEditable[0];
}
/* (non-Javadoc)
@@ -619,8 +586,9 @@
public void actionPerformed(ActionEvent e) {
if(e.getSource()==calque_){
- updateListenAndMoveBt();
+ updateListen();
fillTableGeometry();
+ updateBtMovement();
}
else if(e.getSource()==btUp_)
moveUpSelectedGeometies();
@@ -666,7 +634,7 @@
boolean found=false;
int i=-1;
while(!found&&++i<table_.getModel().getRowCount()){
- ZModeleDonnees model=((ZCalqueAffichageDonneesInterface) table_.getModel().getValueAt(i, 2)).modeleDonnees();
+ ZModeleEditable model=(ZModeleEditable) table_.getModel().getValueAt(i, 2);
Integer indexGeom=(Integer) table_.getModel().getValueAt(i, 3);
found=(model==_source)&&(indexGeom==_geom);
}
@@ -691,7 +659,7 @@
public void selectionChanged(ZSelectionEvent _evt) {
if (listenSelection) {
listenSelection=false;
- updateTableSelection(_evt.getSource());
+ updateTableSelection();
updateBtMovement();
listenSelection=true;
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java 2008-11-05 14:56:59 UTC (rev 4173)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java 2008-11-05 16:12:55 UTC (rev 4174)
@@ -171,7 +171,7 @@
arrayList.add(new CalqueGISEditionAction(getArbreCalqueModel().getTreeSelectionModel(), gisEditor_, getScene()));
arrayList.add(new SceneRotationAction(getArbreCalqueModel().getTreeSelectionModel(), gisEditor_, gisEditor_.getSceneEditor(),getEbliFormatter()));
arrayList.add(new SceneDeplacementAction(getArbreCalqueModel().getTreeSelectionModel(), gisEditor_.getSceneEditor(),getEbliFormatter(), getCalqueDeplacement()));
- arrayList.add(new EditVisibilityAction(getArbreCalqueModel(), mng_));
+ arrayList.add(new EditVisibilityAction(getArbreCalqueModel(), getScene(), mng_));
return (EbliActionInterface[]) arrayList.toArray(new EbliActionInterface[arrayList.size()]);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-11-05 14:57:04
|
Revision: 4173
http://fudaa.svn.sourceforge.net/fudaa/?rev=4173&view=rev
Author: bmarchan
Date: 2008-11-05 14:56:59 +0000 (Wed, 05 Nov 2008)
Log Message:
-----------
Detail sur l'implementation.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EditVisibilityAction.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EditVisibilityAction.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EditVisibilityAction.java 2008-11-05 14:49:55 UTC (rev 4172)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EditVisibilityAction.java 2008-11-05 14:56:59 UTC (rev 4173)
@@ -10,12 +10,13 @@
import javax.swing.JComponent;
import org.fudaa.ctulu.CtuluCommandManager;
-import org.fudaa.ctulu.CtuluResource;
import org.fudaa.ebli.calque.BArbreCalqueModel;
import org.fudaa.ebli.calque.edition.BPaletteEditVisibility;
import org.fudaa.ebli.commun.EbliActionPaletteAbstract;
import org.fudaa.ebli.ressource.EbliResource;
+import com.memoire.bu.BuResource;
+
/**
* Action permettant d'afficher une palette de modification de l'attribut
* 'visibilite' des g\xE9om\xE9tries.
@@ -30,7 +31,7 @@
protected CtuluCommandManager cmd_;
public EditVisibilityAction(BArbreCalqueModel _treeModel, CtuluCommandManager _cmd) {
- super(EbliResource.EBLI.getString("Edition visibilit\xE9"), CtuluResource.CTULU.getToolIcon("crystal22_visibilite"), "VISIBILITY_EDITION", true);
+ super(EbliResource.EBLI.getString("Edition visibilit\xE9"), BuResource.BU.getIcon("visibilite"), "VISIBILITY_EDITION", true);
treeModel_=_treeModel;
cmd_=_cmd;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2008-11-05 14:50:06
|
Revision: 4172
http://fudaa.svn.sourceforge.net/fudaa/?rev=4172&view=rev
Author: emmanuel_martin
Date: 2008-11-05 14:49:55 +0000 (Wed, 05 Nov 2008)
Log Message:
-----------
Ajout de la possibilit?\195?\169 de changer l'ordre des g?\195?\169om?\195?\169tries dans le model via la palette de visibilit?\195?\169
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCollection.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollection.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java
Added Paths:
-----------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/crystal22_descendre.png
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/crystal22_monter.png
Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/crystal22_descendre.png
===================================================================
(Binary files differ)
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/crystal22_descendre.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:keywords
+ Id
Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/crystal22_monter.png
===================================================================
(Binary files differ)
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/crystal22_monter.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:keywords
+ Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCollection.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCollection.java 2008-11-05 13:41:57 UTC (rev 4171)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCollection.java 2008-11-05 14:49:55 UTC (rev 4172)
@@ -10,7 +10,9 @@
import java.util.List;
import java.util.TreeSet;
+import org.fudaa.ctulu.CtuluCommandComposite;
import org.fudaa.ctulu.CtuluCommandContainer;
+import org.fudaa.ctulu.CtuluCommandManager;
import org.fudaa.ctulu.collection.CtuluListObject;
import com.vividsolutions.jts.geom.Coordinate;
@@ -398,4 +400,25 @@
Assert.shouldNeverReachHere();
}
+ /**
+ * Permute les deux g\xE9om\xE9tries indiqu\xE9es par les deux index pass\xE9s en param\xE8tre.
+ * Si les index sont incoh\xE9rents, {@link IllegalArgumentException} est lev\xE9.
+ * @param _index1 l'index de la premi\xE8re g\xE9om\xE9trie
+ * @param _index2 l'index de la seconde gom\xE9trie
+ * @param _cmd le command manager pour le undo/redo
+ */
+ public void switchGeometries(int _index1, int _index2, CtuluCommandContainer _cmd){
+ if(_index1<0||_index1>geometry_.getSize()-1||_index2<0||_index2>geometry_.getSize()-1)
+ throw new IllegalArgumentException("Au moins l'un des deux index est incoh\xE9rent.");
+ if(_index1!=_index2){
+ CtuluCommandComposite cmd=new CtuluCommandComposite();
+ // Permutation de la g\xE9om\xE9trie
+ Object tmp=geometry_.getValueAt(_index1);
+ geometry_.set(_index1, geometry_.getValueAt(_index2), cmd);
+ geometry_.set(_index2, tmp, cmd);
+ if(_cmd!=null)
+ _cmd.addCmd(cmd.getSimplify());
+ }
+ }
+
}
\ No newline at end of file
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollection.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollection.java 2008-11-05 13:41:57 UTC (rev 4171)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollection.java 2008-11-05 14:49:55 UTC (rev 4172)
@@ -18,7 +18,9 @@
import com.vividsolutions.jts.geom.GeometryFactory;
import org.fudaa.ctulu.CtuluCommand;
+import org.fudaa.ctulu.CtuluCommandComposite;
import org.fudaa.ctulu.CtuluCommandContainer;
+import org.fudaa.ctulu.CtuluCommandManager;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.collection.CtuluCollection;
import org.fudaa.ctulu.collection.CtuluCollectionDoubleEdit;
@@ -772,5 +774,30 @@
getData(i).remove(_i, _c);
}
}
- }
+ }
+
+ /**
+ * Permute les deux g\xE9om\xE9tries indiqu\xE9es par les deux index pass\xE9s en param\xE8tre.
+ * Si les index sont incoh\xE9rents, {@link IllegalArgumentException} est lev\xE9.
+ * @param _index1 l'index de la premi\xE8re g\xE9om\xE9trie
+ * @param _index2 l'index de la seconde gom\xE9trie
+ * @param _cmd le command manager pour le undo/redo
+ */
+ public void switchGeometries(int _index1, int _index2, CtuluCommandContainer _cmd){
+ if(_index1<0||_index1>geometry_.getSize()-1||_index2<0||_index2>geometry_.getSize()-1)
+ throw new IllegalArgumentException("Au moins l'un des deux index est incoh\xE9rent.");
+ if(_index1!=_index2){
+ CtuluCommandComposite cmd=new CtuluCommandComposite();
+ // Permutation des g\xE9om\xE9tries
+ super.switchGeometries(_index1, _index2, cmd);
+ // Permutation des valeurs d'attributs
+ for(int i=0;i<attr_.length;i++){
+ Object tmp=attr_[i].getObjectValueAt(_index1);
+ attr_[i].setObject(_index1, attr_[i].getObjectValueAt(_index2), cmd);
+ attr_[i].setObject(_index2, tmp, _cmd);
+ }
+ if(_cmd!=null)
+ _cmd.addCmd(cmd.getSimplify());
+ }
+ }
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java 2008-11-05 13:41:57 UTC (rev 4171)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java 2008-11-05 14:49:55 UTC (rev 4172)
@@ -15,7 +15,9 @@
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.lang.reflect.Array;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.EventObject;
import java.util.HashMap;
import java.util.List;
@@ -56,12 +58,15 @@
import org.fudaa.ebli.calque.ZSelectionListener;
import org.fudaa.ebli.commun.BPalettePanelInterface;
import org.fudaa.ebli.commun.EbliLib;
+import org.jfree.util.ArrayUtilities;
import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuButton;
import com.memoire.bu.BuCheckBox;
import com.memoire.bu.BuComboBox;
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuPanel;
+import com.memoire.bu.BuResource;
import com.memoire.bu.BuScrollPane;
import com.vividsolutions.jts.geom.Geometry;
@@ -95,6 +100,8 @@
protected boolean onlyInvisible_;
protected final CtuluTable table_;
protected TableModel geomTableModel_;
+ protected BuButton btUp_;
+ protected BuButton btDown_;
/**
* @param _treeModel
@@ -137,11 +144,22 @@
table_=new CtuluTable();
table_.getSelectionModel().addListSelectionListener(this);
add(new BuScrollPane(table_), BuBorderLayout.CENTER);
+ // Ajout des boutons de d\xE9placement des g\xE9om\xE9tries \\
+ Container btCont=new Container();
+ btCont.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
+ btUp_=new BuButton(BuResource.BU.getIcon("crystal22_monter"));
+ btDown_=new BuButton(BuResource.BU.getIcon("crystal22_descendre"));
+ btUp_.addActionListener(this);
+ btDown_.addActionListener(this);
+ btCont.add(btUp_);
+ btCont.add(btDown_);
+ add(btCont, BuBorderLayout.SOUTH);
// Ajout des informations \\
fillCalqueComboBox();
calque_.addActionListener(this);
cb.addChangeListener(this);
fillTableGeometry();
+ updateBtMovement();
}
/**
@@ -320,13 +338,13 @@
calque_.setSelectedItem(selectedItem);
else
calque_.setSelectedIndex(0);
- updateListen();
+ updateListenAndMoveBt();
}
/**
* Met \xE0 jour l'\xE9coute des calques et de leurs model
*/
- private void updateListen(){
+ protected void updateListenAndMoveBt(){
// Suppression de l'\xE9coute de tout les calques
for(int i=0;i<listenCalques_.length;i++){
listenCalques_[i].removeSelectionListener(this);
@@ -350,6 +368,8 @@
listenCalques_[i].addSelectionListener(this);
((ZModeleGeometry) listenCalques_[i].modeleDonnees()).addModelListener(this);
}
+ // Mise \xE0 jour des boutons de d\xE9placement
+ updateBtMovement();
}
/**
@@ -461,12 +481,99 @@
}
}
+ protected void updateBtMovement(){
+ boolean base=calque_.getSelectedItem()!=allCalquesEntry_&&table_.getSelectedRowCount()>0;
+ boolean enableUp=false;
+ boolean enableDown=false;
+ if(base){
+ boolean prob=false;
+ int i=0;
+ while(!prob&&++i<table_.getRowCount())
+ prob=!table_.getSelectionModel().isSelectedIndex(i-1)&&table_.getSelectionModel().isSelectedIndex(i);
+ enableUp=prob;
+ prob=false;
+ i=table_.getRowCount()-1;
+ while(!prob&&--i>=0)
+ prob=!table_.getSelectionModel().isSelectedIndex(i+1)&&table_.getSelectionModel().isSelectedIndex(i);
+ enableDown=prob;
+ }
+ btUp_.setEnabled(enableUp);
+ btDown_.setEnabled(enableDown);
+ }
/**
+ * Retourne vrai si _value est dans _table
+ * @param _value
+ * @param _table
+ * @return
+ */
+ private boolean in(int _value, int[] _table){
+ boolean found=false;
+ int i=-1;
+ while(!found&&++i<_table.length)
+ found=_table[i]==_value;
+ return found;
+ }
+
+ /**
+ * "remonte" d'1 les g\xE9om\xE9tries selectionn\xE9es dans leur calque. C'est \xE0 dire
+ * que si une g\xE9om\xE9trie \xE9tait \xE0 l'index 6, elle passe \xE0 l'index 5 (l'ancienne
+ * g\xE9om\xE9trie \xE0 5 passe \xE0 6).
+ */
+ protected void moveUpSelectedGeometies(){
+ int[] selection=table_.getSelectedRows();
+ ArrayList<Integer> newSelection=new ArrayList<Integer>();
+ Arrays.sort(selection);
+ int lastIndexCompute=-1;
+ for(int i=0;i<selection.length;i++){
+ if(selection[i]>0&&(!in(selection[i]-1, selection)||selection[i]-1==lastIndexCompute)){
+ newSelection.add(selection[i]-1);
+ lastIndexCompute=selection[i];
+ ZModeleGeometry model=(ZModeleGeometry) ((ZCalqueAffichageDonneesInterface) table_.getModel().getValueAt(selection[i], 2)).modeleDonnees();
+ int indexGeom=((Integer) table_.getModel().getValueAt(selection[i], 3)).intValue();
+ model.getGeomData().switchGeometries(indexGeom, indexGeom-1, cmd_);
+ }
+ else
+ newSelection.add(selection[i]);
+ }
+ // R\xE9tablissement de la selection dans le tableau
+ table_.getSelectionModel().clearSelection();
+ for(int i=0;i<newSelection.size();i++)
+ table_.getSelectionModel().addSelectionInterval(newSelection.get(i), newSelection.get(i));
+ }
+
+ /**
+ * "descend" d'1 les g\xE9om\xE9tries selectionn\xE9es dans leur calque. C'est \xE0 dire
+ * que si une g\xE9om\xE9trie \xE9tait \xE0 l'index 5, elle passe \xE0 l'index 6 (l'ancienne
+ * g\xE9om\xE9trie \xE0 6 passe \xE0 5).
+ */
+ protected void moveDownSelectedGeometies(){
+ int[] selection=table_.getSelectedRows();
+ ArrayList<Integer> newSelection=new ArrayList<Integer>();
+ Arrays.sort(selection);
+ int lastIndexCompute=-1;
+ for(int i=selection.length-1;i>=0;i--){
+ if(selection[i]<(table_.getRowCount()-1)&&(!in(selection[i]+1, selection)||selection[i]+1==lastIndexCompute)){
+ newSelection.add(selection[i]+1);
+ lastIndexCompute=selection[i];
+ ZModeleGeometry model=(ZModeleGeometry) ((ZCalqueAffichageDonneesInterface) table_.getModel().getValueAt(selection[i], 2)).modeleDonnees();
+ int indexGeom=((Integer) table_.getModel().getValueAt(selection[i], 3)).intValue();
+ model.getGeomData().switchGeometries(indexGeom, indexGeom+1, cmd_);
+ }
+ else
+ newSelection.add(selection[i]);
+ }
+ // R\xE9tablissement de la selection dans le tableau
+ table_.getSelectionModel().clearSelection();
+ for(int i=0;i<newSelection.size();i++)
+ table_.getSelectionModel().addSelectionInterval(newSelection.get(i), newSelection.get(i));
+ }
+
+ /**
* Est appel\xE9e par EditVisibilityAction quand la palette est d\xE9couverte.
*/
public void doShow(){
- updateListen();
+ updateListenAndMoveBt();
}
/**
@@ -508,11 +615,17 @@
return false;
}
- // Changement dans le comboBox des calques \\
+ // Changement dans le comboBox des calques ou dans les boutons de d\xE9placements \\
public void actionPerformed(ActionEvent e) {
- updateListen();
- fillTableGeometry();
+ if(e.getSource()==calque_){
+ updateListenAndMoveBt();
+ fillTableGeometry();
+ }
+ else if(e.getSource()==btUp_)
+ moveUpSelectedGeometies();
+ else if(e.getSource()==btDown_)
+ moveDownSelectedGeometies();
}
//Changement dans le checkBox onlyInvisible \\
@@ -540,7 +653,7 @@
fillCalqueComboBox();
}
- // Modification dans le ou les claque(s) \xE9cout\xE9(s).
+ // Modification dans le ou les model(s) \xE9cout\xE9(s).
public void attributeAction(Object _source, int att, GISAttributeInterface _att, int _action) {
fillTableGeometry();
@@ -561,7 +674,7 @@
if(_att==GISAttributeConstants.TITRE)
table_.getModel().setValueAt(_value, i, 0);
else
- table_.getModel().setValueAt(_value==GISAttributeConstants.ATT_VAL_TRUE ? true : false, i, 1);
+ table_.getModel().setValueAt(_value.equals(GISAttributeConstants.ATT_VAL_TRUE) ? true : false, i, 1);
}
else
// Mise \xE0 jour de toutes les g\xE9om\xE9tries.
@@ -579,6 +692,7 @@
if (listenSelection) {
listenSelection=false;
updateTableSelection(_evt.getSource());
+ updateBtMovement();
listenSelection=true;
}
}
@@ -589,6 +703,7 @@
if (listenSelection) {
listenSelection=false;
updateCalqueSelection();
+ updateBtMovement();
listenSelection=true;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-11-05 13:42:00
|
Revision: 4171
http://fudaa.svn.sourceforge.net/fudaa/?rev=4171&view=rev
Author: bmarchan
Date: 2008-11-05 13:41:57 +0000 (Wed, 05 Nov 2008)
Log Message:
-----------
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java 2008-11-05 12:30:48 UTC (rev 4170)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java 2008-11-05 13:41:57 UTC (rev 4171)
@@ -400,11 +400,13 @@
/**
* Selection d'indices de scene.
+ * @param _idx Les indices.
*/
public void setSelection(int[] _idx) {
TIntArrayList tb=new TIntArrayList(_idx);
int idecal=0;
int idx=0;
+ boolean b=false;
for (ZCalqueAffichageDonneesInterface cq : getTargetLayers()) {
int nb=cq.modeleDonnees().getNombre();
tb.clear();
@@ -412,10 +414,10 @@
tb.add(_idx[idx]-idecal);
idx++;
}
- cq.setSelection(tb.toNativeArray());
+ b|=cq.setSelection(tb.toNativeArray());
idecal+=nb;
}
- fireSelectionEvent();
+ if (b) fireSelectionEvent();
}
// boolean isEditable();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-11-05 12:30:52
|
Revision: 4170
http://fudaa.svn.sourceforge.net/fudaa/?rev=4170&view=rev
Author: bmarchan
Date: 2008-11-05 12:30:48 +0000 (Wed, 05 Nov 2008)
Log Message:
-----------
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java 2008-11-05 12:25:28 UTC (rev 4169)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java 2008-11-05 12:30:48 UTC (rev 4170)
@@ -415,6 +415,7 @@
cq.setSelection(tb.toNativeArray());
idecal+=nb;
}
+ fireSelectionEvent();
}
// boolean isEditable();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-11-05 12:25:44
|
Revision: 4169
http://fudaa.svn.sourceforge.net/fudaa/?rev=4169&view=rev
Author: bmarchan
Date: 2008-11-05 12:25:28 +0000 (Wed, 05 Nov 2008)
Log Message:
-----------
Ajout d'une methode setSelection sur la scene.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMulti.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java 2008-11-05 10:50:53 UTC (rev 4168)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java 2008-11-05 12:25:28 UTC (rev 4169)
@@ -49,6 +49,12 @@
void selectAll();
/**
+ * Selectionne les objets d'indices donn\xE9es.
+ * @param _idx Les indices.
+ */
+ boolean setSelection(int[] _idx);
+
+ /**
* Inverser la selection.
*/
void inverseSelection();
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMulti.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMulti.java 2008-11-05 10:50:53 UTC (rev 4168)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMulti.java 2008-11-05 12:25:28 UTC (rev 4169)
@@ -134,6 +134,15 @@
return true;
}
+ /**
+ * Selectionne les objets d'indice donn\xE9s. La toltalit\xE9 de l'objet doit \xEAtre selectionn\xE9e.
+ * @param _idx Les indices a selectionner.
+ * @return true si une selection a \xE9t\xE9 effectu\xE9e.
+ */
+ public boolean setSelection(final int[] _idx) {
+ return false;
+ }
+
public boolean isSelectionEmpty() {
return selection_ == null ? true : selection_.isEmpty();
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java 2008-11-05 10:50:53 UTC (rev 4168)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java 2008-11-05 12:25:28 UTC (rev 4169)
@@ -7,6 +7,7 @@
*/
package org.fudaa.ebli.calque;
+import gnu.trove.TIntArrayList;
import gnu.trove.TIntObjectIterator;
import java.awt.Graphics2D;
@@ -397,6 +398,24 @@
fireSelectionEvent();
}
+ /**
+ * Selection d'indices de scene.
+ */
+ public void setSelection(int[] _idx) {
+ TIntArrayList tb=new TIntArrayList(_idx);
+ int idecal=0;
+ int idx=0;
+ for (ZCalqueAffichageDonneesInterface cq : getTargetLayers()) {
+ int nb=cq.modeleDonnees().getNombre();
+ tb.clear();
+ while (idx<_idx.length && _idx[idx] < idecal+nb) {
+ tb.add(_idx[idx]-idecal);
+ idx++;
+ }
+ cq.setSelection(tb.toNativeArray());
+ idecal+=nb;
+ }
+ }
// boolean isEditable();
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-11-05 10:51:04
|
Revision: 4168
http://fudaa.svn.sourceforge.net/fudaa/?rev=4168&view=rev
Author: bmarchan
Date: 2008-11-05 10:50:53 +0000 (Wed, 05 Nov 2008)
Log Message:
-----------
Factorisation des ?\195?\169venements envoy?\195?\169s en cas de selection pour en limiter le nombre.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueSelectionInteractionSimple.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueSelectionInteractionSimple.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueSelectionInteractionSimple.java 2008-11-05 10:36:07 UTC (rev 4167)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueSelectionInteractionSimple.java 2008-11-05 10:50:53 UTC (rev 4168)
@@ -53,9 +53,6 @@
if (internalGetScene().isRestrictedToCalqueActif() && internalGetScene().getCalqueActif() == null) {
return;
}
- if (modificateur_.getModificateur() == EbliSelectionState.ACTION_REPLACE) {
- internalGetScene().clearSelection();
- }
if (mode_ == PONCTUEL ||
(mode_ == RECTANGLE && listePoints_.renvoie(0).distanceXY(listePoints_.renvoie(2))<4)) {
final GrPoint pt = listePoints_.renvoie(0);
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java 2008-11-05 10:36:07 UTC (rev 4167)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java 2008-11-05 10:50:53 UTC (rev 4168)
@@ -23,6 +23,7 @@
import org.fudaa.ebli.calque.edition.ZCalqueEditable;
import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface;
+import org.fudaa.ebli.commun.EbliSelectionState;
import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.ebli.geometrie.GrMorphisme;
import org.fudaa.ebli.geometrie.GrPoint;
@@ -366,14 +367,21 @@
}
/**
- * Efface la selection du calque.
+ * Efface la selection de la scene.
*/
public void clearSelection() {
- for (ZCalqueAffichageDonneesInterface cq : getTargetLayers()) cq.clearSelection();
+ internalClearSelection();
fireSelectionEvent();
}
/**
+ * Efface la selection sans envoyer d'evenement.
+ */
+ private void internalClearSelection() {
+ for (ZCalqueAffichageDonneesInterface cq : getTargetLayers()) cq.clearSelection();
+ }
+
+ /**
* Tout selectionner.
*/
public void selectAll() {
@@ -424,7 +432,7 @@
}
/**
- * Permet de modifier la selection du calque \xE0 partir d'un selection ponctuelle. Le premier objet trouv\xE9
+ * Permet de modifier la selection de la scene \xE0 partir d'un selection ponctuelle. Le premier objet trouv\xE9
* interrompt la s\xE9lection.
*
* @param _pointReel le point de selection en coordonnees reelles
@@ -434,6 +442,10 @@
* @see ZCalqueSelectionInteractionAbstract
*/
public boolean changeSelection(GrPoint _pointReel, int _tolerancePixel, int _action) {
+ if (_action == EbliSelectionState.ACTION_REPLACE) {
+ internalClearSelection();
+ }
+
boolean ret=false;
for (ZCalqueAffichageDonneesInterface cq : getTargetLayers()) {
if (cq.changeSelection(_pointReel, _tolerancePixel, _action)) {
@@ -446,7 +458,7 @@
}
/**
- * Permet de modifier la selection du calque \xE0 partir d'un poly de selection.
+ * Permet de modifier la selection de la scene \xE0 partir d'un poly de selection.
*
* @param _p le polygone englobant en COORDONNEES REELS
* @param _action l'action sur la selection (voir les action de ZCalqueSelectionInteraction)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2008-11-05 10:36:18
|
Revision: 4167
http://fudaa.svn.sourceforge.net/fudaa/?rev=4167&view=rev
Author: emmanuel_martin
Date: 2008-11-05 10:36:07 +0000 (Wed, 05 Nov 2008)
Log Message:
-----------
Ajout de le la position lors de l'enregistrement
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java 2008-11-04 17:46:05 UTC (rev 4166)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java 2008-11-05 10:36:07 UTC (rev 4167)
@@ -88,18 +88,24 @@
final FeatureType type = _coll.getSchema();
final int initAttributeCount = type.getAttributeCount();
final List atts = new ArrayList(initAttributeCount);
+ int indexGeomAttr=-1; // Index de l'attribut n\xE9c\xE9ssaire au classement de la g\xE9om\xE9trie dans la zone
final TIntArrayList idxInFeature = new TIntArrayList(initAttributeCount);
for (int i = 0; i < initAttributeCount; i++) {
final GISAttributeInterface att = GISLib.createAttributeFrom(type.getAttributeType(i));
- if (att != null) {
- atts.add(att);
- idxInFeature.add(i);
+ if (att != null){
+ if(att.getName().equals("IndexGeometry"))
+ indexGeomAttr=i;
+ else{
+ atts.add(att);
+ idxInFeature.add(i);
+ }
}
}
final GISAttributeInterface[] finalAtt = (GISAttributeInterface[]) atts.toArray(new GISAttributeInterface[atts
.size()]);
final int finalAttributeCount = finalAtt.length;
final List geom = new ArrayList();
+ final List<Integer> indexGeom=new ArrayList<Integer>();
final List[] values = new ArrayList[finalAttributeCount];
for (int i = values.length - 1; i >= 0; i--) {
values[i] = new ArrayList();
@@ -111,8 +117,43 @@
for (int i = 0; i < finalAttributeCount; i++) {
values[i].add(f.getAttribute(idxInFeature.getQuick(i)));
}
-
+ if(indexGeomAttr!=-1)
+ indexGeom.add((Integer) f.getAttribute(indexGeomAttr));
}
+
+ if (indexGeomAttr!=-1) {
+ // Classement des g\xE9om\xE9tries en fonction de leur index \\
+ /*
+ * L'algorithme utilis\xE9 est simple : pour chaque index on permute le
+ * contenu de cet index dans la case correspondant \xE0 ce contenu. Et cela
+ * tant que le contenu de la case ne correspond pas \xE0 son index. Exemple :
+ * [1, 2, 0, 4, 3] => i=0; permutation index : 0 avec 1
+ * [2, 1, 0, 4, 3] => i=0; permutation index : 0 avec 2
+ * [2, 1, 0, 4, 3] => i=1;
+ * [2, 1, 0, 4, 3] => i=2;
+ * [0, 1, 2, 4, 3] => i=3; permutation index : 3 avec 4
+ * [0, 1, 2, 3, 4] => i=4; fin (le traitement du dernier index n'est jamais utile)
+ */
+ for (int i=0; i<indexGeom.size(); i++) {
+ while (i!=indexGeom.get(i).intValue()) {
+ int j=indexGeom.get(i);
+ // permutation entre i et j dans indexGeom
+ indexGeom.set(i, indexGeom.get(j));
+ indexGeom.set(j, j);
+ // permutation entre i et j dans geom
+ Object tmpGeom=geom.get(i);
+ geom.set(i, geom.get(j));
+ geom.set(j, tmpGeom);
+ // permutation entre i et j dans values
+ for (int k=0; k<values.length; k++) {
+ Object tmpValue=values[k].get(i);
+ values[k].set(i, values[k].get(j));
+ values[k].set(j, tmpValue);
+ }
+ }
+ }
+ }
+
final Object[][] finalValues = new Object[values.length][geom.size()];
for (int i = finalValues.length - 1; i >= 0; i--) {
finalValues[i] = values[i].toArray();
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java 2008-11-04 17:46:05 UTC (rev 4166)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java 2008-11-05 10:36:07 UTC (rev 4167)
@@ -69,7 +69,7 @@
}
final int size = attribute.size();
// on construit les attributs que vont bien
- final AttributeType[] atts = new AttributeType[1 + size];
+ final AttributeType[] atts = new AttributeType[2 + size];
// le premier correspond a la geometrie
atts[0] = AttributeTypeFactory.newAttributeType(BasicFeatureTypes.GEOMETRY_ATTRIBUTE_NAME, Geometry.class);
@@ -81,6 +81,8 @@
.getDataClass(), true, 18);
_attrIdx.put(atts[i + 1], posInZone);
}
+ // Le dernier correspond \xE0 l'index de la g\xE9om\xE9trie dans la GISZone
+ atts[atts.length-1]=AttributeTypeFactory.newAttributeType("IndexGeometry", Integer.class);
return atts;
}
@@ -155,9 +157,11 @@
}
final Feature feature = writer.next();
feature.setDefaultGeometry(_zone.getGeometry(i));
- for (int j = 1; j < nbAttribute; j++) {
+ for (int j = 1; j < nbAttribute-1; j++) {
feature.setAttribute(j, _zone.getModel(attIdx.get(atts[j])).getObjectValueAt(i));
}
+ // Enregistrement de l'index de la g\xE9om\xE9trie dans le fichier
+ feature.setAttribute(nbAttribute-1, new Integer(i));
writer.write();
up.majAvancement();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-11-04 17:46:12
|
Revision: 4166
http://fudaa.svn.sourceforge.net/fudaa/?rev=4166&view=rev
Author: bmarchan
Date: 2008-11-04 17:46:05 +0000 (Tue, 04 Nov 2008)
Log Message:
-----------
Selection de la g?\195?\169om?\195?\169trie/sommet suivant/pr?\195?\169c?\195?\169dent par raccourci clavier.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuInternalFrame.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZSceneEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java
Added Paths:
-----------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/crystal22_avancer2.png
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/crystal_avancer2.png
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneSelectNextAction.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneSelectPreviousAction.java
Property Changed:
----------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuInternalFrame.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuInternalFrame.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuInternalFrame.java 2008-11-04 16:49:39 UTC (rev 4165)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuInternalFrame.java 2008-11-04 17:46:05 UTC (rev 4166)
@@ -1,5 +1,5 @@
/**
- * @modification $Date: 2007-05-04 13:41:57 $
+ * @modification $Date$
* @statut unstable
* @file BuInternalFrame.java
* @version 0.43
@@ -275,11 +275,23 @@
return STRING0;
}
+ /**
+ * Retourne les menus sp\xE9cifiques pour la fenetre.
+ * Les menus sp\xE9cifiques sont switch\xE9s d\xE9s que la fenetre passe de l'\xE9tat actif \xE0 inactif
+ * et inversement. Ils sont ajout\xE9s dans la barre de menus.
+ * @return Les menus sp\xE9cifiques.
+ */
public JMenu[] getSpecificMenus()
{
return JMENU0;
}
+ /**
+ * Retourne les boutons outils sp\xE9cifiques pour la fenetre.
+ * Les outils sp\xE9cifiques sont switch\xE9s d\xE9s que la fenetre passe de l'\xE9tat actif \xE0 inactif
+ * et inversement. Ils remplacent les outils existants.
+ * @return Les composants sp\xE9cifiques.
+ */
public JComponent[] getSpecificTools()
{
return JCOMPONENT0;
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuInternalFrame.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/crystal22_avancer2.png
===================================================================
(Binary files differ)
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/crystal22_avancer2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:keywords
+ Date Revision Author URL Id
Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/crystal_avancer2.png
===================================================================
(Binary files differ)
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/crystal_avancer2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java 2008-11-04 16:49:39 UTC (rev 4165)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java 2008-11-04 17:46:05 UTC (rev 4166)
@@ -1,6 +1,6 @@
/**
* @creation 2002-08-27
- * @modification $Date: 2007-05-04 13:49:43 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -23,7 +23,7 @@
* Un calque de base pour tous les nouveaux calques bases sur les modeles. Ce calque permet de definir en plus si
* l'affichage doit etre total,inutile ou seulement la selection.
*
- * @version $Id: ZCalqueAffichageDonnees.java,v 1.39 2007-05-04 13:49:43 deniger Exp $
+ * @version $Id$
* @author Fred Deniger
*/
public abstract class ZCalqueAffichageDonnees extends ZCalqueAffichageDonneesAbstract {
@@ -230,6 +230,11 @@
*/
public abstract CtuluListSelection selection(LinearRing _poly, int _mode);
+ /**
+ * Selectionne les objets d'indice donn\xE9s.
+ * @param _idx Les indices a selectionner.
+ * @return true si une selection a \xE9t\xE9 effectu\xE9e.
+ */
public boolean setSelection(final int[] _idx) {
if (_idx == null) {
return false;
@@ -252,6 +257,29 @@
return r;
}
+ /**
+ * Selectionne l'objet suivant de l'objet en cours.
+ * @return true si la selection a \xE9t\xE9 modifi\xE9e.
+ */
+ public boolean selectNext() {
+ if (isSelectionEmpty()) return false;
+ int idx=getLayerSelection().getMaxIndex();
+ if (idx>=modeleDonnees().getNombre()-1) return false;
+ return setSelection(new int[]{idx+1});
+ }
+
+
+ /**
+ * Selectionne l'objet suivant de l'objet en cours.
+ * @return true si la selection a \xE9t\xE9 modifi\xE9e.
+ */
+ public boolean selectPrevious() {
+ if (isSelectionEmpty()) return false;
+ int idx=getLayerSelection().getMinIndex();
+ if (idx<=0) return false;
+ return setSelection(new int[]{idx-1});
+ }
+
public void geometryAction(Object _source, int _idx, Geometry _geom, int _action) {
// Une g\xE9om\xE9trie a \xE9t\xE9 ajout\xE9e, supprim\xE9e ou ses points la composant ont \xE9t\xE9
// modifi\xE9s, donc on repaint le tout.
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java 2008-11-04 16:49:39 UTC (rev 4165)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGeometry.java 2008-11-04 17:46:05 UTC (rev 4166)
@@ -886,6 +886,56 @@
return false;
}
+ public boolean selectNext() {
+ if (!isAtomicMode_) {
+ return super.selectNext();
+ }
+ // Ne fonctionne que sur une seule g\xE9om\xE9trie a la fois.
+ else {
+ if (selectionMulti_==null)
+ return false;
+ if (selectionMulti_.getNbListSelected()!=1)
+ return false;
+
+ int idxGeom=selectionMulti_.getIdxSelected()[0];
+
+ CtuluListSelection s=selectionMulti_.get(idxGeom);
+ if (s==null)
+ return false;
+ int idx=s.getMaxIndex();
+ if (idx>=modeleDonnees().getNbPointForGeometry(idxGeom)-1)
+ return false;
+ s.setSelectionInterval(idx+1,idx+1);
+ fireSelectionEvent();
+ return true;
+ }
+ }
+
+ public boolean selectPrevious() {
+ if (!isAtomicMode_) {
+ return super.selectPrevious();
+ }
+ // Ne fonctionne que sur une seule g\xE9om\xE9trie a la fois.
+ else {
+ if (selectionMulti_==null)
+ return false;
+ if (selectionMulti_.getNbListSelected()!=1)
+ return false;
+
+ int idxGeom=selectionMulti_.getIdxSelected()[0];
+
+ CtuluListSelection s=selectionMulti_.get(idxGeom);
+ if (s==null)
+ return false;
+ int idx=s.getMinIndex();
+ if (idx<=0)
+ return false;
+ s.setSelectionInterval(idx-1,idx-1);
+ fireSelectionEvent();
+ return true;
+ }
+ }
+
public boolean setSurfaceModel(final TraceSurfaceModel _model) {
final TraceSurfaceModel surf = getSurfaceModel();
if (_model != null && surf != null && surf.updateData(_model)) {
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java 2008-11-04 16:49:39 UTC (rev 4165)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java 2008-11-04 17:46:05 UTC (rev 4166)
@@ -944,6 +944,56 @@
return false;
}
+ public boolean selectNext() {
+ if (!isAtomicMode_) {
+ return super.selectNext();
+ }
+ // Ne fonctionne que sur une seule g\xE9om\xE9trie a la fois.
+ else {
+ if (selectionMulti_==null)
+ return false;
+ if (selectionMulti_.getNbListSelected()!=1)
+ return false;
+
+ int idxGeom=selectionMulti_.getIdxSelected()[0];
+
+ CtuluListSelection s=selectionMulti_.get(idxGeom);
+ if (s==null)
+ return false;
+ int idx=s.getMaxIndex();
+ if (idx>=getModele().getNbPointForGeometry(idxGeom)-1)
+ return false;
+ s.setSelectionInterval(idx+1,idx+1);
+ fireSelectionEvent();
+ return true;
+ }
+ }
+
+ public boolean selectPrevious() {
+ if (!isAtomicMode_) {
+ return super.selectPrevious();
+ }
+ // Ne fonctionne que sur une seule g\xE9om\xE9trie a la fois.
+ else {
+ if (selectionMulti_==null)
+ return false;
+ if (selectionMulti_.getNbListSelected()!=1)
+ return false;
+
+ int idxGeom=selectionMulti_.getIdxSelected()[0];
+
+ CtuluListSelection s=selectionMulti_.get(idxGeom);
+ if (s==null)
+ return false;
+ int idx=s.getMinIndex();
+ if (idx<=0)
+ return false;
+ s.setSelectionInterval(idx-1,idx-1);
+ fireSelectionEvent();
+ return true;
+ }
+ }
+
public boolean setTitle(final String _title) {
final boolean r = super.setTitle(_title);
if (r && modele_ != null && modele_.getGeomData() != null) {
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java 2008-11-04 16:49:39 UTC (rev 4165)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java 2008-11-04 17:46:05 UTC (rev 4166)
@@ -1,6 +1,6 @@
/*
* @creation 2002-10-8
- * @modification $Date: 2008-05-13 12:10:36 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail de...@fu...
@@ -46,6 +46,7 @@
import org.fudaa.ctulu.image.CtuluImageProducer;
import org.fudaa.ctulu.image.CtuluLibImage;
import org.fudaa.ebli.animation.EbliAnimationSourceAbstract;
+import org.fudaa.ebli.calque.action.SceneSelectPreviousAction;
import org.fudaa.ebli.calque.edition.ZEditorDefault;
import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.ebli.commun.EbliComponentFactory;
@@ -73,7 +74,7 @@
* Par defaut, 3 groupes de boutons sont proposes : selection, standard et navigation. Ils peuvent etre supprimes ou
* modifies avec les methodes remove
*
- * @version $Id: ZEbliCalquesPanel.java,v 1.55.4.4 2008-05-13 12:10:36 bmarchan Exp $
+ * @version $Id$
* @author Guillaume Desnoix , Axel von Arnim, Fred deniger
*/
public class ZEbliCalquesPanel extends BuPanel implements EbliFilleCalquesInterface, BCalqueContextuelListener,
@@ -115,7 +116,7 @@
/**
* @author Fred Deniger
- * @version $Id: ZEbliCalquesPanel.java,v 1.55.4.4 2008-05-13 12:10:36 bmarchan Exp $
+ * @version $Id$
*/
public static class LayerDynamicMenu extends BuDynamicMenu {
@@ -146,7 +147,7 @@
* Le menu des th\xE8mes.
*
* @author Fred Deniger
- * @version $Id: ZEbliCalquesPanel.java,v 1.55.4.4 2008-05-13 12:10:36 bmarchan Exp $
+ * @version $Id$
*/
public static class ThemeMenu extends BuDynamicMenu implements TreeModelListener {
@@ -249,8 +250,8 @@
* @param _m le menu a remplir
*/
protected void fillMenuWithSceneActions(final JMenu _m) {
- if (scene_ != null && scene_.getActions() != null) {
- EbliComponentFactory.INSTANCE.addActionsToMenu(scene_.getActions(), _m);
+ if (scene_ != null && gisEditor_.getSceneEditor().getActions() != null) {
+ EbliComponentFactory.INSTANCE.addActionsToMenu(gisEditor_.getSceneEditor().getActions(), _m);
}
}
@@ -260,8 +261,8 @@
* @param _m le menu a remplir
*/
protected void fillMenuWithSceneActions(final JPopupMenu _m) {
- if (scene_!= null && scene_.getActions() != null) {
- EbliComponentFactory.INSTANCE.addActionsToMenu(scene_.getActions(), _m);
+ if (scene_!= null && gisEditor_.getSceneEditor().getActions() != null) {
+ EbliComponentFactory.INSTANCE.addActionsToMenu(gisEditor_.getSceneEditor().getActions(), _m);
}
}
@@ -619,6 +620,12 @@
return 1;
}
+ /**
+ * Retourne les menus sp\xE9cifiques pour la fenetre.
+ * Les menus sp\xE9cifiques sont switch\xE9s d\xE9s que la fenetre passe de l'\xE9tat actif \xE0 inactif
+ * et inversement. Ils sont ajout\xE9s dans la barre de menus.
+ * @return Les menus sp\xE9cifiques.
+ */
public JMenu[] getSpecificMenus(final String _title) {
if (specificMenus_ == null) {
controller_.initSpecificActions();
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java 2008-11-04 16:49:39 UTC (rev 4165)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java 2008-11-04 17:46:05 UTC (rev 4166)
@@ -1,6 +1,6 @@
/*
* @creation 10 avr. 08
- * @modification $Date: 2008-05-13 12:10:35 $
+ * @modification $Date$
* @license GNU General Public License 2
* @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
* @mail fud...@li...
@@ -37,7 +37,7 @@
* La scene. Contient les modeles de donn\xE9es des calques qui en possedent. Elle permet de proposer
* une interface unique pour la selection, le deplacement, etc.
* @author Bertrand Marchand
- * @version $Id: ZScene.java,v 1.1.2.1 2008-05-13 12:10:35 bmarchan Exp $
+ * @version $Id$
*/
public class ZScene implements TreeModelListener {
@@ -352,11 +352,7 @@
/** La liste des listeners de selection chang\xE9e. */
protected HashSet<ZSelectionListener> selListeners_=new HashSet<ZSelectionListener>();
- /** Toutes les actions li\xE9es \xE0 la scene, ajout\xE9es dans les menus correspondants */
- private EbliActionInterface[] actions_;
-
-
/**
* Cr\xE9ation a partir d'un groupe de calques racine.
* @param _root Le groupe de calque racine.
@@ -793,12 +789,4 @@
for (ZSelectionListener listener : selListeners_)
listener.selectionChanged(evt);
}
-
- public EbliActionInterface[] getActions() {
- return actions_;
- }
-
- public void setActions(EbliActionInterface[] _actions) {
- actions_=_actions;
- }
}
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneSelectNextAction.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneSelectNextAction.java (rev 0)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneSelectNextAction.java 2008-11-04 17:46:05 UTC (rev 4166)
@@ -0,0 +1,66 @@
+/*
+ * @creation 3 juil. 2008
+ * @modification $Date:$
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.ebli.calque.action;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+
+import javax.swing.KeyStroke;
+
+import org.fudaa.ctulu.CtuluLib;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.calque.ZSelectionEvent;
+import org.fudaa.ebli.calque.ZSelectionListener;
+import org.fudaa.ebli.calque.ZScene.SceneSelectionHelper;
+import org.fudaa.ebli.calque.edition.ZSceneEditor;
+import org.fudaa.ebli.commun.EbliActionSimple;
+
+import com.memoire.bu.BuResource;
+
+/**
+ * Une action pour s\xE9lectionner le sommet suivant d'une g\xE9om\xE9trie.
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class SceneSelectNextAction extends EbliActionSimple implements ZSelectionListener {
+ ZSceneEditor editor_;
+
+ public SceneSelectNextAction(ZSceneEditor _editor) {
+ super(BuResource.BU.getString("S\xE9lection de l'objet suivant"), BuResource.BU.getIcon("avancer2"), "SELECT_NEXT");
+ setKey(KeyStroke.getKeyStroke(KeyEvent.VK_G,KeyEvent.CTRL_MASK));
+ editor_=_editor;
+ _editor.getScene().addSelectionListener(this);
+ }
+
+ public void actionPerformed(final ActionEvent _e) {
+ editor_.selectNextObject();
+ }
+
+ public void updateStateBeforeShow() {
+ ZScene scn=editor_.getScene();
+ SceneSelectionHelper hlp=editor_.getScene().getSelectionHelper();
+
+ boolean b=true;
+ // Si la selection n'est pas null
+ b=b && !scn.isSelectionEmpty();
+ // Si la selection est au nombre de 1.
+ b=b && (!scn.isAtomicMode() || hlp.getNbAtomicSelected()==1);
+ b=b && (scn.isAtomicMode() || scn.getLayerSelection().getNbSelectedIndex()==1);
+
+ setEnabled(b);
+ }
+
+ public String getEnableCondition() {
+ return CtuluLib.getS("S\xE9lectionner une g\xE9om\xE9trie ou un sommet");
+ }
+
+ public void selectionChanged(ZSelectionEvent _evt) {
+ updateStateBeforeShow();
+ }
+}
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneSelectNextAction.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Added: svn:eol-style
+ native
Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneSelectPreviousAction.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneSelectPreviousAction.java (rev 0)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneSelectPreviousAction.java 2008-11-04 17:46:05 UTC (rev 4166)
@@ -0,0 +1,66 @@
+/*
+ * @creation 3 juil. 2008
+ * @modification $Date:$
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.ebli.calque.action;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+
+import javax.swing.KeyStroke;
+
+import org.fudaa.ctulu.CtuluLib;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.calque.ZSelectionEvent;
+import org.fudaa.ebli.calque.ZSelectionListener;
+import org.fudaa.ebli.calque.ZScene.SceneSelectionHelper;
+import org.fudaa.ebli.calque.edition.ZSceneEditor;
+import org.fudaa.ebli.commun.EbliActionSimple;
+
+import com.memoire.bu.BuResource;
+
+/**
+ * Une action pour s\xE9lectionner le sommet pr\xE9c\xE9dent d'une g\xE9om\xE9trie.
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class SceneSelectPreviousAction extends EbliActionSimple implements ZSelectionListener {
+ ZSceneEditor editor_;
+
+ public SceneSelectPreviousAction(ZSceneEditor _editor) {
+ super(BuResource.BU.getString("S\xE9lection de l'objet pr\xE9c\xE9dent"), BuResource.BU.getIcon("reculer"), "SELECT_PREVIOUS");
+ setKey(KeyStroke.getKeyStroke(KeyEvent.VK_G,KeyEvent.SHIFT_MASK | KeyEvent.CTRL_MASK));
+ editor_=_editor;
+ _editor.getScene().addSelectionListener(this);
+ }
+
+ public void actionPerformed(final ActionEvent _e) {
+ editor_.selectPreviousObject();
+ }
+
+ public void updateStateBeforeShow() {
+ ZScene scn=editor_.getScene();
+ SceneSelectionHelper hlp=editor_.getScene().getSelectionHelper();
+
+ boolean b=true;
+ // Si la selection n'est pas null
+ b=b && !scn.isSelectionEmpty();
+ // Si la selection est au nombre de 1.
+ b=b && (!scn.isAtomicMode() || hlp.getNbAtomicSelected()==1);
+ b=b && (scn.isAtomicMode() || scn.getLayerSelection().getNbSelectedIndex()==1);
+
+ setEnabled(b);
+ }
+
+ public String getEnableCondition() {
+ return CtuluLib.getS("S\xE9lectionner une g\xE9om\xE9trie ou un sommet");
+ }
+
+ public void selectionChanged(ZSelectionEvent _evt) {
+ updateStateBeforeShow();
+ }
+}
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneSelectPreviousAction.java
___________________________________________________________________
Added: svn:keywords
+ Date Revision Author URL Id
Added: svn:eol-style
+ native
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java 2008-11-04 16:49:39 UTC (rev 4165)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java 2008-11-04 17:46:05 UTC (rev 4166)
@@ -182,7 +182,7 @@
sceneEditor_=_editor;
setMng(new CtuluCommandManager());
// panel_.addKeyListener(this);
- buildDeletesAction();
+ buildActions();
EbliLib.updateMapKeyStroke(_panel, getDeleteActions());
installSceneActions();
}
@@ -436,7 +436,7 @@
return new EbliActionInterface[] { actionDelete_, actionCancel_ };
}
- private void buildDeletesAction() {
+ private void buildActions() {
actionDelete_ = new EbliActionSimple(CtuluLib.getS("Supprimer"), BuResource.BU.getIcon("enlever"),"DeleteSelectedAction") {
public void actionPerformed(final ActionEvent _e) {
delete();
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZSceneEditor.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZSceneEditor.java 2008-11-04 16:49:39 UTC (rev 4165)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZSceneEditor.java 2008-11-04 17:46:05 UTC (rev 4166)
@@ -11,9 +11,11 @@
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluCommandManager;
import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
import org.fudaa.ebli.calque.ZEbliCalquesPanel;
import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.ebli.ressource.EbliResource;
@@ -27,6 +29,8 @@
protected ZEbliCalquesPanel calquePanel_;
protected CtuluCommandManager mng_;
protected CtuluUI ui_;
+ /** Toutes les actions li\xE9es \xE0 la scene, ajout\xE9es dans les menus correspondants */
+ private EbliActionInterface[] actions_;
public ZSceneEditor(ZScene _scene, ZEbliCalquesPanel _calquePanel) {
scene_=_scene;
@@ -52,7 +56,15 @@
public ZScene getScene() {
return scene_;
}
+
+ public EbliActionInterface[] getActions() {
+ return actions_;
+ }
+ public void setActions(EbliActionInterface[] _actions) {
+ actions_=_actions;
+ }
+
public void rotateSelectedObjects(double _angRad, double _xreel0, double _yreel0) {
ZCalqueEditable[] cqs=scene_.getEditableLayers();
@@ -140,4 +152,23 @@
calquePanel_.getVueCalque().changeRepere(this, boite);
}
+ /**
+ * Selectionne l'objet suivant celui selectionn\xE9.
+ */
+ public void selectNextObject() {
+ int idx=getScene().getSelectionHelper().getUniqueSelectedIdx();
+ ZCalqueAffichageDonnees cq=(ZCalqueAffichageDonnees)getScene().getLayerForId(idx);
+
+ cq.selectNext();
+ }
+
+ /**
+ * Selectionne l'objet pr\xE9c\xE9dent celui selectionn\xE9.
+ */
+ public void selectPreviousObject() {
+ int idx=getScene().getSelectionHelper().getUniqueSelectedIdx();
+ ZCalqueAffichageDonnees cq=(ZCalqueAffichageDonnees)getScene().getLayerForId(idx);
+
+ cq.selectPrevious();
+ }
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2008-11-04 16:49:39 UTC (rev 4165)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2008-11-04 17:46:05 UTC (rev 4166)
@@ -65,7 +65,7 @@
super.installSceneActions();
ArrayList<EbliActionInterface> acts=new ArrayList<EbliActionInterface>();
- EbliActionInterface[] actSuper=sceneEditor_.getScene().getActions();
+ EbliActionInterface[] actSuper=sceneEditor_.getActions();
if (actSuper!=null) acts.addAll(Arrays.asList(actSuper));
acts.add(new SceneSplitAction(sceneEditor_));
@@ -74,7 +74,7 @@
acts.add(new SceneDecimationAction((MdlSceneEditor)sceneEditor_));
acts.add(new SceneRefinementAction((MdlSceneEditor)sceneEditor_));
acts.add(new SceneProjectionAction((MdlSceneEditor)sceneEditor_));
- getSceneEditor().getScene().setActions(acts.toArray(new EbliActionAbstract[0]));
+ getSceneEditor().setActions(acts.toArray(new EbliActionAbstract[0]));
}
/**
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java 2008-11-04 16:49:39 UTC (rev 4165)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java 2008-11-04 17:46:05 UTC (rev 4166)
@@ -29,10 +29,13 @@
import org.fudaa.ebli.calque.action.EditVisibilityAction;
import org.fudaa.ebli.calque.action.SceneDeplacementAction;
import org.fudaa.ebli.calque.action.SceneRotationAction;
+import org.fudaa.ebli.calque.action.SceneSelectPreviousAction;
+import org.fudaa.ebli.calque.action.SceneSelectNextAction;
import org.fudaa.ebli.calque.edition.ZCalqueDeplacement;
import org.fudaa.ebli.calque.edition.ZCalqueEditionGroup;
import org.fudaa.ebli.calque.edition.ZEditorDefault;
import org.fudaa.ebli.commun.EbliActionInterface;
+import org.fudaa.ebli.commun.EbliComponentFactory;
import org.fudaa.ebli.commun.EbliFormatter;
import org.fudaa.ebli.commun.EbliSelectionMode;
@@ -122,6 +125,11 @@
res[0] = new BuMenu(_title, "LAYER");
res[0].setIcon(null);
res[0].add(BArbreCalque.buildZNormalMenu(modelArbre_));
+ EbliComponentFactory.INSTANCE.addActionsToMenu(new EbliActionInterface[] {
+ null,
+ new SceneSelectPreviousAction(gisEditor_.getSceneEditor()),
+ new SceneSelectNextAction(gisEditor_.getSceneEditor())
+ },res[0]);
fillMenuWithToolsActions(res[0]);
res[1] = getThemeMenu();
res[1].setMnemonic(res[1].getText().charAt(0));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fa...@us...> - 2008-11-04 16:49:52
|
Revision: 4165
http://fudaa.svn.sourceforge.net/fudaa/?rev=4165&view=rev
Author: fargeix
Date: 2008-11-04 16:49:39 +0000 (Tue, 04 Nov 2008)
Log Message:
-----------
Ajout des ?\195?\169l?\195?\169ments n?\195?\169cessaires ?\195?\160 la cr?\195?\169ation de distributions d'Oscar (izpack)
Modified Paths:
--------------
trunk/fudaa_devel/fudaa-distrib/oscar/build.xml
Added Paths:
-----------
trunk/fudaa_devel/fudaa-distrib/oscar/Licence.txt
trunk/fudaa_devel/fudaa-distrib/oscar/izpack/
trunk/fudaa_devel/fudaa-distrib/oscar/izpack/Unix_shortcutSpec.xml
trunk/fudaa_devel/fudaa-distrib/oscar/izpack/izpack_fudaa_oscar.xml
trunk/fudaa_devel/fudaa-distrib/oscar/izpack/shortcutSpec.xml
trunk/fudaa_devel/fudaa-distrib/oscar/izpack/standalone-compiler.jar
trunk/fudaa_devel/fudaa-distrib/oscar/oscar.JPG
trunk/fudaa_devel/fudaa-distrib/oscar/oscar.PNG
trunk/fudaa_devel/fudaa-distrib/oscar/oscar.bat
trunk/fudaa_devel/fudaa-distrib/oscar/oscar.ico
Added: trunk/fudaa_devel/fudaa-distrib/oscar/Licence.txt
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/oscar/Licence.txt (rev 0)
+++ trunk/fudaa_devel/fudaa-distrib/oscar/Licence.txt 2008-11-04 16:49:39 UTC (rev 4165)
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
Modified: trunk/fudaa_devel/fudaa-distrib/oscar/build.xml
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/oscar/build.xml 2008-11-04 16:30:41 UTC (rev 4164)
+++ trunk/fudaa_devel/fudaa-distrib/oscar/build.xml 2008-11-04 16:49:39 UTC (rev 4165)
@@ -11,5 +11,8 @@
-->
<project name="oscar" default="deploy" basedir=".">
<import file="../ant-deploy.xml" />
- <property name="this.main.class" value="Oscar" />
+ <taskdef name="izpack" classpath="izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
+ <property name="this.main.class" value="Oscar" />
+ <taskdef resource="genjar.properties"/>
+ <izpack input="izpack/izpack_fudaa_oscar.xml" output="../../../distrib/build/jar/oscar/Fudaa_Oscar_Install.jar" basedir="." />
</project>
Added: trunk/fudaa_devel/fudaa-distrib/oscar/izpack/Unix_shortcutSpec.xml
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/oscar/izpack/Unix_shortcutSpec.xml (rev 0)
+++ trunk/fudaa_devel/fudaa-distrib/oscar/izpack/Unix_shortcutSpec.xml 2008-11-04 16:49:39 UTC (rev 4165)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<shortcuts>
+ <programGroup defaultName="Applications Fudaa\Oscar" location="applications"/>
+ <shortcut
+ name="Lancer Oscar"
+ programGroup="yes"
+ desktop="yes"
+ applications="no"
+ startMenu="no"
+ startup="no"
+ target="$JAVA_HOME/bin/java"
+ commandLine="-DFUDAA_SERVEUR=$INSTALL_PATH/serveurs/Fudaa-Oscar -cp $INSTALL_PATH/fudaa-oscar.jar org.fudaa.fudaa.oscar.Oscar"
+ workingDirectory="$INSTALL_PATH"
+ type="Application"
+ iconFile="$INSTALL_PATH/oscar.png"
+ initialState="noShow"
+ description="Lance le logiciel Oscar">
+ <createForPack name="Oscar"/>
+ </shortcut>
+
+ <shortcut
+ name="Supprimer Oscar"
+ programGroup="yes"
+ desktop="yes"
+ applications="no"
+ startMenu="no"
+ startup="no"
+ target="$JAVA_HOME/bin/java"
+ commandLine="-jar "$INSTALL_PATH/Uninstaller/uninstaller.jar""
+ initialState="noShow"
+ iconFile="trashcan_full"
+ iconIndex="0"
+ workingDirectory=""
+ type="Application"
+ encoding="UTF-8"
+ description="Supprime le logiciel Oscar">
+ <createForPack name="Oscar"/>
+ </shortcut>
+
+</shortcuts>
\ No newline at end of file
Added: trunk/fudaa_devel/fudaa-distrib/oscar/izpack/izpack_fudaa_oscar.xml
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/oscar/izpack/izpack_fudaa_oscar.xml (rev 0)
+++ trunk/fudaa_devel/fudaa-distrib/oscar/izpack/izpack_fudaa_oscar.xml 2008-11-04 16:49:39 UTC (rev 4165)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="iso-8859-1" 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>Oscar</appname>
+ <appversion>1.4 beta 1</appversion>
+ <authors>
+ <author name="Olivier HOAREAU" email="de...@fu..."/>
+ <author name="Mederic FARGEIX" email="de...@fu..."/>
+ </authors>
+ <url>http://www.cetmef.developpement-durable.gouv.fr/</url>
+ </info>
+
+ <!--
+ The gui preferences indication.
+ Sets the installer window to 640x480. It will not be able to change the size.
+ -->
+ <guiprefs width="800" height="520" resizable="no"/>
+
+ <variables>
+ <variable name="$DesktopShortcutCheckboxEnabled" value="true"/>
+ </variables>
+
+ <!--
+ The locale section.
+ Asks here to include the English and 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 id="LicencePanel.licence" src="Licence.txt"/>
+ <res id="shortcutSpec.xml" src="izpack/shortcutSpec.xml"/>
+ <res id="Unix_shortcutSpec.xml" src="izpack/Unix_shortcutSpec.xml"/>
+ <res src="oscar.jpg" id="Installer.image.0"/>
+ </resources>
+
+ <!--
+ The panels section.
+ We indicate here which panels we want to use. The order will be respected.
+ -->
+ <panels>
+ <panel classname="HelloPanel" id="hellopanel"/>
+ <panel classname="LicencePanel" id="licensepanel"/>
+ <panel classname="TargetPanel" id="targetpanel"/>
+ <panel classname="PacksPanel" id="packspanel"/>
+ <panel classname="InstallPanel" id="installpanel"/>
+ <panel classname="ShortcutPanel" id="shortcutpanel"/>
+ <panel classname="FinishPanel" id="finishpanel"/>
+ </panels>
+
+ <!--
+ The packs section.
+ We specify here our packs.
+ -->
+
+ <packs>
+ <pack name="Oscar" required="yes">
+ <description>Installe tous les composants du logiciel Oscar</description>
+ <file src="Licence.txt" targetdir="$INSTALL_PATH"/>
+ <file src="oscar.bat" targetdir="$INSTALL_PATH"/>
+ <file src="oscar.ico" targetdir="$INSTALL_PATH"/>
+ <file src="oscar.png" targetdir="$INSTALL_PATH"/>
+ <file src="../../../distrib/build/jar/oscar/fudaa-oscar.jar" targetdir="$INSTALL_PATH"/>
+ <file src="../../../distrib/build/jar/oscar/aide" targetdir="$INSTALL_PATH"/>
+ <file src="../../fudaa/serveurs/oscar" targetdir="$INSTALL_PATH/serveurs"/>
+ <executable targetfile="$INSTALL_PATH/serveurs/oscar/bin/linux/oscar_linux" stage="never"/>
+ <executable targetfile="$INSTALL_PATH/serveurs/oscar/bin/linux/xplan_linux" stage="never"/>
+ <executable targetfile="$INSTALL_PATH/serveurs/oscar/bin/linux/xpsol_ce_linux" stage="never"/>
+ <executable targetfile="$INSTALL_PATH/serveurs/oscar/bin/linux/xpsol_ct_linux" stage="never"/>
+ <executable targetfile="$INSTALL_PATH/serveurs/oscar/bin/linux/xpsol_linux" stage="never"/>
+ </pack>
+ </packs>
+
+ <native type="izpack" name="ShellLink.dll"/>
+
+</installation>
Added: trunk/fudaa_devel/fudaa-distrib/oscar/izpack/shortcutSpec.xml
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/oscar/izpack/shortcutSpec.xml (rev 0)
+++ trunk/fudaa_devel/fudaa-distrib/oscar/izpack/shortcutSpec.xml 2008-11-04 16:49:39 UTC (rev 4165)
@@ -0,0 +1,36 @@
+<shortcuts>
+ <skipIfNotSupported/>
+ <programGroup defaultName="Applications Fudaa\Oscar" location="applications"/>
+ <shortcut
+ name="Lancer Oscar"
+ programGroup="yes"
+ desktop="yes"
+ applications="no"
+ startMenu="no"
+ startup="no"
+ target="$INSTALL_PATH\oscar.bat"
+ commandLine=""
+ workingDirectory="$INSTALL_PATH"
+ iconFile="$INSTALL_PATH\oscar.ico"
+ initialState="noShow"
+ description="Lance le logiciel Oscar">
+ <createForPack name="Oscar"/>
+ </shortcut>
+
+ <shortcut
+ name="Supprimer Oscar"
+ programGroup="yes"
+ desktop="no"
+ applications="no"
+ startMenu="no"
+ startup="no"
+ target="$INSTALL_PATH\Uninstaller\uninstaller.jar"
+ commandLine=""
+ iconFile="%SystemRoot%\system32\SHELL32.dll"
+ iconIndex="31"
+ description="Supprime le logiciel Oscar">
+
+ <createForPack name="Oscar"/>
+ </shortcut>
+
+</shortcuts>
Added: trunk/fudaa_devel/fudaa-distrib/oscar/izpack/standalone-compiler.jar
===================================================================
(Binary files differ)
Property changes on: trunk/fudaa_devel/fudaa-distrib/oscar/izpack/standalone-compiler.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/fudaa_devel/fudaa-distrib/oscar/oscar.JPG
===================================================================
(Binary files differ)
Property changes on: trunk/fudaa_devel/fudaa-distrib/oscar/oscar.JPG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/fudaa_devel/fudaa-distrib/oscar/oscar.PNG
===================================================================
(Binary files differ)
Property changes on: trunk/fudaa_devel/fudaa-distrib/oscar/oscar.PNG
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/fudaa_devel/fudaa-distrib/oscar/oscar.bat
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/oscar/oscar.bat (rev 0)
+++ trunk/fudaa_devel/fudaa-distrib/oscar/oscar.bat 2008-11-04 16:49:39 UTC (rev 4165)
@@ -0,0 +1,6 @@
+echo off
+cls
+echo Execution de Fudaa-Oscar en cours...
+java.exe -Xmx256m -DFUDAA_SERVEUR=serveurs\oscar -jar fudaa-oscar.jar
+cls
+echo Fin d'execution de Fudaa-Oscar
\ No newline at end of file
Added: trunk/fudaa_devel/fudaa-distrib/oscar/oscar.ico
===================================================================
(Binary files differ)
Property changes on: trunk/fudaa_devel/fudaa-distrib/oscar/oscar.ico
___________________________________________________________________
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: <fa...@us...> - 2008-11-04 16:31:19
|
Revision: 4164
http://fudaa.svn.sourceforge.net/fudaa/?rev=4164&view=rev
Author: fargeix
Date: 2008-11-04 16:30:41 +0000 (Tue, 04 Nov 2008)
Log Message:
-----------
Correction d'une erreur de chemin pour l'installation sous izpack de Sinavi3 sous Linux
Modified Paths:
--------------
trunk/fudaa_devel/fudaa-distrib/sinavi3/izpack/Unix_shortcutSpec.xml
Modified: trunk/fudaa_devel/fudaa-distrib/sinavi3/izpack/Unix_shortcutSpec.xml
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/sinavi3/izpack/Unix_shortcutSpec.xml 2008-11-04 16:15:42 UTC (rev 4163)
+++ trunk/fudaa_devel/fudaa-distrib/sinavi3/izpack/Unix_shortcutSpec.xml 2008-11-04 16:30:41 UTC (rev 4164)
@@ -9,7 +9,7 @@
startMenu="no"
startup="no"
target="$JAVA_HOME/bin/java"
- commandLine="-DFUDAA_SERVEUR=$INSTALL_PATH/serveurs/Fudaa-Sinavi -cp $INSTALL_PATH/fudaa-sinavi3.jar:$INSTALL_PATH/jcommon.jar:$INSTALL_PATH/jfreechart.jar:$INSTALL_PATH/liquidlnf.jar org.fudaa.fudaa.sinavi3.Sinavi3"
+ commandLine="-DFUDAA_SERVEUR=$INSTALL_PATH/serveurs/Fudaa-Sinavi -cp $INSTALL_PATH/fudaa-sinavi3.jar org.fudaa.fudaa.sinavi3.Sinavi3"
workingDirectory="$INSTALL_PATH"
type="Application"
iconFile="$INSTALL_PATH/sinavi3.png"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fa...@us...> - 2008-11-04 16:16:08
|
Revision: 4163
http://fudaa.svn.sourceforge.net/fudaa/?rev=4163&view=rev
Author: fargeix
Date: 2008-11-04 16:15:42 +0000 (Tue, 04 Nov 2008)
Log Message:
-----------
Correction d'un probl?\195?\168me sous prepro (telemac) : il ?\195?\169tait impossible d'afficher les num?\195?\169ros de noeuds suite ?\195?\160 une mise ?\195?\160 jour de fudaa-Sig ?\195?\160 la fin du mois d'ao?\195?\187t.
Modified Paths:
--------------
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java 2008-11-04 15:44:00 UTC (rev 4162)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java 2008-11-04 16:15:42 UTC (rev 4163)
@@ -269,7 +269,11 @@
*/
public final void addCqInfos(final EfGridInterface _g) {
if (getCqInfos() != null) {
- return;
+ if (getCqNodeNumber() != null && getCqElementNumber() != null) {
+ if (_g instanceof EfGridVolumeInterface) {
+ if (getCqEdgeNumber() != null) return;
+ } else return;
+ }
}
addCqInfos();
final BGroupeCalque gr = getCqInfos();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2008-11-04 15:44:06
|
Revision: 4162
http://fudaa.svn.sourceforge.net/fudaa/?rev=4162&view=rev
Author: emmanuel_martin
Date: 2008-11-04 15:44:00 +0000 (Tue, 04 Nov 2008)
Log Message:
-----------
Tache #51 : "On ne peut pas joindre 2 semis, comme c'est le cas pour 2 polylignes. "
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueMultiPointEditable.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigEditor.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueMultiPointEditable.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueMultiPointEditable.java 2008-11-04 09:50:06 UTC (rev 4161)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueMultiPointEditable.java 2008-11-04 15:44:00 UTC (rev 4162)
@@ -355,4 +355,27 @@
public final void setEditor(final ZEditorDefault _editor) {
editor_ = _editor;
}
+
+ /**
+ * Joint 2 semis de points.
+ *
+ * @param _cmd La pile de commandes.
+ * @return true si les semis de points ont \xE9t\xE9 jointes.
+ */
+ public boolean joinGeometries(final CtuluCommandContainer _cmd) {
+ if (isSelectionEmpty())
+ return false;
+
+ int[] idxSemis;
+ if(isAtomicMode())
+ idxSemis=selectionMulti_.getIdxSelected();
+ else
+ idxSemis=selection_.getSelectedIndex();
+ if(idxSemis.length!=2)
+ return false;
+
+ // On vide la selection, les 2 semis sont supprim\xE9es par la jonction.
+ clearSelection();
+ return getMultiPointModel().joinGeometries(idxSemis, _cmd)!=-1;
+ }
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java 2008-11-04 09:50:06 UTC (rev 4161)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java 2008-11-04 15:44:00 UTC (rev 4162)
@@ -9,9 +9,17 @@
import gnu.trove.TIntObjectIterator;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
import javax.swing.table.AbstractTableModel;
import org.fudaa.ctulu.CtuluAnalyze;
@@ -29,6 +37,7 @@
import org.fudaa.ctulu.gis.GISAttributeModelDoubleArray;
import org.fudaa.ctulu.gis.GISGeometryFactory;
import org.fudaa.ctulu.gis.GISMultiPoint;
+import org.fudaa.ctulu.gis.GISPolyligne;
import org.fudaa.ctulu.gis.GISZoneCollection;
import org.fudaa.ctulu.gis.GISZoneCollectionMultiPoint;
import org.fudaa.ctulu.gui.CtuluTable;
@@ -39,11 +48,14 @@
import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface;
import org.fudaa.ebli.palette.BPaletteInfo.InfoData;
+import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuLabel;
import com.memoire.bu.BuTable;
import com.memoire.fu.FuLog;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.CoordinateSequence;
import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.impl.CoordinateArraySequenceFactory;
/**
* Une implementation par defaut d'un mod\xE8le \xE9ditable pour des multipoints.
@@ -799,4 +811,69 @@
if(idxAttr >= 0)
getGeomData().getDataModel(idxAttr).setObject(_idx, GISAttributeConstants.ATT_VAL_ETAT_MODI, _cmd);
}
+
+ /**
+ * Joint 2 semis de points.
+ *
+ * @param _idsSemis Les index des 2 semis.
+ * @param _cmd Le conteneur de commandes.
+ * @return L'index de la nouvelle ligne si OK, -1 sinon.
+ */
+ public int joinGeometries(int[] _idxSemis, final CtuluCommandContainer _cmd) {
+ if (geometries_ == null||_idxSemis==null||_idxSemis.length!=2)
+ return -1;
+ final CtuluCommandComposite cmp = new CtuluCommandComposite("Jointure de semis de points");
+
+ // Nouvelles coordonn\xE9es
+ int nbPointMulti1=geometries_.getGeometry(_idxSemis[0]).getNumPoints();
+ int nbPointMulti2=geometries_.getGeometry(_idxSemis[1]).getNumPoints();
+ Coordinate[] coord=new Coordinate[nbPointMulti1+nbPointMulti2];
+ // Remplisage de coord
+ for(int i=0;i<_idxSemis.length;i++){
+ GISMultiPoint multipoint=(GISMultiPoint) geometries_.getGeometry(_idxSemis[i]);
+ for(int j=0;j<multipoint.getNumPoints();j++)
+ coord[i*nbPointMulti1+j]=multipoint.getCoordinateSequence().getCoordinate(j);
+ }
+
+ // Les datas
+ Object[] dataSemis=new Object[geometries_.getNbAttributes()];
+ for (int att=0; att<geometries_.getNbAttributes(); att++) {
+ // Attributs atomiques
+ if (geometries_.getAttribute(att).isAtomicValue()) {
+ // R\xE9cup\xE9ration des valeurs
+ Object[] values=new Object[nbPointMulti1+nbPointMulti2];
+ for(int i=0;i<_idxSemis.length;i++){
+ GISMultiPoint multipoint=(GISMultiPoint) geometries_.getGeometry(_idxSemis[i]);
+ for(int j=0;j<multipoint.getNumPoints();j++)
+ values[i*nbPointMulti1+j]=((GISAttributeModel) geometries_.getModel(att).getObjectValueAt(_idxSemis[i])).getObjectValueAt(j);
+ }
+ dataSemis[att]=(GISAttributeModel)geometries_.getModel(att).getAttribute().createDataForGeom(values,nbPointMulti1+nbPointMulti2);
+ }
+ // Attributs globaux
+ else {
+ // Cas particulier de l'attribut TITRE => <TITRE_GEOM1>_<TITRE_GEOM2>
+ if (geometries_.getModel(att).getAttribute()==GISAttributeConstants.TITRE) {
+ String name1=(String)geometries_.getModel(att).getObjectValueAt(_idxSemis[0]);
+ String name2=(String)geometries_.getModel(att).getObjectValueAt(_idxSemis[1]);
+ dataSemis[att]=name1+"_"+name2;
+ }
+ // Cas particulier de l'attribut ETAT_GEOM => ATT_VAL_ETAT_MODI
+ else if (geometries_.getModel(att).getAttribute()==GISAttributeConstants.ETAT_GEOM) {
+ dataSemis[att]=GISAttributeConstants.ATT_VAL_ETAT_MODI;
+ }
+ // On prend arbitrairement la valeur de la premi\xE8re polyligne.
+ else
+ dataSemis[att]=geometries_.getModel(att).getAttribute().createDataForGeom(geometries_.getModel(att).getObjectValueAt(_idxSemis[0]),1);
+ }
+ }
+
+ // Remplacement dans la collection.
+ if (getGeomData().addGeometry(GISGeometryFactory.INSTANCE.createMultiPoint(coord), dataSemis, _cmd)!=-1) {
+ geometries_.removeGeometries(_idxSemis, cmp);
+ if (_cmd!=null)
+ _cmd.addCmd(cmp.getSimplify());
+ return geometries_.getNbGeometries()-1;
+ }
+ return -1;
+ }
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java 2008-11-04 09:50:06 UTC (rev 4161)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java 2008-11-04 15:44:00 UTC (rev 4162)
@@ -49,6 +49,7 @@
FSigEditor editor=(FSigEditor)getEditor();
ArrayList vacts=new ArrayList();
vacts.addAll(Arrays.asList(editor.getEditAction()));
+ vacts.add(editor.getJoinAction());
// vacts.add(editor.getSplitAction());
// vacts.add(editor.getJoinAction());
vacts.add(null);
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigEditor.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigEditor.java 2008-11-04 09:50:06 UTC (rev 4161)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigEditor.java 2008-11-04 15:44:00 UTC (rev 4162)
@@ -20,6 +20,7 @@
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.gis.GISAttributeInterface;
import org.fudaa.ctulu.gis.GISGeometryFactory;
+import org.fudaa.ctulu.gis.GISMultiPoint;
import org.fudaa.ctulu.gis.GISPolygone;
import org.fudaa.ctulu.gis.GISPolyligne;
import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
@@ -33,12 +34,14 @@
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonneesMulti;
import org.fudaa.ebli.calque.ZEbliCalquesPanel;
import org.fudaa.ebli.calque.ZModelGeometryListener;
import org.fudaa.ebli.calque.ZModeleGeometry;
import org.fudaa.ebli.calque.edition.ZCalqueEditable;
import org.fudaa.ebli.calque.edition.ZCalqueEditionGroup;
import org.fudaa.ebli.calque.edition.ZCalqueLigneBriseeEditable;
+import org.fudaa.ebli.calque.edition.ZCalqueMultiPointEditable;
import org.fudaa.ebli.calque.edition.ZEditorDefault;
import org.fudaa.ebli.calque.edition.ZSceneEditor;
import org.fudaa.ebli.commun.EbliActionSimple;
@@ -224,7 +227,7 @@
}
/**
- * Une action pour joindre 2 polylignes. N'est pas dans les actions par defaut.
+ * Une action pour joindre 2 polylignes ou deux multipoint. N'est pas dans les actions par defaut.
* @return L'action
*/
public EbliActionSimple getJoinAction() {
@@ -334,7 +337,7 @@
protected JoinAction() {
super(BuResource.BU.getString("Joindre"), /*BuResource.BU.getIcon("joindreligne")*/null, "GIS_JOIN");
- setDefaultToolTip(FudaaLib.getS("Joindre 2 polylignes"));
+ setDefaultToolTip(FudaaLib.getS("Joindre 2 polylignes ou 2 multipoint"));
}
public void actionPerformed(final ActionEvent _e) {
@@ -345,43 +348,57 @@
if (Fu.DEBUG && FuLog.isDebug()) {
FuLog.debug("FTR gis target= " + FSigEditor.this.getTarget());
}
-
- ZCalqueLigneBriseeEditable cq=null;
- if (getSupport().getCalqueActif() instanceof ZCalqueLigneBriseeEditable) cq=(ZCalqueLigneBriseeEditable)getSupport().getCalqueActif();
-
- boolean b=true;
- // Uniquement si le calque est editable, en mode atomique, et si le nombre de sommets est 2.
- b&=cq!=null &&
- FSigEditor.this.isEditable(cq) && !cq.isSelectionEmpty() &&
- cq.isAtomicMode() &&
- cq.getLayerSelectionMulti().getNbSelectedItem()==2;
-
- // Uniquement si les sommets sont sur 2 des objets distincts, que ces objets sont des polylignes
- if (b) {
- int[] idxLignes=cq.getLayerSelectionMulti().getIdxSelected();
- b&=idxLignes.length==2;
+ boolean b=false;
+ if (getSupport().getCalqueActif() instanceof ZCalqueLigneBriseeEditable) {
+ ZCalqueLigneBriseeEditable cq=(ZCalqueLigneBriseeEditable)getSupport().getCalqueActif();
+ // Si le calque est editable, en mode atomique, et si le nombre de
+ // sommets est 2.
+ b=cq!=null&&FSigEditor.this.isEditable(cq)&&!cq.isSelectionEmpty()&&cq.isAtomicMode()
+ &&cq.getLayerSelectionMulti().getNbSelectedItem()==2;
+ // Si les sommets sont sur 2 des objets distincts, que ces objets sont
+ // des polylignes
if (b) {
- for (int i=0; i<idxLignes.length; i++)
- b&=(((GISZoneCollectionLigneBrisee)cq.getModele().getGeomData()).getGeometry(idxLignes[i]) instanceof GISPolyligne);
+ int[] idxLignes=cq.getLayerSelectionMulti().getIdxSelected();
+ b&=idxLignes.length==2;
+ if (b) {
+ for (int i=0; i<idxLignes.length; i++)
+ b&=(((GISZoneCollectionLigneBrisee)((ZModeleGeometry)cq.modeleDonnees()).getGeomData()).getGeometry(idxLignes[i]) instanceof GISPolyligne);
+ }
}
}
-
+ // Ou si c'est deux semis de points qui sont selectionn\xE9s
+ else if (getSupport().getCalqueActif() instanceof ZCalqueMultiPointEditable) {
+ ZCalqueMultiPointEditable cq=(ZCalqueMultiPointEditable)getSupport().getCalqueActif();
+ // Deux selections en mode sommet ou global
+ // Ces deux s\xE9lections doivent \xEAtre des semis de points
+ if (cq!=null&&FSigEditor.this.isEditable(cq)&&!cq.isSelectionEmpty()
+ &&(cq.getLayerSelectionMulti()!=null&&cq.getLayerSelectionMulti().getNbSelectedItem()==2||cq.getLayerSelection()!=null&&cq.getLayerSelection().getNbSelectedIndex()==2)) {
+ int[] idxGeom;
+ if (cq.getLayerSelectionMulti()!=null&&cq.getLayerSelectionMulti().getNbSelectedItem()!=0)
+ idxGeom=cq.getLayerSelectionMulti().getIdxSelected();
+ else
+ idxGeom=cq.getLayerSelection().getSelectedIndex();
+ b=true;
+ for (int i=0; i<idxGeom.length; i++)
+ b=b&&(cq.modeleDonnees().getObject(idxGeom[i]) instanceof GISMultiPoint);
+ }
+ }
super.setEnabled(b);
}
public String getEnableCondition() {
- return FudaaLib.getS("S\xE9lectionner les sommets extremit\xE9s de 2 polylignes");
+ return FudaaLib.getS("S\xE9lectionner les sommets extremit\xE9s de 2 polylignes ou deux semis de points");
}
}
/**
- * Joint 2 polylignes distinctes.
+ * Joint 2 polylignes distinctes ou deux semis de points.
*/
protected void joinSelectedGeometries() {
- if (!(getSupport().getCalqueActif() instanceof ZCalqueLigneBriseeEditable)) return;
-
- ZCalqueLigneBriseeEditable cq=(ZCalqueLigneBriseeEditable)getSupport().getCalqueActif();
- cq.joinGeometries(getMng());
+ if (getSupport().getCalqueActif() instanceof ZCalqueLigneBriseeEditable)
+ ((ZCalqueLigneBriseeEditable)getSupport().getCalqueActif()).joinGeometries(getMng());
+ else if (getSupport().getCalqueActif() instanceof ZCalqueMultiPointEditable)
+ ((ZCalqueMultiPointEditable)getSupport().getCalqueActif()).joinGeometries(getMng());
}
protected boolean canExportSelectedLayer() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2008-11-04 09:50:11
|
Revision: 4161
http://fudaa.svn.sourceforge.net/fudaa/?rev=4161&view=rev
Author: emmanuel_martin
Date: 2008-11-04 09:50:06 +0000 (Tue, 04 Nov 2008)
Log Message:
-----------
bugfix : verification de l'existance du fichier _autres.st lors de l'export. Changement de l'op?\195?\169rateur == en equals dans le test de remplissage du tableau dans la palette de visibilit?\195?\169.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java 2008-11-03 18:55:08 UTC (rev 4160)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditVisibility.java 2008-11-04 09:50:06 UTC (rev 4161)
@@ -375,7 +375,7 @@
if(indexTitre!=-1&&indexVisibility!=-1)
for(int j=0;j<zone.getNbGeometries();j++)
if(!onlyInvisible_||zone.getValue(indexVisibility, j)==GISAttributeConstants.ATT_VAL_FALSE)
- rows.add(new Object[]{zone.getValue(indexTitre, j), zone.getValue(indexVisibility, j)==GISAttributeConstants.ATT_VAL_TRUE?true:false, calques_[i], j});
+ rows.add(new Object[]{zone.getValue(indexTitre, j), zone.getValue(indexVisibility, j).equals(GISAttributeConstants.ATT_VAL_TRUE)?true:false, calques_[i], j});
}
}
geomTableModel_=new GeomTableModel(new String[]{EbliLib.getS("Nom"), EbliLib.getS("Visibilit\xE9")}, rows.toArray(new Object[0][]));
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java 2008-11-03 18:55:08 UTC (rev 4160)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java 2008-11-04 09:50:06 UTC (rev 4161)
@@ -285,7 +285,7 @@
}
String name=CtuluLibFile.getSansExtension(f.getName());
// Teste sur l'existance des fichier. Dans le cas d'un enregistrement en
- // rubar, il faut aussi tester avec les extensions .sem et .cn
+ // rubar, il faut aussi tester avec les extensions .sem et .cn et aussi <nom>_autres.st
if (CtuluLibFile.getExtension(f.getName()).equalsIgnoreCase("st")) {
if ((new File(f.getParent()+File.separatorChar+name+".sem")).exists()) {
result+=(result.length()!=0 ? ", ":"")+name+".sem";
@@ -295,6 +295,10 @@
result+=(result.length()!=0 ? ", ":"")+name+".cn";
nbFiles++;
}
+ if ((new File(f.getParent()+File.separatorChar+name+"_autres.st")).exists()) {
+ result+=(result.length()!=0 ? ", ":"")+name+"_autres.st";
+ nbFiles++;
+ }
}
if (nbFiles>0)
if(nbFiles==1&&!ui_.question(CtuluLib.getS("Attention"), CtuluLib.getS("Le fichier {0} existe d\xE9j\xE0. Voulez-vous l'\xE9craser?", result)))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2008-11-03 19:23:43
|
Revision: 4155
http://fudaa.svn.sourceforge.net/fudaa/?rev=4155&view=rev
Author: emmanuel_martin
Date: 2008-11-03 16:11:51 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
tache #74 : "Pas de pr?\195?\169vention de l'utilisateur en cas d'?\195?\169crasement lors de l'exportation des fichiers rubar _autres.st et .sem"
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java 2008-11-03 14:29:31 UTC (rev 4154)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java 2008-11-03 16:11:51 UTC (rev 4155)
@@ -51,6 +51,7 @@
import org.fudaa.ctulu.CtuluArkLoader;
import org.fudaa.ctulu.CtuluLib;
+import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.gis.factory.GISExportDataStoreFactory;
@@ -257,10 +258,6 @@
setErrorText(CtuluLib.getS("Donnez un nom au fichier d'exportation"));
return false;
}
- if (f.exists() && !ui_.question(CtuluLib.getS("Attention"), CtuluLib.getS("Le fichier {0} existe d\xE9j\xE0. Voulez-vous l'\xE9craser?",
- pn_.getFile().toString()))) {
- return false;
- }
boolean bextok=false;
for (int i=0; i<filters_.length; i++) {
if (filters_[i].accept(f)) {
@@ -272,6 +269,39 @@
setErrorText(TrResource.getS("Le fichier choisi a une extension inconnue"));
return false;
}
+ if (CtuluLibFile.getExtension(f.getName())==null) {
+ setErrorText(CtuluLib.getS("Le fichier choisi doit avoir une extension."));
+ return false;
+ }
+ if (CtuluLibFile.getExtension(CtuluLibFile.getSansExtension(f.getName()))!=null) {
+ setErrorText(CtuluLib.getS("Ne mettez pas plusieurs '.' dans le nom."));
+ return false;
+ }
+ String result="";
+ int nbFiles=0;
+ if (f.exists()){
+ result+=f.getName();
+ nbFiles++;
+ }
+ String name=CtuluLibFile.getSansExtension(f.getName());
+ // Teste sur l'existance des fichier. Dans le cas d'un enregistrement en
+ // rubar, il faut aussi tester avec les extensions .sem et .cn
+ if (CtuluLibFile.getExtension(f.getName()).equalsIgnoreCase("st")) {
+ if ((new File(f.getParent()+File.separatorChar+name+".sem")).exists()) {
+ result+=(result.length()!=0 ? ", ":"")+name+".sem";
+ nbFiles++;
+ }
+ if ((new File(f.getParent()+File.separatorChar+name+".cn")).exists()) {
+ result+=(result.length()!=0 ? ", ":"")+name+".cn";
+ nbFiles++;
+ }
+ }
+ if (nbFiles>0)
+ if(nbFiles==1&&!ui_.question(CtuluLib.getS("Attention"), CtuluLib.getS("Le fichier {0} existe d\xE9j\xE0. Voulez-vous l'\xE9craser?", result)))
+ return false;
+ else if(nbFiles>1&&!ui_.question(CtuluLib.getS("Attention"), CtuluLib.getS("Les fichiers {0} existent d\xE9j\xE0. Voulez-vous les \xE9craser?", result)))
+ return false;
+
setErrorText(null);
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cla...@us...> - 2008-11-03 19:23:38
|
Revision: 4158
http://fudaa.svn.sourceforge.net/fudaa/?rev=4158&view=rev
Author: clavreul
Date: 2008-11-03 18:49:50 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
prepro v0.92
curieux bug : l'import d'une classe de jmf com.sun.media.NBA n'est pas reconnu !
Modified Paths:
--------------
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigDataModelSinusxAdapter.java
trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrLauncherDefault.java
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigDataModelSinusxAdapter.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigDataModelSinusxAdapter.java 2008-11-03 18:44:08 UTC (rev 4157)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/wizard/FSigDataModelSinusxAdapter.java 2008-11-03 18:49:50 UTC (rev 4158)
@@ -13,7 +13,7 @@
import java.util.ArrayList;
import java.util.List;
-import com.sun.media.NBA;
+//import com.sun.media.NBA;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.CoordinateSequence;
import com.vividsolutions.jts.geom.Envelope;
Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrLauncherDefault.java
===================================================================
--- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrLauncherDefault.java 2008-11-03 18:44:08 UTC (rev 4157)
+++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrLauncherDefault.java 2008-11-03 18:49:50 UTC (rev 4158)
@@ -134,9 +134,9 @@
infoSoft = new BuInformationsSoftware();
infoSoft.name = "prepro";
- infoSoft.version = "0.91";
- infoSoft.date = "2007-11-29";
- infoSoft.rights = TrResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)2003-2007";
+ infoSoft.version = "0.92";
+ infoSoft.date = "2008-11-03";
+ infoSoft.rights = TrResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)2003-2008";
infoSoft.contact = "fre...@fu...";
infoSoft.license = "GPL2";
infoSoft.languages = languages;
@@ -151,7 +151,7 @@
} else {
infoSoft.man = manUrl.toString() + '/';
}
- infoSoft.authors = new String[] { "Nicolas Clavreul", "Fr\xE9d\xE9ric Deniger" };
+ infoSoft.authors = new String[] {"Fr\xE9d\xE9ric Deniger", "Nicolas Clavreul" };
infoSoft.contributors = new String[] { "Equipes Dodico, Ebli et Fudaa" };
infoSoft.documentors = new String[] { "" };
infoSoft.testers = new String[] { "Fr\xE9d\xE9ric Deniger, Patrick Gomi, Vanessya Laborie", "Andr\xE9 Paquier",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cla...@us...> - 2008-11-03 19:23:38
|
Revision: 4156
http://fudaa.svn.sourceforge.net/fudaa/?rev=4156&view=rev
Author: clavreul
Date: 2008-11-03 18:37:26 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
dicos telemac v5p8
albe derniere mise au point
prepro ef : interpolation des vecteurs
Modified Paths:
--------------
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/albe/DResultatsAlbe.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/ef/interpolation/EfInterpolator.java
trunk/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/TelemacDicoManager.java
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/albe/DResultatsAlbe.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/albe/DResultatsAlbe.java 2008-11-03 16:11:51 UTC (rev 4155)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/albe/DResultatsAlbe.java 2008-11-03 18:37:26 UTC (rev 4156)
@@ -350,6 +350,7 @@
}
catch (final FileNotFoundException _e2) {
System.out.println("le fichier r\xE9sultats " + _nomFichier + " est introuvable.");
+ System.out.println("le chemin courant est : " + System.getProperties().get("user.dir") );
System.out.println("V\xE9rifiez l'existance du sous-r\xE9pertoire tmp dans le r\xE9pertoire de Fudaa-Albe");
}
catch (final IOException _e1) {
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/ef/interpolation/EfInterpolator.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/ef/interpolation/EfInterpolator.java 2008-11-03 16:11:51 UTC (rev 4155)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/ef/interpolation/EfInterpolator.java 2008-11-03 18:37:26 UTC (rev 4156)
@@ -57,22 +57,23 @@
}
public double getValue(int _pt1, int _pt2, double _coef1, double _coef2, CtuluVariable _v, int _tIdx)
- throws IOException {
- if (isVect(_v)) {
+ throws IOException {
+ //Interpolation sur les vecteurs - ca peut servir ulterieurement
+ // if (isVect(_v)) {
- CtuluVariable vx = vect_.getVxSafe(_v);
- CtuluVariable vy = vect_.getVySafe(_v);;
- double vx1 = data_.getData(vx, _tIdx, _pt1);
- double vx2 = data_.getData(vx, _tIdx, _pt2);
- double vy1 = data_.getData(vy, _tIdx, _pt1);
- double vy2 = data_.getData(vy, _tIdx, _pt2);
- double n = getMid(InterpolationVectorContainer.getNorme(vx1, vy1), InterpolationVectorContainer
- .getNorme(vx2, vy2), _coef1, _coef2);
- double t = getMid(InterpolationVectorContainer.getTheta(vx1, vy1), InterpolationVectorContainer
- .getTheta(vx2, vy2), _coef1, _coef2);
- return vect_.isVx(_v) ? InterpolationVectorContainer.getVx(n, t) : InterpolationVectorContainer.getVy(n, t);
- }
- return getMid(data_.getData(_v, _tIdx, _pt1), data_.getData(_v, _tIdx, _pt2), _coef1, _coef2);
+ // CtuluVariable vx = vect_.getVxSafe(_v);
+ // CtuluVariable vy = vect_.getVySafe(_v);;
+ // double vx1 = data_.getData(vx, _tIdx, _pt1);
+ // double vx2 = data_.getData(vx, _tIdx, _pt2);
+ // double vy1 = data_.getData(vy, _tIdx, _pt1);
+ // double vy2 = data_.getData(vy, _tIdx, _pt2);
+ // double n = getMid(InterpolationVectorContainer.getNorme(vx1, vy1), InterpolationVectorContainer
+ // .getNorme(vx2, vy2), _coef1, _coef2);
+ // double t = getMid(InterpolationVectorContainer.getTheta(vx1, vy1), InterpolationVectorContainer
+ // .getTheta(vx2, vy2), _coef1, _coef2);
+ // return vect_.isVx(_v) ? InterpolationVectorContainer.getVx(n, t) : InterpolationVectorContainer.getVy(n, t);
+ //}
+ return getMid(data_.getData(_v, _tIdx, _pt1), data_.getData(_v, _tIdx, _pt2), _coef1, _coef2);
}
Modified: trunk/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/TelemacDicoManager.java
===================================================================
--- trunk/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/TelemacDicoManager.java 2008-11-03 16:11:51 UTC (rev 4155)
+++ trunk/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/TelemacDicoManager.java 2008-11-03 18:37:26 UTC (rev 4156)
@@ -31,10 +31,10 @@
public final static TelemacDicoManager INSTANCE = new TelemacDicoManager();
static {
- final String[] versions = new String[] { "v5p4", "v5p5", "v5p6", "v5p7" };
+ final String[] versions = new String[] { "v5p4", "v5p5", "v5p6", "v5p7","v5p8" };
final Map map = new HashMap(11);
map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getArtemisId()), versions);
- map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getEstel2dId()), new String[] { "v5p4", "v5p5", "v5p7" });
+ map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getEstel2dId()), new String[] { "v5p4", "v5p5", "v5p7","v5p8" });
map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getPostel3dId()), versions);
map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getSisypheId()), versions);
map.put(new TelemacDicoFileFormat(H2dTelemacDicoParams.getStbtelId()), versions);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cla...@us...> - 2008-11-03 19:23:33
|
Revision: 4160
http://fudaa.svn.sourceforge.net/fudaa/?rev=4160&view=rev
Author: clavreul
Date: 2008-11-03 18:55:08 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
java 5
Modified Paths:
--------------
trunk/fudaa_devel/fudaa-distrib/build.xml
Modified: trunk/fudaa_devel/fudaa-distrib/build.xml
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/build.xml 2008-11-03 18:52:30 UTC (rev 4159)
+++ trunk/fudaa_devel/fudaa-distrib/build.xml 2008-11-03 18:55:08 UTC (rev 4160)
@@ -49,7 +49,7 @@
<mkdir dir="${fudaa.dist.classes.test.dir}" />
<echo message="debug=${build.compiler.debug}" />
<echo message="optimize=${build.compiler.optimize}" />
- <echo message="Vous devez utiliser java 1.4" />
+ <echo message="Vous devez utiliser java 1.5" />
<echo message="version utilisee: ${ant.java.version}" />
<ant dir="${ctulu.dir}" antfile="${ctulu.build.file}" target="build" inheritAll="false">
<property name="build.compiler" value="${build.compiler}" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cla...@us...> - 2008-11-03 19:23:14
|
Revision: 4157
http://fudaa.svn.sourceforge.net/fudaa/?rev=4157&view=rev
Author: clavreul
Date: 2008-11-03 18:44:08 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
prepro v0.92
Modified Paths:
--------------
trunk/fudaa_devel/aide/src/prepro/src/web/inc.history.en.html
trunk/fudaa_devel/aide/src/prepro/src/web/inc.history.fr.html
trunk/fudaa_devel/aide/src/prepro/src/web/inc.last-changelog.en.html
trunk/fudaa_devel/aide/src/prepro/src/web/inc.last-changelog.fr.html
trunk/fudaa_devel/aide/src/prepro/src/web/inc.news.en.html
trunk/fudaa_devel/aide/src/prepro/src/web/inc.news.fr.html
Modified: trunk/fudaa_devel/aide/src/prepro/src/web/inc.history.en.html
===================================================================
--- trunk/fudaa_devel/aide/src/prepro/src/web/inc.history.en.html 2008-11-03 18:37:26 UTC (rev 4156)
+++ trunk/fudaa_devel/aide/src/prepro/src/web/inc.history.en.html 2008-11-03 18:44:08 UTC (rev 4157)
@@ -1,6 +1,7 @@
<div class="toc">
<ul>
- <li><a href="#v089">Versions 0.90 (2007-09-18)</a></li>
+ <li><a href="#v091">Version 0.91 (2007-11-29)</a></li>
+ <li><a href="#v090">Versions 0.90 (2007-09-18)</a></li>
<li><a href="#v089">Versions 0.89 (2007-06-22)</a></li>
<li><a href="#v086">Versions 0.86-0.87 (2007-06-19)</a></li>
<li><a href="#v085">Version 0.85 (2007-05-24)</a></li>
@@ -34,6 +35,22 @@
<li><a href="#v007">News in Version 0.07 (2004-06-17)</a></li>
</ul>
</div>
+
+
+<h2 id="v091">Version 0.91 (2007-11-29) </h2>
+<h3>Enhancements</h3>
+
+<h3>Bugs corrected</h3>
+<ul>
+ <li>Geotools is back</li>
+ <li>Telemac : Boundary conditions at liquid frontiers</li>
+
+</ul>
+
+
+
+
+
<h2 id="v090">Version 0.90 (2007-09-18) </h2>
<h3>Enhancements</h3>
<ul>
Modified: trunk/fudaa_devel/aide/src/prepro/src/web/inc.history.fr.html
===================================================================
--- trunk/fudaa_devel/aide/src/prepro/src/web/inc.history.fr.html 2008-11-03 18:37:26 UTC (rev 4156)
+++ trunk/fudaa_devel/aide/src/prepro/src/web/inc.history.fr.html 2008-11-03 18:44:08 UTC (rev 4157)
@@ -1,5 +1,6 @@
<div class="toc">
<ul>
+ <li><a href="#v091">Version 0.91 (2007-11-29)</a></li>
<li><a href="#v090">Version 0.90 (2007-09-18)</a></li>
<li><a href="#v089">Version 0.89 (2007-06-22)</a></li>
<li><a href="#v086">Versions 0.86-0.87 (2007-06-19)</a></li>
@@ -41,6 +42,16 @@
<li><a href="#Version13">Version 0.01 ( diffus\xE9e le 10 juin 2003)</a></li>
</ul>
</div>
+
+
+<h2 id="v091">Version 0.91 (2007-11-29)</h2>
+
+<h3>Bogues corrig\xE9s</h3>
+ <ul>
+ <li>Reint\xE9gration de Geotools</li>
+ <li>T\xE9l\xE9mac : conditions limites aux fronti\xE8res liquides</li>
+ </ul>
+
<h2 id="v090">Version 0.90 (2007-09-18)</h2>
<h3>Am\xE9liorations</h3>
<ul>
@@ -50,6 +61,8 @@
<ul>
<li>Java : la version 1.6.0_02 de java emp\xEAchait le lancement de Fudaa-Prepro</li>
</ul>
+
+
<h2 id="v089">Version 0.89 (2007-06-22)</h2>
<h3>Am\xE9liorations</h3>
<ul>
Modified: trunk/fudaa_devel/aide/src/prepro/src/web/inc.last-changelog.en.html
===================================================================
--- trunk/fudaa_devel/aide/src/prepro/src/web/inc.last-changelog.en.html 2008-11-03 18:37:26 UTC (rev 4156)
+++ trunk/fudaa_devel/aide/src/prepro/src/web/inc.last-changelog.en.html 2008-11-03 18:44:08 UTC (rev 4157)
@@ -1,10 +1,10 @@
<h2>Change Log</h2>
<h3>Enhancements</h3>
-
+<ul>
+<li>TELEMAC :v5p8 dictionaries are availiable</li>
+</ul>
<h3>Bugs corrected</h3>
<ul>
- <li>Geotools is back</li>
- <li>Telemac : Boundary conditions at liquid frontiers</li>
-
+ <li>the problem of the interpolation between vectors has been corrected</li>
</ul>
\ No newline at end of file
Modified: trunk/fudaa_devel/aide/src/prepro/src/web/inc.last-changelog.fr.html
===================================================================
--- trunk/fudaa_devel/aide/src/prepro/src/web/inc.last-changelog.fr.html 2008-11-03 18:37:26 UTC (rev 4156)
+++ trunk/fudaa_devel/aide/src/prepro/src/web/inc.last-changelog.fr.html 2008-11-03 18:44:08 UTC (rev 4157)
@@ -1,9 +1,10 @@
<h2>Derni\xE8res modifications</h2>
<h3>Am\xE9liorations</h3>
-
+<ul>
+ <li>TELEMAC : int\xE9gration des dictionnaires v5p8</li>
<h3>Bogues corrig\xE9s</h3>
<ul>
- <li>Reint\xE9gration de Geotools</li>
- <li>T\xE9l\xE9mac : conditions limites aux fronti\xE8res liquides</li>
+ <li>correction du probl\xE8me de l'interpolation de vecteurs</li>
+
</ul>
\ No newline at end of file
Modified: trunk/fudaa_devel/aide/src/prepro/src/web/inc.news.en.html
===================================================================
--- trunk/fudaa_devel/aide/src/prepro/src/web/inc.news.en.html 2008-11-03 18:37:26 UTC (rev 4156)
+++ trunk/fudaa_devel/aide/src/prepro/src/web/inc.news.en.html 2008-11-03 18:44:08 UTC (rev 4157)
@@ -11,6 +11,14 @@
</tr>
<tr>
<th colspan="1" rowspan="1">
+ <p>2007-11-29</p>
+ </th>
+ <td colspan="1" rowspan="1">
+ <p>New version: 0.91</p>
+ </td>
+ </tr>
+ <tr>
+ <th colspan="1" rowspan="1">
<p>2007-09-18</p>
</th>
<td colspan="1" rowspan="1">
Modified: trunk/fudaa_devel/aide/src/prepro/src/web/inc.news.fr.html
===================================================================
--- trunk/fudaa_devel/aide/src/prepro/src/web/inc.news.fr.html 2008-11-03 18:37:26 UTC (rev 4156)
+++ trunk/fudaa_devel/aide/src/prepro/src/web/inc.news.fr.html 2008-11-03 18:44:08 UTC (rev 4157)
@@ -8,6 +8,14 @@
<p><a href="download.fr.php">Nouvelle version: <?php preproVersion() ?></a></p>
</td>
</tr>
+ <tr>
+ <th colspan="1" rowspan="1">
+ <p>2007-11-29</p>
+ </th>
+ <td colspan="1" rowspan="1">
+ <p>Nouvelle version : 0.91</p>
+ </td>
+ </tr>
<tr>
<th colspan="1" rowspan="1">
<p>2007-09-18</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cla...@us...> - 2008-11-03 19:22:58
|
Revision: 4159
http://fudaa.svn.sourceforge.net/fudaa/?rev=4159&view=rev
Author: clavreul
Date: 2008-11-03 18:52:30 +0000 (Mon, 03 Nov 2008)
Log Message:
-----------
Incomplete - taskprepro - reflux
Modified Paths:
--------------
trunk/fudaa_devel/fudaa-distrib/prepro/prepro.properties
Modified: trunk/fudaa_devel/fudaa-distrib/prepro/prepro.properties
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/prepro/prepro.properties 2008-11-03 18:49:50 UTC (rev 4158)
+++ trunk/fudaa_devel/fudaa-distrib/prepro/prepro.properties 2008-11-03 18:52:30 UTC (rev 4159)
@@ -1,7 +1,7 @@
-@version@=0.91
-...@ve...le@=091
+@version@=0.92
+...@ve...le@=092
@exe.size@=22 Mo
@jar.size@=22 Mo
@jnlp.size@=13 Mo
@zip.size@=22 Mo
-@version.date@=2007-11-29
\ No newline at end of file
+@version.date@=2008-11-03
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
