Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2010-01-20 22:30:57
|
Revision: 5637
http://fudaa.svn.sourceforge.net/fudaa/?rev=5637&view=rev
Author: deniger
Date: 2010-01-20 22:30:44 +0000 (Wed, 20 Jan 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java 2010-01-20 22:29:06 UTC (rev 5636)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java 2010-01-20 22:30:44 UTC (rev 5637)
@@ -459,7 +459,7 @@
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.getSelectionMode() == SelectionMode.Atomic) && cq.getLayerSelectionMulti().getNbSelectedItem() == 2;
+ b &= cq != null && FSigEditor.this.isEditable(cq) && !cq.isSelectionEmpty() && (cq.getSelectionMode() == SelectionMode.ATOMIC) && cq.getLayerSelectionMulti().getNbSelectedItem() == 2;
// Uniquement si les sommets sont sur 2 des objets distincts, que ces
// objets sont des polylignes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-01-23 22:47:54
|
Revision: 8250
http://fudaa.svn.sourceforge.net/fudaa/?rev=8250&view=rev
Author: deniger
Date: 2013-01-23 22:47:43 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java 2013-01-23 22:47:23 UTC (rev 8249)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java 2013-01-23 22:47:43 UTC (rev 8250)
@@ -106,23 +106,25 @@
public boolean changeState(String s) {
return super.changeState(s);
}
-
/**
- * Contient l'index de l'onglet selectionn\xE9 dans le panel d'edition d'objet seul. C'est pour que d'une \xE9dition \xE0
- * l'autre le m\xEAme onglet soit automatiquement selectionn\xE9.
+ * Contient l'index de l'onglet selectionn\xE9 dans le panel d'edition d'objet seul. C'est pour que d'une \xE9dition \xE0 l'autre le m\xEAme onglet soit
+ * automatiquement selectionn\xE9.
*/
private int selectedTabInSingleObjectEditorPanel_ = 0;
/**
* L'\xE9dition pour un objet selectionn\xE9 unique.
- *
+ *
* @param _target Le calque cible editable.
*/
@Override
protected void editSingleObject(final ZCalqueEditable _target) {
final int idxSelected = ((ZCalqueAffichageDonnees) _target).getLayerSelection().getMaxIndex();
final EbliSingleObjectEditorPanel ed = new EbliSingleObjectEditorPanel(_target.getModelEditable(), idxSelected, true, true,
- getCoordinateDefinitions());
+ getCoordinateDefinitions());
+ if (isDeferredModificationAsDefault()) {
+ ed.setDeferredModifications(true);
+ }
ed.setCmd(getMng());
GISZoneCollection zone = _target.getModelEditable().getGeomData();
GISAttributeDouble zAttr = zone.getAttributeIsZ();
@@ -137,9 +139,8 @@
}
/**
- * L'import peut \xEAtre fait si le calque selectionn\xE9 est un groupe de calques SIG ou un calque poss\xE9dant une geometrie
- * modifiable
- *
+ * L'import peut \xEAtre fait si le calque selectionn\xE9 est un groupe de calques SIG ou un calque poss\xE9dant une geometrie modifiable
+ *
* @return true : L'import est possible, false : impossible.
*/
public boolean canImportInSelectedLayer() {
@@ -155,10 +156,19 @@
public GISPolygone[] getEnglobPolygone() {
final GrBoite b = getPanel().getDonneesCalque().getDomaine();
- return new GISPolygone[] { GISGeometryFactory.INSTANCE.createLinearRing(b.o_.x_, b.e_.x_, b.o_.y_, b.e_.y_) };
+ return new GISPolygone[]{GISGeometryFactory.INSTANCE.createLinearRing(b.o_.x_, b.e_.x_, b.o_.y_, b.e_.y_)};
}
+ public static boolean isDeferredModificationAsDefault() {
+ return "true".equals(System.getProperty("USED_DEFERRED_AS_DEFAUT"));
+ }
+
+ public static void activeDeferredModificationAsDefault() {
+ System.setProperty("USED_DEFERRED_AS_DEFAUT", "true");
+ }
+
private static class ZCalqueEditionGroupFromGeomLayer extends ZCalqueEditionGroup {
+
private final ZCalqueEditable calque;
private final CtuluCommandContainer cmd;
@@ -171,7 +181,7 @@
public GISAttributeInterface[] getAttributes() {
return calque.getModelEditable().getGeomData().getAttributes();
}
-
+
@Override
public boolean canAddNewLayer() {
return false;
@@ -201,7 +211,6 @@
public ZCalquePointEditable addPointLayerAct(String _title, GISZoneCollectionPoint _zone, CtuluCommandContainer _cmd) {
return null;
}
-
}
public void importSelectedLayer() {
@@ -298,29 +307,22 @@
}
final GISPoint translate = isTranslate ? new GISPoint(x, y, 0) : null;
new CtuluRunnable(FudaaLib.getS("Export") + ' ' + parent[0].getTitle(), getUi()) {
-
@Override
public boolean run(ProgressionInterface _proj) {
final CtuluIOOperationSynthese op = filter.exportTo((FSigLayerExporterI) filterExporter.get(fileChooser.getFileFilter()), getUi(), f,
- translate, _proj);
+ translate, _proj);
if (op != null) {
getUi().manageErrorOperationAndIsFatal(op);
}
return true;
}
-
}.run();
}
-
EbliActionSimple[] editAction_;
-
EbliActionSimple exportAction_;
-
EbliActionSimple visuAction_;
-
EbliActionSimple importAction_;
-
EbliActionSimple joinAction_;
/**
@@ -328,7 +330,7 @@
*/
public EbliActionSimple[] getEditAction() {
if (editAction_ == null) {
- editAction_ = new EbliActionSimple[] { new EditAction() };
+ editAction_ = new EbliActionSimple[]{new EditAction()};
}
return editAction_;
}
@@ -370,7 +372,7 @@
public void updateStateBeforeShow() {
final BCalque cq = FSigEditor.this.getPanel().getArbreCalqueModel().getSelectedCalque();
super.setEnabled((cq instanceof ZCalqueAffichageDonnees) && (!((ZCalqueAffichageDonnees) cq).isSelectionEmpty())
- && ((((ZCalqueAffichageDonnees) cq).modeleDonnees() instanceof ZModeleGeometry)));
+ && ((((ZCalqueAffichageDonnees) cq).modeleDonnees() instanceof ZModeleGeometry)));
}
@Override
@@ -445,9 +447,11 @@
// R\xE9cup\xE9ration des calques contenant des g\xE9om\xE9tries selectionn\xE9es \\
ZCalqueAffichageDonneesInterface[] calques = getSupport().getAllLayers();
ArrayList<ZCalqueAffichageDonneesInterface> claquesWithSelectedObjects = new ArrayList<ZCalqueAffichageDonneesInterface>();
- for (int i = 0; i < calques.length; i++)
- if (!calques[i].isSelectionEmpty() && calques[i] instanceof ZCalqueEditable)
+ for (int i = 0; i < calques.length; i++) {
+ if (!calques[i].isSelectionEmpty() && calques[i] instanceof ZCalqueEditable) {
claquesWithSelectedObjects.add(calques[i]);
+ }
+ }
super.setEnabled(claquesWithSelectedObjects.size() > 0);
}
@@ -478,7 +482,6 @@
@Override
public void attributeAction(Object _source, int att, GISAttributeInterface _att, int _action) {
-
}
@Override
@@ -501,5 +504,4 @@
public void geometryAction(Object _source, int geom, Geometry _geom, int _action) {
objectAction(_source, geom, _geom, _action);
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-03-05 21:47:56
|
Revision: 8656
http://sourceforge.net/p/fudaa/svn/8656
Author: deniger
Date: 2014-03-05 21:47:52 +0000 (Wed, 05 Mar 2014)
Log Message:
-----------
ajout wrapper
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java 2014-03-05 21:46:37 UTC (rev 8655)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java 2014-03-05 21:47:52 UTC (rev 8656)
@@ -72,6 +72,7 @@
import com.memoire.fu.Fu;
import com.memoire.fu.FuLog;
import com.vividsolutions.jts.geom.Geometry;
+import javax.swing.JComponent;
/**
* @author Fred Deniger
@@ -125,6 +126,8 @@
*/
private int selectedTabInSingleObjectEditorPanel_ = 0;
+
+
/**
* L'\xE9dition pour un objet selectionn\xE9 unique.
*
@@ -135,6 +138,7 @@
final int idxSelected = ((ZCalqueAffichageDonnees) _target).getLayerSelection().getMaxIndex();
final EbliSingleObjectEditorPanel ed = new EbliSingleObjectEditorPanel(_target.getModelEditable(), idxSelected, true, true,
getCoordinateDefinitions());
+ configureEditorPanel(ed);
if (isDeferredModificationAsDefault()) {
ed.setDeferredModifications(true);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-12-05 22:41:10
|
Revision: 9472
http://sourceforge.net/p/fudaa/svn/9472
Author: deniger
Date: 2016-12-05 22:41:07 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
CRUE-654
Modified Paths:
--------------
trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java
Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java 2016-12-05 21:49:16 UTC (rev 9471)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/layer/FSigEditor.java 2016-12-05 22:41:07 UTC (rev 9472)
@@ -252,12 +252,17 @@
}
public void exportSelectedLayer() {
+ exportSelectedLayer(isExportWithId());
+ }
+
+ public void exportSelectedLayer(boolean useIdAsAttributeName) {
+
final BCalque[] parent = super.getPanel().getArbreCalqueModel().getSelection();
if (parent == null) {
return;
}
final FSigLayerFilter filter = new FSigLayerFilter();
- filter.setExportWithId(isExportWithId());
+ filter.setExportWithId(useIdAsAttributeName);
final int nb = parent.length;
for (int i = 0; i < nb; i++) {
parent[i].apply(filter);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X