Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2009-10-15 20:02:46
|
Revision: 5297
http://fudaa.svn.sourceforge.net/fudaa/?rev=5297&view=rev
Author: deniger
Date: 2009-10-15 20:02:39 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/pom.xml
Property Changed:
----------------
trunk/soft/fudaa-modeleur/
Property changes on: trunk/soft/fudaa-modeleur
___________________________________________________________________
Added: svn:ignore
+ .classpath
.project
target
Modified: trunk/soft/fudaa-modeleur/pom.xml
===================================================================
--- trunk/soft/fudaa-modeleur/pom.xml 2009-10-15 19:56:52 UTC (rev 5296)
+++ trunk/soft/fudaa-modeleur/pom.xml 2009-10-15 20:02:39 UTC (rev 5297)
@@ -4,7 +4,7 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-sig.version>1.0-SNAPSHOT</fudaa-sig.version>
+ <fudaa-sig.version>1.0</fudaa-sig.version>
</properties>
<parent>
<groupId>org.fudaa.pom</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-03-10 14:02:10
|
Revision: 6161
http://fudaa.svn.sourceforge.net/fudaa/?rev=6161&view=rev
Author: bmarchan
Date: 2011-03-10 14:02:04 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
MOD : Chgt de version 1.2-SNAPSHOT des librairies ebli/fudaa/dodico
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/pom.xml
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlEditionManager.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java
Modified: trunk/soft/fudaa-modeleur/pom.xml
===================================================================
--- trunk/soft/fudaa-modeleur/pom.xml 2011-03-10 12:08:22 UTC (rev 6160)
+++ trunk/soft/fudaa-modeleur/pom.xml 2011-03-10 14:02:04 UTC (rev 6161)
@@ -4,22 +4,23 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-sig.version>1.0</fudaa-sig.version>
+ <fudaa-sig.version>1.2-SNAPSHOT</fudaa-sig.version>
</properties>
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>soft-pom</artifactId>
- <version>0.4</version>
+ <version>0.7</version>
</parent>
<groupId>org.fudaa.soft.fudaa-modeleur</groupId>
<artifactId>fudaa-modeleur</artifactId>
- <version>0.05</version>
+ <version>1.1-SNAPSHOT</version>
+ <name>Fudaa-Modeleur</name>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.fudaa.business.fudaa-sig</groupId>
<artifactId>fudaa-sig</artifactId>
- <version>${fudaa-sig.version}</version>
+ <version>${fudaa-sig.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlEditionManager.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2011-03-10 12:08:22 UTC (rev 6160)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2011-03-10 14:02:04 UTC (rev 6161)
@@ -94,7 +94,7 @@
public void importSelectedLayer() {
final ZCalqueEditable ed = super.getTarget();
final MdlWizardImport importWizard = new MdlWizardImport(getEnglobPolygone(), ed,
- ((FSigVisuPanel) getPanel()).getImpl(),((FSigVisuPanel) getPanel()).getCmdMng());
+ ((FSigVisuPanel) getPanel()).getCtuluUI(),((FSigVisuPanel) getPanel()).getCmdMng());
final BuWizardDialog dialog = new BuWizardDialog(CtuluLibSwing.getFrameAncestorHelper(super.getPanel()),
importWizard);
importWizard.setDialog(dialog);
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 2011-03-10 12:08:22 UTC (rev 6160)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java 2011-03-10 14:02:04 UTC (rev 6161)
@@ -153,7 +153,7 @@
}
@Override
- public boolean valide() {
+ public boolean isDataValid() {
if (trLayers_.getSelectionCount()==0) {
setErrorText(MdlResource.MDL.getString("Vous devez s\xE9lectionner au moins 1 semis"));
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-04-20 14:26:29
|
Revision: 6219
http://fudaa.svn.sourceforge.net/fudaa/?rev=6219&view=rev
Author: bmarchan
Date: 2011-04-20 14:26:22 +0000 (Wed, 20 Apr 2011)
Log Message:
-----------
Project : Cr?\195?\169ation d'un jar complet.
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/pom.xml
Added Paths:
-----------
trunk/soft/fudaa-modeleur/src/main/assembly/
trunk/soft/fudaa-modeleur/src/main/assembly/assembly.xml
Modified: trunk/soft/fudaa-modeleur/pom.xml
===================================================================
--- trunk/soft/fudaa-modeleur/pom.xml 2011-04-20 14:16:17 UTC (rev 6218)
+++ trunk/soft/fudaa-modeleur/pom.xml 2011-04-20 14:26:22 UTC (rev 6219)
@@ -41,5 +41,32 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <executions>
+ <execution>
+ <id>create-executable-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifest>
+ <mainClass>org.fudaa.fudaa.modeleur.Mdl</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added: trunk/soft/fudaa-modeleur/src/main/assembly/assembly.xml
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/assembly/assembly.xml (rev 0)
+++ trunk/soft/fudaa-modeleur/src/main/assembly/assembly.xml 2011-04-20 14:26:22 UTC (rev 6219)
@@ -0,0 +1,22 @@
+<assembly>
+ <id>with-dep</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <!-- unpack les d\xE9pendances avant de les inclures dans le jar final de l'application -->
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
+
Property changes on: trunk/soft/fudaa-modeleur/src/main/assembly/assembly.xml
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-05-30 15:57:15
|
Revision: 6266
http://fudaa.svn.sourceforge.net/fudaa/?rev=6266&view=rev
Author: bmarchan
Date: 2011-05-30 15:57:08 +0000 (Mon, 30 May 2011)
Log Message:
-----------
MOD : Suppression de bief : Le bief est supprim?\195?\169 en 2d.
MOD : Fusion de bief : Le bief est cr?\195?\169?\195?\169 en 2d.
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/.settings/org.eclipse.jdt.core.prefs
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlEditionManager.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlFille2d.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlLayerExportPanel.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/MdlBiefImportAction.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLine.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/controller/BiefsImporterFromModeleur2d.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefContainerAdapter.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefSet.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefSetListener.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/PnGestionBief.java
Modified: trunk/soft/fudaa-modeleur/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/soft/fudaa-modeleur/.settings/org.eclipse.jdt.core.prefs 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/.settings/org.eclipse.jdt.core.prefs 2011-05-30 15:57:08 UTC (rev 6266)
@@ -1,5 +1,6 @@
-#Tue Jul 21 11:57:47 CEST 2009
+#Fri May 13 11:19:29 CEST 2011
+eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlEditionManager.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2011-05-30 15:57:08 UTC (rev 6266)
@@ -39,7 +39,7 @@
import org.fudaa.fudaa.modeleur.action.SceneProjectionAction;
import org.fudaa.fudaa.modeleur.action.SceneRefinementAction;
import org.fudaa.fudaa.sig.layer.FSigEditor;
-import org.fudaa.fudaa.sig.layer.FSigLayerExporter;
+import org.fudaa.fudaa.sig.layer.FSigLayerExporterI;
import org.fudaa.fudaa.sig.layer.FSigLayerFilter;
import org.fudaa.fudaa.sig.layer.FSigVisuPanel;
@@ -127,7 +127,10 @@
dialog.setVisible(true);
}
- public void exportSelectedLayer() {
+ /**
+ * Exporte les donn\xE9es de la fenetre.
+ */
+ public void exportLayers() {
ZScene scn=getSupport();
boolean bpreselect=
!scn.isAtomicMode() &&
@@ -161,7 +164,7 @@
return;
final File f=pnExport_.getFile();
- final FSigLayerExporter exporter=pnExport_.getSelectedExporter();
+ final FSigLayerExporterI exporter=pnExport_.getSelectedExporter();
new CtuluRunnable(MdlResource.getS("Export de donn\xE9es"), getUi()) {
public boolean run(ProgressionInterface _proj) {
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlFille2d.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlFille2d.java 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlFille2d.java 2011-05-30 15:57:08 UTC (rev 6266)
@@ -75,7 +75,7 @@
}
public void startExport(CtuluUI _impl) {
- getMdlVisuPanel().getEditor().getExportAction().actionPerformed(null);
+ getMdlVisuPanel().getEditor().exportLayers();
}
public void undo() {
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlImplementation.java 2011-05-30 15:57:08 UTC (rev 6266)
@@ -31,9 +31,9 @@
import org.fudaa.ctulu.gui.CtuluLibDialog;
import org.fudaa.ebli.impression.EbliMiseEnPagePreferencesPanel;
import org.fudaa.ebli.ressource.EbliResource;
-import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.commun.FudaaProjectStateListener;
import org.fudaa.fudaa.commun.FudaaProjetStateInterface;
+import org.fudaa.fudaa.commun.exetools.FudaaManageExeTools;
import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
import org.fudaa.fudaa.commun.impl.FudaaGuiLib;
import org.fudaa.fudaa.commun.impl.FudaaLookPreferencesPanel;
@@ -46,12 +46,12 @@
import org.fudaa.fudaa.modeleur.modeleur1d.MdlFille1d;
import org.fudaa.fudaa.modeleur.resource.MdlResource;
import org.fudaa.fudaa.sig.FSigProjectPersistence;
-import org.fudaa.fudaa.sig.FSigResource;
import com.memoire.bu.BuAbstractPreferencesPanel;
import com.memoire.bu.BuBrowserPreferencesPanel;
import com.memoire.bu.BuColumn;
import com.memoire.bu.BuDesktopPreferencesPanel;
+import com.memoire.bu.BuFileFilter;
import com.memoire.bu.BuInformationsSoftware;
import com.memoire.bu.BuLanguagePreferencesPanel;
import com.memoire.bu.BuLib;
@@ -67,8 +67,17 @@
import com.memoire.bu.BuTaskView;
import com.memoire.bu.BuUserPreferencesPanel;
import com.memoire.fu.FuLog;
+import javax.swing.JDialog;
+import org.fudaa.ctulu.gui.CtuluOptionPane;
+import org.fudaa.dodico.mascaret.io.MascaretGEO2dFileFormat;
+import org.fudaa.dodico.rubar.io.RubarStCnFileFormat;
import org.fudaa.ebli.commun.EbliActionMap;
+import org.fudaa.fudaa.commun.exetools.FudaaExeTool;
+import org.fudaa.fudaa.sig.exetools.FSigFileExporterI;
import org.fudaa.fudaa.modeleur.action.MdlBiefImportAction;
+import org.fudaa.fudaa.sig.exetools.FSigFileExporterMascaretGEO2d;
+import org.fudaa.fudaa.sig.exetools.FSigFileExporterRubarSt;
+import org.fudaa.fudaa.sig.exetools.FSigManageExeTools;
/**
* La classe principale de mise en place de l'application, de gestion des
@@ -134,6 +143,7 @@
MdlFille1d mdl1dFrame_=null;
/** Projet modeleur. */
MdlProjet project_;
+ FSigManageExeTools toolMng_;
public MdlImplementation() {
super();
@@ -193,6 +203,7 @@
void createNew1dFrame() {
if (mdl1dFrame_==null) {
mdl1dFrame_=new MdlFille1d(this);
+ getExeToolManager().setRootLayer(mdl2dFrame_.getDonneesCalque());
}
}
@@ -498,6 +509,11 @@
public void saveAs() {
final File f = chooseNewFile(true);
if (f == null) return;
+// Test pour empecher la fermeture de l'appli lors de la sauvegarde. A etendre \xE0 save().
+// CtuluOptionPane pn=new CtuluOptionPane("Une sauvegarde est en cours. Merci de patienter");
+// final JDialog d=pn.createDialog("Message");
+// d.pack();
+// d.setModal(true);
CtuluRunnable act = new CtuluRunnable(FudaaSaveLib.getActionSaveTitle(), this) {
@@ -509,8 +525,10 @@
return false;
}
};
- act.setAfterRunnable(getSaveSwingRunnable(f), true);
+ act.setAfterRunnable(getSaveSwingRunnable(f/*,d*/), true);
act.run();
+
+// d.setVisible(true);
}
protected boolean isProjectModified() {
@@ -604,13 +622,13 @@
return true;
}
- protected Runnable getSaveSwingRunnable(final File _paramFile) {
+ protected Runnable getSaveSwingRunnable(final File _paramFile/*, final JDialog _d*/) {
return new Runnable() {
public void run() {
if (_paramFile != null) project_.setParamFile(_paramFile);
project_.setSaved();
-
+// _d.dispose();
}
};
}
@@ -749,6 +767,11 @@
BuMenu mnProject=buildProjectMenu();
mb.addMenu(mnProject);
+ // Ajout du menu des exe tools
+ BuMenu mnEdition=(BuMenu)mb.getMenu("MENU_EDITION");
+ mnEdition.addSeparator();
+ addExeToolsMenu(mnEdition);
+
/* setEnabledForAction("RANGERICONES", true);
if (!isSupervisor()) {
final JComponent cp = getMainPanel().getMiddleComponent();
@@ -759,6 +782,14 @@
buildTaskView();
}
+ @Override
+ protected FSigManageExeTools getExeToolManager() {
+ if (toolMng_==null)
+ toolMng_=new FSigManageExeTools(this);
+ return toolMng_;
+ }
+
+
/**
* Suppression des commandes par d\xE9faut dans Fudaa.
*/
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlLayerExportPanel.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlLayerExportPanel.java 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlLayerExportPanel.java 2011-05-30 15:57:08 UTC (rev 6266)
@@ -28,7 +28,7 @@
import org.fudaa.ctulu.gui.CtuluFileChooserPanel;
import org.fudaa.dodico.telemac.io.SinusxFileFormat;
import org.fudaa.fudaa.modeleur.resource.MdlResource;
-import org.fudaa.fudaa.sig.layer.FSigLayerExporter;
+import org.fudaa.fudaa.sig.layer.FSigLayerExporterI;
import com.memoire.bu.BuComboBox;
import com.memoire.bu.BuFileFilter;
@@ -53,11 +53,11 @@
BuFileFilter[] filters_;
CtuluUI ui_;
BuFileFilter selectedFilter_=null;
- Map<BuFileFilter, FSigLayerExporter> filter2Exporter_;
+ Map<BuFileFilter, FSigLayerExporterI> filter2Exporter_;
/** Le filtre de fichier pour Rubar */
BuFileFilter fltRubar_;
BuComboBox coFormat_;
- FSigLayerExporter[] exporters_;
+ FSigLayerExporterI[] exporters_;
/**
* @param _ui L'ui.
@@ -147,12 +147,12 @@
final BuFileFilter sx = SinusxFileFormat.getInstance().createFileFilter();
fltRubar_=new BuFileFilter(new String[]{"cn","st","sem"},"Cemagref");
final BuFileFilter dunes= DunesGEOFileFormat.getInstance().createFileFilter();
- filter2Exporter_ = new HashMap<BuFileFilter, FSigLayerExporter>(5);// pour l'instant .....
+ filter2Exporter_ = new HashMap<BuFileFilter, FSigLayerExporterI>(5);// pour l'instant .....
- exporters_=new FSigLayerExporter[]{
- new FSigLayerExporter.ToRubar(),
- new FSigLayerExporter.ToSinusX(),
- new FSigLayerExporter.ToDunes()
+ exporters_=new FSigLayerExporterI[]{
+ new FSigLayerExporterI.ToRubar(),
+ new FSigLayerExporterI.ToSinusX(),
+ new FSigLayerExporterI.ToDunes()
};
filters_ = new BuFileFilter[]{fltRubar_,sx,dunes};
@@ -251,8 +251,8 @@
return fileChooser_.getFile();
}
- public FSigLayerExporter getSelectedExporter() {
- return (FSigLayerExporter)filter2Exporter_.get(selectedFilter_);
+ public FSigLayerExporterI getSelectedExporter() {
+ return (FSigLayerExporterI)filter2Exporter_.get(selectedFilter_);
}
public boolean isAllLayers() {
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlVisuPanel.java 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlVisuPanel.java 2011-05-30 15:57:08 UTC (rev 6266)
@@ -21,7 +21,6 @@
import org.fudaa.ebli.commun.EbliActionMap;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.ebli.commun.EbliComponentFactory;
-import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.modeleur.action.CalqueDeleteCalqueAction;
import org.fudaa.fudaa.modeleur.action.CalqueNewCalqueAction;
import org.fudaa.fudaa.modeleur.action.MdlCasierExportAction;
@@ -48,8 +47,13 @@
import com.memoire.bu.BuMenu;
import com.memoire.bu.BuPopupMenu;
+import java.text.NumberFormat;
+import javax.units.SI;
+import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ebli.calque.BCalqueVisitor;
+import org.fudaa.ebli.calque.EbliCoordinateDefinition;
import org.fudaa.ebli.commun.EbliActionAbstract;
+import org.fudaa.ebli.commun.EbliFormatter;
import org.fudaa.fudaa.modeleur.modeleur1d.model.Bief;
/**
@@ -82,14 +86,32 @@
initCalques(true);
installLayerActions();
getScene().setRestrictedToCalqueActif(false);
+// Test pour changer le nb de digits sur les coordonn\xE9es.
+// EbliCoordinateDefinition[] defs=getCoordinateDefinitions();
+// final NumberFormat fmt = CtuluLib.getDecimalFormat();
+// fmt.setMaximumFractionDigits(4);
+//
+// EbliFormatter efmt=new EbliFormatter();
+// efmt.setUnit(SI.METER);
+// efmt.setFmt(fmt);
+// defs[0]=new EbliCoordinateDefinition("X", efmt);
+// setCoordinateDefinitions(defs);
}
+ @Override
protected FSigEditor createGisEditor() {
FSigEditor editor=new MdlEditionManager(this);
mng_=editor.getMng();
return editor;
}
+ @Override
+ public MdlEditionManager getEditor() {
+ return (MdlEditionManager)super.getEditor();
+ }
+
+
+
protected void initButtonGroupSpecific(final List<EbliActionInterface> _l, final ZEbliCalquePanelController _res) {
super.initButtonGroupSpecific(_l, _res);
_l.add(new MdlCasierExportAction((MdlEditionManager)gisEditor_));
@@ -320,7 +342,7 @@
/**
* Mise en place des calques d'un bief depuis un bief.
*
- * @param _bief Le bief \xE0 cr\xE9er. Peut \xEAtre null, dans ce cas le bief est nul.
+ * @param _bief Le bief \xE0 cr\xE9er. Peut \xEAtre null, dans ce cas le bief est vide.
* @param _build True : Les calques composant le bief doivent \xEAtre construits
*/
public void buildBiefLayers(Bief _bief, boolean _build) {
@@ -400,6 +422,27 @@
}
}
}
+
+ /**
+ * Supprime le bief d\xE9sign\xE9.
+ * @param _bief Le bief.
+ */
+ public void removeBief(Bief _bief) {
+ BCalque cq=cqBiefs_.getCalqueParTitre(_bief.getName());
+ if (cq!=null)
+ cq.detruire();
+ }
+
+ /**
+ * Renomme le bief d\xE9sign\xE9.
+ * @param _bief Le bief.
+ * @param _newName Son nouveau nom
+ */
+ public void renameBief(Bief _bief, String _oldName, String _newName) {
+ BCalque cq=cqBiefs_.getCalqueParTitre(_oldName);
+ if (cq!=null)
+ cq.setTitle(_newName);
+ }
/**
* Mise a jour des actions.
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/MdlBiefImportAction.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/MdlBiefImportAction.java 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/MdlBiefImportAction.java 2011-05-30 15:57:08 UTC (rev 6266)
@@ -25,7 +25,7 @@
import org.fudaa.fudaa.modeleur.resource.MdlResource;
/**
- * Une action pour d\xE9cimer entre 2 sommets ou la totalit\xE9 d'un objets GIS.
+ * Une action pour importer un bief, depuis le 2D ou le 1D.
* @author Bertrand Marchand
* @version $Id$
*/
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLine.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLine.java 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLine.java 2011-05-30 15:57:08 UTC (rev 6266)
@@ -49,6 +49,7 @@
FSigEditor editor=(FSigEditor)getEditor();
ArrayList<EbliActionInterface> vacts=new ArrayList<EbliActionInterface>();
vacts.add(editor.getImportAction());
+ vacts.add(editor.getExportAction());
EbliActionInterface[] acts=vacts.toArray(new EbliActionInterface[0]);
super.setActions(acts);
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java 2011-05-30 15:57:08 UTC (rev 6266)
@@ -48,6 +48,7 @@
FSigEditor editor=(FSigEditor)getEditor();
ArrayList<EbliActionInterface> vacts=new ArrayList<EbliActionInterface>();
vacts.add(editor.getImportAction());
+ vacts.add(editor.getExportAction());
EbliActionInterface[] acts=vacts.toArray(new EbliActionInterface[0]);
super.setActions(acts);
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/controller/BiefsImporterFromModeleur2d.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/controller/BiefsImporterFromModeleur2d.java 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/controller/BiefsImporterFromModeleur2d.java 2011-05-30 15:57:08 UTC (rev 6266)
@@ -50,23 +50,23 @@
rootCalque_=_rootCalque;
// G\xE9n\xE9ration des noms \\
/*
- * Les noms g\xE9n\xE9r\xE9s ne sont pas n\xE9c\xE9ssairement les noms donn\xE9es dans le 2d.
- * La diff\xE9rence apparait quand plusieurs biefs porte le m\xEAme nom. Dans ce
+ * Les noms g\xE9n\xE9r\xE9s sont les noms donn\xE9s dans le 2d. Si 2 biefs portent le
+ * m\xEAme nom, le nom en 2d est modifi\xE9. Dans ce
* cas le nom prend la forme : nuero#nom.
*/
BCalque[] calques=rootCalque_.getCalques();
// Extraction pour chacun des calques de son titre \\
- for (int i=0; i<calques.length; i++)
+ for (int i=0; i<calques.length; i++) {
if(names_.containsKey(calques[i].getTitle())) {
// Ajout d'un num\xE9ro \xE0 la fin du nom du calque \\
int j=2;
- while(names_.containsKey(calques[i].getTitle()+" #"+j+"#"))
+ while(names_.containsKey(calques[i].getTitle()+"("+j+")"))
j++;
- names_.put(calques[i].getTitle()+" #"+j+"#", i);
+ calques[i].setTitle(calques[i].getTitle()+"("+j+")");
}
- else
- // Ajout simple du nom \\
- names_.put(calques[i].getTitle(), i);
+ // Ajout simple du nom \\
+ names_.put(calques[i].getTitle(), i);
+ }
}
/**
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java 2011-05-30 15:57:08 UTC (rev 6266)
@@ -421,7 +421,6 @@
}
public void updateFrom2d() {
- controllerBief_.removeAllBiefs(false);
controllerBief_.updateFrom2d();
}
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java 2011-05-30 15:57:08 UTC (rev 6266)
@@ -38,21 +38,25 @@
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.CoordinateSequence;
+import org.fudaa.fudaa.modeleur.modeleur1d.model.BiefSetListener;
import org.fudaa.fudaa.modeleur.resource.MdlResource;
/**
* Controller permettant de g\xE9rer (cr\xE9er, modifier, supprimer, selectionner) les biefs.
+ * Le controlleur bief sert aussi a synchroniser la partie 2d pour les op\xE9rations
+ * faites sur le 1d.
+ *
* @author Emmanuel MARTIN
* @version $Id$
*/
-public class ControllerBief {
+public class ControllerBief implements BiefSetListener {
/** Le controller principal. */
protected Controller1d controller1d_;
/** Le nom du bief selectionn\xE9. */
protected String nomSelectedBief_=null;
/** l'ensemble de biefs. */
- protected BiefSet biefSet_=new BiefSet();
+ protected BiefSet biefSet_;
/** Le container de bief. */
BiefContainerAdapter biefContainerAdapter_;
/** Le model de selection des biefs. */
@@ -61,8 +65,13 @@
protected PnGestionBief vueModuleGestionBief_;
/** La vue sur les biefs. */
protected VueBief vueBief_;
+ /** La synchronisation se fait depuis le 2d -> 1d : Pas de modifications des biefs 2d. */
+ protected boolean bsyncFrom2d_=false;
public ControllerBief(Controller1d _controller1d) {
+ biefSet_=new BiefSet();
+ biefSet_.addBiefSetListener(this);
+
controller1d_=_controller1d;
biefContainerAdapter_=new BiefContainerAdapter(biefSet_);
biefSelectionModel_=new BiefSelectionModel();
@@ -75,11 +84,16 @@
*/
public void updateFrom2d(){
try {
+ bsyncFrom2d_=true;
+ removeAllBiefs(false);
importBiefsFrom2d(controller1d_.getImplementation().get2dFrame().getVisuPanel().getArbreCalqueModel().getRootCalque().getCalqueParNom("gcBiefs"));
}
catch(IllegalArgumentException _exp) {
controller1d_.getImplementation().error(MdlResource.getS("Erreur dans l'import depuis le 2d"), _exp.getMessage());
}
+ finally {
+ bsyncFrom2d_=false;
+ }
}
/**
@@ -416,7 +430,7 @@
String biefName=name1+"_"+name2;
int k=1;
while (biefSet_.getBief(biefName)!=null)
- biefName=name1+"_"+name2+"#"+Integer.toString(++k);
+ biefName=name1+"_"+name2+"("+Integer.toString(++k)+")";
newBief.setName(biefName);
// Racourcis
@@ -593,7 +607,23 @@
public Bief getSelectedBief(){
return biefSet_.getBief(getSelectedBiefName());
}
+
+ // Synchronisation du 2D
+ public void addedBief(Bief _bief, String _newName) {
+ if (!bsyncFrom2d_)
+ controller1d_.getImplementation().get2dFrame().getMdlVisuPanel().buildBiefLayers(_bief, true);
+ }
+
+ public void renamedBief(Bief _bief, String _oldName, String _newName) {
+ controller1d_.getImplementation().get2dFrame().getMdlVisuPanel().renameBief(_bief, _oldName, _newName);
+ }
+
+ public void removedBief(Bief _bief, String _oldName) {
+ if (!bsyncFrom2d_)
+ controller1d_.getImplementation().get2dFrame().getMdlVisuPanel().removeBief(_bief);
+ }
+
// Le model de selection concernant les biefs \\
/**
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefContainerAdapter.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefContainerAdapter.java 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefContainerAdapter.java 2011-05-30 15:57:08 UTC (rev 6266)
@@ -179,16 +179,16 @@
// R\xE9action aux modifications dans le BiefCollection \\
- public void addedBief(String _name) {}
+ public void addedBief(Bief _bief, String _name) {}
- public void removedBief(String _name) {
+ public void removedBief(Bief _bief, String _name) {
if(_name==nomBiefSelected_) {
nomBiefSelected_=null;
fireBiefSelectedChanged(null);
}
}
- public void renamedBief(String _oldName, String _newName) {
+ public void renamedBief(Bief _bief, String _oldName, String _newName) {
if(_oldName==nomBiefSelected_) {
nomBiefSelected_=_newName;
fireBiefSelectedRenamed(_oldName, _newName);
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefSet.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefSet.java 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefSet.java 2011-05-30 15:57:08 UTC (rev 6266)
@@ -16,7 +16,6 @@
import org.fudaa.ctulu.CtuluCommandComposite;
import org.fudaa.ctulu.CtuluCommandContainer;
import org.fudaa.ctulu.CtuluNamedCommand;
-import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.modeleur.resource.MdlResource;
/**
@@ -52,8 +51,8 @@
if(_nom==null||_bief==null)
throw new IllegalArgumentException("Erreur prog : Ni _nom ni _bief ne peuvent \xEAtre null.");
if(biefs_.containsKey(_nom))
- throw new IllegalArgumentException(MdlResource.getS("Ce nom de profil est d\xE9j\xE0 utilis\xE9."));
- class AddBiefCtuluCommand implements CtuluCommand, CtuluNamedCommand {
+ throw new IllegalArgumentException(MdlResource.getS("Ce nom de bief est d\xE9j\xE0 utilis\xE9."));
+ class AddBiefCtuluCommand implements CtuluNamedCommand {
public String nom_;
public Bief bief_;
public AddBiefCtuluCommand(String _nom, Bief _bief){nom_=_nom;bief_=_bief;}
@@ -65,7 +64,7 @@
listNoms_.add(_nom);
if(_cmd!=null)
_cmd.addCmd(new AddBiefCtuluCommand(_nom, _bief));
- fireAddedBief(_nom);
+ fireAddedBief(_bief, _nom);
}
/**
@@ -113,7 +112,7 @@
listNoms_.remove(_nomBief);
if(_cmd!=null)
_cmd.addCmd(new removeBiefCtuluCommand(_nomBief, bief, isSynchronise));
- fireRemovedBief(_nomBief);
+ fireRemovedBief(bief, _nomBief);
}
/**
@@ -139,10 +138,10 @@
biefs_.get(_oldName).setName(_newName);
biefs_.put(_newName, biefs_.get(_oldName));
listNoms_.set(listNoms_.indexOf(_oldName), _newName);
- biefs_.remove(_oldName);
+ Bief bief=biefs_.remove(_oldName);
if(_cmd!=null)
_cmd.addCmd(new renameBiefCtuluCommand(_oldName, _newName));
- fireRenamedBief(_oldName, _newName);
+ fireRenamedBief(bief, _oldName, _newName);
}
// Gestion des listeners \\
@@ -163,17 +162,17 @@
listeners_.remove(_listener);
}
- protected void fireAddedBief(String _newName) {
+ protected void fireAddedBief(Bief _bief, String _newName) {
for(BiefSetListener listener: listeners_)
- listener.addedBief(_newName);
+ listener.addedBief(_bief,_newName);
}
- protected void fireRenamedBief(String _oldName, String _newName) {
+ protected void fireRenamedBief(Bief _bief, String _oldName, String _newName) {
for(BiefSetListener listener: listeners_)
- listener.renamedBief(_oldName, _newName);
+ listener.renamedBief(_bief, _oldName, _newName);
}
- protected void fireRemovedBief(String _oldName) {
+ protected void fireRemovedBief(Bief _bief, String _oldName) {
for(BiefSetListener listener: listeners_)
- listener.removedBief(_oldName);
+ listener.removedBief(_bief, _oldName);
}
// R\xE9cup\xE9ration des donn\xE9es \\
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefSetListener.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefSetListener.java 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/model/BiefSetListener.java 2011-05-30 15:57:08 UTC (rev 6266)
@@ -12,12 +12,12 @@
* impl\xE9menter cette interface.
*
* @author Emmanuel MARTIN
- * @version $Id:$
+ * @version $Id$
*/
public interface BiefSetListener {
- public void addedBief(String _newName);
- public void renamedBief(String _oldName, String _newName);
- public void removedBief(String _oldName);
+ public void addedBief(Bief _bief, String _newName);
+ public void renamedBief(Bief _bief, String _oldName, String _newName);
+ public void removedBief(Bief _bief, String _oldName);
}
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/PnGestionBief.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/PnGestionBief.java 2011-05-30 15:52:47 UTC (rev 6265)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/PnGestionBief.java 2011-05-30 15:57:08 UTC (rev 6266)
@@ -33,7 +33,7 @@
import org.fudaa.ctulu.table.CtuluTable;
import org.fudaa.ebli.commun.EbliActionMap;
import org.fudaa.ebli.commun.EbliComponentFactory;
-import org.fudaa.fudaa.commun.FudaaLib;
+import org.fudaa.fudaa.modeleur.modeleur1d.model.Bief;
import org.fudaa.fudaa.modeleur.resource.MdlResource;
/**
@@ -155,38 +155,43 @@
biefSet_.addBiefSetListener(this);
}
+ @Override
public Class<?> getColumnClass(int columnIndex) {
return String.class;
}
+ @Override
public int getRowCount() {
if(biefSet_==null)
return 0;
return biefSet_.getNbBief();
}
+ @Override
public Object getValueAt(int rowIndex, int columnIndex) {
return biefSet_.getBiefName(rowIndex);
}
+ @Override
public boolean isCellEditable(int rowIndex, int columnIndex) {
return true;
}
+ @Override
public void setValueAt(Object value, int rowIndex, int columnIndex) {
if(!getValueAt(rowIndex, columnIndex).equals(value))
controllerBief_.renameBief((String) getValueAt(rowIndex, columnIndex), (String) value);
}
- public void addedBief(String name) {
+ public void addedBief(Bief _bief, String name) {
fireTableDataChanged();
}
- public void removedBief(String name) {
+ public void removedBief(Bief _bief, String name) {
fireTableDataChanged();
}
- public void renamedBief(String name, String name2) {
+ public void renamedBief(Bief _bief, String name, String name2) {
fireTableDataChanged();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-12-12 17:43:00
|
Revision: 8123
http://fudaa.svn.sourceforge.net/fudaa/?rev=8123&view=rev
Author: deniger
Date: 2012-12-12 17:42:46 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/pom.xml
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlFille2d.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/resource/mdl_en.fr_txt
Added Paths:
-----------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridAction.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridProcessor.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridStopAction.java
Modified: trunk/soft/fudaa-modeleur/pom.xml
===================================================================
--- trunk/soft/fudaa-modeleur/pom.xml 2012-12-12 16:47:19 UTC (rev 8122)
+++ trunk/soft/fudaa-modeleur/pom.xml 2012-12-12 17:42:46 UTC (rev 8123)
@@ -1,51 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <properties>
- <fudaa-sig.version>1.4-SNAPSHOT</fudaa-sig.version>
- <javaCompiler>1.6</javaCompiler>
- <targetJdk>1.6</targetJdk>
- </properties>
- <parent>
- <groupId>org.fudaa.pom</groupId>
- <artifactId>soft-pom</artifactId>
- <version>1.3</version>
- </parent>
- <groupId>org.fudaa.soft.fudaa-modeleur</groupId>
- <artifactId>fudaa-modeleur</artifactId>
- <version>1.2-SNAPSHOT</version>
- <name>Fudaa-Modeleur</name>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.fudaa-sig</groupId>
- <artifactId>fudaa-sig</artifactId>
- <version>${fudaa-sig.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.fudaa-sig</groupId>
- <artifactId>fudaa-sig</artifactId>
- <version>${fudaa-sig.version}</version>
- </dependency>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <properties>
+ <fudaa-mesh.version>1.4-SNAPSHOT</fudaa-mesh.version>
+ <javaCompiler>1.6</javaCompiler>
+ <targetJdk>1.6</targetJdk>
+ </properties>
+ <parent>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>soft-pom</artifactId>
+ <version>1.3</version>
+ </parent>
+ <groupId>org.fudaa.soft.fudaa-modeleur</groupId>
+ <artifactId>fudaa-modeleur</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <name>Fudaa-Modeleur</name>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-mesh</groupId>
+ <artifactId>fudaa-mesh</artifactId>
+ <version>${fudaa-mesh.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
<dependency>
- <groupId>org.fudaa.framework.ebli</groupId>
- <artifactId>ebli-1d</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <groupId>org.fudaa.soft.fudaa-mesh</groupId>
+ <artifactId>fudaa-mesh</artifactId>
+ <version>${fudaa-mesh.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ebli</groupId>
+ <artifactId>ebli-1d</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
- <plugins>
+<!-- <plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
@@ -68,10 +68,10 @@
</execution>
</executions>
</plugin>
- </plugins>
+ </plugins>-->
<pluginManagement>
<plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlFille2d.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlFille2d.java 2012-12-12 16:47:19 UTC (rev 8122)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlFille2d.java 2012-12-12 17:42:46 UTC (rev 8123)
@@ -45,6 +45,7 @@
public MdlFille2d(MdlImplementation _ui) {
super(new MdlVisuPanel(_ui), _ui, null);
+ setDoubleBuffered(false);
setTitle(MdlResource.getS("Vue 2D"));
setPreferredSize(new Dimension(500, 400));
cutCopyPasteManager_=new MdlCutCopyPasteManager(this, (MdlSceneEditor) getMdlVisuPanel().getEditor().getSceneEditor());
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlVisuPanel.java 2012-12-12 16:47:19 UTC (rev 8122)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlVisuPanel.java 2012-12-12 17:42:46 UTC (rev 8123)
@@ -76,7 +76,7 @@
super(_impl);
impl_=_impl;
setName("mdlMainFille");
-
+ setDoubleBuffered(false);
initCalques(true);
installLayerActions();
getScene().setRestrictedToCalqueActif(false);
Added: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridAction.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridAction.java (rev 0)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridAction.java 2012-12-12 17:42:46 UTC (rev 8123)
@@ -0,0 +1,120 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.modeleur.action;
+
+import java.awt.Color;
+import java.awt.EventQueue;
+import java.awt.event.ActionEvent;
+import org.fudaa.ctulu.CtuluTaskDelegate;
+import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.commun.EbliUIProperties;
+import org.fudaa.ebli.trace.TraceLigne;
+import org.fudaa.ebli.trace.TraceLigneModel;
+import org.fudaa.fudaa.meshviewer.layer.MvElementLayer;
+import org.fudaa.fudaa.meshviewer.model.MvElementModelDefault;
+import org.fudaa.fudaa.modeleur.layer.MdlLayer2dMultiPoint;
+import org.fudaa.fudaa.modeleur.resource.MdlResource;
+import org.fudaa.fudaa.sig.layer.FSigEditor;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class CalqueCreateGridAction extends EbliActionSimple {
+
+ private final MdlLayer2dMultiPoint layer;
+ CalqueCreateGridStopAction stopAction;
+
+ public CalqueCreateGridAction(MdlLayer2dMultiPoint layer) {
+ super(MdlResource.getS("Mailler"), null, "PERFORM_GRID");
+ this.layer = layer;
+ stopAction = new CalqueCreateGridStopAction(this);
+ stopAction.setEnabled(false);
+ }
+
+ public CalqueCreateGridStopAction getStopAction() {
+ return stopAction;
+
+
+ }
+ CalqueCreateGridProcessor processor;
+ private volatile boolean running;
+
+ @Override
+ public void updateStateBeforeShow() {
+ setEnabled(!running);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ stop = false;
+ setEnabled(false);
+ running = true;
+ stopAction.setRunning(true);
+ MvElementLayer gridLayer = getGridLayer();
+ final EbliUIProperties saveUIProperties = gridLayer == null ? null : gridLayer.saveUIProperties();
+ if (gridLayer != null) {
+ layer.remove(gridLayer);
+ ((FSigEditor) layer.getEditor()).getPanel().getVueCalque().repaint(0);
+ }
+ final FSigEditor editor = (FSigEditor) layer.getEditor();
+ final CtuluTaskDelegate createTask = editor.getUi().createTask(getTitle());
+ createTask.start(new Runnable() {
+ @Override
+ public void run() {
+ processor = new CalqueCreateGridProcessor(layer.modeleDonnees(), editor.getUi());
+ final EfGridInterface grid = processor.process(createTask.getStateReceiver());
+ EventQueue.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ running = false;
+ setEnabled(true);
+ stopAction.setRunning(running);
+ if (grid != null && !stop) {
+ addLayer(grid, saveUIProperties);
+ }
+ }
+ });
+ }
+ });
+
+ }
+
+ @Override
+ public void setEnabled(boolean _newValue) {
+ super.setEnabled(_newValue && !running);
+ }
+
+ private void addLayer(EfGridInterface grid, EbliUIProperties saveUIProperties) {
+ MvElementLayer eltLayer = getGridLayer();
+ if (eltLayer == null) {
+ eltLayer = new MvElementLayer();
+ eltLayer.setTitle(MdlResource.getS("Maillage"));
+ eltLayer.setName("cqGrid");
+ eltLayer.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1f, Color.LIGHT_GRAY));
+ eltLayer.setAlpha(128);
+ }
+ if (saveUIProperties != null) {
+ eltLayer.initFrom(saveUIProperties);
+ }
+ layer.add(eltLayer);
+ eltLayer.setModele(new MvElementModelDefault(grid));
+ eltLayer.repaint();
+ ((FSigEditor) layer.getEditor()).getPanel().getVueCalque().repaint(0);
+ ((FSigEditor) layer.getEditor()).getPanel().getVueCalque().revalidate();
+ }
+ private volatile boolean stop;
+
+ void stop() {
+ stop = true;
+ if (processor != null) {
+ processor.stop();
+ }
+ }
+
+ public MvElementLayer getGridLayer() {
+ return (MvElementLayer) layer.getCalqueParNom("cqGrid");
+ }
+}
Added: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridProcessor.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridProcessor.java (rev 0)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridProcessor.java 2012-12-12 17:42:46 UTC (rev 8123)
@@ -0,0 +1,93 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.modeleur.action;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.fudaa.ctulu.CtuluIOOperationSynthese;
+import org.fudaa.ctulu.CtuluIOResult;
+import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.dodico.ef.impl.EFGridArrayZ;
+import org.fudaa.dodico.ef.io.triangle.TriangleEleNodeGridCreator;
+import org.fudaa.dodico.ef.io.triangle.TriangleNodeAdapter;
+import org.fudaa.dodico.ef.io.triangle.TriangleNodeWriter;
+import org.fudaa.dodico.objet.CExec;
+import org.fudaa.dodico.objet.CExecListener;
+import org.fudaa.ebli.calque.ZModeleMultiPoint;
+import org.fudaa.fudaa.modeleur.resource.MdlResource;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class CalqueCreateGridProcessor implements CExecListener {
+
+ private ZModeleMultiPoint points;
+ private CtuluUI ui;
+
+ public CalqueCreateGridProcessor(ZModeleMultiPoint points, CtuluUI ui) {
+ this.points = points;
+ this.ui = ui;
+ }
+
+ @Override
+ public void setProcess(Process _p) {
+ this.p = _p;
+ }
+ private volatile boolean stop;
+
+ public void stop() {
+ stop = true;
+ if (p != null) {
+ p.destroy();
+ }
+ }
+ Process p;
+
+ public EfGridInterface process(ProgressionInterface prog) {
+ try {
+ stop = false;
+ File tmpDir = CtuluLibFile.createTempDir();
+ System.err.println("tmp =" + tmpDir.getAbsolutePath());
+ File nodeFile = new File(tmpDir, "in.node");
+ TriangleNodeWriter writer = new TriangleNodeWriter();
+ CtuluIOOperationSynthese write = writer.write(new TriangleNodeAdapter(points.getGeomData()), nodeFile, prog);
+ if (write.containsError()) {
+ ui.manageErrorOperationAndIsFatal(write);
+ return null;
+ }
+ if (prog != null) {
+ prog.setDesc(MdlResource.getS("Ex\xE9cution du mailleur"));
+ }
+ CExec exe = new CExec();
+ exe.setExecDirectory(tmpDir);
+ exe.setCommand(new String[]{"C:\\devel\\triangle\\CARRE\\triangle.exe", "in.node"});
+ exe.setListener(this);
+ exe.exec();
+ if (stop) {
+ return null;
+ }
+ File targetNode = new File(tmpDir, "in.1.node");
+ File targetEle = new File(tmpDir, "in.1.ele");
+ TriangleEleNodeGridCreator creator = new TriangleEleNodeGridCreator();
+ creator.setProgression(prog);
+ creator.setUseFirstAttributesAsZ(false);
+ CtuluIOResult<EFGridArrayZ> readGrid = creator.readGrid(targetNode, targetEle);
+ if (readGrid.getSource() == null) {
+ ui.manageAnalyzeAndIsFatal(readGrid.getAnalyze());
+ }
+ CtuluLibFile.deleteDir(tmpDir);
+ return readGrid.getSource();
+ } catch (IOException ex) {
+ ui.error(MdlResource.getS("Impossible de cr\xE9er un dossier temporaire"));
+ Logger.getLogger(CalqueCreateGridProcessor.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ return null;
+ }
+}
Added: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridStopAction.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridStopAction.java (rev 0)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridStopAction.java 2012-12-12 17:42:46 UTC (rev 8123)
@@ -0,0 +1,45 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.modeleur.action;
+
+import com.memoire.bu.BuResource;
+import java.awt.event.ActionEvent;
+import javax.swing.Icon;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.fudaa.modeleur.resource.MdlResource;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class CalqueCreateGridStopAction extends EbliActionSimple {
+
+ CalqueCreateGridAction action;
+ boolean running;
+
+ public CalqueCreateGridStopAction(CalqueCreateGridAction action) {
+ super(MdlResource.getS("Stopper le maillage"), BuResource.BU.getIcon("arreter"), "STOP_GRID");
+ this.action = action;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent _e) {
+ action.stop();
+ }
+
+ @Override
+ public void updateStateBeforeShow() {
+ setEnabled(running);
+ }
+
+ protected void setRunning(boolean running) {
+ this.running = running;
+ setEnabled(running);
+ }
+
+ @Override
+ public void setEnabled(boolean _newValue) {
+ super.setEnabled(_newValue && running);
+ }
+}
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java 2012-12-12 16:47:19 UTC (rev 8122)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java 2012-12-12 17:42:46 UTC (rev 8123)
@@ -10,11 +10,12 @@
import java.awt.Color;
import org.fudaa.ctulu.gis.GISAttributeConstants;
-import org.fudaa.ebli.calque.BCalqueLegende;
import org.fudaa.ebli.calque.BCalquePersistenceInterface;
import org.fudaa.ebli.calque.edition.ZModeleMultiPointEditable;
+import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.ebli.trace.TraceIcon;
import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.fudaa.modeleur.action.CalqueCreateGridAction;
import org.fudaa.fudaa.modeleur.persistence.MdlLayer2dCloudPersistence;
import org.fudaa.fudaa.modeleur.resource.MdlResource;
import org.fudaa.fudaa.sig.layer.FSigEditor;
@@ -41,6 +42,8 @@
setIconModel(0, new TraceIconModel(TraceIcon.CARRE_PLEIN, 2, new Color(0, 190, 0)));
setTitle(MdlResource.getS("Semis de points"));
setAttributForLabels(GISAttributeConstants.LABEL);
+ final CalqueCreateGridAction createGridAction = new CalqueCreateGridAction(this);
+ setActions(new EbliActionInterface[]{createGridAction, createGridAction.getStopAction()});
}
public MdlLayer2dCloud(FSigEditor _editor) {
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java 2012-12-12 16:47:19 UTC (rev 8122)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java 2012-12-12 17:42:46 UTC (rev 8123)
@@ -46,7 +46,7 @@
setDestructible(true);
installActions();
updatePositionDataBathy();
- setLegende(_editor==null?null:_editor.getPanel().getCqLegend());
+ setLegende(_editor == null ? null : _editor.getPanel().getCqLegend());
}
private void updatePositionDataBathy() {
@@ -59,7 +59,16 @@
updatePositionDataBathy();
}
+ /**
+ *
+ * @return true car ce claque pourra avoir le calque maillage comme calque enfant.
+ */
@Override
+ public boolean isGroupeCalque() {
+ return true;
+ }
+
+ @Override
public void modele(ZModeleMultiPoint _modele) {
super.modele(_modele);
updatePositionDataBathy();
@@ -90,12 +99,12 @@
@Override
public boolean isPaletteModifiable() {
- return bathyDonneesIndice>=0;
+ return bathyDonneesIndice >= 0;
}
@Override
public boolean isDonneesBoiteAvailable() {
- return bathyDonneesIndice>=0;
+ return bathyDonneesIndice >= 0;
}
@Override
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/resource/mdl_en.fr_txt
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/resource/mdl_en.fr_txt 2012-12-12 16:47:19 UTC (rev 8122)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/resource/mdl_en.fr_txt 2012-12-12 17:42:46 UTC (rev 8123)
@@ -1 +1,5 @@
-Fond de carte=Raster map
\ No newline at end of file
+Fond de carte=Raster map
+Mailler=Perform grid computing
+Impossible de cr\xE9er un dossier temporaire=A temporary directory can't be created
+Ex\xE9cution du mailleur=Extern grid processing
+Stopper le maillage=Stop grid processing
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2013-01-07 14:05:47
|
Revision: 8187
http://fudaa.svn.sourceforge.net/fudaa/?rev=8187&view=rev
Author: deniger
Date: 2013-01-07 14:05:39 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/pom.xml
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridAction.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/CalqueCreateGridGmshProcessor.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/CalqueCreateGridPoly2TriProcessor.java
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/MdlGridExportFactory.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/CreateIsoLinesAction.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/DeleteGridAction.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/GridSetMeshPaintedAction.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/GridUnsetMeshPaintedAction.java
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/Show3DAction.java
Added Paths:
-----------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/CreateIsoLinesChooseLimiteValue.java
Removed Paths:
-------------
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/CreateIsoLinesChooseVariable.java
Modified: trunk/soft/fudaa-modeleur/pom.xml
===================================================================
--- trunk/soft/fudaa-modeleur/pom.xml 2013-01-07 13:30:16 UTC (rev 8186)
+++ trunk/soft/fudaa-modeleur/pom.xml 2013-01-07 14:05:39 UTC (rev 8187)
@@ -50,7 +50,7 @@
</dependency>
</dependencies>
<build>
-<!-- <plugins>
+ <plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
@@ -73,7 +73,7 @@
</execution>
</executions>
</plugin>
- </plugins>-->
+ </plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridAction.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridAction.java 2013-01-07 13:30:16 UTC (rev 8186)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/action/CalqueCreateGridAction.java 2013-01-07 14:05:39 UTC (rev 8187)
@@ -45,6 +45,9 @@
private volatile boolean running;
private volatile boolean stop;
+ /**
+ * @param layer la calque semis de points associ\xE9e
+ */
public CalqueCreateGridAction(MdlCalqueMultiPointEditable layer) {
super(MdlResource.getS("Mailler"), null, "PERFORM_GRID");
this.layer = layer;
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/CalqueCreateGridGmshProcessor.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/CalqueCreateGridGmshProcessor.java 2013-01-07 13:30:16 UTC (rev 8186)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/CalqueCreateGridGmshProcessor.java 2013-01-07 14:05:39 UTC (rev 8187)
@@ -35,10 +35,7 @@
@Override
public EfGridInterface process(ProgressionInterface prog) {
-// if (!CalqueGridTriangleConfigurationAction.isTriangleExeConfigured()) {
-// return null;
-// }
- try {
+ try {
stop = false;
File tmpDir = CtuluLibFile.createTempDir();
String fileName = null;
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/CalqueCreateGridPoly2TriProcessor.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/CalqueCreateGridPoly2TriProcessor.java 2013-01-07 13:30:16 UTC (rev 8186)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/CalqueCreateGridPoly2TriProcessor.java 2013-01-07 14:05:39 UTC (rev 8187)
@@ -30,7 +30,6 @@
import org.fudaa.dodico.ef.io.common.TriangulationUniqueDataContentBuilder;
import org.fudaa.ebli.calque.ZCalqueLigneBrisee;
import org.fudaa.ebli.calque.ZModeleMultiPoint;
-import org.fudaa.fudaa.modeleur.layer.MdlLayer2dContour;
import org.fudaa.fudaa.modeleur.resource.MdlResource;
import org.poly2tri.Poly2Tri;
import org.poly2tri.geometry.polygon.Polygon;
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-07 13:30:16 UTC (rev 8186)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlElementLayer.java 2013-01-07 14:05:39 UTC (rev 8187)
@@ -9,7 +9,7 @@
import org.fudaa.fudaa.meshviewer.model.MvElementModel;
/**
- *
+ * Le calque affichage le maillage.
* @author Frederic Deniger
*/
public class MdlElementLayer extends MvElementLayer {
@@ -26,6 +26,11 @@
}
@Override
+ public String editSelected() {
+ return null;
+ }
+
+ @Override
public boolean isDestructible() {
return true;
}
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlGridExportFactory.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlGridExportFactory.java 2013-01-07 13:30:16 UTC (rev 8186)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/MdlGridExportFactory.java 2013-01-07 14:05:39 UTC (rev 8187)
@@ -9,6 +9,7 @@
import org.fudaa.fudaa.sig.layer.FSigEditor;
/**
+ * Classe utilitaire pour l'export au format maillage des donn\xE9es.
*
* @author Frederic Deniger
*/
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/CreateIsoLinesAction.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/CreateIsoLinesAction.java 2013-01-07 13:30:16 UTC (rev 8186)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/CreateIsoLinesAction.java 2013-01-07 14:05:39 UTC (rev 8187)
@@ -11,11 +11,12 @@
import java.awt.event.ActionEvent;
import java.io.IOException;
import java.util.Arrays;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.swing.JPanel;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluTaskDelegate;
import org.fudaa.ctulu.ProgressionInterface;
-import org.fudaa.ctulu.gis.GISAttributeConstants;
import org.fudaa.ctulu.gis.GISDataModelFilterAdapter;
import org.fudaa.ctulu.gui.CtuluDialogPanel;
import org.fudaa.ctulu.gui.CtuluListEditorPanel;
@@ -57,6 +58,11 @@
setEnabled(delegate.getGridLayer() != null);
}
+ /**
+ * Ajoute le calque contenant les isolignes demand\xE9es.
+ *
+ * @param res le r\xE9sultat de la recherche d'isoligne
+ */
private void addIsoLineLayer(EfIsoResultDefault res) {
FSigEditor editor = (FSigEditor) delegate.getParentLayer().getEditor();
if (res.getNumGeometries() > 0) {
@@ -76,9 +82,9 @@
private static class ChooseVariablePanel extends CtuluDialogPanel {
private final BuTextField tfPrecision;
- private final CreateIsoLinesChooseVariable limits;
+ private final CreateIsoLinesChooseLimiteValue limits;
- public ChooseVariablePanel(CreateIsoLinesChooseVariable limits) {
+ public ChooseVariablePanel(CreateIsoLinesChooseLimiteValue limits) {
super(true);
setLayout(new BorderLayout(10, 0));
this.limits = limits;
@@ -111,8 +117,8 @@
delegate.getUI().warn(getTitle(), MdlResource.getS("Pour cr\xE9er des isolignes, le maillage correspondant doit \xEAtre cr\xE9\xE9"), false);
return;
}
- final CreateIsoLinesChooseVariable values = new CreateIsoLinesChooseVariable(delegate);
- //le pn permet de choisir les valeus \xE0 utiliser pour les isolignes.
+ final CreateIsoLinesChooseLimiteValue values = new CreateIsoLinesChooseLimiteValue(delegate);
+ //le pn permet de choisir les valeurs \xE0 utiliser pour les isolignes.
//par defaut, les valeurs de la palette sont utilis\xE9es.
ChooseVariablePanel pn = new ChooseVariablePanel(values);
final String title = MdlResource.getS("Cr\xE9ation des lignes de niveau");
@@ -128,7 +134,13 @@
}
}
- private void searchIsoLines(ProgressionInterface progression, CreateIsoLinesChooseVariable values) {
+ /**
+ * D\xE9termination des isolignes
+ *
+ * @param progression
+ * @param values
+ */
+ private void searchIsoLines(ProgressionInterface progression, CreateIsoLinesChooseLimiteValue values) {
CtuluAnalyze log = new CtuluAnalyze();
final TDoubleHashSet set = new TDoubleHashSet(values.getRowCount());
for (int i = 0; i < values.getRowCount(); i++) {
@@ -142,17 +154,21 @@
act.setEpsForValues(precision);
final int nbValues = isoValues.length;
try {
+ //cr\xE9ation des classes permettant de d\xE9terminer les isolignes:
EfData data = gridData.getData(H2dVariableType.BATHYMETRIE, 0);
final EfGridDataInterpolationValuesAdapter interpolatedValues = new EfGridDataInterpolationValuesAdapter(gridData, 0);
final EfIsoActivitySearcher searcher = act.search(H2dVariableType.BATHYMETRIE, data, progression, log, interpolatedValues);
if (searcher == null) {
return;
}
+ //recherche pour chaque valeur
+ //TODO PERF: multi-threade ce point si n\xE9cesasaire
for (int v = 0; v < nbValues; v++) {
final double value = isoValues[v];
searcher.search(value, res, progression, log);
}
} catch (IOException iOException) {
+ Logger.getLogger(CreateIsoLinesAction.class.getName()).log(Level.INFO, "message {0}", iOException);
}
if (log.containsErrorOrFatalError()) {
delegate.getUI().manageAnalyzeAndIsFatal(log);
Copied: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/CreateIsoLinesChooseLimiteValue.java (from rev 8171, trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/CreateIsoLinesChooseVariable.java)
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/CreateIsoLinesChooseLimiteValue.java (rev 0)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/CreateIsoLinesChooseLimiteValue.java 2013-01-07 14:05:39 UTC (rev 8187)
@@ -0,0 +1,125 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.modeleur.grid.action;
+
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.fudaa.ctulu.CtuluLib;
+import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.gui.CtuluListEditorModel;
+import org.fudaa.ctulu.iterator.NumberIterator;
+import org.fudaa.dodico.ef.EfData;
+import org.fudaa.dodico.h2d.type.H2dVariableType;
+import org.fudaa.ebli.palette.BPalettePlageInterface;
+import org.fudaa.ebli.palette.BPalettePlageTarget;
+import org.fudaa.fudaa.modeleur.grid.LayerGridController;
+import org.fudaa.fudaa.modeleur.resource.MdlResource;
+
+/**
+ * Panneau permettant de choisir les valeurs pour la construction des iso-lignes.
+ * @author Frederic Deniger
+ */
+public class CreateIsoLinesChooseLimiteValue extends CtuluListEditorModel {
+
+ final DecimalFormat fmt_ = CtuluLib.getDecimalFormat();
+ EfData bathy;
+ LayerGridController support_;
+
+ public CreateIsoLinesChooseLimiteValue(final LayerGridController _support) {
+ fmt_.setMaximumFractionDigits(1);
+ support_ = _support;
+ try {
+ bathy = support_.getExportGridData().getData(H2dVariableType.BATHYMETRIE, 0);
+ } catch (IOException ex) {
+ Logger.getLogger(CreateIsoLinesChooseLimiteValue.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ List defaultValuesFromPalette = getDefaultValuesFromPalette();
+ if (defaultValuesFromPalette != null) {
+ setData(defaultValuesFromPalette);
+ } else {
+ updateOrCreateValues();
+ }
+ }
+
+ @Override
+ public String getColumnName(final int _column) {
+ return MdlResource.getS("Valeurs");
+ }
+
+ private List getDefaultValuesFromPalette() {
+ if (support_.getParentLayer() instanceof BPalettePlageTarget) {
+ final BPalettePlageTarget cq = (BPalettePlageTarget) support_.getParentLayer();
+ final BPalettePlageInterface plage = cq.getPaletteCouleur();
+ final int nb = plage.getNbPlages();
+ final List res = new ArrayList(nb);
+ int inc = 1;
+ // pour eviter de proposer trop de valeurs
+ if (nb > 20) {
+ inc = nb / 20;
+ }
+ addVal(plage, res, plage.getPlageInterface(0).getMin());
+ for (int i = 0; i < nb; i += inc) {
+ addVal(plage, res, plage.getPlageInterface(i).getMax());
+ }
+ return res;
+ }
+ return null;
+ }
+
+ private void addVal(final BPalettePlageInterface _plage, final List _res, final double _val) {
+ if (_plage.getFormatter() == null) {
+ _res.add(fmt_.format(_val));
+ } else {
+ _res.add(_plage.getFormatter().format(_val));
+ }
+ }
+
+ private void initFor(final EfData _data, final List _l) {
+ if (_data == null || _l == null) {
+ return;
+ }
+ _l.clear();
+ final NumberIterator it = new NumberIterator();
+ it.init(_data.getMin(), _data.getMax(), 10);
+
+ while (it.hasNext()) {
+ _l.add(CtuluLib.DEFAULT_NUMBER_FORMAT.format(it.currentValue()));
+ it.nextMajor();
+ }
+ }
+
+ private void updateOrCreateValues() {
+ final List newValue = new ArrayList();
+ initFor(bathy, newValue);
+ if (newValue.isEmpty()) {
+ newValue.add(CtuluLibString.ZERO);
+ newValue.add(CtuluLibString.UN);
+ newValue.add(CtuluLibString.DEUX);
+ }
+ setData(newValue);
+ }
+
+ @Override
+ public Object createNewObject() {
+ final int val = getRowCount();
+ if (val >= 2) {
+ final double v0 = Double.parseDouble(((String) getValueAt(getRowCount() - 2)));
+ final double v1 = Double.parseDouble(((String) getValueAt(getRowCount() - 1)));
+ return fmt_.format(v1 + v1 - v0);
+ }
+ if (bathy != null) {
+ if (val == 1) {
+ final double v1 = Double.parseDouble(((String) getValueAt(getRowCount() - 1)));
+ final double inc = Math.abs((bathy.getMax() - v1) / 10);
+ return fmt_.format(v1 + inc);
+ }
+ return fmt_.format(bathy.getMin());
+ }
+ return CtuluLibString.ZERO;
+ }
+}
Deleted: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/CreateIsoLinesChooseVariable.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/CreateIsoLinesChooseVariable.java 2013-01-07 13:30:16 UTC (rev 8186)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/CreateIsoLinesChooseVariable.java 2013-01-07 14:05:39 UTC (rev 8187)
@@ -1,125 +0,0 @@
-/*
- GPL 2
- */
-package org.fudaa.fudaa.modeleur.grid.action;
-
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.fudaa.ctulu.CtuluLib;
-import org.fudaa.ctulu.CtuluLibString;
-import org.fudaa.ctulu.gui.CtuluListEditorModel;
-import org.fudaa.ctulu.iterator.NumberIterator;
-import org.fudaa.dodico.ef.EfData;
-import org.fudaa.dodico.h2d.type.H2dVariableType;
-import org.fudaa.ebli.palette.BPalettePlageInterface;
-import org.fudaa.ebli.palette.BPalettePlageTarget;
-import org.fudaa.fudaa.modeleur.grid.LayerGridController;
-import org.fudaa.fudaa.modeleur.resource.MdlResource;
-
-/**
- *
- * @author Frederic Deniger
- */
-public class CreateIsoLinesChooseVariable extends CtuluListEditorModel {
-
- final DecimalFormat fmt_ = CtuluLib.getDecimalFormat();
- EfData bathy;
- LayerGridController support_;
-
- public CreateIsoLinesChooseVariable(final LayerGridController _support) {
- fmt_.setMaximumFractionDigits(1);
- support_ = _support;
- try {
- bathy = support_.getExportGridData().getData(H2dVariableType.BATHYMETRIE, 0);
- } catch (IOException ex) {
- Logger.getLogger(CreateIsoLinesChooseVariable.class.getName()).log(Level.SEVERE, null, ex);
- }
- List defaultValuesFromPalette = getDefaultValuesFromPalette();
- if (defaultValuesFromPalette != null) {
- setData(defaultValuesFromPalette);
- } else {
- updateOrCreateValues();
- }
- }
-
- @Override
- public String getColumnName(final int _column) {
- return MdlResource.getS("Valeurs");
- }
-
- private List getDefaultValuesFromPalette() {
- if (support_.getParentLayer() instanceof BPalettePlageTarget) {
- final BPalettePlageTarget cq = (BPalettePlageTarget) support_.getParentLayer();
- final BPalettePlageInterface plage = cq.getPaletteCouleur();
- final int nb = plage.getNbPlages();
- final List res = new ArrayList(nb);
- int inc = 1;
- // pour eviter de proposer trop de valeurs
- if (nb > 20) {
- inc = nb / 20;
- }
- addVal(plage, res, plage.getPlageInterface(0).getMin());
- for (int i = 0; i < nb; i += inc) {
- addVal(plage, res, plage.getPlageInterface(i).getMax());
- }
- return res;
- }
- return null;
- }
-
- private void addVal(final BPalettePlageInterface _plage, final List _res, final double _val) {
- if (_plage.getFormatter() == null) {
- _res.add(fmt_.format(_val));
- } else {
- _res.add(_plage.getFormatter().format(_val));
- }
- }
-
- private void initFor(final EfData _data, final List _l) {
- if (_data == null || _l == null) {
- return;
- }
- _l.clear();
- final NumberIterator it = new NumberIterator();
- it.init(_data.getMin(), _data.getMax(), 10);
-
- while (it.hasNext()) {
- _l.add(CtuluLib.DEFAULT_NUMBER_FORMAT.format(it.currentValue()));
- it.nextMajor();
- }
- }
-
- private void updateOrCreateValues() {
- final List newValue = new ArrayList();
- initFor(bathy, newValue);
- if (newValue.isEmpty()) {
- newValue.add(CtuluLibString.ZERO);
- newValue.add(CtuluLibString.UN);
- newValue.add(CtuluLibString.DEUX);
- }
- setData(newValue);
- }
-
- @Override
- public Object createNewObject() {
- final int val = getRowCount();
- if (val >= 2) {
- final double v0 = Double.parseDouble(((String) getValueAt(getRowCount() - 2)));
- final double v1 = Double.parseDouble(((String) getValueAt(getRowCount() - 1)));
- return fmt_.format(v1 + v1 - v0);
- }
- if (bathy != null) {
- if (val == 1) {
- final double v1 = Double.parseDouble(((String) getValueAt(getRowCount() - 1)));
- final double inc = Math.abs((bathy.getMax() - v1) / 10);
- return fmt_.format(v1 + inc);
- }
- return fmt_.format(bathy.getMin());
- }
- return CtuluLibString.ZERO;
- }
-}
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/DeleteGridAction.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/DeleteGridAction.java 2013-01-07 13:30:16 UTC (rev 8186)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/DeleteGridAction.java 2013-01-07 14:05:39 UTC (rev 8187)
@@ -10,7 +10,7 @@
import org.fudaa.fudaa.modeleur.resource.MdlResource;
/**
- * Action permettant d'exporter le maillage.
+ * Action permettant de supprimer le maillage.
*
* @author Frederic Deniger
*/
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/GridSetMeshPaintedAction.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/GridSetMeshPaintedAction.java 2013-01-07 13:30:16 UTC (rev 8186)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/GridSetMeshPaintedAction.java 2013-01-07 14:05:39 UTC (rev 8187)
@@ -10,7 +10,7 @@
import org.fudaa.fudaa.modeleur.resource.MdlResource;
/**
- * Permet de demander l'affichage des isosurfaces sur les \xE9l\xE9ments s\xE9lectionn\xE9es
+ * Permet de demander l'affichage des isosurfaces sur les \xE9l\xE9ments s\xE9lectionn\xE9s
*
* @author Frederic Deniger
*/
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/GridUnsetMeshPaintedAction.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/GridUnsetMeshPaintedAction.java 2013-01-07 13:30:16 UTC (rev 8186)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/GridUnsetMeshPaintedAction.java 2013-01-07 14:05:39 UTC (rev 8187)
@@ -10,7 +10,7 @@
import org.fudaa.fudaa.modeleur.resource.MdlResource;
/**
- * Permet de demander l'affichage des isosurfaces sur les \xE9l\xE9ments s\xE9lectionn\xE9es
+ * Permet de demander le non-affichage des isosurfaces sur les \xE9l\xE9ments s\xE9lectionn\xE9s
*
* @author Frederic Deniger
*/
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/Show3DAction.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/Show3DAction.java 2013-01-07 13:30:16 UTC (rev 8186)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/grid/action/Show3DAction.java 2013-01-07 14:05:39 UTC (rev 8187)
@@ -19,14 +19,15 @@
import org.fudaa.fudaa.modeleur.resource.MdlResource;
/**
+ * Affichage du semis en 3D si un maillage est actif.
*
* @author Frederic Deniger
*/
public class Show3DAction extends EbliActionSimple {
-
+
private final LayerGridController delegate;
JFrame f_;
-
+
public Show3DAction(final LayerGridController delegate) {
super(EbliLib.getS("Afficher la vue 3D"), EbliResource.EBLI.getToolIcon("3d"), "SHOW_3D");
this.delegate = delegate;
@@ -34,16 +35,16 @@
super.setDefaultToolTip(MdlResource.getS("Afficher la vue 3D du maillage associ\xE9 au semis de points"));
super.setUnableToolTip(MdlResource.getS("Le semis doit \xEAtre maill\xE9 et Java3D install\xE9"));
}
-
+
public ZVue3DPanel getVue3D() {
return (ZVue3DPanel) f_.getContentPane();
}
-
+
@Override
public void updateStateBeforeShow() {
setEnabled(delegate.getGridLayer() != null);
}
-
+
@Override
public void actionPerformed(final ActionEvent _e) {
if (!BJava3DVersionTest.isJava3DFound()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2016-04-26 22:05:23
|
Revision: 9388
http://sourceforge.net/p/fudaa/svn/9388
Author: deniger
Date: 2016-04-26 22:05:21 +0000 (Tue, 26 Apr 2016)
Log Message:
-----------
version 1.9-SNAPSHOT
Modified Paths:
--------------
trunk/soft/fudaa-modeleur/pom.xml
trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java
Modified: trunk/soft/fudaa-modeleur/pom.xml
===================================================================
--- trunk/soft/fudaa-modeleur/pom.xml 2016-04-26 22:01:01 UTC (rev 9387)
+++ trunk/soft/fudaa-modeleur/pom.xml 2016-04-26 22:05:21 UTC (rev 9388)
@@ -39,51 +39,45 @@
<artifactId>fudaa-mesh</artifactId>
<version>${fudaa-mesh.version}</version>
<exclusions>
- <!-- exclude ebli common -->
- <exclusion>
- <groupId>org.fudaa.framework.ebli</groupId>
- <artifactId>ebli-1d</artifactId>
- </exclusion>
- </exclusions>
+ <!-- exclude ebli common -->
+ <exclusion>
+ <groupId>org.fudaa.framework.ebli</groupId>
+ <artifactId>ebli-1d</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-1d</artifactId>
<!-- il nous faut les dernières version de ebli common -->
- <version>${fudaa-framework.version}</version>
<exclusions>
- <!-- exclude ebli common -->
- <exclusion>
- <groupId>org.fudaa.framework.ebli</groupId>
- <artifactId>ebli-common</artifactId>
- </exclusion>
- </exclusions>
+ <!-- exclude ebli common -->
+ <exclusion>
+ <groupId>org.fudaa.framework.ebli</groupId>
+ <artifactId>ebli-common</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.fudaa.framework.ctulu</groupId>
- <artifactId>ctulu-fu</artifactId>
- <version>${fudaa-framework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ctulu</groupId>
- <artifactId>ctulu-bu</artifactId>
- <version>${fudaa-framework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ctulu</groupId>
- <artifactId>ctulu-ui</artifactId>
- <version>${fudaa-framework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ebli</groupId>
- <artifactId>ebli-common</artifactId>
- <version>${fudaa-framework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-core</artifactId>
- <version>${fudaa-business.version}</version>
- </dependency>
+ <groupId>org.fudaa.framework.ctulu</groupId>
+ <artifactId>ctulu-fu</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ctulu</groupId>
+ <artifactId>ctulu-bu</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ctulu</groupId>
+ <artifactId>ctulu-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ebli</groupId>
+ <artifactId>ebli-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-core</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java 2016-04-26 22:01:01 UTC (rev 9387)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java 2016-04-26 22:05:21 UTC (rev 9388)
@@ -107,7 +107,7 @@
double zoffSet_;
private String title;
-
+
public CourbeGeomModel() {
}
@@ -116,6 +116,11 @@
return false;
}
+ @Override
+ public int[] getInitRows() {
+ return null;
+ }
+
/**
* @return Retourne le profil associ\xE9.
*/
@@ -344,7 +349,7 @@
}
public String getTitle() {
- return title!=null?title:MdlResource.getS("Courbe");
+ return title != null ? title : MdlResource.getS("Courbe");
}
public double getX(int _idx) {
@@ -542,10 +547,6 @@
public void replayData(EGGrapheModel model, Map infos, CtuluUI impl) {
}
- @Override
- public int[] getInitRows() {
- return null;
- }
}
protected class EmptyCurveModel implements EGModel {
@@ -556,6 +557,11 @@
}
@Override
+ public int[] getInitRows() {
+ return null;
+ }
+
+ @Override
public boolean useSpecificIcon(int idx) {
return false;
}
@@ -686,10 +692,6 @@
public void replayData(EGGrapheModel model, Map infos, CtuluUI impl) {
}
- @Override
- public int[] getInitRows() {
- return null;
- }
}
/**
@@ -782,7 +784,7 @@
* La courbe suivante
*/
EGCourbeSimple nextCurve_;
-
+
/* Un modele de courbe vide */
// EmptyCurveModel emptyModel_=new EmptyCurveModel();
// Les boutons permettant de modifier les positions des rives et des limites de stockages. \\
@@ -794,7 +796,6 @@
BuToggleButton btShowPrevNext_;
private EGGrapheSimpleModel grapheModel_;
-
private EGAxeVertical axeY_;
private ProfileSetI profSet_;
private int selectedPrf_ = -1;
@@ -874,9 +875,9 @@
// Les actions a conserver.
HashSet<String> actionsKept = new HashSet<String>(Arrays.asList(
new String[]{
- "SELECT", "RESTORE", "AUTO_REST", "CONFIGURE_REPERE",
- "ZOOM", "SUIVI", "MOVE_POINT", "CONFIGURE", "INFOS", "TABLE"
- }));
+ "SELECT", "RESTORE", "AUTO_REST", "CONFIGURE_REPERE",
+ "ZOOM", "SUIVI", "MOVE_POINT", "CONFIGURE", "INFOS", "TABLE"
+ }));
for (int i = 0; i < actionAbs.length; i++) {
if (actionAbs[i] != null && actionsKept.contains(actionAbs[i].getValue(Action.ACTION_COMMAND_KEY))) {
@@ -897,7 +898,8 @@
_actions.add(btShowPrevNext_);
// Bouton d'alignement.
- EbliActionPaletteAbstract btAlign = new EbliActionPaletteAbstract(MdlResource.getS("Alignement des profils"), MdlResource.MDL.getIcon("aligner-profils"), "ALIGNMENT") {
+ EbliActionPaletteAbstract btAlign = new EbliActionPaletteAbstract(MdlResource.getS("Alignement des profils"), MdlResource.MDL.getIcon(
+ "aligner-profils"), "ALIGNMENT") {
@Override
protected JComponent buildContentPane() {
return new CurveOptionPanel(VueCourbe.this);
@@ -1138,7 +1140,7 @@
prevCurve_.setAspectContour(c);
prevCurve_.setIconeModel(new TraceIconModel(TraceIcon.CARRE_PLEIN, 1, c));
grapheModel_.addCourbe(prevCurve_, null);
-
+
c = Color.GREEN.darker();
nextCurve_ = new EGCourbeSimple(axeY_, new CourbeGeomModel());
nextCurve_.setLigneModel(new TraceLigneModel(TraceLigne.TIRETE, 0.5f, c));
@@ -1155,9 +1157,9 @@
grapheModel_.addCourbe(courbe_, null);
}
- public EGCourbeSimple getCourbe() {
- return courbe_;
- }
+ public EGCourbeSimple getCourbe() {
+ return courbe_;
+ }
/**
* Mise a jour des courbes, par changement de mod\xE8le.
@@ -1217,43 +1219,34 @@
grapheVue_.structureChanged();
}
-
-
-
- public int buildCurve(TraceLigneModel model, int idxProfil) {
- CourbeGeomModel md = new CourbeGeomModel();
- EGCourbeSimple courbe = new EGCourbeSimple(axeY_, md);
- courbe.setLigneModel(model);
- courbe.setAspectContour(courbe.getLigneModel().getCouleur());
- courbe.setIconeModel(new TraceIconModel(TraceIcon.CARRE_PLEIN, 1, courbe.getLigneModel().getCouleur()));
- grapheModel_.addCourbe(courbe, null);
- ProfilContainerI pf = profSet_.getProfil(idxProfil);
- double xoff = computeXOffset(pf, profSet_.getProfil(idxProfil));
- double zoff = computeZOffset(pf, profSet_.getProfil(idxProfil));
- md.setProfil(pf);
- md.setOffsets(xoff, zoff);
- courbe.setVisible(true);
- courbe.setTitle(pf.getName());
-
-
-
- return grapheModel_.getCourbes().length-1;
- }
-
-
- public void updateComparisonCurves(final int[] selection, final ComparisonCurvesPanel panelComparison,
- final MdlCompareProfilePanel compPanel, final int idxProf) {
- if (panelComparison.updateComparisonCurves(this, selection,compPanel, idxProf)) {
- setPrevNextVisible(false);
- grapheVue_.structureChanged();
- updateLabels();
- }
+ public int buildCurve(TraceLigneModel model, int idxProfil) {
+ CourbeGeomModel md = new CourbeGeomModel();
+ EGCourbeSimple courbe = new EGCourbeSimple(axeY_, md);
+ courbe.setLigneModel(model);
+ courbe.setAspectContour(courbe.getLigneModel().getCouleur());
+ courbe.setIconeModel(new TraceIconModel(TraceIcon.CARRE_PLEIN, 1, courbe.getLigneModel().getCouleur()));
+ grapheModel_.addCourbe(courbe, null);
+ ProfilContainerI pf = profSet_.getProfil(idxProfil);
+ double xoff = computeXOffset(pf, profSet_.getProfil(idxProfil));
+ double zoff = computeZOffset(pf, profSet_.getProfil(idxProfil));
+ md.setProfil(pf);
+ md.setOffsets(xoff, zoff);
+ courbe.setVisible(true);
+ courbe.setTitle(pf.getName());
+
+ return grapheModel_.getCourbes().length - 1;
+ }
+
+ public void updateComparisonCurves(final int[] selection, final ComparisonCurvesPanel panelComparison,
+ final MdlCompareProfilePanel compPanel, final int idxProf) {
+ if (panelComparison.updateComparisonCurves(this, selection, compPanel, idxProf)) {
+ setPrevNextVisible(false);
+ grapheVue_.structureChanged();
+ updateLabels();
}
+ }
-
-
-
/**
* Mise a jour des lignes remarquables sur le graphe pour \xEAtre en conformit\xE9 avec le profil courant.
*/
@@ -1272,27 +1265,32 @@
// Rive gauche
double absCurv = courbeModel_.getProfil().getAbsCurvRiveGauche();
if (absCurv != -1) {
- courbe_.addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("RG"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.blue), false));
+ courbe_.
+ addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("RG"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.blue), false));
}
// Rive droite
absCurv = courbeModel_.getProfil().getAbsCurvRiveDroite();
if (absCurv != -1) {
- courbe_.addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("RD"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.blue), false));
+ courbe_.
+ addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("RD"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.blue), false));
}
// Axe hydraulique
absCurv = courbeModel_.getProfil().getAbsCurvAxeHydrauliqueOnProfil();
if (absCurv != -1) {
- courbe_.addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("AH"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.green.darker()), false));
+ courbe_.addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("AH"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.green.
+ darker()), false));
}
// Limite stockage gauche
absCurv = courbeModel_.getProfil().getAbsCurvLimiteStockageGauche();
if (absCurv != -1) {
- courbe_.addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("SG"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.green), false));
+ courbe_.addMarqueur(
+ new EGCourbeMarqueur(absCurv, MdlResource.getS("SG"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.green), false));
}
// Limite stockage droite
absCurv = courbeModel_.getProfil().getAbsCurvLimiteStockageDroite();
if (absCurv != -1) {
- courbe_.addMarqueur(new EGCourbeMarqueur(absCurv, MdlResource.getS("SD"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.green), false));
+ courbe_.addMarqueur(
+ new EGCourbeMarqueur(absCurv, MdlResource.getS("SD"), true, new TraceLigneModel(TraceLigne.POINTILLE, 1, Color.green), false));
}
// grapheVue_.structureChanged();
@@ -1313,16 +1311,13 @@
}
public EGGrapheSimpleModel getGrapheModel() {
- return grapheModel_;
- }
+ return grapheModel_;
+ }
- public EGGraphe getGraphe() {
- return grapheVue_;
- }
+ public EGGraphe getGraphe() {
+ return grapheVue_;
+ }
-
-
-
/**
* Selectionne les points dont les indices sont pass\xE9s en param\xE8tre.
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X