[Fudaa-svn-commit] SF.net SVN: fudaa:[8176] trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/ fudaa/modeleur

[<de...@us...>]

Revision: 8176
          http://fudaa.svn.sourceforge.net/fudaa/?rev=8176&view=rev
Author:   deniger
Date:     2013-01-03 23:01:17 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java
    trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/CalqueCreateGridTriangleProcessor.java
    trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LayerGridController.java
    trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlCalqueMultiPointEditable.java
    trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlElementLayer.java

Added Paths:
-----------
    trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/DeleteGridAction.java

Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java	2013-01-03 23:00:41 UTC (rev 8175)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java	2013-01-03 23:01:17 UTC (rev 8176)
@@ -63,8 +63,7 @@
     BuLabel lbTitle=new BuLabel(MdlResource.getS("S\xE9lectionnez les semis"));
     add(lbTitle);
 
-    CalqueGISTreeModel md=new CalqueGISTreeModel(null,_pn.getDonneesCalque());
-    md.setMask(GISLib.MASK_MULTIPOINT);
+    CalqueGISTreeModel md=new CalqueGISTreeModel(null,_pn.getDonneesCalque(),GISLib.MASK_MULTIPOINT);
     trLayers_=md.createView(true,true);
     
     trLayers_.addTreeSelectionListener(new TreeSelectionListener() {

Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/CalqueCreateGridTriangleProcessor.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/CalqueCreateGridTriangleProcessor.java	2013-01-03 23:00:41 UTC (rev 8175)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/CalqueCreateGridTriangleProcessor.java	2013-01-03 23:01:17 UTC (rev 8176)
@@ -76,9 +76,9 @@
           return null;
         }
         //https://www.cs.cmu.edu/~quake/triangle.switch.html
-        String options = "-D";
+        String options = "-DYY";
         if (convexHull == null) {
-          options = "-cD";
+          options = "-cDYY";
         }
         exe.setCommand(new String[]{getTriangleExe(), options, fileName});
       }

Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LayerGridController.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LayerGridController.java	2013-01-03 23:00:41 UTC (rev 8175)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/LayerGridController.java	2013-01-03 23:01:17 UTC (rev 8176)
@@ -117,6 +117,7 @@
     MdlElementLayer eltLayer = getGridLayer();
     if (eltLayer != null) {
       parentLayer.remove(eltLayer);
+      parentLayer.clearCacheAndRepaint();
     }
   }
 
@@ -132,6 +133,7 @@
     } else {
       installGridLayer(eltLayer, grid);
     }
+    parentLayer.clearCacheAndRepaint();
     ((FSigEditor) parentLayer.getEditor()).getPanel().getVueCalque().repaint(0);
     ((FSigEditor) parentLayer.getEditor()).getPanel().getVueCalque().revalidate();
   }

Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlCalqueMultiPointEditable.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlCalqueMultiPointEditable.java	2013-01-03 23:00:41 UTC (rev 8175)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlCalqueMultiPointEditable.java	2013-01-03 23:01:17 UTC (rev 8176)
@@ -28,6 +28,7 @@
 import org.fudaa.fudaa.modeleur.action.CalqueCreateGridAction;
 import org.fudaa.fudaa.modeleur.action.CalqueGridTriangleConfigurationAction;
 import org.fudaa.fudaa.modeleur.grid.action.CreateIsoLinesAction;
+import org.fudaa.fudaa.modeleur.grid.action.DeleteGridAction;
 import org.fudaa.fudaa.sig.layer.FSigEditor;
 
 /**
@@ -69,6 +70,7 @@
     final CalqueCreateGridAction createGridAction = new CalqueCreateGridAction(this);
     vacts.add(createGridAction);
     vacts.add(createGridAction.getStopAction());
+    vacts.add(new DeleteGridAction(layerGridDelegate));
     vacts.add(null);
     vacts.add(new CreateIsoLinesAction(layerGridDelegate));
     vacts.add(null);

Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlElementLayer.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlElementLayer.java	2013-01-03 23:00:41 UTC (rev 8175)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlElementLayer.java	2013-01-03 23:01:17 UTC (rev 8176)
@@ -22,8 +22,13 @@
     super(_modele);
     setSelectable(false);
   }
-  
-  public void clearCacheAndRepaint(){
+
+  @Override
+  public boolean isDestructible() {
+    return true;
+  }
+
+  public void clearCacheAndRepaint() {
     super.clearCache();
     repaint(0);
   }

Copied: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/DeleteGridAction.java (from rev 8171, trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/ExportGridAction.java)
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/DeleteGridAction.java	                        (rev 0)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/DeleteGridAction.java	2013-01-03 23:01:17 UTC (rev 8176)
@@ -0,0 +1,37 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.modeleur.grid.action;
+
+import com.memoire.bu.BuResource;
+import java.awt.event.ActionEvent;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.fudaa.modeleur.grid.LayerGridController;
+import org.fudaa.fudaa.modeleur.resource.MdlResource;
+
+/**
+ * Action permettant d'exporter le maillage.
+ *
+ * @author Frederic Deniger
+ */
+public class DeleteGridAction extends EbliActionSimple {
+
+  private final LayerGridController delegate;
+
+  public DeleteGridAction(LayerGridController delegate) {
+    super(MdlResource.getS("Supprimer le maillage"), BuResource.BU.getIcon("detruire"), "DESTROY_GRID");
+    this.delegate = delegate;
+  }
+
+  @Override
+  public void updateStateBeforeShow() {
+    setEnabled(delegate.getGridLayer() != null);
+  }
+
+  @Override
+  public void actionPerformed(ActionEvent _e) {
+    if (delegate.getGridLayer() != null) {
+      delegate.clearGrid();
+    }
+  }
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.