Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2009-10-15 18:52:01
|
Revision: 5290
http://fudaa.svn.sourceforge.net/fudaa/?rev=5290&view=rev
Author: deniger
Date: 2009-10-15 18:51:54 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
Property Changed:
----------------
trunk/soft/fudaa-prepro/
trunk/soft/fudaa-prepro/ui/
Property changes on: trunk/soft/fudaa-prepro
___________________________________________________________________
Added: svn:ignore
+ .project
Property changes on: trunk/soft/fudaa-prepro/ui
___________________________________________________________________
Added: svn:ignore
+ target
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-15 20:13:58
|
Revision: 5299
http://fudaa.svn.sourceforge.net/fudaa/?rev=5299&view=rev
Author: deniger
Date: 2009-10-15 20:13:46 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/pom.xml
Property Changed:
----------------
trunk/soft/fudaa-prepro/meshview/
Property changes on: trunk/soft/fudaa-prepro/meshview
___________________________________________________________________
Added: svn:ignore
+ target
.classpath
.project
Modified: trunk/soft/fudaa-prepro/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/pom.xml 2009-10-15 20:04:29 UTC (rev 5298)
+++ trunk/soft/fudaa-prepro/pom.xml 2009-10-15 20:13:46 UTC (rev 5299)
@@ -5,7 +5,7 @@
<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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-22 22:06:50
|
Revision: 5443
http://fudaa.svn.sourceforge.net/fudaa/?rev=5443&view=rev
Author: deniger
Date: 2009-10-22 22:06:39 +0000 (Thu, 22 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/meshview/pom.xml
trunk/soft/fudaa-prepro/ui/pom.xml
Modified: trunk/soft/fudaa-prepro/meshview/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/meshview/pom.xml 2009-10-22 22:05:09 UTC (rev 5442)
+++ trunk/soft/fudaa-prepro/meshview/pom.xml 2009-10-22 22:06:39 UTC (rev 5443)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>0.94</version>
+ <version>0.95-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>meshview</artifactId>
Modified: trunk/soft/fudaa-prepro/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/ui/pom.xml 2009-10-22 22:05:09 UTC (rev 5442)
+++ trunk/soft/fudaa-prepro/ui/pom.xml 2009-10-22 22:06:39 UTC (rev 5443)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>0.94</version>
+ <version>0.95-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>prepro-ui</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-11-10 17:10:16
|
Revision: 5477
http://fudaa.svn.sourceforge.net/fudaa/?rev=5477&view=rev
Author: chrisc83
Date: 2009-11-10 17:10:07 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
OPEN - issue PREPRO-53: Ajout d'un panel pour le traitement du maillage
http://www.fudaa.fr/jira/browse/PREPRO-53
Modified Paths:
--------------
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java
trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess.properties
trunk/soft/fudaa-prepro/meshview/src/test/java/org/fudaa/fudaa/meshviewer/gridprocess/TestGridProcess.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrFileFormatManager.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacAppliManager.java
Added Paths:
-----------
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/Messages.java
trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_en.properties
trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_fr.properties
Modified: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java 2009-11-10 17:08:51 UTC (rev 5476)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java 2009-11-10 17:10:07 UTC (rev 5477)
@@ -1,6 +1,7 @@
package org.fudaa.fudaa.meshviewer.gridprocess;
import java.awt.Color;
+import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
@@ -9,21 +10,27 @@
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
import javax.swing.border.TitledBorder;
import javax.swing.filechooser.FileFilter;
import org.fudaa.ctulu.CtuluActivity;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluIOOperationSynthese;
-import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.ProgressionUpdater;
import org.fudaa.ctulu.fileformat.FileFormat;
import org.fudaa.ctulu.gui.CtuluFileChooserPanel;
import org.fudaa.ctulu.gui.CtuluLibDialog;
import org.fudaa.ctulu.gui.CtuluLibSwing;
+import org.fudaa.ctulu.gui.CtuluOptionPane;
+import org.fudaa.ctulu.gui.CtuluUIDialog;
import org.fudaa.dodico.ef.EfDataAdapter;
import org.fudaa.dodico.ef.EfFrontierInterface;
import org.fudaa.dodico.ef.EfGridData;
@@ -47,7 +54,11 @@
import org.fudaa.dodico.telemac.io.TelemacCLFileFormat;
import org.fudaa.fudaa.commun.impl.FudaaPanelTaskModel;
+import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuButton;
import com.memoire.bu.BuCheckBox;
+import com.memoire.bu.BuContentFrame;
+import com.memoire.bu.BuDialog;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuNumericValueValidator;
@@ -147,11 +158,48 @@
{
return this.filePanel.getFileWithExt();
}
+
+ public void setHtmlToolTip(String message)
+ {
+ this.filePanel.setToolTipText("<HTML>" + message + "</HTML>");
+ }
}
@SuppressWarnings("serial")
private static class ChooseProcessPanel extends BuPanel implements ActionListener, Validator
{
+ private static class HelpButton extends BuButton implements ActionListener
+ {
+ public String message;
+
+ public HelpButton()
+ {
+ this.setIcon(BuResource.BU.getIcon("crystal_aide"));
+
+ this.addActionListener(this);
+ }
+
+ public void setHtmlMessage(String message)
+ {
+ if ((message == null) || (message.length() == 0))
+ {
+ this.message = null;
+ }
+ else
+ {
+ this.message = "<HTML>" + message + "</HTML>";
+ }
+ }
+
+ public void actionPerformed(ActionEvent e)
+ {
+ if (this.message != null)
+ {
+ CtuluOptionPane.showDialog(this, "Aide", new JOptionPane(message, JOptionPane.INFORMATION_MESSAGE));
+ }
+ }
+ }
+
private static final String MIN_DIST_CMD = "MIN_DIST_CMD";
private static final String BACK_DEP_CMD = "BACK_DEP_CMD";
@@ -176,6 +224,11 @@
this.backEliminationCheckBox.addActionListener(this);
}
+ private void setHtmlToolTip(JComponent component, String message)
+ {
+ component.setToolTipText("<HTML>" + message + "</HTML>");
+ }
+
public void actionPerformed(ActionEvent arg0)
{
String cmd = arg0.getActionCommand();
@@ -192,11 +245,11 @@
private void initComponent()
{
- this.cleanGridCheckBox = new BuCheckBox("Distance minimale");
- this.refineEdgeCheckBox = new BuCheckBox("Raffinage");
- this.overstressedCheckBox = new BuCheckBox("Surcontraint");
- this.renumerationCheckBox = new BuCheckBox("Renumeration");
- this.backEliminationCheckBox = new BuCheckBox("D\xE9pendance arri\xE8re");
+ this.cleanGridCheckBox = new BuCheckBox(Messages.getString("gridprocess.distMini.txt"));
+ this.refineEdgeCheckBox = new BuCheckBox(Messages.getString("gridprocess.refine.txt"));
+ this.overstressedCheckBox = new BuCheckBox(Messages.getString("gridprocess.overstressed.txt"));
+ this.renumerationCheckBox = new BuCheckBox(Messages.getString("gridprocess.renum.txt"));
+ this.backEliminationCheckBox = new BuCheckBox(Messages.getString("gridprocess.backDep.txt"));
this.minDistanceValue = new BuTextField();
this.vectorLengthValue = new BuTextField();
@@ -212,17 +265,31 @@
this.minDistanceValue.setEnabled(false);
this.vectorLengthValue.setEnabled(false);
- this.setBorder(BorderFactory.createTitledBorder("Process"));
+ this.setBorder(BorderFactory.createTitledBorder(Messages.getString("gridprocess.process.txt")));
this.setLayout(new BuVerticalLayout(2, true, false));
+
+ this.add(this.createPanelWithHelpButton(this.createSubpanel(this.cleanGridCheckBox, this.minDistanceValue), "Permet de nettoyer le maillage.<BR/>Les points non utilis\xE9s sont supprim\xE9s ainsi que ceux dont leur distance \xE0 un autre point est inf\xE9rieur \xE0 la <I>distance minimale</I>.<BR/>Les \xE9l\xE9ments d\xE9g\xE9n\xE9r\xE9s ou superpos\xE9s sont supprim\xE9s."));
+ this.add(this.createPanelWithHelpButton(this.refineEdgeCheckBox, "Permet de divis\xE9 des \xE9l\xE9ments de type T3 et Q4 en 4.<BR/>Ce r\xE9sultat est obtenu en ajoutant un nouveau point au centre de chaque segment.<BR/>Pour tout les autres types d'\xE9l\xE9ment un nouveau point est ajout\xE9 au centre de chaque segment et de chaque \xE9l\xE9ment.<BR/>Leurs points se trouvant sur leur pourtour sont reli\xE9 au point ajout\xE9 en leur centre."));
+ this.add(this.createPanelWithHelpButton(this.overstressedCheckBox, "Permet de modifier les \xE9l\xE9ments surcontraints (dont tout leurs points se trouvent sur la fronti\xE8re).<BR/>Ce r\xE9sultat est obtenu en ajoutant un point en leur centre et en reliant tout leurs autres points \xE0 celui-ci.<BR/>Les segments dont leurs points se trouvent sur la fronti\xE8re sont \xE9chang\xE9s."));
+ this.add(this.createPanelWithHelpButton(this.renumerationCheckBox, "Permet de modifier la num\xE9rotation des points afin d'utiliser le nouveau type de stockage des matrices.<BR/>Ils seront num\xE9rot\xE9s de celui appartenant au moins d'\xE9l\xE9ments \xE0 celui apparentant au plus d'\xE9l\xE9ments."));
+ this.add(this.createPanelWithHelpButton(this.createSubpanel(this.backEliminationCheckBox, this.vectorLengthValue), ""));
+ }
- this.add(this.createSubpanel(this.cleanGridCheckBox, this.minDistanceValue));
- this.add(this.refineEdgeCheckBox);
- this.add(this.overstressedCheckBox);
- this.add(this.renumerationCheckBox);
- this.add(this.createSubpanel(this.backEliminationCheckBox, this.vectorLengthValue));
+ private BuPanel createPanelWithHelpButton(JComponent component, String helpMsg)
+ {
+ BuBorderLayout layout = new BuBorderLayout(5, 5);
+ BuPanel panel = new BuPanel(layout);
+ HelpButton helpButton = new HelpButton();
+
+ helpButton.setHtmlMessage(helpMsg);
+
+ panel.add(component);
+ panel.add(helpButton, BuBorderLayout.EAST);
+
+ return panel;
}
-
+
private BuPanel createSubpanel(BuCheckBox checkbox, BuTextField value)
{
BuPanel panel = new BuPanel(new BuGridLayout(2, 5, 5));
@@ -261,7 +328,7 @@
private String getProcessErrorMessage()
{
((TitledBorder) this.getBorder()).setTitleColor(ERROR_COLOR);
- return "Un process au moins doit \xEAtre s\xE9lectionn\xE9";
+ return Messages.getString("gridprocess.processRule.msg");
}
private String getVectorLengthErrorMessage(String message)
@@ -269,7 +336,7 @@
if (this.backEliminationCheckBox.isSelected() && (this.vectorLengthValue.getValue() == null))
{
this.backEliminationCheckBox.setForeground(ERROR_COLOR);
- message = concatMessage(message, "D\xE9pendance arri\xE8re doit \xEAtre un entier positif");
+ message = concatMessage(message, Messages.getString("gridprocess.backDepRule.msg"));
}
return message;
}
@@ -279,7 +346,7 @@
if (this.cleanGridCheckBox.isSelected() && (this.minDistanceValue.getValue() == null))
{
this.cleanGridCheckBox.setForeground(ERROR_COLOR);
- message = concatMessage(message, "Distance minimale doit \xEAtre un r\xE9el positif");
+ message = concatMessage(message, Messages.getString("gridprocess.distMinRule.msg"));
}
return message;
}
@@ -362,9 +429,11 @@
this.stop = false;
this.currentActivity = null;
+ EfGridData resGridData = null;
+
try
{
- EfGridData resGridData = this.doProcess(prog, analyze);
+ resGridData = this.doProcess(prog, analyze);
}
catch (ProcessException e)
{
@@ -373,8 +442,9 @@
}
// TODO Voir comment afficher analyse (actuellement elle s'affiche que sur un fatal error, comment???).
- // TODO Utiliser la classe des messages et mettre les param\xE8tres (nb point, nb \xE9l\xE9ment).
- messages[0] = "gridprocess.result.msg";
+ messages[0] = Messages.getString("gridprocess.result1.msg");
+ messages[2] = Messages.getString("gridprocess.result2.msg", resGridData.getGrid().getPtsNb());
+ messages[4] = Messages.getString("gridprocess.result3.msg", resGridData.getGrid().getEltNb());
}
private EfGridData doProcess(ProgressionInterface prog, CtuluAnalyze analyze) throws ProcessException
@@ -410,8 +480,9 @@
if (this.stop)
{
- // TODO Utiliser la classe des messages
- message = "gridprocess.stop.msg.";
+ // TODO Utiliser la classe des messages
+ // TODO Y mettre dans messages et pas dans analyse.
+ message = Messages.getString("gridprocess.stop.msg");
globalAnalyze.addFatalError(message);
}
@@ -446,7 +517,7 @@
public void decoreBtApply(JButton bt)
{
- bt.setText("Executer");
+ bt.setText(Messages.getString("gridprocess.execute.txt"));
bt.setIcon(BuResource.BU.getIcon("crystal_executer"));
}
@@ -457,17 +528,22 @@
public int getNbMessageMax()
{
- return 1;
+ return 3;
}
private void initComponent()
{
this.panel = new BuPanel(new BuVerticalLayout(2, true, false));
- this.fileInGrid = new FileChooserPanel("Fichier de maillage en entr\xE9e:", SerafinFileFormat.getInstance(), true);
- this.fileInCL = new FileChooserPanel("Fichier de condition en entr\xE9e:", TelemacCLFileFormat.getInstance());
- this.fileOutGrid = new FileChooserPanel("Fichier de maillage en sortie:", SerafinFileFormat.getInstance(), true);
- this.fileOutCL = new FileChooserPanel("Fichier de condition en sortie:", TelemacCLFileFormat.getInstance());
+ this.fileInGrid = new FileChooserPanel(Messages.getString("gridprocess.gridFileIn.txt"), SerafinFileFormat.getInstance(), true);
+ this.fileInCL = new FileChooserPanel(Messages.getString("gridprocess.clFileIn.txt"), TelemacCLFileFormat.getInstance());
+ this.fileOutGrid = new FileChooserPanel(Messages.getString("gridprocess.gridFileOut.txt"), SerafinFileFormat.getInstance(), true);
+ this.fileOutCL = new FileChooserPanel(Messages.getString("gridprocess.clFileOut.txt"), TelemacCLFileFormat.getInstance());
this.chooser = new ChooseProcessPanel();
+
+ this.fileInGrid.setHtmlToolTip("Le chemin du fichier de maillage source");
+ this.fileInCL.setHtmlToolTip("Le chemin du fichier de conditions limites source");
+ this.fileOutGrid.setHtmlToolTip("Le chemin du fichier de maillage r\xE9sultat");
+ this.fileOutCL.setHtmlToolTip("Le chemin du fichier de conditions limites r\xE9sultat");
}
private void createUI()
@@ -495,7 +571,7 @@
public String getTitre()
{
- return "Traitement du maillage";
+ return Messages.getString("gridprocess.title.txt");
}
public String isValid()
@@ -529,7 +605,7 @@
if (!CtuluLibDialog.confirmeOverwriteFiles(this.panel, name.toString()))
{
//TODO Voir si tjs utiliser CtuluLib.getS
- return CtuluLib.getS("Modifier les fichiers cibles");
+ return Messages.getString("gridprocess.modifyTargetFiles.msg");
}
}
}
@@ -604,7 +680,7 @@
nbTotalPts += newFrontiers.getNbPt(i);
}
- updater.majProgessionStateOnly("gridprocess.calculatecl.msg");
+ updater.majProgessionStateOnly(Messages.getString("gridprocess.calculatecl.msg"));
updater.setValue(10, nbTotalPts);
for (int i = 0; i < nbFrontier; i++)
Added: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/Messages.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/Messages.java (rev 0)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/Messages.java 2009-11-10 17:10:07 UTC (rev 5477)
@@ -0,0 +1,41 @@
+package org.fudaa.fudaa.meshviewer.gridprocess;
+
+import java.text.MessageFormat;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+public class Messages
+{
+ private static final String BUNDLE_NAME = "org.fudaa.fudaa.meshviewer.gridprocess.gridprocess"; //$NON-NLS-1$
+
+ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+ private Messages()
+ {
+ }
+
+ public static String getString(String key)
+ {
+ try
+ {
+ return RESOURCE_BUNDLE.getString(key);
+ }
+ catch (MissingResourceException e)
+ {
+ return '!' + key + '!';
+ }
+ }
+
+ public static String getString(String key,Object... args)
+ {
+ try
+ {
+ String string = RESOURCE_BUNDLE.getString(key);
+ return MessageFormat.format(string, args);
+ }
+ catch (MissingResourceException e)
+ {
+ return '!' + key + '!';
+ }
+ }
+}
Modified: trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess.properties
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess.properties 2009-11-10 17:08:51 UTC (rev 5476)
+++ trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess.properties 2009-11-10 17:10:07 UTC (rev 5477)
@@ -1,3 +1,21 @@
-gridprocess.result.msg=Le nouveau maillage contient {0} point(s) et {1} \xE9l\xE9ment(s)
-gridprocess.stop.msg=Op\xE9ration arr\xEAt\xE9e par l'utilisateur
-gridprocess.calculatecl.msg=Calcul des nouvelles conditions limites des points fronti\xE8res
+gridprocess.result1.msg=Le nouveau maillage contient :
+gridprocess.result2.msg={0} point(s)
+gridprocess.result3.msg={0} \u00E9l\u00E9ment(s)
+gridprocess.backDepRule.msg=D\u00E9pendance arri\u00E8re doit \u00EAtre un entier positif
+gridprocess.backDep.txt=D\u00E9pendance arri\u00E8re
+gridprocess.calculatecl.msg=Calcul des nouvelles conditions limites des points fronti\u00E8res
+gridprocess.clFileIn.txt=Fichier de condition en entr\u00E9e :
+gridprocess.clFileOut.txt=Fichier de condition en sortie :
+gridprocess.distMini.txt=Distance minimale
+gridprocess.distMinRule.msg=Distance minimale doit \u00EAtre un r\u00E9el positif
+gridprocess.execute.txt=Executer
+gridprocess.gridFileIn.txt=Fichier de maillage en entr\u00E9e :
+gridprocess.gridFileOut.txt=Fichier de maillage en sortie :
+gridprocess.modifyTargetFiles.msg=Modifier le(s) fichier(s) cible(s)
+gridprocess.overstressed.txt=Surcontraint
+gridprocess.process.txt=Process
+gridprocess.processRule.msg=Un process au moins doit \u00EAtre s\u00E9lectionn\u00E9
+gridprocess.refine.txt=Raffinage
+gridprocess.renum.txt=Renumeration
+gridprocess.stop.msg=Op\u00E9ration arr\u00EAt\u00E9e par l'utilisateur
+gridprocess.title.txt=Traitement du maillage
Added: trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_en.properties
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_en.properties (rev 0)
+++ trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_en.properties 2009-11-10 17:10:07 UTC (rev 5477)
@@ -0,0 +1,21 @@
+gridprocess.result1.msg=The new grid has :
+gridprocess.result2.msg={0} node(s)
+gridprocess.result3.msg={0} element(s)
+gridprocess.backDepRule.msg=Back dependancy must be a positive integer
+gridprocess.backDep.txt=Back dependancy
+gridprocess.calculatecl.msg=New frontier nodes boundary limits calculation
+gridprocess.clFileIn.txt=In boundary limits file :
+gridprocess.clFileOut.txt=Out boundary limits file :
+gridprocess.distMini.txt=Minimal distance
+gridprocess.distMinRule.msg=Minimal distance must be a positive real
+gridprocess.execute.txt=Execute
+gridprocess.gridFileIn.txt=In grid file :
+gridprocess.gridFileOut.txt=Out grid file :
+gridprocess.modifyTargetFiles.msg=Modify target file(s)
+gridprocess.overstressed.txt=Overstressed
+gridprocess.process.txt=Process
+gridprocess.processRule.msg=One or more process must be selected
+gridprocess.refine.txt=Refine
+gridprocess.renum.txt=Renumeration
+gridprocess.stop.msg=Operation stopped by the user
+gridprocess.title.txt=Grid management
Added: trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_fr.properties
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_fr.properties (rev 0)
+++ trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/gridprocess/gridprocess_fr.properties 2009-11-10 17:10:07 UTC (rev 5477)
@@ -0,0 +1,21 @@
+gridprocess.result1.msg=Le nouveau maillage contient :
+gridprocess.result2.msg={0} point(s)
+gridprocess.result3.msg={0} \u00E9l\u00E9ment(s)
+gridprocess.backDepRule.msg=D\u00E9pendance arri\u00E8re doit \u00EAtre un entier positif
+gridprocess.backDep.txt=D\u00E9pendance arri\u00E8re
+gridprocess.calculatecl.msg=Calcul des nouvelles conditions limites des points fronti\u00E8res
+gridprocess.clFileIn.txt=Fichier de condition en entr\u00E9e :
+gridprocess.clFileOut.txt=Fichier de condition en sortie :
+gridprocess.distMini.txt=Distance minimale
+gridprocess.distMinRule.msg=Distance minimale doit \u00EAtre un r\u00E9el positif
+gridprocess.execute.txt=Executer
+gridprocess.gridFileIn.txt=Fichier de maillage en entr\u00E9e :
+gridprocess.gridFileOut.txt=Fichier de maillage en sortie :
+gridprocess.modifyTargetFiles.msg=Modifier le(s) fichier(s) cible(s)
+gridprocess.overstressed.txt=Surcontraint
+gridprocess.process.txt=Process
+gridprocess.processRule.msg=Un process au moins doit \u00EAtre s\u00E9lectionn\u00E9
+gridprocess.refine.txt=Raffinage
+gridprocess.renum.txt=Renumeration
+gridprocess.stop.msg=Op\u00E9ration arr\u00EAt\u00E9e par l'utilisateur
+gridprocess.title.txt=Traitement du maillage
Modified: trunk/soft/fudaa-prepro/meshview/src/test/java/org/fudaa/fudaa/meshviewer/gridprocess/TestGridProcess.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/test/java/org/fudaa/fudaa/meshviewer/gridprocess/TestGridProcess.java 2009-11-10 17:08:51 UTC (rev 5476)
+++ trunk/soft/fudaa-prepro/meshview/src/test/java/org/fudaa/fudaa/meshviewer/gridprocess/TestGridProcess.java 2009-11-10 17:10:07 UTC (rev 5477)
@@ -1,5 +1,7 @@
package org.fudaa.fudaa.meshviewer.gridprocess;
+import java.util.Locale;
+
import javax.swing.JFrame;
import org.fudaa.ctulu.gui.CtuluUIDialog;
@@ -11,7 +13,10 @@
* @param args
*/
public static void main(String[] args) {
- JFrame frame = new JFrame();
+
+// Locale.setDefault(new Locale("fr", "ch"));
+
+ JFrame frame = new JFrame();
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
CtuluUIDialog dialog = new CtuluUIDialog(frame);
dialog.getMainProgression();
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrFileFormatManager.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrFileFormatManager.java 2009-11-10 17:08:51 UTC (rev 5476)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrFileFormatManager.java 2009-11-10 17:10:07 UTC (rev 5477)
@@ -17,10 +17,12 @@
import com.memoire.bu.BuMenu;
import org.fudaa.ctulu.fileformat.FileFormat;
+import org.fudaa.dodico.ef.io.adcirc.AdcircFileFormat;
import org.fudaa.dodico.ef.io.corelebth.CorEleBthFileFormat;
import org.fudaa.dodico.ef.io.dunes.DunesMAIFileFormat;
import org.fudaa.dodico.ef.io.serafin.SerafinFileFormat;
import org.fudaa.dodico.ef.io.serafin.SerafinVolumeFileFormat;
+import org.fudaa.dodico.ef.io.supertab.SuperTabFileFormat;
import org.fudaa.dodico.ef.io.trigrid.TrigridFileFormat;
import org.fudaa.dodico.reflux.io.INPFileFormat;
import org.fudaa.dodico.reflux.io.RefluxRefondeSolutionFileFormat;
@@ -106,6 +108,8 @@
r.add(TrigridFileFormat.getInstance());
r.add(CorEleBthFileFormat.getInstance());
r.add(SerafinFileFormat.getInstance());
+ r.add(AdcircFileFormat.getInstance());
+ r.add(SuperTabFileFormat.getInstance());
return getArray(r);
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacAppliManager.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacAppliManager.java 2009-11-10 17:08:51 UTC (rev 5476)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacAppliManager.java 2009-11-10 17:10:07 UTC (rev 5477)
@@ -11,6 +11,7 @@
import java.io.FileFilter;
import javax.swing.Icon;
+import javax.swing.JFrame;
import javax.swing.JPopupMenu;
import com.memoire.bu.BuMenu;
@@ -21,6 +22,7 @@
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.gui.CtuluDialogPanel;
+import org.fudaa.ctulu.gui.CtuluUIDialog;
import org.fudaa.dodico.ef.io.serafin.SerafinFileFilter;
import org.fudaa.dodico.ef.io.serafin.SerafinFileFormat;
import org.fudaa.dodico.fichiers.FileFormatSoftware;
@@ -30,7 +32,9 @@
import org.fudaa.fudaa.commun.FudaaUI;
import org.fudaa.fudaa.commun.calcul.FudaaCalculOp;
import org.fudaa.fudaa.commun.exec.FudaaExec;
+import org.fudaa.fudaa.commun.impl.FudaaPanelTask;
import org.fudaa.fudaa.fdico.FDicoCalculLocalBuilder;
+import org.fudaa.fudaa.meshviewer.gridprocess.GridProcessTaskModel;
import org.fudaa.fudaa.tr.common.TrApplicationManager;
import org.fudaa.fudaa.tr.common.TrExplorer;
import org.fudaa.fudaa.tr.common.TrLauncher;
@@ -75,6 +79,50 @@
}
+
+
+ private class FudaaExecGridManagment extends FudaaExec {
+
+ /**
+ * Constructeur par defaut.
+ */
+ public FudaaExecGridManagment() {
+ super("Traitement du maillage");
+ }
+
+ @Override
+ public void execInDir(final File _dir, final FudaaUI _ui, final Runnable _nexProcess) {}
+
+ @Override
+ public void execOnFile(final File _target, final FudaaUI _ui, final Runnable _nexProcess)
+ {
+ JFrame frame = new JFrame();
+ CtuluUIDialog dialog = new CtuluUIDialog(frame);
+ dialog.getMainProgression();
+
+ FudaaPanelTask task = new FudaaPanelTask(dialog, new GridProcessTaskModel());
+
+ task.afficheDialog();
+ }
+
+ @Override
+ public Icon getIcon() {
+ return BuResource.BU.getIcon("executer");
+ }
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
/*
* protected class FudaaExecCreateProjectRubens extends FudaaExec {
*
@@ -164,6 +212,12 @@
_m.add(execTelemac_);
postItem_ = _explorer.createFileAction(new FudaaExecPostView(launcher_));
_m.add(postItem_);
+
+ //TODO Ajouter menu pour traitement maillage.
+ BuMenuItem toto = _explorer.createFileAction(new FudaaExecGridManagment());
+ _m.add(toto);
+
+
super.buildCmdForMenuFile(_m, _explorer);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-11-12 11:29:34
|
Revision: 5480
http://fudaa.svn.sourceforge.net/fudaa/?rev=5480&view=rev
Author: chrisc83
Date: 2009-11-12 11:29:18 +0000 (Thu, 12 Nov 2009)
Log Message:
-----------
OPEN - issue PREPRO-53: Ajout d'un panel pour le traitement du maillage
http://www.fudaa.fr/jira/browse/PREPRO-53
Modified Paths:
--------------
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java
trunk/soft/fudaa-prepro/meshview/src/test/java/org/fudaa/fudaa/meshviewer/gridprocess/TestGridProcess.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacAppliManager.java
Modified: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java 2009-11-12 08:17:36 UTC (rev 5479)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java 2009-11-12 11:29:18 UTC (rev 5480)
@@ -1,18 +1,18 @@
package org.fudaa.fudaa.meshviewer.gridprocess;
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
import java.io.File;
+import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.border.TitledBorder;
import javax.swing.filechooser.FileFilter;
@@ -22,15 +22,14 @@
import org.fudaa.ctulu.CtuluIOOperationSynthese;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluLibString;
-import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.ProgressionUpdater;
import org.fudaa.ctulu.fileformat.FileFormat;
+import org.fudaa.ctulu.fileformat.FileFormatUnique;
import org.fudaa.ctulu.gui.CtuluFileChooserPanel;
import org.fudaa.ctulu.gui.CtuluLibDialog;
import org.fudaa.ctulu.gui.CtuluLibSwing;
import org.fudaa.ctulu.gui.CtuluOptionPane;
-import org.fudaa.ctulu.gui.CtuluUIDialog;
import org.fudaa.dodico.ef.EfDataAdapter;
import org.fudaa.dodico.ef.EfFrontierInterface;
import org.fudaa.dodico.ef.EfGridData;
@@ -57,8 +56,7 @@
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuButton;
import com.memoire.bu.BuCheckBox;
-import com.memoire.bu.BuContentFrame;
-import com.memoire.bu.BuDialog;
+import com.memoire.bu.BuComboBox;
import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuNumericValueValidator;
@@ -68,20 +66,27 @@
import com.memoire.bu.BuTextField;
import com.memoire.bu.BuVerticalLayout;
-public class GridProcessTaskModel implements FudaaPanelTaskModel
+public class GridProcessTaskModel implements FudaaPanelTaskModel, ItemListener
{
public final static Color OK_COLOR = getOkColor();
public final static Color ERROR_COLOR = Color.RED;
-
- private BuPanel panel;
- private FileChooserPanel fileInGrid;
- private FileChooserPanel fileInCL;
- private FileChooserPanel fileOutGrid;
- private FileChooserPanel fileOutCL;
- private ChooseProcessPanel chooser;
- private boolean stop;
- private CtuluActivity currentActivity;
+ public final static String COMBO_IN = "COMBO_IN";
+ public final static String COMBO_OUT = "COMBO_OUT";
+ private BuPanel panel;
+ private FileChooserPanel fileInGrid;
+ private FileChooserPanel fileInCL;
+ private FileChooserPanel fileOutGrid;
+ private FileChooserPanel fileOutCL;
+ private ChooseProcessPanel chooser;
+ private FileFormatUniquePanel formatInGrid;
+ private FileFormatUniquePanel formatOutGrid;
+ private boolean stop;
+ private CtuluActivity currentActivity;
+ private List<FileFormatUnique> formatsToWrite;
+ private List<FileFormatUnique> formatsToRead;
+ private File fileIn;
+
private static Color getOkColor()
{
Color okColor = CtuluLibSwing.getDefaultLabelForegroundColor();
@@ -93,6 +98,41 @@
return okColor;
}
+ private static BuPanel createSubpanel(JComponent component1, JComponent component2)
+ {
+ BuPanel panel = new BuPanel(new BuGridLayout(2, 5, 5));
+
+ panel.add(component1);
+ panel.add(component2);
+
+ return panel;
+ }
+
+ public GridProcessTaskModel(FileFormat[] fileFormats, File fileIn)
+ {
+ this.formatsToWrite = new ArrayList<FileFormatUnique>();
+ this.formatsToRead = new ArrayList<FileFormatUnique>();
+ this.fileIn = fileIn;
+
+ for (int i = 0; i < fileFormats.length; i++)
+ {
+ if (fileFormats[i] instanceof FileFormatUnique)
+ {
+ FileFormatUnique fileFormat = (FileFormatUnique)fileFormats[i];
+
+ if (fileFormat.createWriter() != null)
+ {
+ this.formatsToWrite.add(fileFormat);
+ }
+
+ if (fileFormat.createReader() != null)
+ {
+ this.formatsToRead.add(fileFormat);
+ }
+ }
+ }
+ }
+
@SuppressWarnings("serial")
private static class ProcessException extends Exception
{
@@ -108,6 +148,59 @@
}
@SuppressWarnings("serial")
+ private static class FileFormatUniquePanel extends BuPanel
+ {
+ private BuComboBox combo;
+ private BuLabel label;
+ private FileFormatUnique[] formats;
+
+ public FileFormatUniquePanel(String title, FileFormatUnique[] formats)
+ {
+ this.label = new BuLabel(title);
+ this.formats = formats;
+ this.combo = new BuComboBox();
+
+ for (int i = 0; i < this.formats.length; i++)
+ {
+ this.combo.addItem(this.formats[i].getName());
+ }
+
+ this.setLayout(new BuGridLayout(2, 5, 5));
+ this.add(this.label);
+ this.add(this.combo);
+ }
+
+ public void setHtmlToolTip(String message)
+ {
+ this.combo.setToolTipText("<HTML>" + message + "</HTML>");
+ }
+
+ public FileFormatUnique getSelectedFormat()
+ {
+ return this.formats[this.combo.getSelectedIndex()];
+ }
+
+ public void setItemListener(ItemListener listener, String command)
+ {
+ this.combo.addItemListener(listener);
+ this.combo.setActionCommand(command);
+ }
+
+ public void selectFormatForFile(File file)
+ {
+ for (int i = 0; i < this.formats.length; i++)
+ {
+ if (this.formats[i].isAccepted(file))
+ {
+ this.combo.setSelectedIndex(i);
+
+ break;
+ }
+ }
+ }
+ }
+
+ @SuppressWarnings("serial")
private static class FileChooserPanel extends BuPanel implements Validator
{
private CtuluFileChooserPanel filePanel;
@@ -131,14 +224,24 @@
this.fileLabel = new BuLabel(title);
this.filePanel = new CtuluFileChooserPanel();
- this.filePanel.setExt(format.getExtensions()[0]);
- this.filePanel.setFilter(new FileFilter[] { format.createFileFilter() });
-
- setLayout(new BuGridLayout(2, 5, 5));
+ this.setFormat(format);
+
+ this.setLayout(new BuGridLayout(2, 5, 5));
this.add(this.fileLabel);
this.add(this.filePanel);
}
+ public void setFile(File file)
+ {
+ this.filePanel.setFile(file);
+ }
+
+ public void setFormat(FileFormat format)
+ {
+ this.filePanel.setExt(format.getExtensions()[0]);
+ this.filePanel.setFilter(new FileFilter[] { format.createFileFilter() });
+ }
+
public String getErrorMessage()
{
String result = null;
@@ -224,11 +327,6 @@
this.backEliminationCheckBox.addActionListener(this);
}
- private void setHtmlToolTip(JComponent component, String message)
- {
- component.setToolTipText("<HTML>" + message + "</HTML>");
- }
-
public void actionPerformed(ActionEvent arg0)
{
String cmd = arg0.getActionCommand();
@@ -269,11 +367,11 @@
this.setLayout(new BuVerticalLayout(2, true, false));
- this.add(this.createPanelWithHelpButton(this.createSubpanel(this.cleanGridCheckBox, this.minDistanceValue), "Permet de nettoyer le maillage.<BR/>Les points non utilis\xE9s sont supprim\xE9s ainsi que ceux dont leur distance \xE0 un autre point est inf\xE9rieur \xE0 la <I>distance minimale</I>.<BR/>Les \xE9l\xE9ments d\xE9g\xE9n\xE9r\xE9s ou superpos\xE9s sont supprim\xE9s."));
+ this.add(this.createPanelWithHelpButton(createSubpanel(this.cleanGridCheckBox, this.minDistanceValue), "Permet de nettoyer le maillage.<BR/>Les points non utilis\xE9s sont supprim\xE9s ainsi que ceux dont leur distance \xE0 un autre point est inf\xE9rieur \xE0 la <I>distance minimale</I>.<BR/>Les \xE9l\xE9ments d\xE9g\xE9n\xE9r\xE9s ou superpos\xE9s sont supprim\xE9s."));
this.add(this.createPanelWithHelpButton(this.refineEdgeCheckBox, "Permet de divis\xE9 des \xE9l\xE9ments de type T3 et Q4 en 4.<BR/>Ce r\xE9sultat est obtenu en ajoutant un nouveau point au centre de chaque segment.<BR/>Pour tout les autres types d'\xE9l\xE9ment un nouveau point est ajout\xE9 au centre de chaque segment et de chaque \xE9l\xE9ment.<BR/>Leurs points se trouvant sur leur pourtour sont reli\xE9 au point ajout\xE9 en leur centre."));
this.add(this.createPanelWithHelpButton(this.overstressedCheckBox, "Permet de modifier les \xE9l\xE9ments surcontraints (dont tout leurs points se trouvent sur la fronti\xE8re).<BR/>Ce r\xE9sultat est obtenu en ajoutant un point en leur centre et en reliant tout leurs autres points \xE0 celui-ci.<BR/>Les segments dont leurs points se trouvent sur la fronti\xE8re sont \xE9chang\xE9s."));
this.add(this.createPanelWithHelpButton(this.renumerationCheckBox, "Permet de modifier la num\xE9rotation des points afin d'utiliser le nouveau type de stockage des matrices.<BR/>Ils seront num\xE9rot\xE9s de celui appartenant au moins d'\xE9l\xE9ments \xE0 celui apparentant au plus d'\xE9l\xE9ments."));
- this.add(this.createPanelWithHelpButton(this.createSubpanel(this.backEliminationCheckBox, this.vectorLengthValue), ""));
+ this.add(this.createPanelWithHelpButton(createSubpanel(this.backEliminationCheckBox, this.vectorLengthValue), "Permet de renum\xE9roter les \xE9l\xE9ments du maillage de mani\xE8re \xE0 \xE9liminer les d\xE9pendances arri\xE8res.<BR/>Attention : un nombre minimum d'environ 500 \xE9l\xE9ments est requis pour l'activation de cette option."));
}
private BuPanel createPanelWithHelpButton(JComponent component, String helpMsg)
@@ -290,16 +388,6 @@
return panel;
}
- private BuPanel createSubpanel(BuCheckBox checkbox, BuTextField value)
- {
- BuPanel panel = new BuPanel(new BuGridLayout(2, 5, 5));
-
- panel.add(checkbox);
- panel.add(value);
-
- return panel;
- }
-
public String getErrorMessage()
{
String message = null;
@@ -533,27 +621,42 @@
private void initComponent()
{
- this.panel = new BuPanel(new BuVerticalLayout(2, true, false));
- this.fileInGrid = new FileChooserPanel(Messages.getString("gridprocess.gridFileIn.txt"), SerafinFileFormat.getInstance(), true);
- this.fileInCL = new FileChooserPanel(Messages.getString("gridprocess.clFileIn.txt"), TelemacCLFileFormat.getInstance());
- this.fileOutGrid = new FileChooserPanel(Messages.getString("gridprocess.gridFileOut.txt"), SerafinFileFormat.getInstance(), true);
- this.fileOutCL = new FileChooserPanel(Messages.getString("gridprocess.clFileOut.txt"), TelemacCLFileFormat.getInstance());
- this.chooser = new ChooseProcessPanel();
-
+ this.panel = new BuPanel(new BuVerticalLayout(2, true, false));
+ this.formatInGrid = new FileFormatUniquePanel("Format du fichier de maillage en entr\xE9e :", this.formatsToRead.toArray(new FileFormatUnique[0]));
+ this.formatOutGrid = new FileFormatUniquePanel("Format du fichier de maillage en sortie :", this.formatsToWrite.toArray(new FileFormatUnique[0]));
+ this.fileInGrid = new FileChooserPanel(Messages.getString("gridprocess.gridFileIn.txt"), this.formatInGrid.getSelectedFormat(), true);
+ this.fileInCL = new FileChooserPanel(Messages.getString("gridprocess.clFileIn.txt"), TelemacCLFileFormat.getInstance());
+ this.fileOutGrid = new FileChooserPanel(Messages.getString("gridprocess.gridFileOut.txt"), this.formatOutGrid.getSelectedFormat(), true);
+ this.fileOutCL = new FileChooserPanel(Messages.getString("gridprocess.clFileOut.txt"), TelemacCLFileFormat.getInstance());
+ this.chooser = new ChooseProcessPanel();
+
this.fileInGrid.setHtmlToolTip("Le chemin du fichier de maillage source");
this.fileInCL.setHtmlToolTip("Le chemin du fichier de conditions limites source");
this.fileOutGrid.setHtmlToolTip("Le chemin du fichier de maillage r\xE9sultat");
this.fileOutCL.setHtmlToolTip("Le chemin du fichier de conditions limites r\xE9sultat");
+ this.formatInGrid.setHtmlToolTip("Le format du fichier de maillage en entr\xE9e");
+ this.formatOutGrid.setHtmlToolTip("Le format du fichier de maillage en sortie");
+
+ this.formatInGrid.setItemListener(this, COMBO_IN);
+ this.formatOutGrid.setItemListener(this, COMBO_OUT);
+
+ if (this.fileIn != null)
+ {
+ this.formatInGrid.selectFormatForFile(this.fileIn);
+ this.fileInGrid.setFile(this.fileIn);
+ }
}
private void createUI()
{
this.panel.add(this.fileInGrid);
+ this.panel.add(this.formatInGrid);
this.panel.add(this.fileInCL);
this.panel.add(this.chooser);
this.panel.add(this.fileOutGrid);
+ this.panel.add(this.formatOutGrid);
this.panel.add(this.fileOutCL);
}
@@ -830,4 +933,18 @@
return this.doOperation(prog, analyse, backElimination, gridData);
}
+
+ public void itemStateChanged(ItemEvent arg0)
+ {
+ String command = ((BuComboBox)arg0.getSource()).getActionCommand();
+
+ if (command.equals(COMBO_IN))
+ {
+ this.fileInGrid.setFormat(this.formatInGrid.getSelectedFormat());
+ }
+ else if (command.equals(COMBO_OUT))
+ {
+ this.fileOutGrid.setFormat(this.formatOutGrid.getSelectedFormat());
+ }
+ }
}
Modified: trunk/soft/fudaa-prepro/meshview/src/test/java/org/fudaa/fudaa/meshviewer/gridprocess/TestGridProcess.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/test/java/org/fudaa/fudaa/meshviewer/gridprocess/TestGridProcess.java 2009-11-12 08:17:36 UTC (rev 5479)
+++ trunk/soft/fudaa-prepro/meshview/src/test/java/org/fudaa/fudaa/meshviewer/gridprocess/TestGridProcess.java 2009-11-12 11:29:18 UTC (rev 5480)
@@ -1,9 +1,8 @@
package org.fudaa.fudaa.meshviewer.gridprocess;
-import java.util.Locale;
-
import javax.swing.JFrame;
+import org.fudaa.ctulu.fileformat.FileFormat;
import org.fudaa.ctulu.gui.CtuluUIDialog;
import org.fudaa.fudaa.commun.impl.FudaaPanelTask;
@@ -20,9 +19,9 @@
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
CtuluUIDialog dialog = new CtuluUIDialog(frame);
dialog.getMainProgression();
+
+ FudaaPanelTask task = new FudaaPanelTask(dialog, new GridProcessTaskModel(new FileFormat[0], null));
- FudaaPanelTask task = new FudaaPanelTask(dialog, new GridProcessTaskModel());
-
task.afficheDialog();
}
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacAppliManager.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacAppliManager.java 2009-11-12 08:17:36 UTC (rev 5479)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacAppliManager.java 2009-11-12 11:29:18 UTC (rev 5480)
@@ -103,7 +103,7 @@
CtuluUIDialog dialog = new CtuluUIDialog(frame);
dialog.getMainProgression();
- FudaaPanelTask task = new FudaaPanelTask(dialog, new GridProcessTaskModel());
+ FudaaPanelTask task = new FudaaPanelTask(dialog, new GridProcessTaskModel(TrFileFormatManager.getAllGridFormat(), _target));
task.afficheDialog();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2010-01-08 08:06:47
|
Revision: 5594
http://fudaa.svn.sourceforge.net/fudaa/?rev=5594&view=rev
Author: deniger
Date: 2010-01-08 08:06:37 +0000 (Fri, 08 Jan 2010)
Log Message:
-----------
Dossier pour le projet mailleur
Added Paths:
-----------
trunk/soft/fudaa-prepro/grid/
trunk/soft/fudaa-prepro/grid/pom.xml
Added: trunk/soft/fudaa-prepro/grid/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/grid/pom.xml (rev 0)
+++ trunk/soft/fudaa-prepro/grid/pom.xml 2010-01-08 08:06:37 UTC (rev 5594)
@@ -0,0 +1,76 @@
+<?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>
+ <name>Grid pre and post-processing</name>
+ <description>Prepare, launch and post-process a grid.</description>
+ <parent>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>fudaa-prepro</artifactId>
+ <version>0.95-SNAPSHOT</version>
+ </parent>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>grid</artifactId>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase> process-resources
+ </phase>
+ <configuration>
+ <tasks>
+ <replace dir="${project.build.outputDirectory}"
+ includes="**/*.fr_txt" token=" " value="_" />
+ <native2ascii src="${project.build.outputDirectory}"
+ dest="${project.build.outputDirectory}" includes="**/*.fr_txt"
+ ext=".txt" />
+ <delete>
+ <fileset dir="${project.build.outputDirectory}">
+ <include name="**/*.fr_txt" />
+ </fileset>
+ </delete>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ <version>1.5.3-1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5+</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-sig</groupId>
+ <artifactId>fudaa-sig</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.fudaa</groupId>
+ <artifactId>fudaa-common-courbe</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2010-01-09 00:55:14
|
Revision: 5608
http://fudaa.svn.sourceforge.net/fudaa/?rev=5608&view=rev
Author: deniger
Date: 2010-01-09 00:55:01 +0000 (Sat, 09 Jan 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/impl/MvInternalFrame.java
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvVisuPanel.java
trunk/soft/fudaa-prepro/pom.xml
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/data/TrSiProfilLayer.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/data/TrSiProfilModel.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvProfileGridPalette.java
trunk/soft/fudaa-prepro/ui/src/test/java/org/fudaa/fudaa/tr/TestJSave.java
Added Paths:
-----------
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/common/
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/AltimetryLayersBuilder.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/ContextGeometricLayersImpl.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/ContextGeometryModule.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/EnumLayerDataType.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GeometricLayerBuilder.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisuPanelController.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisulPanel.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/LayerHelper.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/RepereContainerImpl.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/model/
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/model/AttributeConstants.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/model/ContextGeometricLayers.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/model/GeometricDefaultIndexer.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/model/GeometricLigneBriseeModel.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/model/GeometricLineFromPointUpdater.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/model/GeometricLineModelIndexer.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/model/GeometricPointFromLineUpdater.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/model/GeometricPointModel.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/model/GeometricPointModelIndexer.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/model/LineFindResult.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/model/NodeFindResult.java
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/model/RepereContainer.java
trunk/soft/fudaa-prepro/grid/src/main/resources/org/fudaa/fudaa/fgrid/
trunk/soft/fudaa-prepro/grid/src/main/resources/org/fudaa/fudaa/fgrid/layer/
trunk/soft/fudaa-prepro/grid/src/main/resources/org/fudaa/fudaa/fgrid/layer/package.html
trunk/soft/fudaa-prepro/grid/src/site/vue-ensemble-calque.xmind
trunk/soft/fudaa-prepro/grid/src/test/java/org/fudaa/fudaa/fgrid/
trunk/soft/fudaa-prepro/grid/src/test/java/org/fudaa/fudaa/fgrid/layer/
trunk/soft/fudaa-prepro/grid/src/test/java/org/fudaa/fudaa/fgrid/layer/ExampleGridVisuPanel.java
trunk/soft/fudaa-prepro/src/config/
trunk/soft/fudaa-prepro/src/config/eclipse/
trunk/soft/fudaa-prepro/src/config/eclipse/org.eclipse.core.resources.prefs
Added: trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/AltimetryLayersBuilder.java
===================================================================
--- trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/AltimetryLayersBuilder.java (rev 0)
+++ trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/AltimetryLayersBuilder.java 2010-01-09 00:55:01 UTC (rev 5608)
@@ -0,0 +1,56 @@
+package org.fudaa.fudaa.fgrid.layer;
+
+import org.fudaa.ctulu.gis.GISAttribute;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
+import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
+import org.fudaa.ebli.calque.ZCalqueLigneBrisee;
+import org.fudaa.fudaa.sig.layer.FSigLayerGroup;
+import org.fudaa.fudaa.sig.layer.FSigLayerPointEditable;
+
+/**
+ * Builder for altimetry layers.
+ *
+ * @author deniger
+ */
+public class AltimetryLayersBuilder {
+
+ protected static FSigLayerGroup buildGroup(final GridVisulPanel visuPanel) {
+ final FSigLayerGroup grAltimetry = new FSigLayerGroup(visuPanel, AltimetryLayersBuilder.buildAttributes());
+ grAltimetry.setTitle("Donn\xE9es altim\xE9triques");
+ grAltimetry.setName("grAlti");
+ return grAltimetry;
+ }
+
+ /**
+ * @param parent the parent group layer to complete with default layer
+ */
+ protected static void buildDefault(final FSigLayerGroup parent) {
+ addLevelLayerLine(parent);
+ addPointsLayer(parent);
+ addProfileLayerLine(parent);
+
+ }
+
+ private static ZCalqueLigneBrisee addLevelLayerLine(final FSigLayerGroup parent) {
+ final GISZoneCollectionLigneBrisee ligne = GeometricLayerBuilder.createZoneCollectionLigne(parent.getAttributes(),
+ parent.getGisEditor());
+ return parent.addLigneBriseeLayerAct("Lignes de niveau", ligne);
+ }
+
+ private static ZCalqueLigneBrisee addProfileLayerLine(final FSigLayerGroup parent) {
+ final GISZoneCollectionLigneBrisee ligne = GeometricLayerBuilder.createZoneCollectionLigne(parent.getAttributes(),
+ parent.getGisEditor());
+ return parent.addLigneBriseeLayerAct("Profils", ligne);
+ }
+
+ private static FSigLayerPointEditable addPointsLayer(final FSigLayerGroup parent) {
+ final GISZoneCollectionPoint pointModele = GeometricLayerBuilder.createZoneCollectionPoint(parent.getAttributes(),
+ parent.getGisEditor());
+ return (FSigLayerPointEditable) parent.addPointLayerAct("Semis de points", pointModele);
+ }
+
+ static GISAttribute[] buildAttributes() {
+ return new GISAttribute[] { GISAttributeConstants.BATHY };
+ }
+}
Added: trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/ContextGeometricLayersImpl.java
===================================================================
--- trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/ContextGeometricLayersImpl.java (rev 0)
+++ trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/ContextGeometricLayersImpl.java 2010-01-09 00:55:01 UTC (rev 5608)
@@ -0,0 +1,223 @@
+package org.fudaa.fudaa.fgrid.layer;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
+import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.gis.GISAttributeModelLongInterface;
+import org.fudaa.ctulu.gis.GISZoneCollection;
+import org.fudaa.ebli.calque.edition.ZCalqueLigneBriseeEditable;
+import org.fudaa.fudaa.fgrid.model.AttributeConstants;
+import org.fudaa.fudaa.fgrid.model.ContextGeometricLayers;
+import org.fudaa.fudaa.fgrid.model.GeometricLigneBriseeModel;
+import org.fudaa.fudaa.fgrid.model.GeometricLineModelIndexer;
+import org.fudaa.fudaa.fgrid.model.GeometricPointModel;
+import org.fudaa.fudaa.fgrid.model.GeometricPointModelIndexer;
+import org.fudaa.fudaa.fgrid.model.LineFindResult;
+import org.fudaa.fudaa.fgrid.model.NodeFindResult;
+import org.fudaa.fudaa.fgrid.model.RepereContainer;
+import org.fudaa.fudaa.sig.layer.FSigLayerLineEditable;
+import org.fudaa.fudaa.sig.layer.FSigLayerPointEditable;
+
+/**
+ * Context for geometric layers. <br>
+ * Permet de retrouver facilement les calques geometriques et de faire des recherches sur les ID des points, lignes et
+ * surfaces. Ce sont les indexer {@linkplain GeometricLineModelIndexer} et {@linkplain GeometricPointModelIndexer} qui
+ * permettent de recuperer facilement les ID des points/lignes.
+ *
+ * @author deniger
+ */
+public class ContextGeometricLayersImpl implements ContextGeometricLayers {
+
+ /**
+ * @param nodeId l'identifiant du noeud a chercher
+ * @param pt le calque a parcourir
+ * @return toujours non null
+ */
+ public static NodeFindResult findNode(long nodeId, FSigLayerPointEditable pt) {
+ NodeFindResult res = NodeFindResult.EMPTY;
+ GISZoneCollection geomData = pt.getModelEditable().getGeomData();
+ int indiceOf = geomData.getIndiceOf(AttributeConstants.ID);
+ GISAttributeModelLongInterface dataModel = (GISAttributeModelLongInterface) geomData.getDataModel(indiceOf);
+ for (int i = dataModel.getSize() - 1; i >= 0; i--) {
+ if (dataModel.getValue(i) == nodeId) {
+ res = new NodeFindResult();
+ res.idx = i;
+ res.layer = pt;
+ return res;
+ }
+ }
+ return res;
+
+ }
+
+ public static boolean isDefinedID(Long id) {
+ return id != null && id.longValue() >= 0;
+ }
+
+ public static boolean isNotDefinedID(Long id) {
+ return !isDefinedID(id);
+ }
+
+ long currentFreeNodeId;
+ long currentFreeLineId;
+
+ long currentFreeSurfaceId;
+
+ final CtuluUI ui;
+
+ Collection<FSigLayerPointEditable> layerPoints = new HashSet<FSigLayerPointEditable>();
+
+ Collection<ZCalqueLigneBriseeEditable> layerLines = new HashSet<ZCalqueLigneBriseeEditable>();
+
+ /**
+ * The support layer in which the node will be created if needed.
+ */
+ FSigLayerPointEditable nodeLayerSupport;
+
+ private final RepereContainer repere;
+
+ /**
+ * @param ui
+ */
+ public ContextGeometricLayersImpl(CtuluUI ui, RepereContainer repere) {
+ super();
+ this.ui = ui;
+ this.repere = repere;
+ }
+
+ /**
+ * @return the next id for a new line
+ */
+ public long createLineId() {
+ return currentFreeLineId++;
+ }
+
+ /**
+ * @return the next id for a new node
+ */
+ public long createNodeId() {
+ return currentFreeNodeId++;
+ }
+
+ /**
+ * @return the next id for a new surface
+ */
+ protected long createSurfaceId() {
+ return currentFreeSurfaceId++;
+ }
+
+ /**
+ * @param dataType
+ * @return the first (created) line layer of type dataType
+ */
+ public ZCalqueLigneBriseeEditable findFirstLineLayerOfType(EnumLayerDataType dataType) {
+ return LayerHelper.findLayerOfType(layerLines, dataType);
+ }
+
+ /**
+ * @param dataType
+ * @return the first (created) point layer of type dataType
+ */
+ public FSigLayerPointEditable findFirstPointLayerOfType(EnumLayerDataType dataType) {
+ return LayerHelper.findLayerOfType(layerPoints, dataType);
+ }
+
+ /**
+ * @param nodeId l'identifiant du noeud
+ * @return toujours non null.
+ */
+ public NodeFindResult findNode(long nodeId) {
+ for (FSigLayerPointEditable layerPt : layerPoints) {
+ NodeFindResult res = findNode(nodeId, layerPt);
+ if (res.isNotEmpty()) return res;
+
+ }
+ return NodeFindResult.EMPTY;
+ }
+
+ /**
+ * @return the layerLines
+ */
+ public Collection<ZCalqueLigneBriseeEditable> getLayerLines() {
+ return layerLines;
+ }
+
+ /**
+ * @return the layerPoints
+ */
+ public Collection<FSigLayerPointEditable> getLayerPoints() {
+ return layerPoints;
+ }
+
+ public Collection<LineFindResult> getLineUsingPoint(long pointID) {
+ List<LineFindResult> res = new ArrayList<LineFindResult>();
+ for (ZCalqueLigneBriseeEditable layer : layerLines) {
+ GeometricLigneBriseeModel model = (GeometricLigneBriseeModel) layer.getModele();
+ model.getIndexer().collectLineUsingPointId(pointID, res, (FSigLayerLineEditable) layer);
+ }
+ return res;
+ }
+
+ public NodeFindResult locateNode(long pointId) {
+ for (FSigLayerPointEditable layer : layerPoints) {
+ NodeFindResult findPoint = ((GeometricPointModel)layer.getModelEditable()).getIndexer().findPoint(pointId);
+ if(findPoint.idx>=0) {
+ findPoint.layer=layer;
+ return findPoint;
+ }
+ }
+
+ return NodeFindResult.EMPTY;
+ }
+
+ /**
+ * @return the nodeLayerSupport
+ */
+ public FSigLayerPointEditable getNodeLayerSupport() {
+ return nodeLayerSupport;
+ }
+
+ public RepereContainer getRepere() {
+ return repere;
+ }
+
+ public GeometricPointModel getSupportModelPoint() {
+ return (GeometricPointModel) getNodeLayerSupport().getModelEditable();
+ }
+
+ /**
+ * @return the ui
+ */
+ public CtuluUI getUi() {
+ return ui;
+ }
+
+ public boolean isNodeUsedByALine(long pointID) {
+ for (ZCalqueLigneBriseeEditable layer : layerLines) {
+ GeometricLigneBriseeModel model = (GeometricLigneBriseeModel) layer.getModele();
+ if (model.getIndexer().isNodeUsedByALine(pointID)) return true;
+ }
+ return false;
+
+ }
+
+ /**
+ * @param layerPt layer to register in the geometric context.
+ */
+ protected void register(FSigLayerPointEditable layerPt) {
+ this.register(layerPt, false);
+ }
+
+ protected void register(FSigLayerPointEditable layerPt, boolean isSupportLayer) {
+ layerPoints.add(layerPt);
+ if (isSupportLayer) nodeLayerSupport = layerPt;
+ }
+
+ protected void register(ZCalqueLigneBriseeEditable layerLine) {
+ layerLines.add(layerLine);
+ }
+
+}
Added: trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/ContextGeometryModule.java
===================================================================
--- trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/ContextGeometryModule.java (rev 0)
+++ trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/ContextGeometryModule.java 2010-01-09 00:55:01 UTC (rev 5608)
@@ -0,0 +1,79 @@
+package org.fudaa.fudaa.fgrid.layer;
+
+import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ebli.calque.BGroupeCalque;
+import org.fudaa.fudaa.fgrid.model.RepereContainer;
+import org.fudaa.fudaa.sig.layer.FSigLayerGroup;
+import org.fudaa.fudaa.sig.layer.FSigVisuPanelController;
+
+/**
+ * GeometryModule Contexte. Contexte du module geometrique. Permet de recuperer les groupe altimetrie et geometrie.
+ * Permet egalement de r\xE9cup\xE9rer le contexte geometrique: ce dernier facilite les recherches dans les indices.
+ *
+ * @author deniger
+ */
+public class ContextGeometryModule {
+
+ private FSigLayerGroup grAltimetry;
+ private FSigLayerGroup grGeometric;
+ private BGroupeCalque cqMain;
+ private GridVisuPanelController visuController;
+ private GridVisulPanel visuPanel;
+
+ private final ContextGeometricLayersImpl geometricContext;
+ private final RepereContainerImpl repere;
+
+ public RepereContainer getRepere() {
+ return repere;
+ }
+
+ /**
+ * @return the geometricContext
+ */
+ public ContextGeometricLayersImpl getGeometricContext() {
+ return geometricContext;
+ }
+
+ public ContextGeometryModule(CtuluUI ui) {
+ visuController = new GridVisuPanelController(ui);
+ // par la suite ce repere devra etre fourni pour le projet.
+ repere = new RepereContainerImpl();
+ geometricContext = new ContextGeometricLayersImpl(ui, repere);
+
+ cqMain = new BGroupeCalque();
+ cqMain.setName("grMain");
+ }
+
+ public FSigLayerGroup getGroupAltimetry() {
+ return grAltimetry;
+ }
+
+ public BGroupeCalque getMainGroup() {
+ return cqMain;
+ }
+
+ public FSigVisuPanelController getVisuController() {
+ return visuController;
+ }
+
+ /**
+ * A utiliser \xE0 l'initialisation de GridVisuPanel: ne doit etre appele qu'une fois.
+ *
+ * @param gridVisulPanel
+ */
+ void install(GridVisulPanel gridVisulPanel) {
+ assert visuPanel == null;
+ visuPanel = gridVisulPanel;
+ // we can select several objects in several layers.
+ visuPanel.getScene().setRestrictedToCalqueActif(false);
+ // install altimetry group
+ grAltimetry = AltimetryLayersBuilder.buildGroup(gridVisulPanel);
+ AltimetryLayersBuilder.buildDefault(grAltimetry);
+ gridVisulPanel.getDonneesCalque().add(grAltimetry);
+ // install geometric group
+ grGeometric = GeometricLayerBuilder.createGeomtricGroupLayer(gridVisulPanel);
+ gridVisulPanel.getDonneesCalque().add(grGeometric);
+ GeometricLayerBuilder.buildDefault(grGeometric, this);
+ }
+
+}
Added: trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/EnumLayerDataType.java
===================================================================
--- trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/EnumLayerDataType.java (rev 0)
+++ trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/EnumLayerDataType.java 2010-01-09 00:55:01 UTC (rev 5608)
@@ -0,0 +1,12 @@
+package org.fudaa.fudaa.fgrid.layer;
+
+/**
+ * Type des diff\xE9rents calques utilis\xE9es. A completer par la suite.
+ * @author deniger
+ *
+ */
+public enum EnumLayerDataType {
+
+ GEOMETRIC_POINT, GEOMETRIC_POINT_DUR, GEOMETRIC_LINE, GEOMETRIC_LINE_DUR
+
+}
Added: trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GeometricLayerBuilder.java
===================================================================
--- trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GeometricLayerBuilder.java (rev 0)
+++ trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GeometricLayerBuilder.java 2010-01-09 00:55:01 UTC (rev 5608)
@@ -0,0 +1,126 @@
+package org.fudaa.fudaa.fgrid.layer;
+
+import org.fudaa.ctulu.gis.GISAttribute;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISAttributeInterface;
+import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
+import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
+import org.fudaa.ctulu.gis.GISZoneListenerDispatcher;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
+import org.fudaa.ebli.calque.edition.ZCalqueLigneBriseeEditable;
+import org.fudaa.ebli.calque.edition.ZCalquePointEditable;
+import org.fudaa.ebli.commun.EbliActionInterface;
+import org.fudaa.fudaa.fgrid.model.AttributeConstants;
+import org.fudaa.fudaa.fgrid.model.GeometricLigneBriseeModel;
+import org.fudaa.fudaa.fgrid.model.GeometricPointModel;
+import org.fudaa.fudaa.sig.layer.FSigEditor;
+import org.fudaa.fudaa.sig.layer.FSigLayerGroup;
+import org.fudaa.fudaa.sig.layer.FSigLayerPointEditable;
+import org.fudaa.fudaa.sig.layer.FSigVisuPanel;
+
+/**
+ * Builder for geometric layer.
+ *
+ * @author deniger
+ */
+public class GeometricLayerBuilder {
+
+ private static String TYPE = "GRID_DATA_TYPE";
+
+ /**
+ * @param pn the parent visu panel
+ * @return created group layer for geometric data.
+ */
+ protected static FSigLayerGroup createGeomtricGroupLayer(FSigVisuPanel pn) {
+ FSigLayerGroup res = new FSigLayerGroup(pn);
+ res.setTitle("Donn\xE9es g\xE9ometriques");
+ res.setName("grGeometric");
+ res.setActions(new EbliActionInterface[] { pn.getGisEditor().getExportAction() });
+ return res;
+ }
+
+ /**
+ * Build default geometric layers.
+ *
+ * @param parent
+ * @param ctx
+ */
+ protected static void buildDefault(FSigLayerGroup parent, ContextGeometryModule ctx) {
+ GISAttribute[] createPointAttributes = createPointAttributes();
+ createNodeLayer(parent, ctx, createPointAttributes);
+ // TODO traduction of Dure
+ createNodeDurLayer(parent, ctx, createPointAttributes);
+ GISAttribute[] createLineAttributes = createLineAttributes();
+ createLineLayer(parent, ctx, createLineAttributes);
+ createLineDurLayer(parent, ctx, createLineAttributes);
+ // il reste a traiter les surfaces.
+ }
+
+ /**
+ * @param cq
+ * @return le type du calque et null si non trouv\xE9.
+ */
+ public static EnumLayerDataType getType(ZCalqueAffichageDonnees cq) {
+ return (EnumLayerDataType) cq.getClientProperty(TYPE);
+ }
+
+ private static void createLineDurLayer(FSigLayerGroup parent, ContextGeometryModule ctx,
+ GISAttribute[] createLineAttributes) {
+ ZCalqueLigneBriseeEditable ligneDurLayer = (ZCalqueLigneBriseeEditable) parent.addLigneBriseeLayerAct(
+ "Lignes dures", new GeometricLigneBriseeModel(ctx.getGeometricContext(), createZoneCollectionLigne(
+ createLineAttributes, parent.getGisEditor())), null);
+ ligneDurLayer.putClientProperty(TYPE, EnumLayerDataType.GEOMETRIC_LINE_DUR);
+ ctx.getGeometricContext().register(ligneDurLayer);
+ }
+
+ private static void createLineLayer(FSigLayerGroup parent, ContextGeometryModule ctx, GISAttribute[] createLineAttributes) {
+ ZCalqueLigneBriseeEditable ligneLayer = (ZCalqueLigneBriseeEditable) parent.addLigneBriseeLayerAct("Lignes",
+ new GeometricLigneBriseeModel(ctx.getGeometricContext(), createZoneCollectionLigne(createLineAttributes, parent
+ .getGisEditor())), null);
+ ligneLayer.putClientProperty(TYPE, EnumLayerDataType.GEOMETRIC_LINE);
+ ctx.getGeometricContext().register(ligneLayer);
+ }
+
+ private static void createNodeDurLayer(FSigLayerGroup parent, ContextGeometryModule ctx,
+ GISAttribute[] createPointAttributes) {
+ ZCalquePointEditable pointDurLayer = parent.addPointLayerAct("Points dur", new GeometricPointModel(
+ createZoneCollectionPoint(createPointAttributes, parent.getGisEditor()), ctx.getGeometricContext()), null);
+ pointDurLayer.putClientProperty(TYPE, EnumLayerDataType.GEOMETRIC_POINT_DUR);
+ ctx.getGeometricContext().register((FSigLayerPointEditable) pointDurLayer);
+ }
+
+ private static void createNodeLayer(FSigLayerGroup parent, ContextGeometryModule ctx,
+ GISAttribute[] createPointAttributes) {
+ ZCalquePointEditable pointLayer = parent.addPointLayerAct("Points", new GeometricPointModel(
+ createZoneCollectionPoint(createPointAttributes, parent.getGisEditor()), ctx.getGeometricContext()), null);
+ // calque support.
+ ctx.getGeometricContext().register((FSigLayerPointEditable) pointLayer, true);
+ pointLayer.putClientProperty(TYPE, EnumLayerDataType.GEOMETRIC_POINT);
+ }
+
+ protected static GISZoneCollectionPoint createZoneCollectionPoint(GISAttributeInterface[] createPointAttributes,
+ FSigEditor editor) {
+ GISZoneListenerDispatcher l = new GISZoneListenerDispatcher();
+ l.addListener(editor);
+ GISZoneCollectionPoint pt = new GISZoneCollectionPoint(l);
+ pt.setAttributes(createPointAttributes, null);
+ return pt;
+ }
+
+ protected static GISZoneCollectionLigneBrisee createZoneCollectionLigne(
+ GISAttributeInterface[] createPointAttributes, FSigEditor editor) {
+ GISZoneListenerDispatcher l = new GISZoneListenerDispatcher();
+ l.addListener(editor);
+ GISZoneCollectionLigneBrisee pt = new GISZoneCollectionLigneBrisee(l);
+ pt.setAttributes(createPointAttributes, null);
+ return pt;
+ }
+
+ private static GISAttribute[] createPointAttributes() {
+ return new GISAttribute[] { AttributeConstants.ID, GISAttributeConstants.BATHY, AttributeConstants.GRID_PRECISION };
+ }
+
+ private static GISAttribute[] createLineAttributes() {
+ return new GISAttribute[] { AttributeConstants.ID, AttributeConstants.NODE_ID, AttributeConstants.GRID_PRECISION };
+ }
+}
Added: trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisuPanelController.java
===================================================================
--- trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisuPanelController.java (rev 0)
+++ trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisuPanelController.java 2010-01-09 00:55:01 UTC (rev 5608)
@@ -0,0 +1,107 @@
+package org.fudaa.fudaa.fgrid.layer;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.Action;
+import javax.swing.JComponent;
+
+import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ebli.commun.EbliActionInterface;
+import org.fudaa.ebli.commun.EbliActionPaletteAbstract;
+import org.fudaa.fudaa.sig.layer.FSigVisuPanelController;
+
+public class GridVisuPanelController extends FSigVisuPanelController {
+
+ Collection<String> useAsTab = Arrays.asList("INFOS", "PALETTE_EDTION", "NAVIGATE");
+ /**
+ * Contient chaque palette enlevee sous la forme l'actionCommand-> l'action
+ */
+ Map<String, EbliActionPaletteAbstract> mapTabPalettes_ = new HashMap<String, EbliActionPaletteAbstract>(2);
+
+ /**
+ * Les palettes utisees dans des composants normaux.
+ */
+ Collection<EbliActionPaletteAbstract> tabPalettes_ = null;
+
+ /**
+ * @param ui
+ */
+ public GridVisuPanelController(CtuluUI ui) {
+ super(ui);
+ }
+
+ @Override
+ protected EbliActionInterface[] getApplicationActions() {
+ return removePalettes(pn_.getApplicationActions());
+ }
+
+ @Override
+ protected void buildButtonGroupNavigation() {
+ if (navigationActionGroup_ != null) { return; }
+ super.buildButtonGroupNavigation();
+ final EbliActionInterface[] actions = navigationActionGroup_;
+ navigationActionGroup_ = removePalettes(actions);
+ }
+
+ @Override
+ protected void buildButtonGroupStandard() {
+ if (standardActionGroup_ != null) return;
+ super.buildButtonGroupStandard();
+ standardActionGroup_ = removePalettes(standardActionGroup_);
+ }
+
+ protected void buildButtonGroupSpecifiques() {
+ if (standardActionGroup_ != null) return;
+ super.buildButtonGroupStandard();
+ standardActionGroup_ = removePalettes(standardActionGroup_);
+
+ }
+
+ /**
+ * recupere les palettes et initialise les actions
+ */
+ @Override
+ public Collection<EbliActionPaletteAbstract> getTabPaletteAction() {
+ // si deja fait on retourne de suite
+ if (tabPalettes_ != null) return tabPalettes_;
+ initSpecificActions();
+ tabPalettes_ = new ArrayList<EbliActionPaletteAbstract>(3);
+ for (final String str : useAsTab) {
+ final EbliActionPaletteAbstract o = mapTabPalettes_.get(str);
+ if (o != null) tabPalettes_.add(o);
+ }
+ return tabPalettes_;
+ }
+
+ /**
+ * @param actions les actions a trier
+ * @return la listes des actions a ajouter dans les menus et autres. Les autres ( les palettes) seront visible tout le
+ * temps dans des dock.
+ */
+ private EbliActionInterface[] removePalettes(final EbliActionInterface[] actions) {
+
+ final List<EbliActionInterface> acts = new ArrayList<EbliActionInterface>(actions.length);
+
+ for (int i = 0; i < actions.length; i++) {
+ final EbliActionInterface action = actions[i];
+ if (action == null) continue;
+ final String value = (String) action.getValue(Action.ACTION_COMMAND_KEY);
+ final boolean isPalette = action instanceof EbliActionPaletteAbstract;
+ if (isPalette && useAsTab.contains(value)) {
+ mapTabPalettes_.put(value, (EbliActionPaletteAbstract) action);
+ } else {
+ acts.add(action);
+ }
+ }
+ return acts.toArray(new EbliActionInterface[acts.size()]);
+ }
+
+ public JComponent getPaletteInfoModel() {
+ return mapTabPalettes_.get("PALETTE_EDTION").buildContentPane();
+ }
+}
Added: trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisulPanel.java
===================================================================
--- trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisulPanel.java (rev 0)
+++ trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisulPanel.java 2010-01-09 00:55:01 UTC (rev 5608)
@@ -0,0 +1,38 @@
+package org.fudaa.fudaa.fgrid.layer;
+
+import org.fudaa.fudaa.sig.layer.FSigLayerGroup;
+import org.fudaa.fudaa.sig.layer.FSigVisuPanel;
+
+/**
+ * Le visupanel contenant toutes les donn\xE9es. Le contexte {@link #getGeometryContext()} permet de recuperer le context
+ * et de naviguer entre les diff\xE9rents calques.
+ *
+ * @author deniger
+ */
+@SuppressWarnings("serial")
+public class GridVisulPanel extends FSigVisuPanel {
+
+ final ContextGeometryModule ctx;
+
+ /**
+ * @return the ctx used for the geometry module
+ */
+ public ContextGeometryModule getGeometryContext() {
+ return ctx;
+ }
+
+ /**
+ * @param ctx le context contenant le tout et utilis\xE9e pour construire les calques.
+ */
+ public GridVisulPanel(ContextGeometryModule ctx) {
+ super(ctx.getMainGroup(), ctx.getVisuController());
+ this.ctx = ctx;
+ ctx.install(this);
+ }
+
+ @Override
+ public FSigLayerGroup getGroupGIS() {
+ return ctx.getGroupAltimetry();
+ }
+
+}
Added: trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/LayerHelper.java
===================================================================
--- trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/LayerHelper.java (rev 0)
+++ trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/LayerHelper.java 2010-01-09 00:55:01 UTC (rev 5608)
@@ -0,0 +1,54 @@
+package org.fudaa.fudaa.fgrid.layer;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.Predicate;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
+
+public class LayerHelper {
+
+ public static class TypePredicate implements Predicate {
+
+ final EnumLayerDataType searchType;
+
+ /**
+ * @param searchType
+ */
+ public TypePredicate(EnumLayerDataType searchType) {
+ super();
+ this.searchType = searchType;
+ }
+
+ public boolean evaluate(Object object) {
+ return GeometricLayerBuilder.getType((ZCalqueAffichageDonnees) object) == searchType;
+ }
+ }
+
+ /**
+ * @param <T>
+ * @param collection
+ * @param dataToSearch
+ * @return the first layer found with the type <code>dataToSearch</code>
+ ...
[truncated message content] |
|
From: <chr...@us...> - 2010-03-11 17:15:30
|
Revision: 5708
http://fudaa.svn.sourceforge.net/fudaa/?rev=5708&view=rev
Author: chrisc83
Date: 2010-03-11 17:15:22 +0000 (Thu, 11 Mar 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportActSerafin.java
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportFactory.java
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportX3D.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportFactory.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportOperationOnClosedLineAbstract.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportPanelFilterFactory.java
Modified: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportActSerafin.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportActSerafin.java 2010-03-11 13:40:35 UTC (rev 5707)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportActSerafin.java 2010-03-11 17:15:22 UTC (rev 5708)
@@ -73,14 +73,14 @@
final MvExportTaskSkeletonWithCondLim skeleton = new MvExportTaskSkeletonWithCondLim(_fact.getDatas(),
_fact.vects_, ser);
MvExportFactory.addSingleFileChooser(skeleton, fmt, _initFile);
-
+
// -- conditions limites --//
MvExportFactory.addSingleFileCondLimitesChooser(skeleton, TelemacCLFileFormat.getInstance(), null);
final MvExportTaskSkeleton.ExportPanelVarTime selection = _fact.buildVarChooser();
ser.volumique_ = isVolumique;
skeleton.setPnVar(selection);
- skeleton.setPnFilter(_fact.buildFilter(ui, _selection, selection.getTimeSelectionModel()));
+ skeleton.setPnFilter(_fact.buildFilter(ui, dd, _selection, selection.getTimeSelectionModel()));
VolumiqueCustomPanel volumiqueCustomPanel = new VolumiqueCustomPanel();
volumiqueCustomPanel.cb_.setSelected(isVolumique);
skeleton.setCustom(new MvExportTaskSkeleton.ExportPanelCustom[] { volumiqueCustomPanel });
Modified: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportFactory.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportFactory.java 2010-03-11 13:40:35 UTC (rev 5707)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportFactory.java 2010-03-11 17:15:22 UTC (rev 5708)
@@ -22,11 +22,6 @@
import javax.swing.ListSelectionModel;
import javax.swing.filechooser.FileFilter;
-import com.memoire.bu.BuBorders;
-import com.memoire.bu.BuFileFilter;
-import com.memoire.fu.FuComparator;
-import com.memoire.fu.FuLog;
-
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.CtuluUI;
@@ -36,6 +31,7 @@
import org.fudaa.ctulu.gui.CtuluLibSwing;
import org.fudaa.ctulu.interpolation.InterpolationVectorContainer;
import org.fudaa.dodico.ef.EfGridData;
+import org.fudaa.dodico.ef.EfGridInterface;
import org.fudaa.dodico.ef.FileFormatGridVersion;
import org.fudaa.dodico.ef.io.corelebth.CorEleBthFileFormat;
import org.fudaa.dodico.ef.io.dunes.DunesMAIFileFormat;
@@ -52,6 +48,11 @@
import org.fudaa.fudaa.sig.layer.FSigVisuPanel;
import org.geotools.data.FileDataStoreFactorySpi;
+import com.memoire.bu.BuBorders;
+import com.memoire.bu.BuFileFilter;
+import com.memoire.fu.FuComparator;
+import com.memoire.fu.FuLog;
+
/**
* @author Fred Deniger
* @version $Id: MvExportFactory.java,v 1.23 2007-06-05 09:01:12 deniger Exp $
@@ -130,13 +131,14 @@
int[] initIpobo_;
private final FSigVisuPanel panel;
final CtuluUI ui;
-
+ final EfGridInterface grid;
+
/**
* @param _vars
* @param _time
* @param _datas
*/
- public MvExportFactory(final CtuluUI ui,final ListModel _vars, final FudaaCourbeTimeListModel _time, final EfGridData _datas,
+ public MvExportFactory(final CtuluUI ui, final EfGridInterface grid,final ListModel _vars, final FudaaCourbeTimeListModel _time, final EfGridData _datas,
final InterpolationVectorContainer _vects, FSigVisuPanel panel) {
super();
this.panel = panel;
@@ -145,6 +147,7 @@
datas_ = _datas;
vects_ = _vects;
this.ui=ui;
+ this.grid = grid;
assert ui!=null;
}
@@ -152,7 +155,7 @@
return new MvExportTaskSkeleton.ExportPaneVarTimelSingleChooser(time_);
}
- protected MvExportPanelFilter buildFilter(CtuluUI ui, final MvSelectionNodeOrEltData _selection, final ListSelectionModel _time) {
+ protected MvExportPanelFilter buildFilter(CtuluUI ui, EfGridInterface grid, final MvSelectionNodeOrEltData _selection, final ListSelectionModel _time) {
final MvExportOperationItem[] item = new MvExportOperationItem[1];
// item[0] = new MvExportPanelFilterDefault.ExportFilterItemNone();
item[0] = new MvExportPanelFilterDefault.ExportFilterItemSelection(_selection);
@@ -237,7 +240,7 @@
final MvExportTaskSkeleton skeleton = new MvExportTaskSkeleton(datas_, vects_, new MvExportActDataStoreSrc(_store));
final MvExportTaskSkeleton.ExportPanelVarTimeChooser selection = buildVarChooser();
skeleton.setPnVar(selection);
- skeleton.setPnFilter(buildFilter(ui, _selection, selection.getTimeSelectionModel()));
+ skeleton.setPnFilter(buildFilter(ui, grid, _selection, selection.getTimeSelectionModel()));
skeleton.setPnFile(new MvExportTaskSkeleton.ExportPanelFileChooserMulti(titre, suffixe, _initFile, CtuluLibFile
.getCorrectExtension(_store.getFileExtensions()[0]), new FileFilter[] { new BuFileFilter(CtuluLibFile
.getCorrectExtension(_store.getFileExtensions())) }));
@@ -274,6 +277,11 @@
return ui;
}
+ public EfGridInterface getGrid()
+ {
+ return grid;
+ }
+
public void setInitIpobo(final int[] _initIpobo) {
initIpobo_ = _initIpobo;
}
@@ -292,7 +300,7 @@
_skeleton.setPnVar(selection);
listSelection = selection.getTimeSelectionModel();
}
- _skeleton.setPnFilter(buildFilter(ui, _selection, listSelection));
+ _skeleton.setPnFilter(buildFilter(ui, grid, _selection, listSelection));
}
}
Modified: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportX3D.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportX3D.java 2010-03-11 13:40:35 UTC (rev 5707)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/export/MvExportX3D.java 2010-03-11 17:15:22 UTC (rev 5708)
@@ -88,7 +88,7 @@
final MvExportTaskSkeleton.ExportPanelVarTime selection = MvExportActX3D.createChooser(_fact.getDatas(), _fact
.getTime());
skeleton.setPnVar(selection);
- skeleton.setPnFilter(_fact.buildFilter(_fact.getUi(), _selection, selection.getTimeSelectionModel()));
+ skeleton.setPnFilter(_fact.buildFilter(_fact.getUi(), dd, _selection, selection.getTimeSelectionModel()));
return skeleton;
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportFactory.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportFactory.java 2010-03-11 13:40:35 UTC (rev 5707)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportFactory.java 2010-03-11 17:15:22 UTC (rev 5708)
@@ -27,6 +27,7 @@
import org.fudaa.ctulu.gui.CtuluLibSwing;
import org.fudaa.ctulu.interpolation.InterpolationVectorContainer;
import org.fudaa.dodico.ef.EfGridData;
+import org.fudaa.dodico.ef.EfGridInterface;
import org.fudaa.dodico.ef.io.corelebth.CorEleBthFileFormat;
import org.fudaa.dodico.h2d.type.H2dVariableType;
import org.fudaa.dodico.reflux.io.RefluxRefondeSolutionFileFormat;
@@ -98,8 +99,8 @@
@Override
protected MvExportPanelFilter buildFilter(CtuluUI ui,
- final MvSelectionNodeOrEltData _selection, final ListSelectionModel _timeSelection) {
- return TrExportPanelFilterFactory.buildFilter(ui,_selection, _timeSelection, time_ != null
+ EfGridInterface grid, final MvSelectionNodeOrEltData _selection, final ListSelectionModel _timeSelection) {
+ return TrExportPanelFilterFactory.buildFilter(ui, grid,_selection, _timeSelection, time_ != null
&& datas_.isDefined(H2dVariableType.HAUTEUR_EAU), (TrVisuPanel) getPanel());
}
@@ -134,7 +135,7 @@
skeleton.setPnVar(selection);
listSelection = selection.getTimeSelectionModel();
}
- skeleton.setPnFilter(buildFilter(getUi(), _selection, listSelection));
+ skeleton.setPnFilter(buildFilter(getUi(), dd, _selection, listSelection));
skeleton.setCustom(new ExportPanelCustom[] { custom });
return skeleton;
}
@@ -176,7 +177,7 @@
skeleton.setPnVar(timeChooser);
}
- skeleton.setPnFilter(buildFilter(getUi(), _selection, listSelection));
+ skeleton.setPnFilter(buildFilter(getUi(), dd, _selection, listSelection));
skeleton.setCustom(new ExportPanelCustom[] { custom });
return skeleton;
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportOperationOnClosedLineAbstract.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportOperationOnClosedLineAbstract.java 2010-03-11 13:40:35 UTC (rev 5707)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportOperationOnClosedLineAbstract.java 2010-03-11 17:15:22 UTC (rev 5708)
@@ -38,18 +38,9 @@
protected MvLineChooser mvLineChooser;
EfGridInterface grid;
- public TrExportOperationOnClosedLineAbstract(CtuluUI ui,final String title, final TrVisuPanel panel) {
+ public TrExportOperationOnClosedLineAbstract(final String title, final TrVisuPanel panel) {
this.title = title;
this.panel = panel;
-
- if (panel == null)
- {
- this.ui = ui;
- }
- else
- {
- this.ui=panel.getCtuluUI();
- }
}
public TrExportOperationOnClosedLineAbstract(CtuluUI ui,EfGridInterface grid,final String title) {
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportPanelFilterFactory.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportPanelFilterFactory.java 2010-03-11 13:40:35 UTC (rev 5707)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/export/TrExportPanelFilterFactory.java 2010-03-11 17:15:22 UTC (rev 5708)
@@ -18,6 +18,7 @@
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.dodico.ef.EfGridData;
+import org.fudaa.dodico.ef.EfGridInterface;
import org.fudaa.fudaa.meshviewer.MvSelectionNodeOrEltData;
import org.fudaa.fudaa.meshviewer.export.MvExportOperationItem;
import org.fudaa.fudaa.meshviewer.export.MvExportPanelFilter;
@@ -33,7 +34,7 @@
public final class TrExportPanelFilterFactory {
private TrExportPanelFilterFactory() {}
- public static MvExportPanelFilter buildFilter(final CtuluUI ui,final MvSelectionNodeOrEltData _selection,
+ public static MvExportPanelFilter buildFilter(final CtuluUI ui, EfGridInterface grid, final MvSelectionNodeOrEltData _selection,
final ListSelectionModel _timeSelection, final boolean _hauteurFilter, TrVisuPanel visu) {
final List<MvExportOperationItem> item = new ArrayList<MvExportOperationItem>();
// item[0] = new MvExportPanelFilterDefault.ExportFilterItemNone();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2010-03-14 19:38:19
|
Revision: 5712
http://fudaa.svn.sourceforge.net/fudaa/?rev=5712&view=rev
Author: deniger
Date: 2010-03-14 19:38:12 +0000 (Sun, 14 Mar 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryEditor.java
Added Paths:
-----------
trunk/soft/fudaa-prepro/.settings/
trunk/soft/fudaa-prepro/.settings/org.eclipse.core.resources.prefs
Added: trunk/soft/fudaa-prepro/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/soft/fudaa-prepro/.settings/org.eclipse.core.resources.prefs (rev 0)
+++ trunk/soft/fudaa-prepro/.settings/org.eclipse.core.resources.prefs 2010-03-14 19:38:12 UTC (rev 5712)
@@ -0,0 +1,3 @@
+#Tue Jan 12 23:53:53 CET 2010
+eclipse.preferences.version=1
+encoding/<project>=ISO-8859-1
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryEditor.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryEditor.java 2010-03-11 20:56:03 UTC (rev 5711)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/telemac/TrTelemacBoundaryEditor.java 2010-03-14 19:38:12 UTC (rev 5712)
@@ -634,7 +634,7 @@
public final boolean isParamValid() {
for (int i = editor_.length - 1; i >= 0; i--) {
- if (!editor_[i].isDataValid()) { return false; }
+ if (!editor_[i].isDataValid()j) { return false; }
}
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2010-05-26 16:30:39
|
Revision: 5755
http://fudaa.svn.sourceforge.net/fudaa/?rev=5755&view=rev
Author: chrisc83
Date: 2010-05-26 16:30:32 +0000 (Wed, 26 May 2010)
Log Message:
-----------
Version de tests!!!
Modified Paths:
--------------
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvElementLayer.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java
Added Paths:
-----------
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvElementLayerOriginal.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefaultOriginal.java
Modified: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvElementLayer.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvElementLayer.java 2010-05-25 21:55:58 UTC (rev 5754)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvElementLayer.java 2010-05-26 16:30:32 UTC (rev 5755)
@@ -14,6 +14,9 @@
import java.awt.Graphics2D;
import java.util.Arrays;
+import javax.print.attribute.standard.JobMessageFromOperator;
+import javax.swing.JOptionPane;
+
import com.vividsolutions.jts.algorithm.SIRtreePointInRing;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Envelope;
@@ -132,6 +135,8 @@
@Override
public void paintDonnees(final Graphics2D _g, final GrMorphisme _versEcran, final GrMorphisme _versReel,
final GrBoite _clipReel) {
+ System.out.println("Start MvElementLayer.paintDonnees");
+
if ((modele_ == null) || (modele_.getNombre() <= 0)) { return; }
final GrBoite clip = _clipReel;
final GrMorphisme versEcran = _versEcran;
@@ -223,6 +228,7 @@
}
}
+ System.out.println("Stop MvElementLayer.paintDonnees");
}
public int[] getSelectedElementIdx() {
Added: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvElementLayerOriginal.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvElementLayerOriginal.java (rev 0)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvElementLayerOriginal.java 2010-05-26 16:30:32 UTC (rev 5755)
@@ -0,0 +1,370 @@
+/*
+ * @creation 13 nov. 2003
+ * @modification $Date: 2008-02-20 10:11:50 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.fudaa.meshviewer.layer;
+
+import gnu.trove.TIntHashSet;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.util.Arrays;
+
+import com.vividsolutions.jts.algorithm.SIRtreePointInRing;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.Envelope;
+import com.vividsolutions.jts.geom.LinearRing;
+
+import com.memoire.fu.Fu;
+import com.memoire.fu.FuLog;
+
+import org.fudaa.ctulu.CtuluListSelection;
+import org.fudaa.ctulu.CtuluListSelectionInterface;
+
+import org.fudaa.dodico.ef.EfElementVolume;
+import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.dodico.ef.EfGridVolumeInterface;
+import org.fudaa.dodico.ef.operation.EfIndexHelper;
+import org.fudaa.dodico.ef.operation.EfIndexVisitorHashSet;
+import org.fudaa.dodico.ef.operation.EfIndexVisitorNearestElt;
+import org.fudaa.dodico.ef.operation.EfIndexVisitorNearestNode;
+
+import org.fudaa.ebli.calque.ZCalquePolygone;
+import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.find.EbliFindActionInterface;
+import org.fudaa.ebli.find.EbliFindExpressionContainerInterface;
+import org.fudaa.ebli.geometrie.GrBoite;
+import org.fudaa.ebli.geometrie.GrMorphisme;
+import org.fudaa.ebli.geometrie.GrPoint;
+import org.fudaa.ebli.geometrie.GrPolygone;
+import org.fudaa.ebli.geometrie.VecteurGrPoint;
+import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.ebli.trace.TraceLigne;
+import org.fudaa.ebli.trace.TraceLigneModel;
+
+import org.fudaa.fudaa.meshviewer.MvLayerGrid;
+import org.fudaa.fudaa.meshviewer.model.MvElementModel;
+import org.fudaa.fudaa.meshviewer.model.MvExpressionSupplierElement;
+
+
+/**
+ * @author deniger
+ * @version $Id: MvElementLayer.java,v 1.31.6.1 2008-02-20 10:11:50 bmarchan Exp $
+ */
+public class MvElementLayerOriginal extends ZCalquePolygone implements MvLayerGrid {
+
+ public MvElementLayerOriginal() {
+ super();
+ iconModel_ = null;
+ }
+
+ public final static int[] getSelectedEdgeIdx(final EfGridVolumeInterface _grid,
+ final CtuluListSelectionInterface _select) {
+ if (_grid == null || _select == null) {
+ return null;
+ }
+ final TIntHashSet set = new TIntHashSet();
+ final int max = _select.getMaxIndex();
+ for (int i = _select.getMinIndex(); i <= max; i++) {
+ if (_select.isSelected(i)) {
+ final EfElementVolume elt = _grid.getEltVolume(i);
+ elt.fillWithAreteIdx(set);
+ }
+ }
+ final int[] res = set.toArray();
+ Arrays.sort(res);
+ return res;
+ }
+
+ public final static int[] getSelectedEdgeIdx(final EfGridVolumeInterface _grid, final int[] _select) {
+ if (_grid == null || _select == null) {
+ return null;
+ }
+ final TIntHashSet set = new TIntHashSet();
+ for (int i = _select.length - 1; i >= 0; i--) {
+ final EfElementVolume elt = _grid.getEltVolume(_select[i]);
+ elt.fillWithAreteIdx(set);
+ }
+ final int[] res = set.toArray();
+ Arrays.sort(res);
+ return res;
+ }
+
+ public int[] getSelectedEdgeIdx() {
+ if (((MvElementModel) modele_).getGrid() instanceof EfGridVolumeInterface) {
+ return getSelectedEdgeIdx((EfGridVolumeInterface) ((MvElementModel) modele_).getGrid(), getLayerSelection());
+ }
+ return null;
+ }
+
+ public boolean isSelectionEdgeEmpty() {
+ return isSelectionEmpty();
+ }
+
+ /**
+ * @param _modele
+ */
+ public MvElementLayerOriginal(final MvElementModel _modele) {
+ super(_modele);
+ }
+
+ @Override
+ public EbliFindActionInterface getFinder() {
+ return new MvFindActionNodeElt(this);
+ }
+
+ @Override
+ public EbliFindExpressionContainerInterface getExpressionContainer() {
+ final EbliFindExpressionContainerInterface i = ((MvElementModel) modele_).getExpressionContainer();
+ return i == null ? new MvExpressionSupplierElement((MvElementModel) modele_) : i;
+ }
+
+ /**
+ * Ne dessine que les donn\xE9es.
+ *
+ * @param _g le graphics cible
+ */
+ @Override
+ public void paintDonnees(final Graphics2D _g, final GrMorphisme _versEcran, final GrMorphisme _versReel,
+ final GrBoite _clipReel) {
+ if ((modele_ == null) || (modele_.getNombre() <= 0)) { return; }
+ final GrBoite clip = _clipReel;
+ final GrMorphisme versEcran = _versEcran;
+ final boolean rapide = isRapide();
+ // BPaletteCouleur paletteCouleur = getPaletteCouleur();
+ // BPaletteIcone paletteIcone = getPaletteIcone();
+ final int nombre = modele_.getNombre();
+ // pour ne pas modifier le model par defaut
+ final TraceIcon icone = iconModel_ == null ? null : new TraceIcon(new TraceIconModel(iconModel_));
+ final GrBoite bPoly = new GrBoite();
+ int incrementPt = 1;
+ final TraceLigne tl = new TraceLigne(new TraceLigneModel(ligneModel_));
+ if (isAttenue()) {
+ tl.setCouleur(attenueCouleur(tl.getCouleur()));
+ if (icone != null) {
+ icone.setCouleur(attenueCouleur(icone.getCouleur()));
+ }
+ }
+ if (EbliLib.isAlphaChanged(alpha_)) {
+ tl.setCouleur(EbliLib.getAlphaColor(tl.getCouleur(), alpha_));
+ if (icone != null) {
+ icone.setCouleur(EbliLib.getAlphaColor(icone.getCouleur(), alpha_));
+ }
+
+ }
+ GrPoint ptOri = null;
+ GrPoint ptDest = null;
+ final MvElementModel model = (MvElementModel) modele_;
+ final boolean containsFr = model.getFrNbFrontier() > 0;
+ for (int i = 0; i < nombre; i++) {
+ // si le polygone i est filtre on passe.
+ if (!modele_.polygone(poly_, i, false)) {
+ continue;
+ }
+ poly_.boite(bPoly);
+ // Si la boite du polygone n'est pas dans la boite d'affichage on passe
+ if (!bPoly.intersectXY(clip)) {
+ continue;
+ }
+ final int nbPoints = poly_.sommets_.nombre();
+ if (nbPoints <= 0) {
+ continue;
+ }
+ if (rapide && (nbPoints > 15)) {
+ incrementPt = 3;
+ } else {
+ incrementPt = 1;
+ }
+ poly_.autoApplique(versEcran);
+ updateTrace(icone == null ? null : icone.getModel(), tl.getModel(), i);
+ ptOri = poly_.sommets_.renvoie(0);
+ ptDest = null;
+ int idxFrom = model.getIndice(i, 0);
+ int idxTo = -1;
+ for (int j = poly_.nombre() - 1; j >= 0; j -= incrementPt) {
+ // le point de dest est initialise
+ idxTo = model.getIndice(i, j);
+ ptDest = poly_.sommets_.renvoie(j);
+ if (!containsFr || idxTo > idxFrom) {
+ if (icone != null) {
+ // icone.paintIconCentre(this, _g, ptDest.x, ptDest.y);
+ icone.paintIconCentre(this, _g, ptOri.x_, ptOri.y_);
+ }
+ tl.dessineTrait(_g, ptOri.x_, ptOri.y_, ptDest.x_, ptDest.y_);
+ }
+ ptOri = ptDest;
+ idxFrom = idxTo;
+ }
+ }
+ ptOri = new GrPoint();
+ ptDest = new GrPoint();
+ for (int i = model.getFrNbFrontier() - 1; i >= 0; i--) {
+ int idxFrom = model.getFrGlobalIdx(i, 0);
+ int idxTo = -1;
+ for (int j = model.getFrNbPointInFrontier(i) - 1; j >= 0; j--) {
+ idxTo = model.getFrGlobalIdx(i, j);
+ if (idxFrom > idxTo) {
+ model.point(idxFrom, ptOri);
+ model.point(idxTo, ptDest);
+ ptDest.autoApplique(versEcran);
+ ptOri.autoApplique(versEcran);
+ if (icone != null) {
+ // icone.paintIconCentre(this, _g, ptDest.x, ptDest.y);
+ icone.paintIconCentre(this, _g, ptOri.x_, ptOri.y_);
+ }
+ tl.dessineTrait(_g, ptOri.x_, ptOri.y_, ptDest.x_, ptDest.y_);
+ }
+ idxFrom = idxTo;
+ }
+
+ }
+ }
+
+ public int[] getSelectedElementIdx() {
+ return selection_ == null ? null : selection_.getSelectedIndex();
+ }
+
+ @Override
+ public int[] getSelectedObjectInTable() {
+ return getSelectedElementIdx();
+ }
+
+ protected EfGridInterface getGrid() {
+ return ((MvElementModel) modele_).getGrid();
+ }
+
+ @Override
+ public CtuluListSelection selection(final GrPoint _pt, final int _tolerance) {
+ return getGrid().getIndex() == null ? super.selection(_pt, _tolerance) : selectionFromIndex(_pt, _tolerance);
+ }
+
+ public CtuluListSelection selectionFromIndex(final LinearRing _poly, final int _mode) {
+ if (Fu.DEBUG && FuLog.isDebug()) {
+ FuLog.debug("FMV: layer select from index");
+ }
+ final EfIndexVisitorHashSet list = new EfIndexVisitorHashSet();
+ final Envelope envelopeInternal = _poly.getEnvelopeInternal();
+ getGrid().getIndex().query(envelopeInternal, list);
+ final SIRtreePointInRing tester = new SIRtreePointInRing(_poly);
+ final int[] nds = list.getResult();
+ final CtuluListSelection r = creeSelection();
+ final Coordinate c = new Coordinate();
+ final GrPolygone poly = new GrPolygone();
+ final GrBoite b = new GrBoite();
+ for (int i = nds.length - 1; i >= 0; i--) {
+ final int idx = nds[i];
+ modele().polygone(poly, idx, true);
+ poly.boite(b);
+ if (VecteurGrPoint.estSelectionneEnv(c, envelopeInternal, _poly, tester, poly.sommets_, _mode)) {
+ r.add(idx);
+ }
+ }
+
+ return r;
+ }
+
+ private CtuluListSelection selectionFromIndex(final GrPoint _pt, final int _tolerance) {
+ if (Fu.DEBUG && FuLog.isDebug()) {
+ FuLog.debug("FMV: layer select from index");
+ }
+ return EfIndexHelper.getNearestElement(getGrid(), _pt.x_, _pt.y_, GrMorphisme.convertDistanceXY(getVersReel(),
+ _tolerance), null);
+// final EfIndexVisitorNearestElt visitor = new EfIndexVisitorNearestElt(grid, _pt.x_, _pt.y_, toleranceReel);
+// grid.getIndex().query(EfIndexVisitorNearestNode.getEnvelope(_pt.x_, _pt.y_, toleranceReel), visitor);
+// return visitor.getSelection();
+ }
+
+ @Override
+ public CtuluListSelection selection(final LinearRing _polySelection, final int _mode) {
+ return getGrid().getIndex() == null ? super.selection(_polySelection, _mode) : selectionFromIndex(_polySelection,
+ _mode);
+ }
+
+ public int[] getSelectedPtIdx() {
+ if (!isSelectionEmpty()) {
+ final TIntHashSet res = new TIntHashSet();
+ final int max = selection_.getMaxIndex();
+ final MvElementModel m = (MvElementModel) modele_;
+ for (int i = selection_.getMinIndex(); i <= max; i++) {
+ if (selection_.isSelected(i)) {
+ m.fillWithPtIdx(i, res);
+ }
+ }
+ return res.toArray();
+ }
+ return null;
+ }
+
+ public GrBoite getDomaineOnSelected() {
+ if (isSelectionEmpty()) {
+ return null;
+ }
+ int m = selection_.getMaxIndex();
+ if (m > modele_.getNombre()) {
+ m = modele_.getNombre() - 1;
+ }
+ final GrBoite r = new GrBoite();
+ final GrBoite temp = new GrBoite();
+ final GrPolygone poly = new GrPolygone();
+ for (int i = selection_.getMinIndex(); i <= m; i++) {
+ if (selection_.isSelected(i)) {
+ modele_.polygone(poly, i, true);
+ poly.boite(temp);
+ r.ajuste(temp);
+ }
+ }
+// ajusteZoomOnSelected(r);
+ return r;
+ }
+
+ public boolean isConfigurable() {
+ return true;
+ }
+
+ public boolean isFontModifiable() {
+ return false;
+ }
+
+ @Override
+ public boolean isPaletteModifiable() {
+ return false;
+ }
+
+ public boolean isSelectionElementEmpty() {
+ return isSelectionEmpty();
+ }
+
+ public boolean isSelectionPointEmpty() {
+ return isSelectionEmpty();
+ }
+
+ @Override
+ public void paintIcon(final Component _c, final Graphics _g, final int _x, final int _y) {
+ super.paintIcon(_c, _g, _x, _y);
+ _g.setColor(getForeground());
+ final int w = getIconWidth();
+ final int h = getIconHeight();
+ int x1 = _x + 3;
+ int y1 = _y + h / 2;
+ final int x2 = _x + w / 2;
+ final int y2 = _y + 3;
+ final int x3 = _x + w / 4;
+ final int y3 = _y + h - 3;
+ final int x4 = x2;
+ final int y4 = _y + h / 2 + 4;
+ _g.drawLine(x1, y1, x2, y2);
+ _g.drawLine(x1, y1, x3, y3);
+ _g.drawLine(x1, y1, x4, y4);
+ _g.drawLine(x2, y2, x4, y4);
+ _g.drawLine(x3, y3, x4, y4);
+ x1 = _x + w - 3;
+ y1 = _y + h / 2 + 3;
+ _g.drawLine(x1, y1, x3, y3);
+ _g.drawLine(x1, y1, x4, y4);
+ }
+}
\ No newline at end of file
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java 2010-05-25 21:55:58 UTC (rev 5754)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java 2010-05-26 16:30:32 UTC (rev 5755)
@@ -15,6 +15,7 @@
import java.awt.RenderingHints;
import java.awt.event.ActionEvent;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -24,17 +25,12 @@
import javax.swing.DefaultListSelectionModel;
import javax.swing.JComponent;
import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
import javax.swing.ListModel;
import javax.swing.ListSelectionModel;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import com.memoire.bu.BuMenuItem;
-import com.memoire.bu.BuResource;
-import com.memoire.fu.FuLog;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.LinearRing;
-
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibArray;
@@ -46,7 +42,13 @@
import org.fudaa.dodico.ef.operation.EfIsoRestructuredGridActivity;
import org.fudaa.dodico.ef.operation.EfIsoRestructuredGridResult;
import org.fudaa.dodico.h2d.type.H2dVariableType;
-import org.fudaa.ebli.calque.*;
+import org.fudaa.ebli.calque.BCalque;
+import org.fudaa.ebli.calque.BCalquePersistenceInterface;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonneesConfigure;
+import org.fudaa.ebli.calque.ZCalquePolygone;
+import org.fudaa.ebli.calque.ZCalqueSondeInterface;
+import org.fudaa.ebli.calque.ZSelectionTrace;
import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.commun.EbliUIProperties;
import org.fudaa.ebli.controle.BConfigurableComposite;
@@ -72,6 +74,12 @@
import org.fudaa.fudaa.tr.persistence.TrPostIsoLayerPersistence;
import org.fudaa.fudaa.tr.post.data.TrPostDataListener;
+import com.memoire.bu.BuMenuItem;
+import com.memoire.bu.BuResource;
+import com.memoire.fu.FuLog;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.LinearRing;
+
/**
* Un calque de trace de cartes avec un nouvel algorithme de trace.
*
@@ -718,6 +726,8 @@
@Override
public void paintDonnees(final Graphics2D _g, final GrMorphisme _versEcran, final GrMorphisme _versReel,
final GrBoite _clipReel) {
+ System.out.println("Start TrIsoLayerDefault.paintDonnees");
+ long currentTime = System.currentTimeMillis();
if (namePalette_ == null) {
updateLegende();
}
@@ -791,6 +801,9 @@
}
}
paintSonde(_g, _versEcran);
+ currentTime = System.currentTimeMillis() - currentTime;
+ System.out.println("Stop TrIsoLayerDefault.paintDonnees");
+ System.out.println("Dur\xE9e : " + currentTime);
}
protected void updateEltAdapter() {
Added: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefaultOriginal.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefaultOriginal.java (rev 0)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefaultOriginal.java 2010-05-26 16:30:32 UTC (rev 5755)
@@ -0,0 +1,1005 @@
+/**
+ * @creation 1999-08-10
+ * @modification $Date: 2007-06-05 09:01:14 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.fudaa.tr.post;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Polygon;
+import java.awt.RenderingHints;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.swing.DefaultListSelectionModel;
+import javax.swing.JComponent;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.ListModel;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.CtuluLib;
+import org.fudaa.ctulu.CtuluLibArray;
+import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.CtuluListSelection;
+import org.fudaa.ctulu.CtuluRange;
+import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.dodico.ef.operation.EfIndexHelper;
+import org.fudaa.dodico.ef.operation.EfIsoRestructuredGridActivity;
+import org.fudaa.dodico.ef.operation.EfIsoRestructuredGridResult;
+import org.fudaa.dodico.h2d.type.H2dVariableType;
+import org.fudaa.ebli.calque.BCalque;
+import org.fudaa.ebli.calque.BCalquePersistenceInterface;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonneesConfigure;
+import org.fudaa.ebli.calque.ZCalquePolygone;
+import org.fudaa.ebli.calque.ZCalqueSondeInterface;
+import org.fudaa.ebli.calque.ZSelectionTrace;
+import org.fudaa.ebli.commun.EbliLib;
+import org.fudaa.ebli.commun.EbliUIProperties;
+import org.fudaa.ebli.controle.BConfigurableComposite;
+import org.fudaa.ebli.controle.BConfigurableInterface;
+import org.fudaa.ebli.controle.BSelecteurListTarget;
+import org.fudaa.ebli.find.EbliFindExpressionContainerInterface;
+import org.fudaa.ebli.geometrie.GrBoite;
+import org.fudaa.ebli.geometrie.GrMorphisme;
+import org.fudaa.ebli.geometrie.GrPoint;
+import org.fudaa.ebli.geometrie.GrPolygone;
+import org.fudaa.ebli.palette.BPalettePlage;
+import org.fudaa.ebli.palette.BPalettePlageInterface;
+import org.fudaa.ebli.palette.BPalettePlageProperties;
+import org.fudaa.ebli.palette.PaletteManager;
+import org.fudaa.ebli.palette.BPaletteInfo.InfoData;
+import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceIsoInterface;
+import org.fudaa.ebli.trace.TraceIsoLignesAvecPlages;
+import org.fudaa.ebli.trace.TraceIsoSurfacesAvecPlages;
+import org.fudaa.ebli.trace.TraceLigne;
+import org.fudaa.ebli.trace.TraceLigneModel;
+import org.fudaa.fudaa.meshviewer.layer.MvNodeLayer;
+import org.fudaa.fudaa.tr.persistence.TrPostIsoLayerPersistence;
+import org.fudaa.fudaa.tr.post.data.TrPostDataListener;
+
+import com.memoire.bu.BuMenuItem;
+import com.memoire.bu.BuResource;
+import com.memoire.fu.FuLog;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.LinearRing;
+
+/**
+ * Un calque de trace de cartes avec un nouvel algorithme de trace.
+ *
+ * @version $Id: TrIsoLayerDefault.java,v 1.48 2007-06-05 09:01:14 deniger Exp $
+ * @author Bertrand Marchand
+ */
+public class TrIsoLayerDefaultOriginal extends MvNodeLayer implements ListSelectionListener, BSelecteurListTarget,
+ ZCalqueSondeInterface, TrPostDataListener {
+
+ static int nameIdx;
+
+ public static TraceIcon getSondeIcone() {
+ final TraceIcon r = new TraceIcon(TraceIcon.RIEN, 6) {
+
+ @Override
+ public void paintIconCentre(final Component _c, final Graphics _g, final int _x, final int _y) {
+ if (_g == null) return;
+ Color old = null;
+ if (getCouleur() != null) {
+ old = _g.getColor();
+ _g.setColor(getCouleur());
+ }
+ final int taille = super.getTaille();
+ final int demiTaille = taille / 2;
+ _g.drawLine(_x - demiTaille, _y, _x - taille, _y + 1);
+ _g.drawLine(_x - demiTaille, _y, _x - taille, _y - 1);
+ _g.drawLine(_x + demiTaille, _y, _x + taille, _y + 1);
+ _g.drawLine(_x + demiTaille, _y, _x + taille, _y - 1);
+ _g.drawLine(_x, _y - demiTaille, _x + 1, _y - taille);
+ _g.drawLine(_x, _y - demiTaille, _x - 1, _y - taille);
+ _g.drawLine(_x, _y + demiTaille, _x + 1, _y + taille);
+ _g.drawLine(_x, _y + demiTaille, _x - 1, _y + taille);
+ _g.drawLine(_x, _y - taille, _x, _y + taille);
+ _g.drawLine(_x - taille, _y, _x + taille, _y);
+ if (super.getCouleur() != null) {
+ _g.setColor(old);
+ }
+ }
+ };
+ r.setCouleur(Color.BLACK);
+ return r;
+ }
+
+ public static boolean restorePalette(final EbliUIProperties _p, final Map _dest) {
+ final String[] names = (String[]) _p.get("post.paletteNames");
+ if (names != null && names.length > 0) {
+ final BPalettePlageProperties[] props = (BPalettePlageProperties[]) _p.get("post.paletteProps");
+ if (_dest.size() > 0) {
+ _dest.clear();
+ }
+ for (int i = 0; i < names.length; i++) {
+ if (props[i] != null && names[i] != null) {
+ _dest.put(names[i], new BPalettePlage(props[i]));
+ }
+ }
+ return true;
+ }
+ return false;
+ }
+
+ public static void restoreVar(final EbliUIProperties _p, final BSelecteurListTarget _target, final String _defaultId) {
+ if (_p == null || _target == null) { return; }
+ final int size = _target.getListModel().getSize();
+ if (size == 0) { return; }
+ String varId = _p.getString("post.varId");
+ if (varId == null) {
+ varId = _defaultId;
+ }
+ if (varId != null) {
+ int idx = TrIsoModelAbstract.getVarIdx(varId, _target.getListModel());
+
+ if (idx < 0 || idx >= size) {
+ idx = size - 1;
+ }
+ if (idx >= 0) {
+ _target.getListSelectionModel().setSelectionInterval(idx, idx);
+ }
+ }
+ }
+
+ public static EbliUIProperties savePalettes(final Map _nameBPalette, final EbliUIProperties _prop) {
+ if (_prop == null) { return null; }
+ if (_nameBPalette == null || _nameBPalette.size() == 0) { return _prop; }
+ final List paletteNames = new ArrayList(_nameBPalette.size());
+ final List palettes = new ArrayList(_nameBPalette.size());
+ for (final Iterator it = _nameBPalette.entrySet().iterator(); it.hasNext();) {
+ final Map.Entry e = (Map.Entry) it.next();
+ final String key = (String) e.getKey();
+ if (!CtuluLibString.isEmpty(key)) {
+
+ paletteNames.add(key);
+ palettes.add(((BPalettePlage) e.getValue()).save());
+ }
+ }
+ _prop.put("post.paletteNames", paletteNames.toArray(new String[paletteNames.size()]));
+ _prop.put("post.paletteProps", palettes.toArray(new BPalettePlageProperties[palettes.size()]));
+ return _prop;
+ }
+
+ public static EbliUIProperties saveVar(final EbliUIProperties _prop, final BSelecteurListTarget _list) {
+ if (_prop == null) { return null; }
+ if (_list == null || _list.getListSelectionModel().isSelectionEmpty()) { return _prop; }
+ final Object oi = _list.getListModel().getElementAt(_list.getListSelectionModel().getMaxSelectionIndex());
+
+ H2dVariableType variableSelected = null;
+ if (oi instanceof H2dVariableType) {
+ variableSelected = (H2dVariableType) oi;
+ } else if (oi instanceof TrPostFlecheContent) {
+ variableSelected = ((TrPostFlecheContent) oi).getVar();
+ }
+ if (variableSelected != null) {
+ final String varName = variableSelected.getID();
+ if (varName != null) {
+ _prop.put("post.varId", varName);
+ }
+ }
+ return _prop;
+ }
+
+ public static int selectionElement(final GrPoint _pt, final int _tolerance, final GrMorphisme _versReel,
+ final TrPostModelInterface _model, final GrBoite _clipReel) {
+ GrBoite bClip = _model.getDomaine();
+ final double distanceReel = GrMorphisme.convertDistanceXY(_versReel, _tolerance);
+ if ((!bClip.contientXY(_pt)) && (bClip.distanceXY(_pt) > distanceReel)) { return -1; }
+ bClip = _clipReel;
+ final GrPolygone poly = new GrPolygone();
+ int r = -1;
+ for (int i = _model.getNbElt() - 1; i >= 0; i--) {
+ _model.polygone(poly, i, true);
+ if (bClip.intersectXY(poly.boite())) {
+ if (poly.contientXY(_pt)) {
+ return i;
+ } else if (poly.distanceXY(_pt) <= distanceReel) {
+ r = i;
+ }
+ }
+ }
+ return r;
+
+ }
+
+ /**
+ * Methode qui permet de savoir si le point appartient a la sonde
+ *
+ * @param _prReel
+ * @param _model
+ * @return
+ */
+ public static int sondeSelection(final GrPoint _prReel, final TrPostModelInterface _model) {
+ final EfGridInterface grid = _model.getGrid();
+ if (grid.getIndex() != null) { return EfIndexHelper.getElementEnglobant(grid, _prReel.x_, _prReel.y_, null); }
+ return sondeSelectionLong(_prReel, _model);
+ }
+
+ /**
+ * Recherche l'\xE9l\xE9ment qui peut contenir la sonde pour bien initialiser la var.
+ *
+ * @param _prReel
+ * @param grid
+ * @return
+ */
+ public static int sondeSelection(final GrPoint _prReel, final EfGridInterface grid) {
+ if (grid.getIndex() != null) { return EfIndexHelper.getElementEnglobant(grid, _prReel.x_, _prReel.y_, null); }
+ return -1;
+ }
+
+ private static int sondeSelectionLong(final GrPoint _prReel, final TrPostModelInterface _model) {
+ final GrPolygone poly = new GrPolygone();
+ for (int i = _model.getNbElt() - 1; i >= 0; i--) {
+ _model.polygone(poly, i, true);
+ if (poly.contientXY(_prReel)) { return i; }
+ }
+ return -1;
+
+ }
+
+ private boolean sonde_;
+
+ ListSelectionModel mainVariableSelectionModel_;
+
+ Map namePalette_;
+
+ boolean oldDataTypeIsElement_;
+
+ TraceIcon sondeIcone_;
+
+ List<GrPoint> sondePt_;
+
+ int sondeSelectedElement_ = -1;
+
+ JMenuItem[] spec_;
+
+ double[] v_;
+
+ /**
+ * Contructeur du calque.
+ *
+ * @param _m le modele de donnees
+ */
+ public TrIsoLayerDefaultOriginal(final TrIsoModelAbstract _m) {
+ super(_m);
+ // setTitle(TrResource.getS("r\xE9sultats"));
+ paletteCouleur_ = new BPalettePlage();
+ // on choisit la hauteur d'eau
+ int i = _m.getIndexOf(H2dVariableType.HAUTEUR_EAU);
+ if (i < 0) {
+ i = 0;
+ }
+ setV(i);
+ sondePt_=new ArrayList<GrPoint>();
+ }
+
+ void initPaletteMap() {
+ if (namePalette_ == null) {
+ namePalette_ = new HashMap(getIsoModelAbstract().getVariableNb() + 1);
+ }
+ }
+
+ protected TrIsoLayerDefaultOriginal buildLayer() {
+ return new TrIsoLayerDefaultOriginal(getIsoModelAbstract());
+ }
+
+ @Override
+ protected void buildSpecificMenuItemsForAction(final List _l) {
+ _l.add(createDuplicateItem());
+
+ }
+
+ protected BPalettePlage createPlageForSelectedVar(final H2dVariableType _t) {
+ if (_t == null) { return null; }
+ BPalettePlage s = new BPalettePlage();
+ final TrIsoModelAbstract model = getIsoModelAbstract();
+ if (_t.getParentVariable() == H2dVariableType.TEMPS) {
+ s = new TrPostPaletteTime(model.s_);
+ }
+ s.setTitre(model.getVarDescriptionForPalette(_t));
+ final CtuluRange r = getRangeForPalette();
+ if (r.max_ - r.min_ < 0.01) {
+ s.initPlages(1, r.min_, r.max_);
+ } else {
+ s.initPlages(10, r.min_, r.max_);
+ }
+ s.initCouleurs(PaletteManager.INSTANCE);
+ updateSavedPalBeforeSet(s);
+ return s;
+ }
+
+ public final TrIsoModelAbstract getIsoModelAbstract() {
+ return (TrIsoModelAbstract) modele_;
+ }
+
+ protected CtuluRange get...
[truncated message content] |
|
From: <chr...@us...> - 2010-05-31 15:50:09
|
Revision: 5758
http://fudaa.svn.sourceforge.net/fudaa/?rev=5758&view=rev
Author: chrisc83
Date: 2010-05-31 15:50:02 +0000 (Mon, 31 May 2010)
Log Message:
-----------
Version de tests!!!
Modified Paths:
--------------
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvElementLayer.java
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvNodeLayer.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java
Added Paths:
-----------
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvNodeLayerOriginal.java
Modified: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvElementLayer.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvElementLayer.java 2010-05-27 22:17:37 UTC (rev 5757)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvElementLayer.java 2010-05-31 15:50:02 UTC (rev 5758)
@@ -136,6 +136,7 @@
public void paintDonnees(final Graphics2D _g, final GrMorphisme _versEcran, final GrMorphisme _versReel,
final GrBoite _clipReel) {
System.out.println("Start MvElementLayer.paintDonnees");
+ long currentTime = System.currentTimeMillis();
if ((modele_ == null) || (modele_.getNombre() <= 0)) { return; }
final GrBoite clip = _clipReel;
@@ -164,6 +165,15 @@
}
GrPoint ptOri = null;
GrPoint ptDest = null;
+
+ /*******************************************************************************/
+ /** D\xE9claration variables utilis\xE9es par algo optimisation par centre \xE9l\xE9ments **/
+ /*******************************************************************************/
+ GrPoint ptCenter = new GrPoint();
+ final int width = this.getSize().width;
+ int count = 0;
+ CtuluListSelection alreadyExist = new CtuluListSelection();
+
final MvElementModel model = (MvElementModel) modele_;
final boolean containsFr = model.getFrNbFrontier() > 0;
for (int i = 0; i < nombre; i++) {
@@ -171,11 +181,58 @@
if (!modele_.polygone(poly_, i, false)) {
continue;
}
+
poly_.boite(bPoly);
// Si la boite du polygone n'est pas dans la boite d'affichage on passe
if (!bPoly.intersectXY(clip)) {
continue;
}
+
+ /******************************************************/
+ /** D\xE9but code algo optimisation par centre \xE9l\xE9ments **/
+ /******************************************************/
+ poly_.centre(ptCenter);
+// System.out.print("X : " + ptCenter.x_ + ", Y : " + ptCenter.y_);
+ ptCenter.autoApplique(versEcran);
+// System.out.println(", X : " + ptCenter.x_ + ", Y : " + ptCenter.y_);
+ int idx = (width * ((int)ptCenter.y_)) + ((int)ptCenter.x_);
+// System.out.println("id : " + idx);
+
+ if (alreadyExist.isSelected(idx))
+ {
+ count++;
+ continue;
+ }
+ else
+ {
+ alreadyExist.add(idx);
+
+ if (rapide)
+ {
+ int idx2;
+ final int height = this.getSize().height;
+
+ for (int j = ((int)ptCenter.x_) - 1; j < (((int)ptCenter.x_) + 2); j++)
+ {
+ for (int k = ((int)ptCenter.y_) - 1; k < (((int)ptCenter.y_) + 2); k++)
+ {
+ if ((j >= 0) && (j < width) && (k >= 0) && (k < height))
+ {
+ idx2 = (width * k) + j;
+
+ if (idx2 != idx)
+ {
+ alreadyExist.add(idx2);
+ }
+ }
+ }
+ }
+ }
+ }
+ /****************************************************/
+ /** Fin code algo optimisation par centre \xE9l\xE9ments **/
+ /****************************************************/
+
final int nbPoints = poly_.sommets_.nombre();
if (nbPoints <= 0) {
continue;
@@ -228,7 +285,10 @@
}
}
+ currentTime = System.currentTimeMillis() - currentTime;
System.out.println("Stop MvElementLayer.paintDonnees");
+ System.out.println("Dur\xE9e : " + currentTime);
+ System.out.println("Nb \xE9l\xE9ment : " + nombre + ", non affich\xE9 : " + count);
}
public int[] getSelectedElementIdx() {
Modified: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvNodeLayer.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvNodeLayer.java 2010-05-27 22:17:37 UTC (rev 5757)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvNodeLayer.java 2010-05-31 15:50:02 UTC (rev 5758)
@@ -10,6 +10,7 @@
import java.awt.Color;
import java.awt.Component;
import java.awt.Graphics;
+import java.awt.Graphics2D;
import org.fudaa.ctulu.CtuluListSelection;
import org.fudaa.ctulu.CtuluRange;
@@ -18,10 +19,14 @@
import org.fudaa.dodico.ef.operation.EfIndexHelper;
import org.fudaa.dodico.ef.operation.EfIndexVisitorHashSetNode;
import org.fudaa.ebli.calque.ZCalquePoint;
+import org.fudaa.ebli.commun.EbliLib;
import org.fudaa.ebli.find.EbliFindActionInterface;
import org.fudaa.ebli.find.EbliFindExpressionContainerInterface;
+import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.ebli.geometrie.GrMorphisme;
import org.fudaa.ebli.geometrie.GrPoint;
+import org.fudaa.ebli.palette.BPalettePlage;
+import org.fudaa.ebli.trace.TraceIcon;
import org.fudaa.fudaa.meshviewer.MvLayerGrid;
import org.fudaa.fudaa.meshviewer.model.MvExpressionSupplierNode;
import org.fudaa.fudaa.meshviewer.model.MvNodeModel;
@@ -170,7 +175,111 @@
return isSelectionEmpty();
}
+
+ /******************************************************************/
+ /** M\xE9thode overrid\xE9e pour mettre en place l'algo d'optimisation **/
+ /******************************************************************/
@Override
+ public void paintDonnees(final Graphics2D _g, final int _nbPt, final GrMorphisme _versEcran, final GrBoite _clipReel)
+ {
+ System.out.println("Start MvNodeLayer.paintDonnees");
+ long currentTime = System.currentTimeMillis();
+
+ if ((modele_ == null) || (_nbPt <= 0)) {
+ return;
+ }
+ final boolean attenue = isAttenue();
+ final boolean rapide = isRapide();
+ final GrPoint point = new GrPoint();
+
+ final TraceIcon icone = iconModel_.buildCopy();
+ if (icone == null) {
+ return;
+ }
+ if (isAttenue()) {
+ icone.setCouleur(attenueCouleur(icone.getCouleur()));
+ }
+ if (EbliLib.isAlphaChanged(alpha_)) {
+ icone.setCouleur(EbliLib.getAlphaColor(icone.getCouleur(), alpha_));
+ }
+
+ /*******************************************************************************/
+ /** D\xE9claration variables utilis\xE9es par algo optimisation par centre \xE9l\xE9ments **/
+ /*******************************************************************************/
+ final int width = this.getSize().width;
+ int count = 0;
+ CtuluListSelection alreadyExist = new CtuluListSelection();
+
+ for (int i = _nbPt - 1; i >= 0; i--) {
+ // si le point est filtre on passe. On ne force pas l'affectation.
+ if (!modele_.point(point, i, false)) {
+ continue;
+ }
+ if (!_clipReel.contientXY(point)) {
+ continue;
+ }
+ final double z = point.z_;
+ point.autoApplique(_versEcran);
+
+ /******************************************************/
+ /** D\xE9but code algo optimisation par centre \xE9l\xE9ments **/
+ /******************************************************/
+// System.out.print("X : " + point.x_ + ", Y : " + point.y_);
+ int idx = (width * ((int)point.y_)) + ((int)point.x_);
+// System.out.println("id : " + idx);
+
+ if (alreadyExist.isSelected(idx))
+ {
+ count++;
+ continue;
+ }
+ else
+ {
+ alreadyExist.add(idx);
+
+ if (rapide)
+ {
+ int idx2;
+ final int height = this.getSize().height;
+
+ for (int j = ((int)point.x_) - 1; j < (((int)point.x_) + 2); j++)
+ {
+ for (int k = ((int)point.y_) - 1; k < (((int)point.y_) + 2); k++)
+ {
+ if ((j >= 0) && (j < width) && (k >= 0) && (k < height))
+ {
+ idx2 = (width * k) + j;
+
+ if (idx2 != idx)
+ {
+ alreadyExist.add(idx2);
+ }
+ }
+ }
+ }
+ }
+ }
+ /****************************************************/
+ /** Fin code algo optimisation par centre \xE9l\xE9ments **/
+ /****************************************************/
+
+ if (!rapide && isPaletteCouleurUsed_ && (paletteCouleur_ != null)) {
+ Color c = ((BPalettePlage) paletteCouleur_).getColorFor(z);
+ if (attenue) {
+ c = attenueCouleur(c);
+ }
+ icone.setCouleur(c);
+ }
+ icone.paintIconCentre(this, _g, (int) point.x_, (int) point.y_);
+ }
+
+ currentTime = System.currentTimeMillis() - currentTime;
+ System.out.println("Stop MvNodeLayer.paintDonnees");
+ System.out.println("Dur\xE9e : " + currentTime);
+ System.out.println("Nb point : " + _nbPt + ", non affich\xE9 : " + count);
+ }
+
+ @Override
public void paintIcon(final Component _c, final Graphics _g, final int _x, final int _y) {
super.paintIcon(_c, _g, _x, _y);
if (modele_ == null || modele_.getNombre() == 0) { return; }
Added: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvNodeLayerOriginal.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvNodeLayerOriginal.java (rev 0)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/layer/MvNodeLayerOriginal.java 2010-05-31 15:50:02 UTC (rev 5758)
@@ -0,0 +1,217 @@
+/**
+ * @creation 13 nov. 2003
+ * @modification $Date: 2007-04-20 16:22:09 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.fudaa.meshviewer.layer;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+
+import org.fudaa.ctulu.CtuluListSelection;
+import org.fudaa.ctulu.CtuluRange;
+import org.fudaa.ctulu.gis.GISLib;
+import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.dodico.ef.operation.EfIndexHelper;
+import org.fudaa.dodico.ef.operation.EfIndexVisitorHashSetNode;
+import org.fudaa.ebli.calque.ZCalquePoint;
+import org.fudaa.ebli.find.EbliFindActionInterface;
+import org.fudaa.ebli.find.EbliFindExpressionContainerInterface;
+import org.fudaa.ebli.geometrie.GrMorphisme;
+import org.fudaa.ebli.geometrie.GrPoint;
+import org.fudaa.fudaa.meshviewer.MvLayerGrid;
+import org.fudaa.fudaa.meshviewer.model.MvExpressionSupplierNode;
+import org.fudaa.fudaa.meshviewer.model.MvNodeModel;
+
+import com.memoire.fu.Fu;
+import com.memoire.fu.FuLog;
+import com.vividsolutions.jts.algorithm.SIRtreePointInRing;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.LinearRing;
+
+/**
+ * @author deniger
+ * @version $Id: MvNodeLayer.java,v 1.27 2007-04-20 16:22:09 deniger Exp $
+ */
+public class MvNodeLayerOriginal extends ZCalquePoint implements MvLayerGrid {
+
+ /**
+ * @param _modele le nouveau modele
+ */
+ public MvNodeLayerOriginal(final MvNodeModel _modele) {
+ super(_modele);
+ }
+
+ public int[] getSelectedEdgeIdx() {
+ return null;
+ }
+
+ public boolean isSelectionEdgeEmpty() {
+ return true;
+ }
+
+ MvNodeModel getNodeModel() {
+ return (MvNodeModel) modele_;
+ }
+
+ @Override
+ public boolean getRange(final CtuluRange _b) {
+ getNodeModel().getDataRange(_b);
+ return true;
+ }
+
+ @Override
+ public boolean getTimeRange(final CtuluRange _b) {
+ return false;
+ }
+
+ @Override
+ public EbliFindExpressionContainerInterface getExpressionContainer() {
+ final EbliFindExpressionContainerInterface i = getNodeModel().getExpressionContainer();
+ return i == null ? new MvExpressionSupplierNode(getNodeModel()) : i;
+ }
+
+ @Override
+ public EbliFindActionInterface getFinder() {
+ return new MvFindActionNodeElt(this);
+ }
+
+ public int[] getSelectedElementIdx() {
+ return null;
+ }
+
+ @Override
+ public int[] getSelectedObjectInTable() {
+ return getSelectedPtIdx();
+ }
+
+ @Override
+ public CtuluListSelection selection(final GrPoint _pt, final int _tolerance) {
+ return (getNodeModel().getGrid().getIndex() == null) ? super.selection(_pt, _tolerance) : selectionFromIndex(_pt,
+ _tolerance);
+ }
+
+ @Override
+ public CtuluListSelection selection(final LinearRing _poly, final int _mode) {
+ return (getNodeModel().getGrid().getIndex() == null) ? super.selection(_poly, _mode) : selectionFromIndex(_poly);
+ }
+
+ public CtuluListSelection selectionFromIndex(final LinearRing _poly) {
+ if (Fu.DEBUG && FuLog.isDebug()) {
+ FuLog.debug("FMV: layer select from index");
+ }
+ final EfGridInterface grid = getNodeModel().getGrid();
+ final EfIndexVisitorHashSetNode list = new EfIndexVisitorHashSetNode(grid);
+ getNodeModel().getGrid().getIndex().query(_poly.getEnvelopeInternal(), list);
+ final SIRtreePointInRing tester = new SIRtreePointInRing(_poly);
+ final int[] nds = list.getResult();
+ final GrPoint p = new GrPoint();
+ final Coordinate c = new Coordinate();
+ final CtuluListSelection r = creeSelection();
+ for (int i = nds.length - 1; i >= 0; i--) {
+ final int idx = nds[i];
+ modele().point(p, idx, true);
+ c.x = p.x_;
+ c.y = p.y_;
+ if (GISLib.isSelected(c, _poly, tester, 1E-5)) {
+ r.add(idx);
+ }
+ }
+ if (r.isEmpty()) { return null; }
+ return r;
+ }
+
+ /**
+ * Methode qui permet de savoir si un point appartient au layer.
+ *
+ * @param _pt
+ * @param _tolerance
+ * @return
+ */
+ public CtuluListSelection selectionFromIndex(final GrPoint _pt, final int _tolerance) {
+ if (Fu.DEBUG && FuLog.isDebug()) {
+ FuLog.debug("FMV: layer select from index");
+ }
+
+ return EfIndexHelper.getNearestNode(getNodeModel().getGrid(), _pt.x_, _pt.y_, GrMorphisme.convertDistanceXY(
+ getVersReel(), _tolerance), null);
+// final EfIndexVisitorNearestNode visitor = new EfIndexVisitorNearestNode(getNodeModel().getGrid(), _pt.x_, _pt.y_,
+// toleranceReel);
+// getNodeModel().getGrid().getIndex().query(EfIndexVisitorNearestNode.getEnvelope(_pt.x_, _pt.y_, toleranceReel),
+// visitor);
+// return visitor.getSelection();
+ }
+
+ /**
+ * @return les indices des points s\xE9lectionn\xE9s
+ */
+ public int[] getSelectedPtIdx() {
+ if (!isSelectionEmpty()) { return selection_.getSelectedIndex(); }
+ return null;
+ }
+
+ @Override
+ public boolean isDonneesBoiteAvailable() {
+ return true;
+ }
+
+ public boolean isFontModifiable() {
+ return false;
+ }
+
+ public boolean isSelectionElementEmpty() {
+ return true;
+ }
+
+ public boolean isSelectionPointEmpty() {
+ return isSelectionEmpty();
+ }
+
+ @Override
+ public void paintIcon(final Component _c, final Graphics _g, final int _x, final int _y) {
+ super.paintIcon(_c, _g, _x, _y);
+ if (modele_ == null || modele_.getNombre() == 0) { return; }
+ if (isPaletteCouleurUsed_) {
+ _g.setColor(Color.RED);
+ } else {
+ _g.setColor(getForeground());
+ }
+ final int w = getIconWidth();
+ final int h = getIconHeight();
+ int x1 = _x + 3;
+ int y1 = _y + h / 2;
+ final int x2 = _x + w / 2;
+ final int y2 = _y + 3;
+ final int x3 = _x + w / 4;
+ final int y3 = _y + h - 3;
+ final int x4 = x2;
+ final int y4 = _y + h / 2 + 4;
+ _g.drawLine(x1 - 1, y1, x1 + 1, y1);
+ _g.drawLine(x1, y1 - 1, x1, y1 + 1);
+ if (isPaletteCouleurUsed_) {
+ _g.setColor(Color.BLUE);
+ }
+ _g.drawLine(x2 - 1, y2, x2 + 1, y2);
+ _g.drawLine(x2, y2 - 1, x2, y2 + 1);
+ if (isPaletteCouleurUsed_) {
+ _g.setColor(Color.ORANGE);
+ }
+ _g.drawLine(x3 - 1, y3, x3 + 1, y3);
+ _g.drawLine(x3, y3 - 1, x3, y3 + 1);
+ if (isPaletteCouleurUsed_) {
+ _g.setColor(Color.GREEN);
+ }
+ _g.drawLine(x4 - 1, y4, x4 + 1, y4);
+ _g.drawLine(x4, y4 - 1, x4, y4 + 1);
+ x1 = _x + w - 3;
+ y1 = _y + h / 2 + 3;
+ if (isPaletteCouleurUsed_) {
+ _g.setColor(Color.yellow);
+ }
+ _g.drawLine(x1 - 1, y1, x1 + 1, y1);
+ _g.drawLine(x1, y1 - 1, x1, y1 + 1);
+ }
+}
\ No newline at end of file
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java 2010-05-27 22:17:37 UTC (rev 5757)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java 2010-05-31 15:50:02 UTC (rev 5758)
@@ -740,6 +740,7 @@
TraceIsoInterface isos = null;
// TrIsoTraceSurface isos = null;
final boolean isElement = getIsoModelAbstract().isCurrentDataElementType();
+ System.out.println(isElement);
boolean keepAntialias = false;
TrPostModelInterface modelToUse = getIsoModelAbstract();
if (traceIsoLine_) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2010-06-24 07:27:53
|
Revision: 5769
http://fudaa.svn.sourceforge.net/fudaa/?rev=5769&view=rev
Author: deniger
Date: 2010-06-24 07:27:46 +0000 (Thu, 24 Jun 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisuPanelController.java
trunk/soft/fudaa-prepro/grid/src/test/java/org/fudaa/fudaa/fgrid/layer/ExampleGridVisuPanel.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostBuilderSuiteCalcul.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeBuilder.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator2.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostProjet.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrReplayCurvesData.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java
trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt
Added Paths:
-----------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostCourbeAddVariableAction.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostCourbeRemoveVariableAction.java
Removed Paths:
-------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeAddVariableAction.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeRemoveVariableAction.java
Modified: trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisuPanelController.java
===================================================================
--- trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisuPanelController.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/grid/src/main/java/org/fudaa/fudaa/fgrid/layer/GridVisuPanelController.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -110,6 +110,6 @@
}
public JComponent getPaletteInfoModel() {
- return mapTabPalettes_.get("PALETTE_EDTION").buildContentPane();
+ return mapTabPalettes_.get("PALETTE_EDTION").getPaletteContent();
}
}
Modified: trunk/soft/fudaa-prepro/grid/src/test/java/org/fudaa/fudaa/fgrid/layer/ExampleGridVisuPanel.java
===================================================================
--- trunk/soft/fudaa-prepro/grid/src/test/java/org/fudaa/fudaa/fgrid/layer/ExampleGridVisuPanel.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/grid/src/test/java/org/fudaa/fudaa/fgrid/layer/ExampleGridVisuPanel.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -40,7 +40,7 @@
static JComponent buildComponent(Collection<EbliActionPaletteAbstract> acts) {
final BuTabbedPane tb = new BuTabbedPane();
for (final EbliActionPaletteAbstract pals : acts) {
- final JComponent component = pals.buildContentPane();
+ final JComponent component = pals.getPaletteContent();
if (component instanceof BCalquePaletteInfo) {
((BCalquePaletteInfo) component).setAvailable(true);
((BCalquePaletteInfo) component).updateState();
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -111,7 +111,7 @@
infoSoft = new BuInformationsSoftware();
infoSoft.name = "prepro";
- infoSoft.version = "1.1RC6";
+ infoSoft.version = "1.1RC7";
infoSoft.date = "2010-06-10";
// infoSoft.version = "1.00";
// infoSoft.date = "2010-01-27";
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostBuilderSuiteCalcul.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostBuilderSuiteCalcul.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostBuilderSuiteCalcul.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -81,7 +81,7 @@
// -- on ajoute la nouvelle src r\xE9sultat comme \xE9tant une suite de calcul --//
- proj.getImpl().c_.ajouterSource(suiteCalcul, suiteCalcul.getTitle());
+ proj.getImpl().project.ajouterSource(suiteCalcul, suiteCalcul.getTitle());
// -- on cree la vue 2d correspondante --//
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCommonImplementation.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -37,14 +37,14 @@
*/
public abstract class TrPostCommonImplementation extends TrCommonImplementation {
- TrPostProjet c_;
+ TrPostProjet project;
public final TrPostProjet getCurrentProject() {
- return c_;
+ return project;
}
public final void setCurrentProject(TrPostProjet _c) {
- c_ = _c;
+ project = _c;
}
/**
@@ -118,22 +118,22 @@
@Override
public void close() {
- if (c_ != null) {
- c_.close();
+ if (project != null) {
+ project.close();
}
removeInternalFrames(getAllInternalFrames());
}
public void setProjet(final TrPostProjet _c) {
- if (c_ == _c) { return; }
+ if (project == _c) { return; }
new CtuluTaskOperationGUI(null, CtuluLibString.EMPTY_STRING) {
@Override
public void act() {
saveAndCloseProjet(createProgressionInterface(this));
- c_ = _c;
- if (c_ != null) {
- c_.active(TrPostCommonImplementation.this);
+ project = _c;
+ if (project != null) {
+ project.active(TrPostCommonImplementation.this);
BuLib.invokeNowOrLater(new Runnable() {
public void run() {
setEnabledForAction("CREER", true);
@@ -152,19 +152,19 @@
}
public boolean saveAndCloseProjet(final ProgressionInterface _interface) {
- if (c_ != null) {
+ if (project != null) {
// -- enregistrement sauce widget --//
- if (c_.isModified()) {
+ if (project.isModified()) {
final int i = CtuluLibDialog.confirmExitIfProjectisModified(getFrame());
if (i == JOptionPane.CANCEL_OPTION) { return false; }
if (i != JOptionPane.NO_OPTION) {
- c_.getManager().saveProject(false);
+ project.getManager().saveProject(false);
// c_.save(this, _interface);
}
}
- c_.close();
- c_ = null;
+ project.close();
+ project = null;
SwingUtilities.invokeLater(new Runnable() {
public void run() {
@@ -183,7 +183,7 @@
@Override
public boolean confirmExit() {
final boolean b = super.confirmExit();
- if (b && c_ != null && !saveAndCloseProjet(null)) { return false; }
+ if (b && project != null && !saveAndCloseProjet(null)) { return false; }
return b;
}
@@ -193,45 +193,45 @@
if ("CREER".equals(com)) {
- if (c_ != null) {
+ if (project != null) {
final int reponse = JOptionPane.showConfirmDialog(this.getParentComponent(), TrResource
.getS("Le projet courant va \xEAtre ferm\xE9. \n Voulez vous sauvegarder le projet courant avant sa fermeture?"));
if (reponse == JOptionPane.CANCEL_OPTION) { return; }
if (reponse == JOptionPane.OK_OPTION) {
- c_.getManager().saveProject(false);
+ project.getManager().saveProject(false);
}
// -- nettoyage du projet pr\xE9c\xE9dent --//
- c_.getManager().clearProject();
+ project.getManager().clearProject();
} else {
- c_ = new TrPostProjet(this);
- c_.setMenuPost();
+ project = new TrPostProjet(this);
+ project.setMenuPost();
}
// -- ouverture d'un fichier r\xE9sultat qui sera automatiquement ajout\xE9 dans la layout courante --//
- c_.createNewLayoutFrame();
+ project.createNewLayoutFrame();
// -- ouverture d'un fichier r\xE9sultat --//
- TrPostActionChooseAndCreateCalque chooserSource = new TrPostActionChooseAndCreateCalque(c_, c_.getImpl()
+ TrPostActionChooseAndCreateCalque chooserSource = new TrPostActionChooseAndCreateCalque(project, project.getImpl()
.getCurrentLayoutFille().controller_);
chooserSource.actionPerformed(null);
} else if ("OUVRIR".equals(com)) {
// -- ouverture d un nouveau projet --//
- if (c_ != null) {
+ if (project != null) {
final int reponse = JOptionPane.showConfirmDialog(this.getParentComponent(), TrResource
.getS("Le projet courant va \xEAtre ferm\xE9. \n Voulez vous sauvegarder le projet courant avant sa fermeture?"));
if (reponse == JOptionPane.CANCEL_OPTION) { return; }
if (reponse == JOptionPane.OK_OPTION) {
- c_.getManager().saveProject(false);
+ project.getManager().saveProject(false);
}
// -- nettoyage du projet pr\xE9c\xE9dent --//
- c_.getManager().clearProject();
+ project.getManager().clearProject();
} else {
- c_ = new TrPostProjet(this);
- c_.setMenuPost();
+ project = new TrPostProjet(this);
+ project.setMenuPost();
}
- c_.getManager().loadProject(false, null);
+ project.getManager().loadProject(false, null);
// new TrPostFusionProjet(c_);
} else
@@ -244,7 +244,7 @@
saveAndCloseProjet(createProgressionInterface(this));
}
}.start();
- } else if ("ENREGISTRER".equals(com) && c_ != null) {
+ } else if ("ENREGISTRER".equals(com) && project != null) {
new CtuluTaskOperationGUI(this, TrResource.getS("Enregistrement")) {
@Override
@@ -252,11 +252,11 @@
// c_.save(TrPostCommonImplementation.this, createProgressionInterface(this));
// -- enregistrement sauce widget --//
- c_.getManager().saveProject(false);
+ project.getManager().saveProject(false);
}
}.start();
- } else if ("ENREGISTRERSOUS".equals(com) && c_ != null) {
+ } else if ("ENREGISTRERSOUS".equals(com) && project != null) {
new CtuluTaskOperationGUI(this, TrResource.getS("Enregistrement Sous")) {
@Override
@@ -264,7 +264,7 @@
// c_.save(TrPostCommonImplementation.this, createProgressionInterface(this));
// -- enregistrement sauce widget --//
- c_.getManager().saveProject(true);
+ project.getManager().saveProject(true);
}
}.start();
@@ -295,10 +295,10 @@
*/
public void cmdOuvrirLayoutFile(final File _f) {
- if (c_ == null) {
+ if (project == null) {
// setProjet(new TrPostProjet(TrPostCommonImplementation.this));
- c_ = new TrPostProjet(TrPostCommonImplementation.this);
- c_.active(TrPostCommonImplementation.this);
+ project = new TrPostProjet(TrPostCommonImplementation.this);
+ project.active(TrPostCommonImplementation.this);
BuLib.invokeNowOrLater(new Runnable() {
public void run() {
setEnabledForAction("ENREGISTRER", true);
@@ -313,7 +313,7 @@
BuLib.invokeLater(new Runnable() {
public void run() {
- c_.getManager().loadProject(true, _f);
+ project.getManager().loadProject(true, _f);
}
});
@@ -321,10 +321,10 @@
public void cmdOuvrirScopFile(final File _f) {
- if (c_ == null) {
+ if (project == null) {
// setProjet(new TrPostProjet(TrPostCommonImplementation.this));
- c_ = new TrPostProjet(TrPostCommonImplementation.this);
- c_.active(TrPostCommonImplementation.this);
+ project = new TrPostProjet(TrPostCommonImplementation.this);
+ project.active(TrPostCommonImplementation.this);
BuLib.invokeNowOrLater(new Runnable() {
public void run() {
setEnabledForAction("ENREGISTRER", true);
@@ -408,4 +408,11 @@
}
}
+ /**
+ * @return the project
+ */
+ public TrPostProjet getProject() {
+ return project;
+ }
+
}
\ No newline at end of file
Deleted: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeAddVariableAction.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeAddVariableAction.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeAddVariableAction.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -1,136 +0,0 @@
-/*
- * @creation 1 sept. 06
- * @modification $Date: 2007-01-19 13:14:11 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.fudaa.tr.post;
-
-import java.awt.Component;
-import java.awt.EventQueue;
-import java.awt.event.ActionEvent;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.swing.Action;
-
-import com.memoire.bu.BuBorderLayout;
-import com.memoire.bu.BuBorders;
-import com.memoire.bu.BuLabel;
-import com.memoire.bu.BuList;
-import com.memoire.bu.BuResource;
-import com.memoire.bu.BuScrollPane;
-import com.memoire.fu.FuComparator;
-
-import org.fudaa.ctulu.CtuluLib;
-import org.fudaa.ctulu.CtuluLibArray;
-import org.fudaa.ctulu.ProgressionBuAdapter;
-import org.fudaa.ctulu.gui.CtuluDialogPanel;
-import org.fudaa.ctulu.gui.CtuluLibSwing;
-import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
-import org.fudaa.dodico.h2d.type.H2dVariableType;
-import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.courbe.EGCourbe;
-import org.fudaa.ebli.courbe.EGGraphe;
-
-//TODO a modifier
-class TrPostCourbeAddVariableAction extends EbliActionSimple {
-
- final TrPostCommonImplementation impl_;
- final EGGraphe model_;
-
- public TrPostCourbeAddVariableAction(final TrPostCommonImplementation _impl, final EGGraphe _model) {
- super(CtuluLib.getS("Ajouter des variables"), BuResource.BU.getToolIcon("ajouter"), "ADD_VARIALBES");
- impl_ = _impl;
- model_ = _model;
-
- }
-
- public static Object[] select(final Object[] _init, final String _title, final Component _parent) {
- Arrays.sort(_init, FuComparator.STRING_COMPARATOR);
- final BuList l = CtuluLibSwing.createBuList(_init);
- final CtuluDialogPanel pn = new CtuluDialogPanel(false);
- pn.setLayout(new BuBorderLayout());
- pn.setBorder(BuBorders.EMPTY3333);
- pn.add(new BuLabel(CtuluLib.getS("S\xE9lectionner les variables \xE0 ajouter")), BuBorderLayout.NORTH);
- pn.add(new BuScrollPane(l));
- if (CtuluDialogPanel.isOkResponse(pn.afficheModale(_parent, _title))) { return l.getSelectedValues(); }
- return null;
- }
-
-
- public static int selectSource(final Object[] _init, final String _title, final Component _parent) {
- Arrays.sort(_init, FuComparator.STRING_COMPARATOR);
- final BuList l = CtuluLibSwing.createBuList(_init);
- final CtuluDialogPanel pn = new CtuluDialogPanel(false);
- pn.setLayout(new BuBorderLayout());
- pn.setBorder(BuBorders.EMPTY3333);
- pn.add(new BuLabel(CtuluLib.getS("S\xE9lectionner le fichier r\xE9sultat")), BuBorderLayout.NORTH);
- pn.add(new BuScrollPane(l));
- if (CtuluDialogPanel.isOkResponse(pn.afficheModale(_parent, _title))) { return l.getSelectedIndex(); }
- return -1;
- }
-
- @Override
- public void actionPerformed(final ActionEvent _e) {
- final TrPostCourbeTreeModel model = (TrPostCourbeTreeModel) model_.getModel();
- final EGCourbe selectedComponent = model_.getSelectedComponent();
- // final EGCourbe selectedComponent = model_.getModel().getCourbes()[0];
- TrPostSource src = null;
-// if (selectedComponent != null && selectedComponent.getModel() instanceof TrPostCourbeModel) {
-// src = ((TrPostCourbeModel) selectedComponent.getModel()).getSource();
-// }
-
- if(selectedComponent==null || !(selectedComponent.getModel() instanceof TrPostCourbeModel)){
- impl_.error("Impossibe, on ne peut ajouter des variables que pour une \xE9volution temporelle. \n La courbe choisie n'est pas une \xE9volution temporelle.");
- return;
- }
-
- final TrPostCourbeModel modelEvol=(TrPostCourbeModel)selectedComponent.getModel();
-
- //-- creation d'un lister de fichier source --//
- final String[] values = impl_.c_.getListSources(false);
-
- final int selectedSource = selectSource(values, (String) getValue(Action.NAME), impl_.getFrame());
- if(selectedSource !=-1)
- src=impl_.c_.getSource(selectedSource);
- if (src == null) return;
- final TrPostSource finalSrc = src;
-
-
-
- final Set var = new HashSet(Arrays.asList(src.getAllVariablesNonVec()));
- if(model.varSupported_!=null)
- var.removeAll(model.varSupported_);
-
-
-// if(model.objIdx_==null){
-// model.objIdx_=new int[src.getTime().getNbTimeStep()];
-// for(int i=0;i<src.getTime().getNbTimeStep();i++)
-// model.objIdx_[i]=i;
-// }
-// if(model.intepolPt_==null)
-// model.intepolPt_ = new HashSet();
-
- final H2dVariableType[] vars = (H2dVariableType[]) var.toArray(new H2dVariableType[var.size()]);
- final Object[] selected = select(vars, (String) getValue(Action.NAME), impl_.getFrame());
- if (!CtuluLibArray.isEmpty(selected)) {
- new CtuluTaskOperationGUI(impl_, (String) getValue(Action.NAME)) {
-
- @Override
- public void act() {
- model.addVariables(modelEvol,finalSrc, Arrays.asList(selected), new ProgressionBuAdapter(this), model_.getCmd());
- EventQueue.invokeLater(new Runnable() {
-
- public void run() {
- model_.restore();
- }
- });
- }
- }.start();
- }
-
- }
-}
\ No newline at end of file
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeBuilder.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeBuilder.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeBuilder.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -20,6 +20,8 @@
import org.fudaa.fudaa.meshviewer.export.MvExportChooseVarAndTime;
import org.fudaa.fudaa.tr.common.TrResource;
import org.fudaa.fudaa.tr.post.actions.TrPostCourbeAddPointsAction;
+import org.fudaa.fudaa.tr.post.actions.TrPostCourbeAddVariableAction;
+import org.fudaa.fudaa.tr.post.actions.TrPostCourbeRemoveVariableAction;
import org.fudaa.fudaa.tr.post.dialogSpec.TrPostWizardCourbeTemporelle;
/**
Deleted: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeRemoveVariableAction.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeRemoveVariableAction.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeRemoveVariableAction.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -1,78 +0,0 @@
-/*
- * @creation 1 sept. 06
- * @modification $Date: 2007-01-19 13:14:11 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.fudaa.tr.post;
-
-import java.awt.EventQueue;
-import java.awt.event.ActionEvent;
-import java.util.Arrays;
-
-import javax.swing.Action;
-
-import com.memoire.bu.BuBorderLayout;
-import com.memoire.bu.BuBorders;
-import com.memoire.bu.BuLabel;
-import com.memoire.bu.BuList;
-import com.memoire.bu.BuResource;
-import com.memoire.bu.BuScrollPane;
-import com.memoire.fu.FuComparator;
-
-import org.fudaa.ctulu.CtuluLib;
-import org.fudaa.ctulu.gui.CtuluDialogPanel;
-import org.fudaa.ctulu.gui.CtuluLibSwing;
-import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
-import org.fudaa.dodico.h2d.type.H2dVariableType;
-import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.ebli.courbe.EGGraphe;
-import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
-
-class TrPostCourbeRemoveVariableAction extends EbliActionSimple {
-
- final FudaaCommonImplementation impl_;
- final EGGraphe model_;
-
- public TrPostCourbeRemoveVariableAction(final FudaaCommonImplementation _impl, final EGGraphe _model) {
- super(CtuluLib.getS("Enlever des variables"), BuResource.BU.getToolIcon("enlever"), "ADD_VARIALBES");
- impl_ = _impl;
- model_ = _model;
-
- }
-
- @Override
- public void actionPerformed(final ActionEvent _e) {
- final TrPostCourbeTreeModel model = (TrPostCourbeTreeModel) model_.getModel();
- final H2dVariableType[] vars = (H2dVariableType[]) model.varSupported_
- .toArray(new H2dVariableType[model.varSupported_.size()]);
- Arrays.sort(vars, FuComparator.STRING_COMPARATOR);
- final BuList l = CtuluLibSwing.createBuList(vars);
- final CtuluDialogPanel pn = new CtuluDialogPanel(false);
- pn.setLayout(new BuBorderLayout());
- pn.setBorder(BuBorders.EMPTY3333);
- pn.add(new BuLabel(CtuluLib.getS("S\xE9lectionner les variables \xE0 enlever")), BuBorderLayout.NORTH);
- pn.add(new BuScrollPane(l));
- final String title = (String) getValue(Action.NAME);
- if (CtuluDialogPanel.isOkResponse(pn.afficheModale(impl_.getFrame(), title))) {
- final Object[] val = l.getSelectedValues();
- if (val != null && val.length > 0) {
- new CtuluTaskOperationGUI(impl_, title) {
-
- @Override
- public void act() {
- model.removeVariables(Arrays.asList(val), model_.getCmd());
- EventQueue.invokeLater(new Runnable() {
-
- public void run() {
- model_.restore();
- }
- });
- }
- }.start();
- }
- }
-
- }
-}
\ No newline at end of file
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -37,6 +37,7 @@
import org.fudaa.fudaa.tr.common.TrLib;
import org.fudaa.fudaa.tr.common.TrResource;
import org.fudaa.fudaa.tr.common.TrCourbeImporter.Target;
+import org.fudaa.fudaa.tr.post.actions.TrPostCourbeAddVariableAction;
@SuppressWarnings("serial")
public class TrPostCourbeTreeModel extends EGGrapheTreeModel implements TrPostTimeContentListener, Target {
@@ -69,6 +70,10 @@
// isAllTimeStep_ = true;
}
+ public H2dVariableType[] getVarSupportedArray() {
+ return (H2dVariableType[]) varSupported_.toArray(new H2dVariableType[varSupported_.size()]);
+ }
+
public TrPostCourbeTreeModel(final FudaaCommonImplementation _impl, final TrPostSource _src, final int[] _timeIdx,
final TrPostInterpolatePoint _interpol, final H2dVariableType[] _vars, final TrPostProjet _projet) {
this(_vars, _projet);
@@ -414,7 +419,7 @@
* @param _prog
* @param _cmd
*/
- protected void addVariables(TrPostCourbeModel modelCourbe, final TrPostSource _src, final List _var,
+ public void addVariables(TrPostCourbeModel modelCourbe, final TrPostSource _src, final List _var,
final ProgressionInterface _prog, final CtuluCommandContainer _cmd) {
// buildTimeSteps();
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -109,8 +109,8 @@
public void active(final File _f, final TrPostCommonImplementation _impl){
String uniqueId;
- if(_impl.c_!=null)
- uniqueId=_impl.c_.deliverSourceId(_f.getName());
+ if(_impl.project!=null)
+ uniqueId=_impl.project.deliverSourceId(_f.getName());
else
uniqueId=CtuluLibGenerator.getInstance().deliverUniqueStringId();
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator2.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator2.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostMultiSourceActivator2.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -79,8 +79,8 @@
public void active(final File _f, final TrPostCommonImplementation _impl) {
String uniqueId;
- if (_impl.c_ != null) {
- uniqueId = _impl.c_.deliverSourceId(_f.getName());
+ if (_impl.project != null) {
+ uniqueId = _impl.project.deliverSourceId(_f.getName());
} else {
uniqueId = CtuluLibGenerator.getInstance().deliverUniqueStringId();
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostProjet.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostProjet.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostProjet.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -15,8 +15,10 @@
import java.awt.event.ActionListener;
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Observable;
import java.util.Observer;
@@ -595,11 +597,11 @@
final EbliWidgetControllerGraphe controller = (EbliWidgetControllerGraphe) nodeG.getWidget().getIntern()
.getController();
controller.ajoutLegende();
+ currentLayoutFilleOrFirst.getScene().setSelectedObjects(new HashSet(Arrays.asList(nodeG)));
}
});
- // getImpl().getCurrentLayoutFilleOrFirst().getScene().refresh();
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrReplayCurvesData.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrReplayCurvesData.java 2010-06-22 22:33:59 UTC (rev 5768)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrReplayCurvesData.java 2010-06-24 07:27:46 UTC (rev 5769)
@@ -34,6 +34,7 @@
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuBorders;
import com.memoire.bu.BuButton;
+import com.memoire.bu.BuGridLayout;
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuList;
import com.memoire.bu.BuRadioButton;
@@ -148,7 +149,7 @@
return memoire_;
BCalqueLegende legende=new BCalqueLegende();
- TrPostVisuPanel vue2d=new TrPostVisuPanel(implementation,implementation.c_,legende,src);
+ TrPostVisuPanel vue2d=new TrPostVisuPanel(implementation,implementation.project,legende,src);
vue2d.removeCalqueLegend();
vue2d.restaurer();
@@ -180,7 +181,6 @@
public JToolBar constructToolBarVue2d(final TrPostVisuPanel vue2d,boolean modeEdition){
JToolBar toolbarCalque = new BuToolBar();
AbstractButton boutonSelection=null;
- //final EbliActionInterface[] actions =vue2d.getController().getSelectedNavigationAndStandardActionGroup();
final List actions = vue2d.getController().getNonSpecificsActions();//getSelectedNavigationAndStandardActionGroup();
int i=0;
for (final Iterator iterator = actions.iterator(); iterator.hasNext();) {
@@ -321,7 +321,12 @@
panelSouth.add(this.ajouter_);
if(this.rejouerSrc_!=null){
TrPostCourbeModel postModel=(TrPostCourbeModel)modele;
- panelSouth2.add(new JLabel(TrResource.TR.getString("Le fichier r\xE9sultat actuel est {0}",postModel.getSource().getMainFile().getName())));
+ JPanel pnEtat=new JPanel(new BuGridLayout(2));
+ pnEtat.add(new JLabel(TrResource.TR.getString("Le fichier r\xE9sultat utilis\xE9 actuellement:")));
+ pnEtat.add(new JLabel(postModel.getSource().getMainFile().getName()));
+ pnEtat.add(new JLabel(TrResource.TR.getString("Le fichier r\xE9sultat qui sera utilis\xE9:")));
+ pnEtat.add(new JLabel(srcMemoire_.getMainFile().getName()));
+
panelSouth2.add(rejouerSrc_);
}
@@ -439,10 +444,7 @@
dataP[i][1]=listePoints.getCoordinateN(i).y;
}
- //ZModelePointEditable modelePointEdit=new ZModelePointEditable(collectionPoint);
-
BCalque memoire=vue2d.getCalqueActif();
- //ZCalquePoint calqueZ=new ZCalquePoint(modelePointEdit);
GISZoneCollectionLigneBrisee ligneBrisee=new GISZoneCollectionLigneBrisee();
@@ -452,11 +454,8 @@
- //calqueZ.setVisible(true);
- //calqueZ.setLineModel(0, new TraceLigneModel(1,2,Color.BLACK));
calqueZ.setIconModel(0, new TraceIconModel(TraceIcon.CARRE_SELECTION,3,Color.blue));
calqueZ.setTitle("Origine courbe de "+modele.getTitle());
- //vue2d.addCalque(calqueZ, true);
FSigLayerGroup group=TrPostWizardProfilSpatial.getGroup(TrPostWizardProfilSpatial.idSpatial, vue2d);
group.add(calqueZ);
@@ -468,15 +467...
[truncated message content] |
|
From: <de...@us...> - 2011-03-23 22:01:20
|
Revision: 6172
http://fudaa.svn.sourceforge.net/fudaa/?rev=6172&view=rev
Author: deniger
Date: 2011-03-23 22:01:14 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-prepro-1.0.0
Modified Paths:
--------------
trunk/soft/fudaa-prepro/grid/pom.xml
trunk/soft/fudaa-prepro/meshview/pom.xml
trunk/soft/fudaa-prepro/pom.xml
trunk/soft/fudaa-prepro/ui/pom.xml
Modified: trunk/soft/fudaa-prepro/grid/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/grid/pom.xml 2011-03-23 21:57:03 UTC (rev 6171)
+++ trunk/soft/fudaa-prepro/grid/pom.xml 2011-03-23 22:01:14 UTC (rev 6172)
@@ -1,14 +1,12 @@
<?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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Grid pre and post-processing</name>
<description>Prepare, launch and post-process a grid.</description>
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>0.95-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>grid</artifactId>
Modified: trunk/soft/fudaa-prepro/meshview/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/meshview/pom.xml 2011-03-23 21:57:03 UTC (rev 6171)
+++ trunk/soft/fudaa-prepro/meshview/pom.xml 2011-03-23 22:01:14 UTC (rev 6172)
@@ -1,12 +1,10 @@
<?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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>0.95-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>meshview</artifactId>
@@ -21,11 +19,8 @@
</phase>
<configuration>
<tasks>
- <replace dir="${project.build.outputDirectory}"
- includes="**/*.fr_txt" token=" " value="_" />
- <native2ascii src="${project.build.outputDirectory}"
- dest="${project.build.outputDirectory}" includes="**/*.fr_txt"
- ext=".txt" />
+ <replace dir="${project.build.outputDirectory}" includes="**/*.fr_txt" token=" " value="_" />
+ <native2ascii src="${project.build.outputDirectory}" dest="${project.build.outputDirectory}" includes="**/*.fr_txt" ext=".txt" />
<delete>
<fileset dir="${project.build.outputDirectory}">
<include name="**/*.fr_txt" />
Modified: trunk/soft/fudaa-prepro/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/pom.xml 2011-03-23 21:57:03 UTC (rev 6171)
+++ trunk/soft/fudaa-prepro/pom.xml 2011-03-23 22:01:14 UTC (rev 6172)
@@ -1,7 +1,5 @@
<?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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
@@ -15,7 +13,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>Fudaa-Prepro</name>
<packaging>pom</packaging>
<modules>
@@ -74,4 +72,10 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/soft/fudaa-prepro-1.0.0</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/soft/fudaa-prepro-1.0.0</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/soft/fudaa-prepro-1.0.0</url>
+ </scm>
</project>
Modified: trunk/soft/fudaa-prepro/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/ui/pom.xml 2011-03-23 21:57:03 UTC (rev 6171)
+++ trunk/soft/fudaa-prepro/ui/pom.xml 2011-03-23 22:01:14 UTC (rev 6172)
@@ -1,12 +1,10 @@
<?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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>0.95-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>prepro-ui</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2011-03-23 22:01:55
|
Revision: 6174
http://fudaa.svn.sourceforge.net/fudaa/?rev=6174&view=rev
Author: deniger
Date: 2011-03-23 22:01:49 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/soft/fudaa-prepro/grid/pom.xml
trunk/soft/fudaa-prepro/meshview/pom.xml
trunk/soft/fudaa-prepro/pom.xml
trunk/soft/fudaa-prepro/ui/pom.xml
Modified: trunk/soft/fudaa-prepro/grid/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/grid/pom.xml 2011-03-23 22:01:35 UTC (rev 6173)
+++ trunk/soft/fudaa-prepro/grid/pom.xml 2011-03-23 22:01:49 UTC (rev 6174)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>grid</artifactId>
Modified: trunk/soft/fudaa-prepro/meshview/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/meshview/pom.xml 2011-03-23 22:01:35 UTC (rev 6173)
+++ trunk/soft/fudaa-prepro/meshview/pom.xml 2011-03-23 22:01:49 UTC (rev 6174)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>meshview</artifactId>
Modified: trunk/soft/fudaa-prepro/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/pom.xml 2011-03-23 22:01:35 UTC (rev 6173)
+++ trunk/soft/fudaa-prepro/pom.xml 2011-03-23 22:01:49 UTC (rev 6174)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>Fudaa-Prepro</name>
<packaging>pom</packaging>
<modules>
@@ -72,10 +72,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/soft/fudaa-prepro-1.0.0</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/soft/fudaa-prepro-1.0.0</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/soft/fudaa-prepro-1.0.0</url>
- </scm>
</project>
Modified: trunk/soft/fudaa-prepro/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/ui/pom.xml 2011-03-23 22:01:35 UTC (rev 6173)
+++ trunk/soft/fudaa-prepro/ui/pom.xml 2011-03-23 22:01:49 UTC (rev 6174)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>prepro-ui</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-03-24 03:10:49
|
Revision: 7027
http://fudaa.svn.sourceforge.net/fudaa/?rev=7027&view=rev
Author: deniger
Date: 2012-03-24 03:10:43 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-prepro-1.1.0
Modified Paths:
--------------
trunk/soft/fudaa-prepro/grid/pom.xml
trunk/soft/fudaa-prepro/meshview/pom.xml
trunk/soft/fudaa-prepro/pom.xml
trunk/soft/fudaa-prepro/ui/pom.xml
Modified: trunk/soft/fudaa-prepro/grid/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/grid/pom.xml 2012-03-24 03:08:36 UTC (rev 7026)
+++ trunk/soft/fudaa-prepro/grid/pom.xml 2012-03-24 03:10:43 UTC (rev 7027)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
</parent>
<artifactId>grid</artifactId>
<build>
@@ -48,7 +48,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
Modified: trunk/soft/fudaa-prepro/meshview/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/meshview/pom.xml 2012-03-24 03:08:36 UTC (rev 7026)
+++ trunk/soft/fudaa-prepro/meshview/pom.xml 2012-03-24 03:10:43 UTC (rev 7027)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>meshview</artifactId>
@@ -70,7 +70,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
Modified: trunk/soft/fudaa-prepro/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/pom.xml 2012-03-24 03:08:36 UTC (rev 7026)
+++ trunk/soft/fudaa-prepro/pom.xml 2012-03-24 03:10:43 UTC (rev 7027)
@@ -1,7 +1,5 @@
<?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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
@@ -17,7 +15,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<name>Fudaa-Prepro</name>
<packaging>pom</packaging>
<modules>
@@ -76,4 +74,10 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/soft/fudaa-prepro-1.1.0</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/soft/fudaa-prepro-1.1.0</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/soft/fudaa-prepro-1.1.0</url>
+ </scm>
</project>
Modified: trunk/soft/fudaa-prepro/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/ui/pom.xml 2012-03-24 03:08:36 UTC (rev 7026)
+++ trunk/soft/fudaa-prepro/ui/pom.xml 2012-03-24 03:10:43 UTC (rev 7027)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>prepro-ui</artifactId>
@@ -94,7 +94,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore></ignore>
+ <ignore />
</action>
</pluginExecution>
</pluginExecutions>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-03-24 03:11:19
|
Revision: 7029
http://fudaa.svn.sourceforge.net/fudaa/?rev=7029&view=rev
Author: deniger
Date: 2012-03-24 03:11:13 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/soft/fudaa-prepro/grid/pom.xml
trunk/soft/fudaa-prepro/meshview/pom.xml
trunk/soft/fudaa-prepro/pom.xml
trunk/soft/fudaa-prepro/ui/pom.xml
Modified: trunk/soft/fudaa-prepro/grid/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/grid/pom.xml 2012-03-24 03:11:02 UTC (rev 7028)
+++ trunk/soft/fudaa-prepro/grid/pom.xml 2012-03-24 03:11:13 UTC (rev 7029)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<artifactId>grid</artifactId>
<build>
Modified: trunk/soft/fudaa-prepro/meshview/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/meshview/pom.xml 2012-03-24 03:11:02 UTC (rev 7028)
+++ trunk/soft/fudaa-prepro/meshview/pom.xml 2012-03-24 03:11:13 UTC (rev 7029)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>meshview</artifactId>
Modified: trunk/soft/fudaa-prepro/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/pom.xml 2012-03-24 03:11:02 UTC (rev 7028)
+++ trunk/soft/fudaa-prepro/pom.xml 2012-03-24 03:11:13 UTC (rev 7029)
@@ -15,7 +15,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<name>Fudaa-Prepro</name>
<packaging>pom</packaging>
<modules>
@@ -74,10 +74,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/soft/fudaa-prepro-1.1.0</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/soft/fudaa-prepro-1.1.0</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/soft/fudaa-prepro-1.1.0</url>
- </scm>
</project>
Modified: trunk/soft/fudaa-prepro/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/ui/pom.xml 2012-03-24 03:11:02 UTC (rev 7028)
+++ trunk/soft/fudaa-prepro/ui/pom.xml 2012-03-24 03:11:13 UTC (rev 7029)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>prepro-ui</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-03-24 03:15:51
|
Revision: 7030
http://fudaa.svn.sourceforge.net/fudaa/?rev=7030&view=rev
Author: deniger
Date: 2012-03-24 03:15:39 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/grid/pom.xml
trunk/soft/fudaa-prepro/meshview/pom.xml
trunk/soft/fudaa-prepro/pom.xml
trunk/soft/fudaa-prepro/ui/pom.xml
Added Paths:
-----------
trunk/soft/fudaa-prepro/grid/pom.xml.releaseBackup
trunk/soft/fudaa-prepro/meshview/pom.xml.releaseBackup
trunk/soft/fudaa-prepro/pom.xml.releaseBackup
trunk/soft/fudaa-prepro/release.properties
trunk/soft/fudaa-prepro/ui/pom.xml.releaseBackup
Modified: trunk/soft/fudaa-prepro/grid/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/grid/pom.xml 2012-03-24 03:11:13 UTC (rev 7029)
+++ trunk/soft/fudaa-prepro/grid/pom.xml 2012-03-24 03:15:39 UTC (rev 7030)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.0</version>
</parent>
<artifactId>grid</artifactId>
<build>
@@ -15,8 +15,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
Added: trunk/soft/fudaa-prepro/grid/pom.xml.releaseBackup
===================================================================
--- trunk/soft/fudaa-prepro/grid/pom.xml.releaseBackup (rev 0)
+++ trunk/soft/fudaa-prepro/grid/pom.xml.releaseBackup 2012-03-24 03:15:39 UTC (rev 7030)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <name>Grid pre and post-processing</name>
+ <description>Prepare, launch and post-process a grid.</description>
+ <parent>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>fudaa-prepro</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>grid</artifactId>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!--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>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <versionRange>[1.3,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-sig</groupId>
+ <artifactId>fudaa-sig</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.fudaa</groupId>
+ <artifactId>fudaa-common-courbe</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <project.build.sourceEncoding>ISO-8859-15</project.build.sourceEncoding>
+ </properties>
+</project>
Modified: trunk/soft/fudaa-prepro/meshview/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/meshview/pom.xml 2012-03-24 03:11:13 UTC (rev 7029)
+++ trunk/soft/fudaa-prepro/meshview/pom.xml 2012-03-24 03:15:39 UTC (rev 7030)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.0</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>meshview</artifactId>
Added: trunk/soft/fudaa-prepro/meshview/pom.xml.releaseBackup
===================================================================
--- trunk/soft/fudaa-prepro/meshview/pom.xml.releaseBackup (rev 0)
+++ trunk/soft/fudaa-prepro/meshview/pom.xml.releaseBackup 2012-03-24 03:15:39 UTC (rev 7030)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>fudaa-prepro</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>meshview</artifactId>
+ <name>Affichage maillage</name>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase> process-resources
+ </phase>
+ <configuration>
+ <tasks>
+ <replace dir="${project.build.outputDirectory}" includes="**/*.fr_txt" token=" " value="_" />
+ <native2ascii src="${project.build.outputDirectory}" dest="${project.build.outputDirectory}" includes="**/*.fr_txt" ext=".txt" />
+ <delete>
+ <fileset dir="${project.build.outputDirectory}">
+ <include name="**/*.fr_txt" />
+ </fileset>
+ </delete>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ <version>1.5.3-1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5+</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+
+ </dependencies>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!--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>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <versionRange>[1.3,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-sig</groupId>
+ <artifactId>fudaa-sig</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.fudaa</groupId>
+ <artifactId>fudaa-common-courbe</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: trunk/soft/fudaa-prepro/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/pom.xml 2012-03-24 03:11:13 UTC (rev 7029)
+++ trunk/soft/fudaa-prepro/pom.xml 2012-03-24 03:15:39 UTC (rev 7030)
@@ -15,7 +15,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.0</version>
<name>Fudaa-Prepro</name>
<packaging>pom</packaging>
<modules>
Added: trunk/soft/fudaa-prepro/pom.xml.releaseBackup
===================================================================
--- trunk/soft/fudaa-prepro/pom.xml.releaseBackup (rev 0)
+++ trunk/soft/fudaa-prepro/pom.xml.releaseBackup 2012-03-24 03:15:39 UTC (rev 7030)
@@ -0,0 +1,79 @@
+<?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.2</fudaa-sig.version>
+ <javaCompiler>1.6</javaCompiler>
+ <targetJdk>1.6</targetJdk>
+ </properties>
+
+ <parent>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>soft-pom</artifactId>
+ <version>1.2</version>
+ </parent>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>fudaa-prepro</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <name>Fudaa-Prepro</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>meshview</module>
+ <module>grid</module>
+ <module>ui</module>
+ </modules>
+ <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>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-sig</groupId>
+ <artifactId>fudaa-sig</artifactId>
+ <version>${fudaa-sig.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>prepro-ui</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>meshview</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>grid</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <classpathContainers>
+ <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</classpathContainer>
+ </classpathContainers>
+ <additionalConfig>
+ <file>
+ <name>.settings/org.eclipse.core.resources.prefs</name>
+ <location>../src/config/eclipse/org.eclipse.core.resources.prefs</location>
+ </file>
+ </additionalConfig>
+
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: trunk/soft/fudaa-prepro/release.properties
===================================================================
--- trunk/soft/fudaa-prepro/release.properties (rev 0)
+++ trunk/soft/fudaa-prepro/release.properties 2012-03-24 03:15:39 UTC (rev 7030)
@@ -0,0 +1,24 @@
+#release configuration
+#Sat Mar 24 04:11:15 CET 2012
+project.scm.org.fudaa.soft.fudaa-prepro\:grid.empty=true
+scm.commentPrefix=[maven-release-plugin]
+pushChanges=true
+project.scm.org.fudaa.soft.fudaa-prepro\:prepro-ui.empty=true
+project.dev.org.fudaa.soft.fudaa-prepro\:meshview=1.1.1-SNAPSHOT
+scm.tag=fudaa-prepro-1.1.0
+scm.tagBase=https\://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/soft
+remoteTagging=true
+project.rel.org.fudaa.soft.fudaa-prepro\:meshview=1.1.0
+project.scm.org.fudaa.soft.fudaa-prepro\:fudaa-prepro.empty=true
+project.rel.org.fudaa.soft.fudaa-prepro\:fudaa-prepro=1.1.0
+scm.url=scm\:svn\:https\://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/soft/fudaa-prepro
+scm.tagNameFormat=@{project.artifactId}-@{project.version}
+preparationGoals=clean verify
+project.scm.org.fudaa.soft.fudaa-prepro\:meshview.empty=true
+exec.snapshotReleasePluginAllowed=false
+project.dev.org.fudaa.soft.fudaa-prepro\:grid=1.1.1-SNAPSHOT
+project.dev.org.fudaa.soft.fudaa-prepro\:fudaa-prepro=1.1.1-SNAPSHOT
+project.rel.org.fudaa.soft.fudaa-prepro\:prepro-ui=1.1.0
+project.rel.org.fudaa.soft.fudaa-prepro\:grid=1.1.0
+project.dev.org.fudaa.soft.fudaa-prepro\:prepro-ui=1.1.1-SNAPSHOT
+completedPhase=end-release
Modified: trunk/soft/fudaa-prepro/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/ui/pom.xml 2012-03-24 03:11:13 UTC (rev 7029)
+++ trunk/soft/fudaa-prepro/ui/pom.xml 2012-03-24 03:15:39 UTC (rev 7030)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.0</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>prepro-ui</artifactId>
Added: trunk/soft/fudaa-prepro/ui/pom.xml.releaseBackup
===================================================================
--- trunk/soft/fudaa-prepro/ui/pom.xml.releaseBackup (rev 0)
+++ trunk/soft/fudaa-prepro/ui/pom.xml.releaseBackup 2012-03-24 03:15:39 UTC (rev 7030)
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>fudaa-prepro</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>prepro-ui</artifactId>
+ <name>prepro-ui</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>meshview</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ebli</groupId>
+ <artifactId>ebli-3d</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
+ <artifactId>dico-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.ebli</groupId>
+ <artifactId>ebli-visuallibrary</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${dodicoGroupId}</groupId>
+ <artifactId>dodico-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${ctuluGroupId}</groupId>
+ <artifactId>ctulu-gis</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.fudaa.fudaa.tr.Tr</mainClass>
+ </manifest>
+ </archive>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!--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>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <versionRange>[1.3,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <properties>
+ <project.build.sourceEncoding>ISO-8859-15</project.build.sourceEncoding>
+ </properties>
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-03-24 03:21:07
|
Revision: 7031
http://fudaa.svn.sourceforge.net/fudaa/?rev=7031&view=rev
Author: deniger
Date: 2012-03-24 03:20:56 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/grid/pom.xml
trunk/soft/fudaa-prepro/meshview/pom.xml
trunk/soft/fudaa-prepro/pom.xml
trunk/soft/fudaa-prepro/ui/pom.xml
Removed Paths:
-------------
trunk/soft/fudaa-prepro/grid/pom.xml.releaseBackup
trunk/soft/fudaa-prepro/pom.xml.releaseBackup
trunk/soft/fudaa-prepro/release.properties
trunk/soft/fudaa-prepro/ui/pom.xml.releaseBackup
Modified: trunk/soft/fudaa-prepro/grid/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/grid/pom.xml 2012-03-24 03:15:39 UTC (rev 7030)
+++ trunk/soft/fudaa-prepro/grid/pom.xml 2012-03-24 03:20:56 UTC (rev 7031)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<artifactId>grid</artifactId>
<build>
Deleted: trunk/soft/fudaa-prepro/grid/pom.xml.releaseBackup
===================================================================
--- trunk/soft/fudaa-prepro/grid/pom.xml.releaseBackup 2012-03-24 03:15:39 UTC (rev 7030)
+++ trunk/soft/fudaa-prepro/grid/pom.xml.releaseBackup 2012-03-24 03:20:56 UTC (rev 7031)
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <name>Grid pre and post-processing</name>
- <description>Prepare, launch and post-process a grid.</description>
- <parent>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>fudaa-prepro</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </parent>
- <artifactId>grid</artifactId>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--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>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <versionRange>[1.3,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.fudaa-sig</groupId>
- <artifactId>fudaa-sig</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.fudaa</groupId>
- <artifactId>fudaa-common-courbe</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <project.build.sourceEncoding>ISO-8859-15</project.build.sourceEncoding>
- </properties>
-</project>
Modified: trunk/soft/fudaa-prepro/meshview/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/meshview/pom.xml 2012-03-24 03:15:39 UTC (rev 7030)
+++ trunk/soft/fudaa-prepro/meshview/pom.xml 2012-03-24 03:20:56 UTC (rev 7031)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>meshview</artifactId>
Modified: trunk/soft/fudaa-prepro/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/pom.xml 2012-03-24 03:15:39 UTC (rev 7030)
+++ trunk/soft/fudaa-prepro/pom.xml 2012-03-24 03:20:56 UTC (rev 7031)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-sig.version>1.2</fudaa-sig.version>
+ <fudaa-sig.version>1.3-SNAPSHOT</fudaa-sig.version>
<javaCompiler>1.6</javaCompiler>
<targetJdk>1.6</targetJdk>
</properties>
@@ -15,7 +15,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<name>Fudaa-Prepro</name>
<packaging>pom</packaging>
<modules>
Deleted: trunk/soft/fudaa-prepro/pom.xml.releaseBackup
===================================================================
--- trunk/soft/fudaa-prepro/pom.xml.releaseBackup 2012-03-24 03:15:39 UTC (rev 7030)
+++ trunk/soft/fudaa-prepro/pom.xml.releaseBackup 2012-03-24 03:20:56 UTC (rev 7031)
@@ -1,79 +0,0 @@
-<?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.2</fudaa-sig.version>
- <javaCompiler>1.6</javaCompiler>
- <targetJdk>1.6</targetJdk>
- </properties>
-
- <parent>
- <groupId>org.fudaa.pom</groupId>
- <artifactId>soft-pom</artifactId>
- <version>1.2</version>
- </parent>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>fudaa-prepro</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <name>Fudaa-Prepro</name>
- <packaging>pom</packaging>
- <modules>
- <module>meshview</module>
- <module>grid</module>
- <module>ui</module>
- </modules>
- <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>
- <dependency>
- <groupId>org.fudaa.business.fudaa-sig</groupId>
- <artifactId>fudaa-sig</artifactId>
- <version>${fudaa-sig.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>prepro-ui</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>meshview</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>grid</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <classpathContainers>
- <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</classpathContainer>
- </classpathContainers>
- <additionalConfig>
- <file>
- <name>.settings/org.eclipse.core.resources.prefs</name>
- <location>../src/config/eclipse/org.eclipse.core.resources.prefs</location>
- </file>
- </additionalConfig>
-
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Deleted: trunk/soft/fudaa-prepro/release.properties
===================================================================
--- trunk/soft/fudaa-prepro/release.properties 2012-03-24 03:15:39 UTC (rev 7030)
+++ trunk/soft/fudaa-prepro/release.properties 2012-03-24 03:20:56 UTC (rev 7031)
@@ -1,24 +0,0 @@
-#release configuration
-#Sat Mar 24 04:11:15 CET 2012
-project.scm.org.fudaa.soft.fudaa-prepro\:grid.empty=true
-scm.commentPrefix=[maven-release-plugin]
-pushChanges=true
-project.scm.org.fudaa.soft.fudaa-prepro\:prepro-ui.empty=true
-project.dev.org.fudaa.soft.fudaa-prepro\:meshview=1.1.1-SNAPSHOT
-scm.tag=fudaa-prepro-1.1.0
-scm.tagBase=https\://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/soft
-remoteTagging=true
-project.rel.org.fudaa.soft.fudaa-prepro\:meshview=1.1.0
-project.scm.org.fudaa.soft.fudaa-prepro\:fudaa-prepro.empty=true
-project.rel.org.fudaa.soft.fudaa-prepro\:fudaa-prepro=1.1.0
-scm.url=scm\:svn\:https\://fudaa.svn.sourceforge.net/svnroot/fudaa/trunk/soft/fudaa-prepro
-scm.tagNameFormat=@{project.artifactId}-@{project.version}
-preparationGoals=clean verify
-project.scm.org.fudaa.soft.fudaa-prepro\:meshview.empty=true
-exec.snapshotReleasePluginAllowed=false
-project.dev.org.fudaa.soft.fudaa-prepro\:grid=1.1.1-SNAPSHOT
-project.dev.org.fudaa.soft.fudaa-prepro\:fudaa-prepro=1.1.1-SNAPSHOT
-project.rel.org.fudaa.soft.fudaa-prepro\:prepro-ui=1.1.0
-project.rel.org.fudaa.soft.fudaa-prepro\:grid=1.1.0
-project.dev.org.fudaa.soft.fudaa-prepro\:prepro-ui=1.1.1-SNAPSHOT
-completedPhase=end-release
Modified: trunk/soft/fudaa-prepro/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/ui/pom.xml 2012-03-24 03:15:39 UTC (rev 7030)
+++ trunk/soft/fudaa-prepro/ui/pom.xml 2012-03-24 03:20:56 UTC (rev 7031)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>prepro-ui</artifactId>
Deleted: trunk/soft/fudaa-prepro/ui/pom.xml.releaseBackup
===================================================================
--- trunk/soft/fudaa-prepro/ui/pom.xml.releaseBackup 2012-03-24 03:15:39 UTC (rev 7030)
+++ trunk/soft/fudaa-prepro/ui/pom.xml.releaseBackup 2012-03-24 03:20:56 UTC (rev 7031)
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>fudaa-prepro</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </parent>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>prepro-ui</artifactId>
- <name>prepro-ui</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>meshview</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ebli</groupId>
- <artifactId>ebli-3d</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
- <artifactId>dico-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.ebli</groupId>
- <artifactId>ebli-visuallibrary</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${dodicoGroupId}</groupId>
- <artifactId>dodico-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${ctuluGroupId}</groupId>
- <artifactId>ctulu-gis</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.fudaa.fudaa.tr.Tr</mainClass>
- </manifest>
- </archive>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--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>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <versionRange>[1.3,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <properties>
- <project.build.sourceEncoding>ISO-8859-15</project.build.sourceEncoding>
- </properties>
-</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-03-24 03:23:32
|
Revision: 7032
http://fudaa.svn.sourceforge.net/fudaa/?rev=7032&view=rev
Author: deniger
Date: 2012-03-24 03:23:26 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/grid/pom.xml
trunk/soft/fudaa-prepro/meshview/pom.xml
trunk/soft/fudaa-prepro/pom.xml
trunk/soft/fudaa-prepro/ui/pom.xml
Removed Paths:
-------------
trunk/soft/fudaa-prepro/meshview/pom.xml.releaseBackup
Modified: trunk/soft/fudaa-prepro/grid/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/grid/pom.xml 2012-03-24 03:20:56 UTC (rev 7031)
+++ trunk/soft/fudaa-prepro/grid/pom.xml 2012-03-24 03:23:26 UTC (rev 7032)
@@ -1,64 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Grid pre and post-processing</name>
<description>Prepare, launch and post-process a grid.</description>
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.0</version>
</parent>
<artifactId>grid</artifactId>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--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>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <versionRange>[1.3,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!--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>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <versionRange>[1.3,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <dependencies>
<dependency>
<groupId>org.fudaa.business.fudaa-sig</groupId>
<artifactId>fudaa-sig</artifactId>
@@ -77,7 +79,7 @@
<scope>test</scope>
</dependency>
</dependencies>
- <properties>
- <project.build.sourceEncoding>ISO-8859-15</project.build.sourceEncoding>
- </properties>
+ <properties>
+ <project.build.sourceEncoding>ISO-8859-15</project.build.sourceEncoding>
+ </properties>
</project>
Modified: trunk/soft/fudaa-prepro/meshview/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/meshview/pom.xml 2012-03-24 03:20:56 UTC (rev 7031)
+++ trunk/soft/fudaa-prepro/meshview/pom.xml 2012-03-24 03:23:26 UTC (rev 7032)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.0</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>meshview</artifactId>
Deleted: trunk/soft/fudaa-prepro/meshview/pom.xml.releaseBackup
===================================================================
--- trunk/soft/fudaa-prepro/meshview/pom.xml.releaseBackup 2012-03-24 03:20:56 UTC (rev 7031)
+++ trunk/soft/fudaa-prepro/meshview/pom.xml.releaseBackup 2012-03-24 03:23:26 UTC (rev 7032)
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>fudaa-prepro</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </parent>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>meshview</artifactId>
- <name>Affichage maillage</name>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase> process-resources
- </phase>
- <configuration>
- <tasks>
- <replace dir="${project.build.outputDirectory}" includes="**/*.fr_txt" token=" " value="_" />
- <native2ascii src="${project.build.outputDirectory}" dest="${project.build.outputDirectory}" includes="**/*.fr_txt" ext=".txt" />
- <delete>
- <fileset dir="${project.build.outputDirectory}">
- <include name="**/*.fr_txt" />
- </fileset>
- </delete>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-optional</artifactId>
- <version>1.5.3-1</version>
- </dependency>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.5+</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
-
- </dependencies>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--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>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <versionRange>[1.3,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.fudaa-sig</groupId>
- <artifactId>fudaa-sig</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.fudaa</groupId>
- <artifactId>fudaa-common-courbe</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
Modified: trunk/soft/fudaa-prepro/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/pom.xml 2012-03-24 03:20:56 UTC (rev 7031)
+++ trunk/soft/fudaa-prepro/pom.xml 2012-03-24 03:23:26 UTC (rev 7032)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-sig.version>1.3-SNAPSHOT</fudaa-sig.version>
+ <fudaa-sig.version>1.2</fudaa-sig.version>
<javaCompiler>1.6</javaCompiler>
<targetJdk>1.6</targetJdk>
</properties>
@@ -15,7 +15,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.0</version>
<name>Fudaa-Prepro</name>
<packaging>pom</packaging>
<modules>
Modified: trunk/soft/fudaa-prepro/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/ui/pom.xml 2012-03-24 03:20:56 UTC (rev 7031)
+++ trunk/soft/fudaa-prepro/ui/pom.xml 2012-03-24 03:23:26 UTC (rev 7032)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.0</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>prepro-ui</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-03-25 20:20:40
|
Revision: 7035
http://fudaa.svn.sourceforge.net/fudaa/?rev=7035&view=rev
Author: deniger
Date: 2012-03-25 20:20:34 +0000 (Sun, 25 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/grid/pom.xml
trunk/soft/fudaa-prepro/meshview/pom.xml
trunk/soft/fudaa-prepro/pom.xml
trunk/soft/fudaa-prepro/ui/pom.xml
Modified: trunk/soft/fudaa-prepro/grid/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/grid/pom.xml 2012-03-25 20:06:19 UTC (rev 7034)
+++ trunk/soft/fudaa-prepro/grid/pom.xml 2012-03-25 20:20:34 UTC (rev 7035)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>grid</artifactId>
<build>
Modified: trunk/soft/fudaa-prepro/meshview/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/meshview/pom.xml 2012-03-25 20:06:19 UTC (rev 7034)
+++ trunk/soft/fudaa-prepro/meshview/pom.xml 2012-03-25 20:20:34 UTC (rev 7035)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>meshview</artifactId>
Modified: trunk/soft/fudaa-prepro/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/pom.xml 2012-03-25 20:06:19 UTC (rev 7034)
+++ trunk/soft/fudaa-prepro/pom.xml 2012-03-25 20:20:34 UTC (rev 7035)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-sig.version>1.2</fudaa-sig.version>
+ <fudaa-sig.version>1.3-SNAPSHOT</fudaa-sig.version>
<javaCompiler>1.6</javaCompiler>
<targetJdk>1.6</targetJdk>
</properties>
@@ -15,7 +15,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0-SNAPSHOT</version>
<name>Fudaa-Prepro</name>
<packaging>pom</packaging>
<modules>
Modified: trunk/soft/fudaa-prepro/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/ui/pom.xml 2012-03-25 20:06:19 UTC (rev 7034)
+++ trunk/soft/fudaa-prepro/ui/pom.xml 2012-03-25 20:20:34 UTC (rev 7035)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>prepro-ui</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-04-17 13:50:46
|
Revision: 7076
http://fudaa.svn.sourceforge.net/fudaa/?rev=7076&view=rev
Author: deniger
Date: 2012-04-17 13:50:34 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java
trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/mv_en.fr_txt
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrApplicationManager.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheLayer.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionBilan.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionCubature.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardProfilSpatial.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvLineChooser.java
trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt
Modified: trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java 2012-04-17 13:49:32 UTC (rev 7075)
+++ trunk/soft/fudaa-prepro/meshview/src/main/java/org/fudaa/fudaa/meshviewer/gridprocess/GridProcessTaskModel.java 2012-04-17 13:50:34 UTC (rev 7076)
@@ -86,6 +86,7 @@
import org.fudaa.dodico.telemac.io.TelemacCLFileFormat;
import org.fudaa.dodico.telemac.io.TelemacCLLine;
import org.fudaa.fudaa.commun.impl.FudaaPanelTaskModel;
+import org.fudaa.fudaa.meshviewer.MvLayerGrid;
import org.fudaa.fudaa.meshviewer.MvResource;
import org.fudaa.fudaa.sig.FSigGeomSrcData;
import org.fudaa.fudaa.sig.FSigVarAttrMapperTableModel.MapperResult;
@@ -856,11 +857,11 @@
private void initComponent() {
this.panel = new BuPanel(new BuVerticalLayout(20, true, false));
// TODO Traduire label
- this.formatInGrid = new FileFormatUniquePanel("Format du fichier de maillage en entr\xE9e :", this.formatsToRead
+ this.formatInGrid = new FileFormatUniquePanel(MvResource.getS("Format du fichier de maillage en entr\xE9e"), this.formatsToRead
.toArray(new FileFormatUnique[0]));
// FileFormatGridVersion guessFmt = guessFmt(this.fileIn, formatsToRead);
// formatInGrid.combo.setSelectedItem(guessFmt);
- this.formatOutGrid = new FileFormatUniquePanel("Format du fichier de maillage en sortie :", this.formatsToWrite
+ this.formatOutGrid = new FileFormatUniquePanel(MvResource.getS("Format du fichier de maillage en sortie"), this.formatsToWrite
.toArray(new FileFormatUnique[0]));
FileFormatGridVersion selectedFormat = this.formatInGrid.getSelectedFormat();
this.fileInGrid = new FileChooserPanel(Messages.getString("gridprocess.gridFileIn.txt"),
Modified: trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/mv_en.fr_txt
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/mv_en.fr_txt 2012-04-17 13:49:32 UTC (rev 7075)
+++ trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/mv_en.fr_txt 2012-04-17 13:50:34 UTC (rev 7076)
@@ -2,11 +2,12 @@
G\xE9n\xE9rer le fichier COX (cote de fond)=Generate the COX file ( bottom elevation)
G\xE9n\xE9rer le fichier INX (conditions initiales)=Generate the INX file ( initial conditions)
G\xE9n\xE9rer le fichier FRX (frottement)=Generate the FRX file (bottom friction)
-Fichier INX\: exporter la hauteur d'eau=File INX: export the water depth
+Fichier INX\: exporter la hauteur d'eau=File INX\: export the water depth
G\xE9n\xE9rer le fichier de maillage IMA=Generate the IMA file
Le fichier INX contient soit la cote d'eau soit la hauteur=The INX file can contain the water depth xor the water elevation
Par d\xE9faut, la cote d'eau est utilis\xE9e=The water elevation is used by default
Aucune donn\xE9e n'a \xE9t\xE9 s\xE9lectionn\xE9e=No data selected
+Permet de calculer le volume sur le maillage ou sur la s\xE9lection courante=Compute volume on whole grid or on current selection
Transfomer les \xE9l\xE9ments en triangle=Transform meshes in triangle
G\xE9n\xE9rer le fichier de maillage MAI=Generate the MAI grid file
Tout exporter=Export all
@@ -36,6 +37,10 @@
B\xE2timent=Building
Editer les b\xE2timents pour la vue 3D=Edit building for the 3D view
Si vous voulez \xE9diter les fichiers g\xE9n\xE9r\xE9s par Oasis, cochez cette option=If you want to edit the files with Oasis, check this box
+Cr\xE9er/Modifier=Create/Modify
+Cr\xE9er une nouvelle ligne=Create a new line
+Format du fichier de maillage en entr\xE9e=Input grid fileformat
+Format du fichier de maillage en sortie=Output grid fileformat
Conserver les \xE9l\xE9ments T3=Keep T3 meshes
Transformer en T3=Transform to T3 meshes
Conserver les \xE9l\xE9ments T6=Keep T6 meshes
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2012-04-17 13:49:32 UTC (rev 7075)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java 2012-04-17 13:50:34 UTC (rev 7076)
@@ -77,8 +77,8 @@
infoSoft = new BuInformationsSoftware();
infoSoft.name = "prepro";
- infoSoft.version = "1.2RC3";
- infoSoft.date = "2012-04-06";
+ infoSoft.version = "1.2RC4";
+ infoSoft.date = "2012-04-17";
infoSoft.rights = TrResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)2003-2009";
infoSoft.contact = "fre...@fu...";
infoSoft.license = "GPL2";
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrApplicationManager.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrApplicationManager.java 2012-04-17 13:49:32 UTC (rev 7075)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/common/TrApplicationManager.java 2012-04-17 13:50:34 UTC (rev 7076)
@@ -360,7 +360,7 @@
* Constructeur par defaut. default constructor
*/
public FudaaExecGridManagement(FileFormat[] fileFormat) {
- super("Traitement du maillage");
+ super(TrLib.getString("Traitement du maillage"));
this.fileFormat = fileFormat;
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java 2012-04-17 13:49:32 UTC (rev 7075)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java 2012-04-17 13:50:34 UTC (rev 7076)
@@ -65,11 +65,12 @@
import org.fudaa.ebli.geometrie.GrMorphisme;
import org.fudaa.ebli.geometrie.GrPoint;
import org.fudaa.ebli.geometrie.GrPolygone;
+import org.fudaa.ebli.palette.BPaletteInfo.InfoData;
import org.fudaa.ebli.palette.BPalettePlage;
+import org.fudaa.ebli.palette.BPalettePlageAbstract;
import org.fudaa.ebli.palette.BPalettePlageInterface;
import org.fudaa.ebli.palette.BPalettePlageProperties;
import org.fudaa.ebli.palette.PaletteManager;
-import org.fudaa.ebli.palette.BPaletteInfo.InfoData;
import org.fudaa.ebli.trace.TraceIcon;
import org.fudaa.ebli.trace.TraceIsoInterface;
import org.fudaa.ebli.trace.TraceIsoLignesAvecPlages;
@@ -136,7 +137,9 @@
}
for (int i = 0; i < names.length; i++) {
if (props[i] != null && names[i] != null) {
- _dest.put(names[i], new BPalettePlage(props[i]));
+ BPalettePlage plage = new BPalettePlage(props[i]);
+ initSubTitleLabel(plage);
+ _dest.put(names[i], plage);
}
}
return true;
@@ -334,7 +337,7 @@
return null;
}
BPalettePlage s = new BPalettePlage();
- s.setSubTitleLabel(TrLib.getString("Temps"));
+ initSubTitleLabel(s);
final TrIsoModelAbstract model = getIsoModelAbstract();
if (_t.getParentVariable() == H2dVariableType.TEMPS) {
s = new TrPostPaletteTime(model.s_);
@@ -351,6 +354,14 @@
return s;
}
+ /**
+ * Initialize the palette with the subtitle Time.
+ * @param s
+ */
+ public static void initSubTitleLabel(BPalettePlageAbstract s) {
+ s.setSubTitleLabel(TrLib.getString("Temps"));
+ }
+
public final TrIsoModelAbstract getIsoModelAbstract() {
return (TrIsoModelAbstract) modele_;
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheLayer.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheLayer.java 2012-04-17 13:49:32 UTC (rev 7075)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostFlecheLayer.java 2012-04-17 13:50:34 UTC (rev 7076)
@@ -204,13 +204,13 @@
@Override
protected void construitLegende() {
- // if (!isPaletteCouleurUsed_) { return; }
super.construitLegende();
}
protected void updateLegende() {
if (!isPaletteCouleurUsed_) {
if (paletteCouleur_ != null) {
+ TrIsoLayerDefault.initSubTitleLabel(paletteCouleur_);
updateTitre(paletteCouleur_);
updateLegendeTitre();
}
@@ -225,6 +225,7 @@
if (s == null) {
s = new BPalettePlage();
updateTitre(s);
+ TrIsoLayerDefault.initSubTitleLabel(s);
final CtuluRange r = initModel_.getExtremaForTimeStep();
if (r.max_ - r.min_ < 0.01) {
s.initPlages(1, r.min_, r.max_);
@@ -619,6 +620,7 @@
if (paletteCouleur_ != null) {
updateTitre(paletteCouleur_);
updateLegende();
+ TrIsoLayerDefault.initSubTitleLabel(paletteCouleur_);
}
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionBilan.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionBilan.java 2012-04-17 13:49:32 UTC (rev 7075)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionBilan.java 2012-04-17 13:50:34 UTC (rev 7076)
@@ -5,6 +5,7 @@
import org.fudaa.ctulu.CtuluResource;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.fudaa.meshviewer.MvResource;
+import org.fudaa.fudaa.tr.common.TrLib;
import org.fudaa.fudaa.tr.post.TrPostCommonImplementation;
import org.fudaa.fudaa.tr.post.TrPostVisuPanel;
import org.fudaa.fudaa.tr.post.dialogSpec.TrPostDialogBilan;
@@ -25,7 +26,7 @@
TrPostCommonImplementation impl_;
public TrPostActionBilan(final TrPostVisuPanel _visu, final TrPostCommonImplementation impl) {
- super(MvResource.getS("Calcul des bilans"), CtuluResource.CTULU.getIcon("crystal_calc1.png"), "BILAN");
+ super(TrLib.getString("Calcul des bilans"), CtuluResource.CTULU.getIcon("crystal_calc1.png"), "BILAN");
panel_ = _visu;
modelGraphe_ = null;
startWithCalque = true;
@@ -33,7 +34,7 @@
}
public TrPostActionBilan(final MvProfileTreeModel _model, final TrPostCommonImplementation impl) {
- super(MvResource.getS("Calcul des bilans"), CtuluResource.CTULU.getIcon("crystal_calc1.png"), "BILAN");
+ super(TrLib.getString("Calcul des bilans"), CtuluResource.CTULU.getIcon("crystal_calc1.png"), "BILAN");
modelGraphe_ = _model;
panel_ = null;
startWithCalque = false;
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionCubature.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionCubature.java 2012-04-17 13:49:32 UTC (rev 7075)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/actions/TrPostActionCubature.java 2012-04-17 13:50:34 UTC (rev 7076)
@@ -4,7 +4,7 @@
import org.fudaa.ctulu.CtuluResource;
import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.fudaa.meshviewer.MvResource;
+import org.fudaa.fudaa.tr.common.TrLib;
import org.fudaa.fudaa.tr.post.TrPostCommonImplementation;
import org.fudaa.fudaa.tr.post.TrPostVisuPanel;
import org.fudaa.fudaa.tr.post.dialogSpec.TrPostDialogCubature;
@@ -21,7 +21,7 @@
TrPostCommonImplementation impl_;
public TrPostActionCubature(final TrPostVisuPanel _visu, final TrPostCommonImplementation impl) {
- super(MvResource.getS("Calcul des cubatures"), CtuluResource.CTULU.getIcon("crystal_calc2.png"), "CUBATURE");
+ super(TrLib.getString("Calcul des cubatures"), CtuluResource.CTULU.getIcon("crystal_calc2.png"), "CUBATURE");
panel_ = _visu;
impl_ = impl;
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java 2012-04-17 13:49:32 UTC (rev 7075)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogBilan.java 2012-04-17 13:50:34 UTC (rev 7076)
@@ -186,7 +186,7 @@
center.add(center1);
center.add(center2);
content.add(center, BorderLayout.CENTER);
- content.setBorder(BorderFactory.createTitledBorder(TrResource.getS("Choix de l'isoligne")));
+ content.setBorder(BorderFactory.createTitledBorder(TrResource.getS("Choix de la ligne")));
// -- init et gestion des evenements --//
textX1.setCharValidator(BuCharValidator.FLOAT);
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java 2012-04-17 13:49:32 UTC (rev 7075)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostDialogCubature.java 2012-04-17 13:50:34 UTC (rev 7076)
@@ -160,7 +160,7 @@
gp.add(cbSelectedObject_);
gp.add(cbAll_);
gp.add(cbChooseLine_);
- content.setBorder(BorderFactory.createTitledBorder(TrResource.getS("Caluler la cubature sur:")));
+ content.setBorder(BorderFactory.createTitledBorder(TrResource.getS("Calculer la cubature sur")));
return content;
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java 2012-04-17 13:49:32 UTC (rev 7075)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java 2012-04-17 13:50:34 UTC (rev 7076)
@@ -208,7 +208,7 @@
// private int[] ptIdx_;
BuCheckBox checkboxNewGraphe_ = new BuCheckBox(TrResource.TR.getString("Cr\xE9er un nouveau graphe"));
- BuCheckBox traceOrigineDansVue2d_ = new BuCheckBox(TrResource.TR.getString("Cr\xE9er calque avec points d'origine de la courbe:"));
+ BuCheckBox traceOrigineDansVue2d_ = new BuCheckBox(TrResource.TR.getString("Cr\xE9er calque avec points d'origine de la courbe"));
private final MvExportChooseVarAndTime chooserVarTime_;
@@ -816,7 +816,7 @@
switch (current_) {
case 0:
- r = TrResource.getS("Voici les points r\xE9cup\xE9r\xE9s du calque");
+ r = TrResource.getS("Choisir les points");
break;
case 1:
r = TrResource.getS("S\xE9lection des variables");
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardProfilSpatial.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardProfilSpatial.java 2012-04-17 13:49:32 UTC (rev 7075)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardProfilSpatial.java 2012-04-17 13:50:34 UTC (rev 7076)
@@ -57,7 +57,7 @@
BuCheckBox checkboxNewGraphe_ = new BuCheckBox(TrResource.TR.getString("Cr\xE9er un nouveau graphe"));
BuCheckBox traceOrigineDansVue2d_ = new BuCheckBox(TrResource.TR
- .getString("Cr\xE9er calque avec points d'origine de la courbe:"));
+ .getString("Cr\xE9er calque avec points d'origine de la courbe"));
private final TrPostVisuPanel calque_;
TrPostSource src_;
@@ -307,7 +307,7 @@
switch (current_) {
case 0:
- r = TrResource.getS("Voici les points r\xE9cup\xE9r\xE9s du calque");
+ r = TrResource.getS("Choisir les points");
break;
case 1:
r = TrResource.getS("Veuillez s\xE9lectionner le(s) variable(s)");
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvLineChooser.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvLineChooser.java 2012-04-17 13:49:32 UTC (rev 7075)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/profile/MvLineChooser.java 2012-04-17 13:50:34 UTC (rev 7076)
@@ -159,7 +159,7 @@
bg.add(rdCreateNew_);
final JPanel pn = new JPanel(new BorderLayout());
pn.add(rdCreateNew_);
- buttonCreateNew_ = new BuButton("Cr\xE9er/Modifier");
+ buttonCreateNew_ = new BuButton(MvResource.getS("Cr\xE9er/Modifier"));
buttonCreateNew_.addActionListener(new ActionListener() {
@Override
Modified: trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt 2012-04-17 13:49:32 UTC (rev 7075)
+++ trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt 2012-04-17 13:50:34 UTC (rev 7076)
@@ -3,6 +3,9 @@
La tentative de rejouer les donn\xE9es pour le graphe \xE9volution temporel {0} a \xE9chou\xE9 avec le fichier d'id {1}=The time evolution {0} for the source {1} can't be rebuilt
Ouvrir et recalculer=Open and recompute
Courbe spatiale=Spatial curve
+R\xE9sultat=Result
+Positif=Positive
+N\xE9gatif=Negative
Fl\xE8che=Arrow
Cercle=Circle
Ellipse=Ellipse
@@ -721,13 +724,21 @@
El\xE9ment englobant=Parent mesh
Temps de d\xE9but=Begin timestep
Temps de fin=End timestep
+Calculer la cubature sur=Compute volume measurement on
Ajouter une variable d\xE9finie sur la max, min=Add a variable for max, min
Ajouter une nouvelle variable calculant le max, min, la moyenne, ... d'une variable d\xE9j\xE0 d\xE9finie=Add a new variable computing the max, min, the average, ... of an existant variable
Une seule fronti\xE8re doit \xEAtre s\xE9lectionn\xE9e=Only one frontier must be selected
Un seul bord doit \xEAtre s\xE9lectionn\xE9=Only one boundary must be selected
D\xE9sactiver le mode "Source"=Disable the mode "Source"
Activer le mode "Source"=Enable the mode "Source"
+Veuillez s\xE9lectionner le(s) variable(s)=Please, choose the variable(s)
+Veuillez s\xE9lectionner les graphes pour la cr\xE9ation des courbes ou cr\xE9er un nouveau graphe=Please, choose the target graphs or create a new one
+Cr\xE9er un nouveau graphe=Creata a new graph
+Graphes possibles=Available graphs
+Graphes choisis=selected graphs
+Cr\xE9er calque avec points d'origine de la courbe=Create a layer containing points used to create curves
S\xE9lectionner au moins une extremit\xE9 de siphon=Select at least a culvert's end
+Choisir les points=Choose points
S\xE9lectionner au moins un siphon=Select at least one culvert
S\xE9lectionner deux sources=Select two sources
Erreur dans la s\xE9lection=Selection error
@@ -1026,10 +1037,13 @@
Veuillez s\xE9lectionner la variable et pas de temps= Select the variable and the timestep
Choix des variables et pas de temps= Choose variables and timestep
Choix des variables= Choose variables
-Calcul des cubatures=Compute the cubatures
+Calcul des cubatures=Compute volume measurement
+Calcul des bilans=Compute assessments
Choix de la ligne bris\xE9e du calque=Selection of the line
Point non saisi correctement=the point typed isn't correct
Le seuil doit \xEAtre d\xE9fini par un r\xE9el=The treshold must be a real number
+Choix de la ligne=Choose line
+Choix du seuil=Choose threshold
Il faut choisir une ligne bris\xE9e= You have to choose a line
Il faut choisir un pas de temps= You have to choose a timestep
Il faut choisir une variable=You have to choose a variable
@@ -1038,6 +1052,7 @@
Importation graphe=Graph import
Choisir la plage des abscisses= Choose the abscisses interval
Param\xE8tres de cr\xE9ation=Creation parameters
+Traitement du maillage=Grid processing
Erreur. Veuillez choisir un fichier valide=Error. Choose a valid file.
Valeurs num\xE9riques du s\xE9parateur de bloc= Numerical value of the bloc separator
Liste des couples variable/separateur= List of couple svariable/separator
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-10-16 07:23:33
|
Revision: 7747
http://fudaa.svn.sourceforge.net/fudaa/?rev=7747&view=rev
Author: deniger
Date: 2012-10-16 07:23:24 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/grid/pom.xml
trunk/soft/fudaa-prepro/meshview/pom.xml
trunk/soft/fudaa-prepro/pom.xml
trunk/soft/fudaa-prepro/prepro-jnlp/pom.xml
Added Paths:
-----------
trunk/soft/fudaa-prepro/prepro-jnlp/src/test/
trunk/soft/fudaa-prepro/prepro-jnlp/src/test/java/
Modified: trunk/soft/fudaa-prepro/grid/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/grid/pom.xml 2012-10-15 15:29:32 UTC (rev 7746)
+++ trunk/soft/fudaa-prepro/grid/pom.xml 2012-10-16 07:23:24 UTC (rev 7747)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</parent>
<artifactId>grid</artifactId>
<build>
Modified: trunk/soft/fudaa-prepro/meshview/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/meshview/pom.xml 2012-10-15 15:29:32 UTC (rev 7746)
+++ trunk/soft/fudaa-prepro/meshview/pom.xml 2012-10-16 07:23:24 UTC (rev 7747)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>meshview</artifactId>
Modified: trunk/soft/fudaa-prepro/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/pom.xml 2012-10-15 15:29:32 UTC (rev 7746)
+++ trunk/soft/fudaa-prepro/pom.xml 2012-10-16 07:23:24 UTC (rev 7747)
@@ -15,7 +15,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<name>Fudaa-Prepro</name>
<packaging>pom</packaging>
<modules>
Modified: trunk/soft/fudaa-prepro/prepro-jnlp/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/prepro-jnlp/pom.xml 2012-10-15 15:29:32 UTC (rev 7746)
+++ trunk/soft/fudaa-prepro/prepro-jnlp/pom.xml 2012-10-16 07:23:24 UTC (rev 7747)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>fudaa-prepro</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</parent>
<artifactId>prepro-jnlp</artifactId>
<name>Prepro jnlp</name>
@@ -27,7 +27,7 @@
<!--outputDirectory></outputDirectory--> <!-- not required?? -->
<!-- Set to true to exclude all transitive dependencies. Default is false. -->
- <excludeTransitive>true</excludeTransitive>
+ <excludeTransitive>false</excludeTransitive>
<!-- The path where the libraries are stored within the jnlp structure. not required. by default the libraries are within the working directory -->
<libPath>lib</libPath>
<outputJarVersions>false</outputJarVersions>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-11-13 08:51:15
|
Revision: 7876
http://fudaa.svn.sourceforge.net/fudaa/?rev=7876&view=rev
Author: deniger
Date: 2012-11-13 08:51:04 +0000 (Tue, 13 Nov 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/mv_en.fr_txt
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceFileFinder.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceManager.java
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostSourcePersist.java
trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt
Added Paths:
-----------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceXstreamConfiguration.java
Modified: trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/mv_en.fr_txt
===================================================================
--- trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/mv_en.fr_txt 2012-11-13 08:50:35 UTC (rev 7875)
+++ trunk/soft/fudaa-prepro/meshview/src/main/resources/org/fudaa/fudaa/meshviewer/mv_en.fr_txt 2012-11-13 08:51:04 UTC (rev 7876)
@@ -1,4 +1,5 @@
G\xE9n\xE9rer le fichier de maillage MAI=Generate the grid file MAI
+Centre de l'\xE9l\xE9ment=Mesh's center
G\xE9n\xE9rer le fichier COX (cote de fond)=Generate the COX file ( bottom elevation)
G\xE9n\xE9rer le fichier INX (conditions initiales)=Generate the INX file ( initial conditions)
G\xE9n\xE9rer le fichier FRX (frottement)=Generate the FRX file (bottom friction)
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceFileFinder.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceFileFinder.java 2012-11-13 08:50:35 UTC (rev 7875)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceFileFinder.java 2012-11-13 08:51:04 UTC (rev 7876)
@@ -1,12 +1,18 @@
package org.fudaa.fudaa.tr.post.persist;
import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.fudaa.tr.post.TrPostSource;
/**
* Tentative de simplificattion de {@link TrPostPersistenceManager}
- *
+ *
* @author deniger
*/
public class TrPostPersistenceFileFinder {
@@ -16,14 +22,15 @@
*/
public static String EXTENSION = "." + TrPostFileFilter.DEFAULT_EXTENSION;
/**
- * Point d'entr\xE9e poru charger un projet repertoire. Continet le path du directory. Cela permet de placer ce fichier
- * n'importe ou sur le ddur et de pouvoir charger le projet. Peut etre g\xE9r\xE9 comem un raccourcis.
+ * Point d'entr\xE9e poru charger un projet repertoire. Continet le path du directory. Cela permet de placer ce fichier n'importe ou sur le ddur et de
+ * pouvoir charger le projet. Peut etre g\xE9r\xE9 comem un raccourcis.
*/
public static final String MAIN_SETUP_FILENAME = "setup";// + EXTENSION;
/**
* Fichier qui d\xE9crit tous les contenu layout sauvegard\xE9s Et noms des balises importantes
*/
public final static String MAIN_LAYOUTS_CONFIG_FILENAME = "info_layout";// "InfoLayout" + EXTENSION;
+ public final static String VERSION_FILE = "version.txt";// "InfoLayout" + EXTENSION;
/**
* Fichier qui d\xE9crit int\xE9gralement le contenu d'une scene
*/
@@ -35,7 +42,6 @@
public final static String REP_TEXTES = "TEXTES";
public final static String REP_CHECKSUM = "checksum";
public final static String MAIN_WIDGET_NAMES_FILENAME = "nom_frame";// "FramesNames"+ EXTENSION;
-
private final File projectBaseDir;
/**
@@ -50,6 +56,42 @@
return new File(projectBaseDir, MAIN_SETUP_FILENAME);
}
+ public void saveVersion(String version) {
+ File versionFile = new File(projectBaseDir, VERSION_FILE);
+ versionFile.delete();
+ FileWriter writer = null;
+ try {
+ Properties properties = new Properties();
+ properties.put("version", version);
+ writer = new FileWriter(versionFile);
+ properties.store(writer, "file Version");
+ } catch (Exception ex) {
+ Logger.getLogger(TrPostPersistenceFileFinder.class.getName()).log(Level.INFO, "message");
+ } finally {
+ CtuluLibFile.close(writer);
+ }
+ }
+
+ public String getVersion() {
+ File versionFile = new File(projectBaseDir, VERSION_FILE);
+ String version = null;
+ if (versionFile.exists()) {
+ FileReader reader = null;
+ try {
+ Properties properties = new Properties();
+ reader = new FileReader(versionFile);
+ properties.load(reader);
+ version = properties.getProperty("version");
+ } catch (Exception ex) {
+ Logger.getLogger(TrPostPersistenceFileFinder.class.getName()).log(Level.INFO, "message");
+ } finally {
+ CtuluLibFile.close(reader);
+ }
+ }
+ return version;
+
+ }
+
public File getBaseDir() {
return projectBaseDir;
}
@@ -75,15 +117,14 @@
}
public File getChecksumFileForSetup() {
- return new File(getMainChecksumDir(), TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME.toLowerCase()+".checksum");
+ return new File(getMainChecksumDir(), TrPostPersistenceFileFinder.MAIN_SETUP_FILENAME.toLowerCase() + ".checksum");
}
public File getChecksumFileForVariables() {
- return new File(getMainChecksumDir(), TrPostPersistenceFileFinder.REP_VAR.toLowerCase()+".checksum");
+ return new File(getMainChecksumDir(), TrPostPersistenceFileFinder.REP_VAR.toLowerCase() + ".checksum");
}
-
+
public File getChecksumFileForSources(TrPostSource src) {
- return new File(getMainChecksumDir(), "sources_"+src.getId()+".checksum");
+ return new File(getMainChecksumDir(), "sources_" + src.getId() + ".checksum");
}
-
}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceManager.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceManager.java 2012-11-13 08:50:35 UTC (rev 7875)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceManager.java 2012-11-13 08:51:04 UTC (rev 7876)
@@ -56,27 +56,17 @@
import org.fudaa.fudaa.tr.post.TrPostUserSaverContent;
import org.fudaa.fudaa.tr.post.TrPostUserVariableSaver;
import org.fudaa.fudaa.tr.post.actions.TrPostActionFusionCalques;
-import org.fudaa.fudaa.tr.post.data.TrPostDataCreatedStatisticSaver;
import org.netbeans.api.visual.widget.Widget;
-import org.netbeans.modules.visual.anchor.TriangleAnchorShape;
import com.memoire.fu.FuLib;
import com.memoire.fu.FuLog;
import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.converters.Converter;
-import com.thoughtworks.xstream.converters.MarshallingContext;
-import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import com.thoughtworks.xstream.io.HierarchicalStreamReader;
-import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import com.thoughtworks.xstream.io.xml.XmlFriendlyReplacer;
-import com.thoughtworks.xstream.io.xml.XppDriver;
import com.thoughtworks.xstream.persistence.XmlArrayList;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import org.fudaa.ebli.commun.XstreamCustomizer;
-import org.fudaa.fudaa.tr.post.TrPostCourbeTreeModelPersist;
/**
* Manager qui se charge de donner les noms standart des balises, le chooser de fichiers et appel aux bonnes m\xE9thodes pour la persistence des donn\xE9es.
@@ -85,6 +75,7 @@
*/
public class TrPostPersistenceManager {
+ public static final String CURRENT_VERSION = "1.0";
/**
* Le projet a persiter
*/
@@ -154,7 +145,10 @@
}
if (directory != null && directory.exists()) {
- fileChooser.setCurrentDirectory(directory);
+ try {
+ fileChooser.setCurrentDirectory(directory);
+ } catch (Exception e) {
+ }
}
if (fileDefaut.exists()) {
fileChooser.setSelectedFile(fileDefaut);
@@ -317,7 +311,7 @@
// -- ecriture de la classe xstream
ObjectOutputStream out = null;
try {
- out = EbliLib.createObjectOutpuStream(file, getParser());
+ out = EbliLib.createObjectOutpuStream(file, getParser(true));
// -- readme --//
out.writeObject(XmlCommentaire.getCommentaireLayout());
@@ -368,7 +362,7 @@
try {
- in = EbliLib.createObjectInpuStream(file, getParser());
+ in = EbliLib.createObjectInpuStream(file, getParser(isNewVersion));
int nbFichiersToGenrate;
// -- lecture readme --//
@@ -527,7 +521,7 @@
if (!file.exists()) {
file.getParentFile().mkdirs();
}
- out = EbliLib.createObjectOutpuStream(file, getParser());
+ out = EbliLib.createObjectOutpuStream(file, getParser(true));
// -- redame --//
out.writeObject(XmlCommentaire.getCommentaireSources());
@@ -593,7 +587,7 @@
for (int i = 0; i < listeVar.size(); i++) {
final TrPostUserSaverContent var = listeVar.get(i);
final TrPostTimeModelSaver ptd = listePdt.get(i);
- XStream parser = getParser();
+ XStream parser = getParser(true);
parser.omitField(TrPostUserVariableSaver.class, "g__");
String idSource = listeCouplesIdSources.get(i).IdSource;
File xmlFile = getVariableFile(pathVariables, idSource);
@@ -613,7 +607,7 @@
for (int i = 0; i < listeVarSuites.size(); i++) {
final TrPostUserVariableSaver var = listeVarSuites.get(i);
final TrPostTimeModelSaver ptd = listePdtSuites.get(i);
- XStream parser = getParser();
+ XStream parser = getParser(true);
parser.omitField(TrPostTimeModelSaver.class, "fmtPattern__");
out = parser.createObjectOutputStream(new FileWriter(getVariableFile(pathVariables, listeSuiteCalcul.get(i).Id)));
out.writeObject(var);
@@ -645,7 +639,7 @@
// -- outputstream du xstream --//
ObjectInputStream in = null;
try {
- in = EbliLib.createObjectInpuStream(file, getParser());
+ in = EbliLib.createObjectInpuStream(file, getParser(isNewVersion));
// -- recuperation du multiSourceActivator--//
final TrPostMultiSourceActivator2 multiProjectActivator = new TrPostMultiSourceActivator2(mainProject);
@@ -782,7 +776,7 @@
if (fileVariables.canRead()) {
ObjectInputStream in = null;
try {
- in = EbliLib.createObjectInpuStream(fileVariables, getParser());
+ in = EbliLib.createObjectInpuStream(fileVariables, getParser(isNewVersion));
Object var = in.readObject();
if (var instanceof TrPostUserVariableSaver) {
Map<String, double[]> savedValues = new HashMap<String, double[]>();
@@ -852,6 +846,7 @@
boolean res = false;
try {
final HashMap<String, Object> parametres = new HashMap<String, Object>();
+ parametres.put(XstreamCustomizer.PARAMETER_ID, new TrPostPersistenceXstreamConfiguration.CustomXstreamCustomizer(true));
progression("Cr\xE9ation du r\xE9pertoire", 10);
res = false;
@@ -862,7 +857,7 @@
// -- etape 1: creation du repertoire des graphe et calques --//
final File fileVar = projectFileFinder.getVariablesDir();
fileVar.mkdirs();
-
+ projectFileFinder.saveVersion(CURRENT_VERSION);
// -- etape 2 sauvegarde du fichier contenant tous les sources ouverts
progression("Cr\xE9ation du fichier descripteur de sources", 15);
File mainSetupFile = projectFileFinder.getMainSetupFile();
@@ -953,7 +948,7 @@
ObjectOutputStream out = null;
try {
mkdirParent(file);
- out = EbliLib.createObjectOutpuStream(file, getParser());
+ out = EbliLib.createObjectOutpuStream(file, getParser(true));
// --readme --//
out.writeObject(XmlCommentaire.getCommentaireName());
@@ -994,7 +989,7 @@
return Collections.emptyList();
}
try {
- in = EbliLib.createObjectInpuStream(file, getParser());
+ in = EbliLib.createObjectInpuStream(file, getParser(isNewVersion));
// --readme --//
final Object debuTfichier = in.readObject();
if (debuTfichier instanceof XmlCommentaire) {
@@ -1015,6 +1010,7 @@
}
return liste;
}
+ boolean isNewVersion;
/**
* Methode qui charge le projet,l'ensemble des sources et toutes les widgets dans les layouts.
@@ -1043,8 +1039,10 @@
// -- etape 2 sauvegarde du fichier contenant tous les sources ouverts
progression("Chargement du fichier descripteur de sources", 15);
File mainSetupFile = projectFileFinder.getMainSetupFile();
+ isNewVersion = projectFileFinder.getVersion() != null;//pour l'instant qu'une version...
final HashMap<String, Object> parametres = new HashMap<String, Object>();
+ parametres.put(XstreamCustomizer.PARAMETER_ID, new TrPostPersistenceXstreamConfiguration.CustomXstreamCustomizer(isNewVersion));
if (!loadSource(mainSetupFile, parametres)) {
managerError.addMessageError(
"Veuillez corriger les chemins des fichiers r\xE9sultats dans le fichier setup et r\xE9it\xE9rez l'op\xE9ration.");
@@ -1077,7 +1075,6 @@
parametres.put(TrPostReloadParameter.POST_PROJET, mainProject);
parametres.put("errorMsg", managerError.listeMessageError);
parametres.put(TrPostReloadParameter.RECOMPUTE, Boolean.valueOf(recomputeAllData));
- parametres.put(XstreamCustomizer.PARAMETER_ID, new CustomXstreamCustomizer());
// -- etape 5 lecture de la liste des couples nomsfRAME /ID --//
final List<EbliWidgetSerializeXml.CoupleNomId> listeCouplesNoms = loadNomsFrames(projectFileFinder.getMainWidgetDir());
SwingUtilities.invokeLater(new Runnable() {
@@ -1126,72 +1123,13 @@
}
private XStream parser_;
- private XStream getParser() {
+ private XStream getParser(boolean newVersion) {
if (parser_ == null) {
- parser_ = createXmlParser();
+ parser_ = TrPostPersistenceXstreamConfiguration.createXmlParser(newVersion);
}
return parser_;
}
- /**
- * Init le parser avec les alias adequats.
- *
- * @return
- */
- private static XStream createXmlParser() {
- final XmlFriendlyReplacer replacer = new XmlFriendlyReplacer("#", "_");
- // final DomDriver domDriver = new DomDriver("UTF-8", replacer);
- final XppDriver staxDriver = new XppCustomDriver(replacer);
- final XStream xstream = new XStream(staxDriver);
- // -- creation des alias pour que ce soit + parlant dans le xml file --//
- xstream.alias("LAYOUT", EbliSceneSerializeXml.class);
- xstream.alias("FRAME", EbliWidgetSerializeXml.class);
- xstream.alias("GROUPE", EbliWidgetGroupSerializeXml.class);
- xstream.alias("FRAMESNAME", EbliWidgetSerializeXml.CoupleNomId.class);
- xstream.alias("SOURCE", TrPostSourcePersist.class);
- // these field is no more needed:
- xstream.omitField(TrPostSourcePersist.class, "rechargerLesLiens");
- xstream.alias("PROJECTED_SOURCE", TrPostSourceProjectedPersistReplay.class);
- xstream.alias("ONETIME_SOURCE", TrPostSourceOneTimeStepReplayPersist.class);
- xstream.alias("COMPARAISON_SOURCE", TrPostSourceComparaisonPersistReplay.class);
- xstream.alias("SUITECALCUL", TrPostSourcePersistComposite.class);
- xstream.alias("LAYOUTDESCRIPTOR", LayoutDescriptor.class);
- xstream.alias("README", XmlCommentaire.class);
- xstream.alias("TIMEMODEL", TrPostTimeModelSaver.class);
- xstream.alias("USERVAR", TrPostUserVariableSaver.class);
- xstream.omitField(TrPostDataCreatedStatisticSaver.class, "data_");
- xstream.omitField(TriangleAnchorShape.class, "generalPath");
- xstream.registerLocalConverter(TrPostDataCreatedStatisticSaver.class, "data_", new Converter() {
- @Override
- public boolean canConvert(Class type) {
- return true;
- }
-
- @Override
- public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
- return null;
- }
-
- @Override
- public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
- }
- });
- xstream.omitField(TrPostCourbeTreeModelPersist.class, "varSupported");
- xstream.omitField(TrPostCourbeTreeModelPersist.class, "objIdx");
- xstream.omitField(TrPostCourbeTreeModelPersist.class, "intepolPt");
- return xstream;
- }
-
- private static class CustomXstreamCustomizer implements XstreamCustomizer {
-
- @Override
- public void configureXstream(XStream xstream) {
- xstream.omitField(TrPostCourbeTreeModelPersist.class, "varSupported");
- xstream.omitField(TrPostCourbeTreeModelPersist.class, "objIdx");
- xstream.omitField(TrPostCourbeTreeModelPersist.class, "intepolPt");
- }
- }
-
private static void buildMapWithDataPath(TrPostPersistenceFileFinder projectFileFinder, final Map parametres,
final String repertoireLayout) {
final File repertoireLayoutFile = projectFileFinder.getPath(repertoireLayout);
@@ -1208,7 +1146,6 @@
parametres.put("pathGraphes", dirGraphes.getAbsolutePath());
parametres.put("pathCalques", dirCalques.getAbsolutePath());
parametres.put("pathTexte", dirText.getAbsolutePath());
-
}
/**
@@ -1234,7 +1171,7 @@
// -- outputstream du xstream --//
ObjectOutputStream out = null;
try {
- out = EbliLib.createObjectOutpuStream(file, createXmlParser());
+ out = EbliLib.createObjectOutpuStream(file, TrPostPersistenceXstreamConfiguration.createXmlParser(true));
// -- g\xE9n\xE9ration du xml pour la scene --//
out.writeObject(new EbliSceneSerializeXml(scene, title, (Dimension) parametres.get("dimensions"), (Point) parametres.get(
@@ -1343,7 +1280,7 @@
// -- inputstream du xstream --//
ObjectInputStream in = null;
try {
- in = EbliLib.createObjectInpuStream(file, getParser());
+ in = EbliLib.createObjectInpuStream(file, getParser(isNewVersion));
// -- r\xE9cup\xE9ration de la scene xml --//
final EbliSceneSerializeXml sceneXml = (EbliSceneSerializeXml) in.readObject();
Added: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceXstreamConfiguration.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceXstreamConfiguration.java (rev 0)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostPersistenceXstreamConfiguration.java 2012-11-13 08:51:04 UTC (rev 7876)
@@ -0,0 +1,123 @@
+/*
+ GPL 2
+ */
+package org.fudaa.fudaa.tr.post.persist;
+
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.Converter;
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import com.thoughtworks.xstream.io.xml.XmlFriendlyReplacer;
+import com.thoughtworks.xstream.io.xml.XppDriver;
+import org.fudaa.ctulu.xml.BooleanArrayConverter;
+import org.fudaa.ctulu.xml.DoubleArrayConverter;
+import org.fudaa.ctulu.xml.FloatArrayConverter;
+import org.fudaa.ctulu.xml.IntegerArrayConverter;
+import org.fudaa.ctulu.xml.StringArrayConverter;
+import org.fudaa.ebli.commun.XstreamCustomizer;
+import org.fudaa.ebli.converter.TraceToStringConverter;
+import org.fudaa.ebli.courbe.EGCourbeMarqueur;
+import org.fudaa.ebli.courbe.EGCourbePersist;
+import org.fudaa.ebli.courbe.convert.EGAxePersistConverter;
+import org.fudaa.ebli.courbe.convert.EGCourbePersistConverter;
+import org.fudaa.ebli.courbe.convert.EGPersistHelper;
+import org.fudaa.ebli.visuallibrary.persist.EbliSceneSerializeXml;
+import org.fudaa.ebli.visuallibrary.persist.EbliWidgetGroupSerializeXml;
+import org.fudaa.ebli.visuallibrary.persist.EbliWidgetSerializeXml;
+import org.fudaa.fudaa.tr.post.TrPostCourbeTreeModelPersist;
+import org.fudaa.fudaa.tr.post.TrPostSourcePersistComposite;
+import org.fudaa.fudaa.tr.post.TrPostTimeModelSaver;
+import org.fudaa.fudaa.tr.post.TrPostUserVariableSaver;
+import org.fudaa.fudaa.tr.post.data.TrPostDataCreatedStatisticSaver;
+import org.fudaa.fudaa.tr.post.profile.MvProfileTreeModelPersist;
+import org.netbeans.modules.visual.anchor.TriangleAnchorShape;
+
+/**
+ *
+ * @author Frederic Deniger
+ */
+public class TrPostPersistenceXstreamConfiguration {
+
+ protected static class CustomXstreamCustomizer implements XstreamCustomizer {
+
+ boolean newVersion;
+
+ public CustomXstreamCustomizer(boolean newVersion) {
+ this.newVersion = newVersion;
+ }
+
+ @Override
+ public void configureXstream(XStream xstream) {
+ if (newVersion) {
+ configureTraceColors(xstream);
+ }
+ xstream.omitField(TrPostCourbeTreeModelPersist.class, "varSupported");
+ xstream.omitField(TrPostCourbeTreeModelPersist.class, "objIdx");
+ xstream.omitField(TrPostCourbeTreeModelPersist.class, "intepolPt");
+ }
+ }
+
+ private static void configureTraceColors(XStream xstream) {
+ final TraceToStringConverter traceToStringConverter = new TraceToStringConverter();
+ EGPersistHelper.registerDefaultConverters(xstream, traceToStringConverter);
+ new EGAxePersistConverter(traceToStringConverter).initXstream(xstream);
+ xstream.processAnnotations(EGCourbeMarqueur.class);
+ xstream.registerConverter(new DoubleArrayConverter());
+ xstream.registerConverter(new BooleanArrayConverter());
+ xstream.registerConverter(new IntegerArrayConverter());
+ xstream.registerConverter(new FloatArrayConverter());
+ xstream.alias("PostVisuPanelPersistManager", org.fudaa.fudaa.tr.post.TrPostVisuPanelPersistManager.class);
+ xstream.alias("MvProfileTreeModelPersist", MvProfileTreeModelPersist.class);
+ }
+
+ /**
+ * Init le parser avec les alias adequats.
+ *
+ * @return
+ */
+ public static XStream createXmlParser(boolean newVersion) {
+ final XmlFriendlyReplacer replacer = new XmlFriendlyReplacer("#", "_");
+ final XppDriver staxDriver = new XppCustomDriver(replacer);
+ final XStream xstream = new XStream(staxDriver);
+ xstream.alias("LAYOUT", EbliSceneSerializeXml.class);
+ xstream.alias("FRAME", EbliWidgetSerializeXml.class);
+ xstream.alias("GROUPE", EbliWidgetGroupSerializeXml.class);
+ xstream.alias("FRAMESNAME", EbliWidgetSerializeXml.CoupleNomId.class);
+ xstream.alias("SOURCE", TrPostSourcePersist.class);
+ xstream.omitField(TrPostSourcePersist.class, "rechargerLesLiens");
+ xstream.alias("PROJECTED_SOURCE", TrPostSourceProjectedPersistReplay.class);
+ xstream.alias("ONETIME_SOURCE", TrPostSourceOneTimeStepReplayPersist.class);
+ xstream.alias("COMPARAISON_SOURCE", TrPostSourceComparaisonPersistReplay.class);
+ xstream.alias("SUITECALCUL", TrPostSourcePersistComposite.class);
+ xstream.alias("LAYOUTDESCRIPTOR", LayoutDescriptor.class);
+ xstream.alias("README", XmlCommentaire.class);
+ xstream.alias("TIMEMODEL", TrPostTimeModelSaver.class);
+ xstream.alias("USERVAR", TrPostUserVariableSaver.class);
+ xstream.omitField(TrPostDataCreatedStatisticSaver.class, "data_");
+ xstream.omitField(TriangleAnchorShape.class, "generalPath");
+ xstream.registerLocalConverter(TrPostDataCreatedStatisticSaver.class, "data_", new Converter() {
+ @Override
+ public boolean canConvert(Class type) {
+ return true;
+ }
+
+ @Override
+ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
+ return null;
+ }
+
+ @Override
+ public void marshal(Object source, HierarchicalStreamWriter writer, MarshallingContext context) {
+ }
+ });
+ xstream.omitField(TrPostCourbeTreeModelPersist.class, "varSupported");
+ xstream.omitField(TrPostCourbeTreeModelPersist.class, "objIdx");
+ xstream.omitField(TrPostCourbeTreeModelPersist.class, "intepolPt");
+ if (newVersion) {
+ configureTraceColors(xstream);
+ }
+ return xstream;
+ }
+}
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostSourcePersist.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostSourcePersist.java 2012-11-13 08:50:35 UTC (rev 7875)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/persist/TrPostSourcePersist.java 2012-11-13 08:51:04 UTC (rev 7876)
@@ -20,7 +20,6 @@
@XStreamAlias("warning")
String warning = "ID unique";
String IdSource;
-// private boolean rechargerLesLiens = false;
String[] pathRelatifSource;
String[] pathSource;
Modified: trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt 2012-11-13 08:50:35 UTC (rev 7875)
+++ trunk/soft/fudaa-prepro/ui/src/main/resources/org/fudaa/fudaa/tr/common/tr_en.fr_txt 2012-11-13 08:51:04 UTC (rev 7876)
@@ -1241,4 +1241,8 @@
La courbe actuelle va \xEAtre recalcul\xE9e pour les donn\xE9es suivantes\:\n Variable\: {0}\n Nombre d'\xE9l\xE9ments\: {1}=The current curve will be recaculated with the following inputs\:\n Variable\: {0}\n Number of meshes\: {1}
Une nouvelle courbe de cubature va \xEAtre recalcul\xE9e pour les donn\xE9es suivantes\:\n Variable\: {0}\n Nombre d'\xE9l\xE9ments\: {1}.\nLa courbe actuelle ne sera pas \xE9cras\xE9e=A new curve will be recalculated with the following inputs\:\n Variable\: {0}\n Number of meshes\: {1}.\nThe current curve won't be deleted
Il faut s\xE9lectionner au moins 1 \xE9l\xE9ment afin de calculer un volume.\nPour s\xE9lectionner plusieurs \xE9l\xE9ments, maintenir la touche shift=At least one mesh must be selected to calculate the volume.\nTo select several meshes, press the key Shift
-S\xE9lectionner le fichier r\xE9sultat=Select the result file
\ No newline at end of file
+S\xE9lectionner le fichier r\xE9sultat=Select the result file
+Fusionner avec un autre projet POST=Merge with another POST project
+Choisir le pas de temps \xE0 utiliser=Choose the timestep to use
+Les t\xE2ches en cours=Current tasks
+Cacher/Afficher les t\xE2ches=Hide/show tasks
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-12-12 16:41:58
|
Revision: 8120
http://fudaa.svn.sourceforge.net/fudaa/?rev=8120&view=rev
Author: deniger
Date: 2012-12-12 16:41:48 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/pom.xml
Removed Paths:
-------------
trunk/soft/fudaa-prepro/meshview/
Modified: trunk/soft/fudaa-prepro/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/pom.xml 2012-12-12 16:38:07 UTC (rev 8119)
+++ trunk/soft/fudaa-prepro/pom.xml 2012-12-12 16:41:48 UTC (rev 8120)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-sig.version>1.4-SNAPSHOT</fudaa-sig.version>
+ <fudaa-mesh.version>1.4-SNAPSHOT</fudaa-mesh.version>
<javaCompiler>1.6</javaCompiler>
<targetJdk>1.6</targetJdk>
</properties>
@@ -19,7 +19,7 @@
<name>Fudaa-Prepro</name>
<packaging>pom</packaging>
<modules>
- <module>meshview</module>
+ <!--<module>meshview</module>-->
<module>grid</module>
<module>ui</module>
</modules>
@@ -27,7 +27,7 @@
<profile>
<id>release</id>
<modules>
- <module>meshview</module>
+ <!--<module>meshview</module>-->
<module>grid</module>
<module>ui</module>
<module>prepro-jnlp</module>
@@ -37,27 +37,27 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.fudaa.business.fudaa-sig</groupId>
- <artifactId>fudaa-sig</artifactId>
- <version>${fudaa-sig.version}</version>
+ <groupId>org.fudaa.soft.fudaa-mesh</groupId>
+ <artifactId>fudaa-mesh</artifactId>
+ <version>${fudaa-mesh.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.fudaa.business.fudaa-sig</groupId>
- <artifactId>fudaa-sig</artifactId>
- <version>${fudaa-sig.version}</version>
+ <groupId>org.fudaa.soft.fudaa-mesh</groupId>
+ <artifactId>fudaa-mesh</artifactId>
+ <version>${fudaa-mesh.version}</version>
</dependency>
<dependency>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>prepro-ui</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>meshview</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.fudaa.soft.fudaa-prepro</groupId>
<artifactId>grid</artifactId>
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:27
|
Revision: 8124
http://fudaa.svn.sourceforge.net/fudaa/?rev=8124&view=rev
Author: deniger
Date: 2012-12-12 17:43:15 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-prepro/grid/pom.xml
trunk/soft/fudaa-prepro/ui/pom.xml
Modified: trunk/soft/fudaa-prepro/grid/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/grid/pom.xml 2012-12-12 17:42:46 UTC (rev 8123)
+++ trunk/soft/fudaa-prepro/grid/pom.xml 2012-12-12 17:43:15 UTC (rev 8124)
@@ -1,85 +1,85 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <name>Grid pre and post-processing</name>
- <description>Prepare, launch and post-process a grid.</description>
- <parent>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>fudaa-prepro</artifactId>
- <version>1.2.0</version>
- </parent>
- <artifactId>grid</artifactId>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--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>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <versionRange>[1.3,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.fudaa-sig</groupId>
- <artifactId>fudaa-sig</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.fudaa</groupId>
- <artifactId>fudaa-common-courbe</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <project.build.sourceEncoding>ISO-8859-15</project.build.sourceEncoding>
- </properties>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <name>Grid pre and post-processing</name>
+ <description>Prepare, launch and post-process a grid.</description>
+ <parent>
+ <groupId>org.fudaa.soft.fudaa-prepro</groupId>
+ <artifactId>fudaa-prepro</artifactId>
+ <version>1.2.0</version>
+ </parent>
+ <artifactId>grid</artifactId>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!--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>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <versionRange>[1.3,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-mesh</groupId>
+ <artifactId>fudaa-mesh</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.fudaa</groupId>
+ <artifactId>fudaa-common-courbe</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <project.build.sourceEncoding>ISO-8859-15</project.build.sourceEncoding>
+ </properties>
</project>
Modified: trunk/soft/fudaa-prepro/ui/pom.xml
===================================================================
--- trunk/soft/fudaa-prepro/ui/pom.xml 2012-12-12 17:42:46 UTC (rev 8123)
+++ trunk/soft/fudaa-prepro/ui/pom.xml 2012-12-12 17:43:15 UTC (rev 8124)
@@ -19,8 +19,8 @@
<artifactId>j3d-core-utils</artifactId>
</dependency>
<dependency>
- <groupId>org.fudaa.soft.fudaa-prepro</groupId>
- <artifactId>meshview</artifactId>
+ <groupId>org.fudaa.soft.fudaa-mesh</groupId>
+ <artifactId>fudaa-mesh</artifactId>
</dependency>
<dependency>
<groupId>com.jidesoft</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X