Menu
▾
▴
fudaa-svn-commit — svn commit with diffs
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(46) |
Jul
(37) |
Aug
(154) |
Sep
(140) |
Oct
(132) |
Nov
(104) |
Dec
(67) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(113) |
Feb
(73) |
Mar
(102) |
Apr
(106) |
May
(114) |
Jun
(67) |
Jul
(116) |
Aug
(48) |
Sep
(108) |
Oct
(296) |
Nov
(56) |
Dec
(53) |
| 2010 |
Jan
(95) |
Feb
(31) |
Mar
(40) |
Apr
(12) |
May
(10) |
Jun
(27) |
Jul
(19) |
Aug
(81) |
Sep
(48) |
Oct
(45) |
Nov
(40) |
Dec
(7) |
| 2011 |
Jan
(16) |
Feb
(32) |
Mar
(55) |
Apr
(38) |
May
(24) |
Jun
(37) |
Jul
(12) |
Aug
(16) |
Sep
(97) |
Oct
(90) |
Nov
(101) |
Dec
(89) |
| 2012 |
Jan
(18) |
Feb
(2) |
Mar
(54) |
Apr
(69) |
May
(97) |
Jun
(131) |
Jul
(70) |
Aug
(48) |
Sep
(48) |
Oct
(119) |
Nov
(194) |
Dec
(60) |
| 2013 |
Jan
(73) |
Feb
(35) |
Mar
(42) |
Apr
(28) |
May
(7) |
Jun
(17) |
Jul
(27) |
Aug
(10) |
Sep
(38) |
Oct
(12) |
Nov
(4) |
Dec
(16) |
| 2014 |
Jan
(33) |
Feb
(37) |
Mar
(19) |
Apr
(3) |
May
(47) |
Jun
(26) |
Jul
(22) |
Aug
|
Sep
(10) |
Oct
(30) |
Nov
(24) |
Dec
(19) |
| 2015 |
Jan
(13) |
Feb
(16) |
Mar
(36) |
Apr
(19) |
May
(5) |
Jun
(5) |
Jul
(3) |
Aug
(11) |
Sep
(22) |
Oct
(7) |
Nov
(14) |
Dec
|
| 2016 |
Jan
|
Feb
(26) |
Mar
(13) |
Apr
(61) |
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
(27) |
Nov
(14) |
Dec
(21) |
| 2017 |
Jan
(30) |
Feb
(4) |
Mar
(3) |
Apr
(5) |
May
(69) |
Jun
(29) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <bma...@us...> - 2015-01-29 11:10:03
|
Revision: 9001
http://sourceforge.net/p/fudaa/svn/9001
Author: bmarchan
Date: 2015-01-29 11:10:00 +0000 (Thu, 29 Jan 2015)
Log Message:
-----------
Chgt version en 1.4-SNAPSHOT
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/pom.xml
Modified: trunk/soft/fudaa-lspiv/pom.xml
===================================================================
--- trunk/soft/fudaa-lspiv/pom.xml 2015-01-29 10:52:32 UTC (rev 9000)
+++ trunk/soft/fudaa-lspiv/pom.xml 2015-01-29 11:10:00 UTC (rev 9001)
@@ -12,11 +12,11 @@
<parent>
<groupId>org.fudaa.pom</groupId>
<artifactId>soft-pom</artifactId>
- <version>1.3</version>
+ <version>1.5</version>
</parent>
<groupId>org.fudaa.soft.fudaa-lspiv</groupId>
<artifactId>fudaa-lspiv</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
<name>Fudaa-Lspiv</name>
<dependencyManagement>
<dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-01-29 10:52:39
|
Revision: 9000
http://sourceforge.net/p/fudaa/svn/9000
Author: bmarchan
Date: 2015-01-29 10:52:32 +0000 (Thu, 29 Jan 2015)
Log Message:
-----------
Ajout des methodes CtuluDialogPanel.affiche(Component, ...)
Modified Paths:
--------------
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluDialogPanel.java
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluDialogPanel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluDialogPanel.java 2015-01-27 15:43:20 UTC (rev 8999)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluDialogPanel.java 2015-01-29 10:52:32 UTC (rev 9000)
@@ -376,6 +376,28 @@
ctuluDialog.setTitle(_title);
ctuluDialog.afficheDialog();
}
+
+ public void affiche(final Component _parent) {
+ affiche(_parent, null);
+ }
+
+ public void affiche(final Component _parent, final int _option) {
+ affiche(_parent, null, _option);
+ }
+
+ public void affiche(final Component _parent, final String _title) {
+ affiche(_parent, _title, CtuluDialog.OK_CANCEL_OPTION);
+ }
+
+ public void affiche(final Component _parent, final String _t, final int _option) {
+ final CtuluDialog s = createDialog(_parent);
+ s.setInitParent(_parent);
+ s.setOption(_option);
+ if (_t != null) {
+ s.setTitle(_t);
+ }
+ s.afficheDialog();
+ }
public int afficheModale(final Component _parent) {
return afficheModale(_parent, null, CtuluDialog.OK_CANCEL_OPTION);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-01-27 15:43:22
|
Revision: 8999
http://sourceforge.net/p/fudaa/svn/8999
Author: bmarchan
Date: 2015-01-27 15:43:20 +0000 (Tue, 27 Jan 2015)
Log Message:
-----------
Ajout de la m?\195?\169thode CtuluListEditorPanel.setAllEnabled()
Modified Paths:
--------------
trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluListEditorPanel.java
Modified: trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluListEditorPanel.java
===================================================================
--- trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluListEditorPanel.java 2015-01-27 15:38:02 UTC (rev 8998)
+++ trunk/framework/ctulu-ui/src/main/java/org/fudaa/ctulu/gui/CtuluListEditorPanel.java 2015-01-27 15:43:20 UTC (rev 8999)
@@ -48,6 +48,8 @@
protected JButton btCopy_;
boolean doubleClickEdit_;
+ /** Pour rendre le panneau enable ou non */
+ private boolean allEnabled_=true;
public CtuluListEditorPanel(final CtuluListEditorModel _m) {
this(_m, true, true, true, true, true);
@@ -449,6 +451,15 @@
popupMenu(_evt);
}
}
+
+ /**
+ * Rend actif ou inactif tous les sous composants.
+ * @param _b True : Le composant est actif.
+ */
+ public void setAllEnabled(boolean _b) {
+ allEnabled_=_b;
+ updateActionsState();
+ }
void popupMenu(final MouseEvent _evt) {
buildPopupMenu().show((JComponent) _evt.getSource(), _evt.getX(), _evt.getY());
@@ -456,28 +467,30 @@
protected void updateActionsState() {
if (btAjouter_ != null) {
- btAjouter_.setEnabled(model_.canAdd());
+ btAjouter_.setEnabled(model_.canAdd() && allEnabled_);
}
if (btInserer_ != null) {
- btInserer_.setEnabled((model_.canAdd()) && (table_.getSelectedRowCount() == 1));
+ btInserer_.setEnabled((model_.canAdd()) && (table_.getSelectedRowCount() == 1) && allEnabled_);
}
if (btSupprimer_ != null) {
- btSupprimer_.setEnabled((model_.canRemove()) && (table_.getSelectedRowCount() != 0));
+ btSupprimer_.setEnabled((model_.canRemove()) && (table_.getSelectedRowCount() != 0) && allEnabled_);
}
if (btModifier_ != null) {
- btModifier_.setEnabled(table_.getSelectedRowCount() == 1);
+ btModifier_.setEnabled(table_.getSelectedRowCount() == 1 && allEnabled_);
}
if (btCopy_ != null) {
- btCopy_.setEnabled(table_.getSelectedRowCount() == 1);
+ btCopy_.setEnabled(table_.getSelectedRowCount() == 1 && allEnabled_);
}
if (btMonter_ != null) {
final boolean isOnlyOne = table_.getRowCount() > 1 && table_.getSelectedRowCount() >= 1
- && table_.getSelectedRow() >= 0;
- btMonter_.setEnabled(isOnlyOne && table_.getSelectionModel().getMinSelectionIndex() > 0);
+ && table_.getSelectedRow() >= 0 && allEnabled_;
+ btMonter_.setEnabled(isOnlyOne && table_.getSelectionModel().getMinSelectionIndex() > 0 && allEnabled_);
btDescendre_
- .setEnabled(isOnlyOne && table_.getSelectionModel().getMaxSelectionIndex() < table_.getRowCount() - 1);
+ .setEnabled(isOnlyOne && table_.getSelectionModel().getMaxSelectionIndex() < table_.getRowCount() - 1 && allEnabled_);
}
+
+ table_.setEnabled(allEnabled_);
}
public void setDoubleClickEdit(final boolean _b) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-01-27 15:38:22
|
Revision: 8998
http://sourceforge.net/p/fudaa/svn/8998
Author: bmarchan
Date: 2015-01-27 15:38:02 +0000 (Tue, 27 Jan 2015)
Log Message:
-----------
Recentrage de l'espace image lors de la s?\195?\169lection d'images sources.
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivSelectImagesAction.java
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivSelectImagesAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivSelectImagesAction.java 2015-01-27 15:13:06 UTC (rev 8997)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivSelectImagesAction.java 2015-01-27 15:38:02 UTC (rev 8998)
@@ -17,7 +17,6 @@
import org.fudaa.fudaa.piv.PivExePanel;
import org.fudaa.fudaa.piv.PivImplementation;
import org.fudaa.fudaa.piv.PivManageOriginalFilesPanel;
-import org.fudaa.fudaa.piv.PivPreferences;
import org.fudaa.fudaa.piv.PivProgressionPanel;
import org.fudaa.fudaa.piv.PivResource;
import org.fudaa.fudaa.piv.PivVisuPanel;
@@ -95,9 +94,6 @@
finally {
diProgress_.dispose();
}
-
- impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_ORIGINAL_VIEW);
-// impl.message(PivResource.getS("{0} images ont \xE9t\xE9 reconditionn\xE9es avec succ\xE8s",impl.getCurrentProject().getSrcImageFiles().length));
}
};
@@ -109,6 +105,9 @@
r.start();
diProgress_.afficheDialogModal();
+
+ impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_ORIGINAL_VIEW);
+ impl.get2dFrame().restaurer();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-01-27 15:13:18
|
Revision: 8997
http://sourceforge.net/p/fudaa/svn/8997
Author: bmarchan
Date: 2015-01-27 15:13:06 +0000 (Tue, 27 Jan 2015)
Log Message:
-----------
Export des images sources et transform?\195?\169es
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportImageFilesPanel.java
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportImageFilesPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportImageFilesPanel.java 2015-01-27 14:59:19 UTC (rev 8996)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportImageFilesPanel.java 2015-01-27 15:13:06 UTC (rev 8997)
@@ -66,7 +66,7 @@
fcDirExport_=new CtuluFileChooserPanel(PivResource.getS("R\xE9pertoire destination"));
fcDirExport_.setFileSelectMode(JFileChooser.DIRECTORIES_ONLY);
fcDirExport_.setWriteMode(false);
- JPanel pnDirExport=CtuluFileChooserPanel.buildPanel(fcDirExport_, PivResource.getS("R\xE9pertoire destination"));
+ JPanel pnDirExport=CtuluFileChooserPanel.buildPanel(fcDirExport_, PivResource.getS("R\xE9pertoire destination:"));
// Liste des images
mdFiles_=new CtuluListEditorModel(true) {
@@ -112,7 +112,7 @@
cbFormat_=new JComboBox();
// 2 formats suppl\xE9mentaires
- cbFormat_.addItem(PivResource.getS("<d'origine>"));
+ cbFormat_.addItem(PivResource.getS("<original>"));
cbFormat_.addItem("pgm");
List<String> exts=CtuluImageExport.FORMAT_LIST;
for (String ext : exts) {
@@ -121,7 +121,7 @@
JPanel pnFormat=new JPanel();
pnFormat.setLayout(new BorderLayout(3,3));
- pnFormat.add(new JLabel(PivResource.getS("Format d'export")),BorderLayout.WEST);
+ pnFormat.add(new JLabel(PivResource.getS("Format d'export:")),BorderLayout.WEST);
pnFormat.add(cbFormat_,BorderLayout.CENTER);
add(rbAllFiles_);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-01-27 14:59:22
|
Revision: 8996
http://sourceforge.net/p/fudaa/svn/8996
Author: bmarchan
Date: 2015-01-27 14:59:19 +0000 (Tue, 27 Jan 2015)
Log Message:
-----------
Affichage GRP au mm dans fenetre de v?\195?\169rification
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoVerifyGRPPanel.java
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoVerifyGRPPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoVerifyGRPPanel.java 2015-01-27 14:52:27 UTC (rev 8995)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoVerifyGRPPanel.java 2015-01-27 14:59:19 UTC (rev 8996)
@@ -97,8 +97,8 @@
public GRPCellRenderer() {
this.setHorizontalAlignment(SwingConstants.RIGHT);
- fmt.setMaximumFractionDigits(2);
- fmt.setMinimumFractionDigits(2);
+ fmt.setMaximumFractionDigits(3);
+ fmt.setMinimumFractionDigits(3);
}
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-01-27 14:52:30
|
Revision: 8995
http://sourceforge.net/p/fudaa/svn/8995
Author: bmarchan
Date: 2015-01-27 14:52:27 +0000 (Tue, 27 Jan 2015)
Log Message:
-----------
Export des images sources et transform?\195?\169es
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
Added Paths:
-----------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportImageFilesPanel.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportImagesAction.java
Removed Paths:
-------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportTranfFilesPanel.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportTransfImagesAction.java
Copied: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportImageFilesPanel.java (from rev 8994, trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportTranfFilesPanel.java)
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportImageFilesPanel.java (rev 0)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportImageFilesPanel.java 2015-01-27 14:52:27 UTC (rev 8995)
@@ -0,0 +1,232 @@
+/*
+ * @creation 18 d\xE9c. 2008
+ * @modification $Date:$
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.fudaa.piv;
+
+import java.awt.BorderLayout;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.io.File;
+import java.util.List;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JComboBox;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+
+import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.gui.CtuluCellTextRenderer;
+import org.fudaa.ctulu.gui.CtuluDialogPanel;
+import org.fudaa.ctulu.gui.CtuluFileChooserPanel;
+import org.fudaa.ctulu.gui.CtuluListEditorModel;
+import org.fudaa.ctulu.gui.CtuluListEditorPanel;
+import org.fudaa.ctulu.image.CtuluImageExport;
+
+import com.memoire.bu.BuVerticalLayout;
+
+/**
+ * Un panneau pour exporter les images transform\xE9es pgm ou autres vers un r\xE9pertoire choisi.
+ *
+ * @author mar...@de...
+ * @version $Id$
+ */
+public class PivExportImageFilesPanel extends CtuluDialogPanel {
+
+ private CtuluUI ui_;
+ /** Le repertoire d'export. */
+ private CtuluFileChooserPanel fcDirExport_;
+ /** Le mod\xE8le pour la liste des images */
+ private CtuluListEditorModel mdFiles_;
+ /** La liste des images */
+ private CtuluListEditorPanel pnFiles_;
+ /** toutes les images */
+ private JRadioButton rbAllFiles_;
+ /** Une selection des images */
+ private JRadioButton rbSelectedImages_;
+ /** Format d'export */
+ private JComboBox cbFormat_;
+
+ /**
+ * Constructeur.
+ * @param _ui Le parent pour la boite de dialogue.
+ * @param _originalFormatSupported
+ */
+ public PivExportImageFilesPanel(CtuluUI _ui) {
+ ui_=_ui;
+
+ setLayout(new BuVerticalLayout(5, true, true));
+ setHelpText(PivResource.getS("S\xE9lectionnez les images que vous souhaitez exporter, puis le format d'export."));
+
+ fcDirExport_=new CtuluFileChooserPanel(PivResource.getS("R\xE9pertoire destination"));
+ fcDirExport_.setFileSelectMode(JFileChooser.DIRECTORIES_ONLY);
+ fcDirExport_.setWriteMode(false);
+ JPanel pnDirExport=CtuluFileChooserPanel.buildPanel(fcDirExport_, PivResource.getS("R\xE9pertoire destination"));
+
+ // Liste des images
+ mdFiles_=new CtuluListEditorModel(true) {
+ @Override
+ public boolean isCellEditable(int _rowIndex, int _columnIndex) {
+ return false;
+ }
+ @Override
+ public Object createNewObject() {
+ return null;
+ }
+ };
+
+ pnFiles_=new CtuluListEditorPanel(mdFiles_, false, false, false, false, false) {
+ @Override
+ public void actionAdd() {
+ }
+ };
+
+ pnFiles_.setValueListCellRenderer(new CtuluCellTextRenderer() {
+ @Override
+ public void setValue(Object _file) {
+ File f=(File)_file;
+ setText(f.getName());
+ }
+ });
+
+ rbAllFiles_=new JRadioButton(PivResource.getS("Toutes les images"));
+ rbAllFiles_.addItemListener(new ItemListener() {
+
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ pnFiles_.setAllEnabled(!rbAllFiles_.isSelected());
+ }
+ });
+ rbSelectedImages_=new JRadioButton(PivResource.getS("Les images s\xE9lectionn\xE9es"));
+
+ ButtonGroup bg=new ButtonGroup();
+ bg.add(rbAllFiles_);
+ bg.add(rbSelectedImages_);
+
+ rbAllFiles_.setSelected(true);
+
+ cbFormat_=new JComboBox();
+ // 2 formats suppl\xE9mentaires
+ cbFormat_.addItem(PivResource.getS("<d'origine>"));
+ cbFormat_.addItem("pgm");
+ List<String> exts=CtuluImageExport.FORMAT_LIST;
+ for (String ext : exts) {
+ cbFormat_.addItem(ext);
+ }
+
+ JPanel pnFormat=new JPanel();
+ pnFormat.setLayout(new BorderLayout(3,3));
+ pnFormat.add(new JLabel(PivResource.getS("Format d'export")),BorderLayout.WEST);
+ pnFormat.add(cbFormat_,BorderLayout.CENTER);
+
+ add(rbAllFiles_);
+ add(rbSelectedImages_);
+ add(pnFiles_);
+ add(pnFormat);
+ add(pnDirExport);
+ }
+
+ @Override
+ public void setValue(Object _files) {
+ if (!(_files instanceof File[]))
+ throw new IllegalArgumentException("bad type parameter");
+ setFiles((File[])_files);
+ }
+
+ @Override
+ public File[] getValue() {
+ return getFiles();
+ }
+
+ /**
+ * D\xE9finit l'utilitaire \xE0 modifier.
+ * @param _tool L'utilitaire
+ */
+ public void setFiles(File[] _files) {
+ if (_files==null) return;
+
+ mdFiles_.setData(_files);
+ }
+
+ /**
+ * @return Les fichiers image.
+ */
+ public File[] getFiles() {
+ File[] files=new File[mdFiles_.getRowCount()];
+ mdFiles_.getValues(files);
+
+ return files;
+ }
+
+ /**
+ * @return Les fichiers selectionn\xE9s de la liste, ou tous les fichiers si le bouton radio
+ * "toutes images" est activ\xE9.
+ */
+ public File[] getSelectedFiles() {
+ if (rbAllFiles_.isSelected()) {
+ return getFiles();
+ }
+ else {
+ int[] selind=pnFiles_.getTable().getSelectedRows();
+ File[] files=new File[selind.length];
+ for (int i=0; i<selind.length; i++) {
+ files[i]=(File)mdFiles_.getValueAt(selind[i]);
+ }
+ return files;
+ }
+ }
+
+ /**
+ * @return Le repertoire destination
+ */
+ public File getDestinationDir() {
+ return fcDirExport_.getFile();
+ }
+
+ /**
+ * @return Le format d'export. ORIGIN si le format d'origine est autoris\xE9.
+ */
+ public String getFormat() {
+ if (cbFormat_.getSelectedIndex()==0) {
+ return "ORIGIN";
+ }
+ return (String)cbFormat_.getSelectedItem();
+ }
+
+ @Override
+ public boolean isDataValid() {
+ if (getSelectedFiles().length==0) {
+ setErrorText(PivResource.getS("Pas d'image \xE0 transf\xE9rer ou aucune image s\xE9lectionn\xE9e"));
+ return false;
+ }
+ File dir=fcDirExport_.getFile();
+ if (dir==null || !dir.exists() || !dir.canWrite()) {
+ setErrorText(PivResource.getS("Le r\xE9pertoire de destination n'est pas d\xE9fini ou est inaccessible"));
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public void apply() {
+ setErrorText("");
+ super.apply();
+ }
+
+ @Override
+ public boolean cancel() {
+ setErrorText("");
+ return super.cancel();
+ }
+
+ @Override
+ public boolean ok() {
+ setErrorText("");
+ return super.ok();
+ }
+}
Deleted: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportTranfFilesPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportTranfFilesPanel.java 2015-01-23 14:32:27 UTC (rev 8994)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportTranfFilesPanel.java 2015-01-27 14:52:27 UTC (rev 8995)
@@ -1,137 +0,0 @@
-/*
- * @creation 18 d\xE9c. 2008
- * @modification $Date:$
- * @license GNU General Public License 2
- * @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail fud...@li...
- */
-package org.fudaa.fudaa.piv;
-
-import java.io.File;
-
-import javax.swing.JFileChooser;
-import javax.swing.JLabel;
-
-import org.fudaa.ctulu.CtuluUI;
-import org.fudaa.ctulu.gui.CtuluCellTextRenderer;
-import org.fudaa.ctulu.gui.CtuluDialogPanel;
-import org.fudaa.ctulu.gui.CtuluFileChooser;
-import org.fudaa.ctulu.gui.CtuluFileChooserPanel;
-import org.fudaa.ctulu.gui.CtuluListEditorModel;
-import org.fudaa.ctulu.gui.CtuluListEditorPanel;
-
-import com.memoire.bu.BuVerticalLayout;
-
-/**
- * Un panneau pour exporter les images transform\xE9es pgm ou autres vers un r\xE9pertoire choisi.
- *
- * @author mar...@de...
- * @version $Id$
- */
-public class PivExportTranfFilesPanel extends CtuluDialogPanel {
-
- private CtuluUI ui_;
- /** Le repertoire racine du projet */
- private File prjRoot_;
- /** Le repertoire d'export. */
- private CtuluFileChooserPanel fcDirExport_;
- /** Le mod\xE8le pour la liste des images */
- private CtuluListEditorModel mdFiles_;
-
- /**
- * Constructeur.
- * @param _ui Le parent pour la boite de dialogue.
- */
- public PivExportTranfFilesPanel(CtuluUI _ui) {
- ui_=_ui;
-
- setLayout(new BuVerticalLayout(5, true, true));
- setHelpText(PivResource.getS("Selectionner les images que vous souhaitez exporter."));
-
- fcDirExport_=new CtuluFileChooserPanel();
- fcDirExport_.setFileSelectMode(JFileChooser.DIRECTORIES_ONLY);
- add(fcDirExport_);
-
- // Label images
- add(new JLabel(PivResource.getS("Liste des images"),JLabel.LEFT));
-
- // Liste des images
- mdFiles_=new CtuluListEditorModel(true) {
- @Override
- public boolean isCellEditable(int _rowIndex, int _columnIndex) {
- return false;
- }
- @Override
- public Object createNewObject() {
- return null;
- }
- };
-
- CtuluListEditorPanel pnFiles=new CtuluListEditorPanel(mdFiles_, true, true, false) {
- @Override
- public void actionAdd() {
- }
- };
-
- pnFiles.setValueListCellRenderer(new CtuluCellTextRenderer() {
- @Override
- public void setValue(Object _file) {
- File f=(File)_file;
- setText(f.getName());
- if (f.getPath().startsWith(prjRoot_.getPath())) {
- setToolTipText(PivResource.getS("Dans le projet"));
- }
- else {
- setToolTipText(f.getPath());
- }
- }
- });
-
- add(pnFiles);
- }
-
- @Override
- public void setValue(Object _files) {
- if (!(_files instanceof File[]))
- throw new IllegalArgumentException("bad type parameter");
- setFiles((File[])_files);
- }
-
- @Override
- public File[] getValue() {
- return getFiles();
- }
-
- /**
- * Definit la racine du projet, pour savoir si un fichier fait d\xE9j\xE0 partie du projet.
- * @param _root La racine du projet.
- */
- public void setRootProject(File _root) {
- prjRoot_=_root;
- }
-
- /**
- * D\xE9finit l'utilitaire \xE0 modifier.
- * @param _tool L'utilitaire
- */
- public void setFiles(File[] _files) {
- if (_files==null) return;
-
- mdFiles_.setData(_files);
- }
-
- /**
- * @return Les fichiers image, comportant les anciens et nouveaux fichiers.
- */
- public File[] getFiles() {
- File[] files=new File[mdFiles_.getRowCount()];
- mdFiles_.getValues(files);
-
- return files;
- }
-
- @Override
- public boolean isDataValid() {
- return true;
- }
-}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-01-23 14:32:27 UTC (rev 8994)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-01-27 14:52:27 UTC (rev 8995)
@@ -42,7 +42,7 @@
import org.fudaa.fudaa.piv.action.PivComputeFlowAction;
import org.fudaa.fudaa.piv.action.PivComputeLaunchAction;
import org.fudaa.fudaa.piv.action.PivComputeParamAction;
-import org.fudaa.fudaa.piv.action.PivExportTransfImagesAction;
+import org.fudaa.fudaa.piv.action.PivExportImagesAction;
import org.fudaa.fudaa.piv.action.PivFlowParamAction;
import org.fudaa.fudaa.piv.action.PivImportGRPAction;
import org.fudaa.fudaa.piv.action.PivImportGridAction;
@@ -222,6 +222,7 @@
setEnabledForAction("SHOW_VELOCITIES_RESULTS", bprjOpen && project.getAverageResults()!=null);
setEnabledForAction("SHOW_FLOW_RESULTS", bprjOpen && project.getFlowResults()!=null);
setEnabledForAction("EXPORT_TRANSF_IMAGES", bprjOpen && bprjHasTransfImg);
+ setEnabledForAction("EXPORT_SRC_IMAGES", bprjOpen && bprjHasSrcImg);
refreshTitle();
}
@@ -818,7 +819,8 @@
super.initExportImageToClipborad(itExportImageToClip);
mnExport.add(itExportImageToClip);
mnExport.addSeparator();
- mnExport.add(new PivExportTransfImagesAction(this));
+ mnExport.add(new PivExportImagesAction(this,true));
+ mnExport.add(new PivExportImagesAction(this,false));
}
/**
Copied: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportImagesAction.java (from rev 8994, trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportTransfImagesAction.java)
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportImagesAction.java (rev 0)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportImagesAction.java 2015-01-27 14:52:27 UTC (rev 8995)
@@ -0,0 +1,169 @@
+/*
+ * @creation 3 juil. 2008
+ * @modification $Date:$
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.fudaa.piv.action;
+
+import java.awt.event.ActionEvent;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.ctulu.gui.CtuluDialog;
+import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
+import org.fudaa.ctulu.image.CtuluImageExport;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.fudaa.piv.PivExportImageFilesPanel;
+import org.fudaa.fudaa.piv.PivImplementation;
+import org.fudaa.fudaa.piv.PivProgressionPanel;
+import org.fudaa.fudaa.piv.PivResource;
+import org.fudaa.fudaa.piv.imageio.PivPGMWriter;
+
+import com.memoire.fu.FuLog;
+
+/**
+ * Une action pour eporter les images transform\xE9es ou sources
+ *
+ * @author Bertrand Marchand (mar...@de...)
+ * @version $Id$
+ */
+public class PivExportImagesAction extends EbliActionSimple {
+ PivImplementation impl;
+ PivExportImageFilesPanel pnExportImages;
+ CtuluDialog diProgress_;
+ boolean exportSrc_;
+
+ static final String TXTEXPORTERSRC=PivResource.getS("Exporter les images sources");
+ static final String TXTEXPORTERTRANSF=PivResource.getS("Exporter les images transform\xE9es");
+ static final String TXTEXPORTSRC=PivResource.getS("Export des images sources");
+ static final String TXTEXPORTTRANSF=PivResource.getS("Export des images transform\xE9es");
+
+ /**
+ * Constructeur.
+ * @param _impl L'implementation.
+ */
+ public PivExportImagesAction(PivImplementation _impl, boolean _exportSrc) {
+ super((_exportSrc ? TXTEXPORTERSRC:TXTEXPORTERTRANSF)+"...", null, _exportSrc ? "EXPORT_TRANSF_IMAGES":"EXPORT_SRC_IMAGES");
+ exportSrc_=_exportSrc;
+
+ impl=_impl;
+ setEnabled(false);
+ }
+
+ /**
+ * Exporte les images transform\xE9es au format pgm.
+ * @param _e L'evenement pour l'action.
+ */
+ @Override
+ public void actionPerformed(final ActionEvent _e) {
+ if (!isValide()) {
+ return;
+ }
+
+ // Selection des images
+ if (pnExportImages==null)
+ pnExportImages = new PivExportImageFilesPanel(impl);
+
+ if (exportSrc_) {
+ pnExportImages.setFiles(impl.getCurrentProject().getSrcImageFiles());
+ }
+ else {
+ pnExportImages.setFiles(impl.getCurrentProject().getTransfImageFiles());
+ }
+ if (!pnExportImages.afficheModaleOk(impl.getFrame(), (exportSrc_ ? TXTEXPORTERSRC:TXTEXPORTERTRANSF), CtuluDialog.OK_CANCEL_OPTION)) {
+ return;
+ }
+
+ // Export des images, eventuellement dans un autre format.
+ CtuluTaskOperationGUI r=new CtuluTaskOperationGUI(impl, (exportSrc_ ? TXTEXPORTSRC:TXTEXPORTTRANSF)) {
+
+ @Override
+ public void act() {
+ try {
+ this.setDesc((exportSrc_ ? TXTEXPORTSRC:TXTEXPORTTRANSF));
+ this.setProgression(0);
+
+ File[] exportImgFiles=pnExportImages.getSelectedFiles();
+ File destinationDir=pnExportImages.getDestinationDir();
+ // Correspond aux extensions
+ String format=pnExportImages.getFormat();
+
+ for (int i=0; i<exportImgFiles.length; i++) {
+ File cacheFile=impl.getCurrentProject().getCacheImageFile(exportImgFiles[i]);
+ // Chaque image dans sont format d'origine
+ if (format.equals("ORIGIN")) {
+ File destFile=new File(destinationDir,exportImgFiles[i].getName());
+ String ext=CtuluLibFile.getExtension(exportImgFiles[i].getName());
+
+ if (exportImgFiles.equals(cacheFile)) {
+ CtuluLibFile.copyFile(cacheFile, destFile);
+ }
+ else {
+ BufferedImage img = ImageIO.read(cacheFile);
+ if (ext.equals("pgm")) {
+ new PivPGMWriter().write(destFile, img);
+ }
+ else {
+ CtuluImageExport.export(img, destFile, ext, impl);
+ }
+ }
+ }
+ else {
+ File destFile=CtuluLibFile.changeExtension(new File(destinationDir,exportImgFiles[i].getName()),format);
+
+ // Le format d'export est le m\xEAme que le format de stockage
+ if (format.equals(CtuluLibFile.getExtension(cacheFile.getName()))) {
+ CtuluLibFile.copyFile(cacheFile, destFile);
+ }
+ // Sinon, transfert du format de stockage vers format d'export.
+ else {
+ BufferedImage img = ImageIO.read(cacheFile);
+ if (format.equals("pgm")) {
+ new PivPGMWriter().write(destFile, img);
+ }
+ else {
+ CtuluImageExport.export(img, destFile, format, impl);
+ }
+ }
+ }
+ setProgression(((i+1)*100)/exportImgFiles.length);
+ if (this.isStopRequested()) return;
+ }
+ }
+ catch (IOException e) {
+ FuLog.error("Erreur lors de l'export des images");
+ }
+ finally {
+ diProgress_.dispose();
+ }
+ }
+ };
+
+ PivProgressionPanel pnProgress_=new PivProgressionPanel(r);
+ diProgress_ = pnProgress_.createDialog(impl.getParentComponent());
+ diProgress_.setOption(CtuluDialog.ZERO_OPTION);
+ diProgress_.setDefaultCloseOperation(CtuluDialog.DO_NOTHING_ON_CLOSE);
+ diProgress_.setTitle(r.getName());
+
+ r.start();
+ diProgress_.afficheDialogModal();
+ }
+
+ /**
+ * @return true Si toutes les donn\xE9es sont pr\xE9sentes pour un lancement.
+ */
+ public boolean isValide() {
+ return true;
+ }
+
+ @Override
+ public String getEnableCondition() {
+ return PivResource.getS("Les images doivent exister");
+ }
+}
Deleted: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportTransfImagesAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportTransfImagesAction.java 2015-01-23 14:32:27 UTC (rev 8994)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportTransfImagesAction.java 2015-01-27 14:52:27 UTC (rev 8995)
@@ -1,126 +0,0 @@
-/*
- * @creation 3 juil. 2008
- * @modification $Date:$
- * @license GNU General Public License 2
- * @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail fud...@li...
- */
-package org.fudaa.fudaa.piv.action;
-
-import java.awt.event.ActionEvent;
-import java.io.File;
-
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.ctulu.gui.CtuluDialog;
-import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
-import org.fudaa.ebli.commun.EbliActionSimple;
-import org.fudaa.fudaa.piv.PivExePanel;
-import org.fudaa.fudaa.piv.PivExportTranfFilesPanel;
-import org.fudaa.fudaa.piv.PivImplementation;
-import org.fudaa.fudaa.piv.PivManageOriginalFilesPanel;
-import org.fudaa.fudaa.piv.PivPreferences;
-import org.fudaa.fudaa.piv.PivProgressionPanel;
-import org.fudaa.fudaa.piv.PivResource;
-import org.fudaa.fudaa.piv.PivVisuPanel;
-import org.fudaa.fudaa.piv.io.PivExeLauncher;
-
-/**
- * Une action pour eporter les images transform\xE9es.
- *
- * @author Bertrand Marchand (mar...@de...)
- * @version $Id$
- */
-public class PivExportTransfImagesAction extends EbliActionSimple {
- PivImplementation impl;
- PivExportTranfFilesPanel pnExportImages;
- CtuluDialog diProgress_;
-
- /**
- * Constructeur.
- * @param _impl L'implementation.
- */
- public PivExportTransfImagesAction(PivImplementation _impl) {
- super(PivResource.getS("Export des images transform\xE9es..."), null, "EXPORT_TRANSF_IMAGES");
-
- impl=_impl;
- setEnabled(false);
- }
-
- /**
- * Exporte les images transform\xE9es au format pgm.
- * @param _e L'evenement pour l'action.
- */
- @Override
- public void actionPerformed(final ActionEvent _e) {
- if (!isValide()) {
- return;
- }
-
-// if (!PivExeLauncher.instance().areExeOK()) {
-// PivExePanel pnExe = new PivExePanel();
-//
-// // TODO BM : Verifier que les nouvelles images sont compatibles avec les donn\xE9es d'ortho ou message.
-//
-// if (!pnExe.afficheModaleOk(impl.getFrame(), PivResource.getS("R\xE9pertoire contenant les executables"))) {
-// return;
-// }
-// }
-
- // Selection des images
- if (pnExportImages==null)
- pnExportImages = new PivExportTranfFilesPanel(impl);
- pnExportImages.setRootProject(impl.getCurrentProject().getRoot());
- pnExportImages.setFiles(impl.getCurrentProject().getTransfImageFiles());
- if (!pnExportImages.afficheModaleOk(impl.getFrame(), PivResource.getS("Export des images"), CtuluDialog.OK_CANCEL_OPTION)) {
- return;
- }
-
- final File[] exportImgFiles=pnExportImages.getFiles();
-
-// // Le reconditionnement des images.
-// CtuluTaskOperationGUI r=new CtuluTaskOperationGUI(impl, PivResource.getS("Traitement des images sources")) {
-//
-// @Override
-// public void act() {
-// try {
-// CtuluAnalyze ana=new CtuluAnalyze();
-// ana.setDesc(getName());
-// impl.getCurrentProject().setSrcImagesFiles(exportImgFiles, this, ana);
-//
-// if (ana.containsErrorOrFatalError()) {
-// impl.error(ana.getResume());
-// return;
-// }
-//
-// }
-// finally {
-// diProgress_.dispose();
-// }
-//
-// impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_ORIGINAL_VIEW);
-//// impl.message(PivResource.getS("{0} images ont \xE9t\xE9 reconditionn\xE9es avec succ\xE8s",impl.getCurrentProject().getSrcImageFiles().length));
-// }
-// };
-//
-// PivProgressionPanel pnProgress_=new PivProgressionPanel(r);
-// diProgress_ = pnProgress_.createDialog(impl.getParentComponent());
-// diProgress_.setOption(CtuluDialog.ZERO_OPTION);
-// diProgress_.setDefaultCloseOperation(CtuluDialog.DO_NOTHING_ON_CLOSE);
-// diProgress_.setTitle(r.getName());
-//
-// r.start();
-// diProgress_.afficheDialogModal();
- }
-
- /**
- * @return true Si toutes les donn\xE9es sont pr\xE9sentes pour un lancement.
- */
- public boolean isValide() {
- return true;
- }
-
- @Override
- public String getEnableCondition() {
- return PivResource.getS("Les images transform\xE9es doivent exister");
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-01-23 14:32:29
|
Revision: 8994
http://sourceforge.net/p/fudaa/svn/8994
Author: bmarchan
Date: 2015-01-23 14:32:27 +0000 (Fri, 23 Jan 2015)
Log Message:
-----------
Acceptation de tout type de format d'image
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/pom.xml
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoLaunchAction.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java
trunk/soft/fudaa-lspiv/src/main/resources/org/fudaa/fudaa/piv/banniere.jpg
Added Paths:
-----------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportTranfFilesPanel.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportTransfImagesAction.java
Modified: trunk/soft/fudaa-lspiv/pom.xml
===================================================================
--- trunk/soft/fudaa-lspiv/pom.xml 2015-01-22 08:33:35 UTC (rev 8993)
+++ trunk/soft/fudaa-lspiv/pom.xml 2015-01-23 14:32:27 UTC (rev 8994)
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-framework.version>1.4-SNAPSHOT</fudaa-framework.version>
- <fudaa-mesh.version>1.4-SNAPSHOT</fudaa-mesh.version>
+ <fudaa-framework.version>1.7-SNAPSHOT</fudaa-framework.version>
+ <fudaa-mesh.version>1.5-SNAPSHOT</fudaa-mesh.version>
<javaCompiler>1.6</javaCompiler>
<targetJdk>1.6</targetJdk>
</properties>
Added: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportTranfFilesPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportTranfFilesPanel.java (rev 0)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportTranfFilesPanel.java 2015-01-23 14:32:27 UTC (rev 8994)
@@ -0,0 +1,137 @@
+/*
+ * @creation 18 d\xE9c. 2008
+ * @modification $Date:$
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.fudaa.piv;
+
+import java.io.File;
+
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+
+import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.gui.CtuluCellTextRenderer;
+import org.fudaa.ctulu.gui.CtuluDialogPanel;
+import org.fudaa.ctulu.gui.CtuluFileChooser;
+import org.fudaa.ctulu.gui.CtuluFileChooserPanel;
+import org.fudaa.ctulu.gui.CtuluListEditorModel;
+import org.fudaa.ctulu.gui.CtuluListEditorPanel;
+
+import com.memoire.bu.BuVerticalLayout;
+
+/**
+ * Un panneau pour exporter les images transform\xE9es pgm ou autres vers un r\xE9pertoire choisi.
+ *
+ * @author mar...@de...
+ * @version $Id$
+ */
+public class PivExportTranfFilesPanel extends CtuluDialogPanel {
+
+ private CtuluUI ui_;
+ /** Le repertoire racine du projet */
+ private File prjRoot_;
+ /** Le repertoire d'export. */
+ private CtuluFileChooserPanel fcDirExport_;
+ /** Le mod\xE8le pour la liste des images */
+ private CtuluListEditorModel mdFiles_;
+
+ /**
+ * Constructeur.
+ * @param _ui Le parent pour la boite de dialogue.
+ */
+ public PivExportTranfFilesPanel(CtuluUI _ui) {
+ ui_=_ui;
+
+ setLayout(new BuVerticalLayout(5, true, true));
+ setHelpText(PivResource.getS("Selectionner les images que vous souhaitez exporter."));
+
+ fcDirExport_=new CtuluFileChooserPanel();
+ fcDirExport_.setFileSelectMode(JFileChooser.DIRECTORIES_ONLY);
+ add(fcDirExport_);
+
+ // Label images
+ add(new JLabel(PivResource.getS("Liste des images"),JLabel.LEFT));
+
+ // Liste des images
+ mdFiles_=new CtuluListEditorModel(true) {
+ @Override
+ public boolean isCellEditable(int _rowIndex, int _columnIndex) {
+ return false;
+ }
+ @Override
+ public Object createNewObject() {
+ return null;
+ }
+ };
+
+ CtuluListEditorPanel pnFiles=new CtuluListEditorPanel(mdFiles_, true, true, false) {
+ @Override
+ public void actionAdd() {
+ }
+ };
+
+ pnFiles.setValueListCellRenderer(new CtuluCellTextRenderer() {
+ @Override
+ public void setValue(Object _file) {
+ File f=(File)_file;
+ setText(f.getName());
+ if (f.getPath().startsWith(prjRoot_.getPath())) {
+ setToolTipText(PivResource.getS("Dans le projet"));
+ }
+ else {
+ setToolTipText(f.getPath());
+ }
+ }
+ });
+
+ add(pnFiles);
+ }
+
+ @Override
+ public void setValue(Object _files) {
+ if (!(_files instanceof File[]))
+ throw new IllegalArgumentException("bad type parameter");
+ setFiles((File[])_files);
+ }
+
+ @Override
+ public File[] getValue() {
+ return getFiles();
+ }
+
+ /**
+ * Definit la racine du projet, pour savoir si un fichier fait d\xE9j\xE0 partie du projet.
+ * @param _root La racine du projet.
+ */
+ public void setRootProject(File _root) {
+ prjRoot_=_root;
+ }
+
+ /**
+ * D\xE9finit l'utilitaire \xE0 modifier.
+ * @param _tool L'utilitaire
+ */
+ public void setFiles(File[] _files) {
+ if (_files==null) return;
+
+ mdFiles_.setData(_files);
+ }
+
+ /**
+ * @return Les fichiers image, comportant les anciens et nouveaux fichiers.
+ */
+ public File[] getFiles() {
+ File[] files=new File[mdFiles_.getRowCount()];
+ mdFiles_.getValues(files);
+
+ return files;
+ }
+
+ @Override
+ public boolean isDataValid() {
+ return true;
+ }
+}
Property changes on: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExportTranfFilesPanel.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-01-22 08:33:35 UTC (rev 8993)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-01-23 14:32:27 UTC (rev 8994)
@@ -42,6 +42,7 @@
import org.fudaa.fudaa.piv.action.PivComputeFlowAction;
import org.fudaa.fudaa.piv.action.PivComputeLaunchAction;
import org.fudaa.fudaa.piv.action.PivComputeParamAction;
+import org.fudaa.fudaa.piv.action.PivExportTransfImagesAction;
import org.fudaa.fudaa.piv.action.PivFlowParamAction;
import org.fudaa.fudaa.piv.action.PivImportGRPAction;
import org.fudaa.fudaa.piv.action.PivImportGridAction;
@@ -81,14 +82,14 @@
protected static BuInformationsSoftware isPIV_ = new BuInformationsSoftware();
static {
isPIV_.name = "LSPIV";
- isPIV_.version = "1.3.2";
- isPIV_.date = "2013-02-14";
- isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2013";
+ isPIV_.version = "1.4.1";
+ isPIV_.date = "2014-12-10";
+ isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2014";
isPIV_.license = "GPL2";
isPIV_.languages = "en,fr";
isPIV_.authors=new String[]{"B.Marchand (mar...@de...)"};
isPIV_.contact="mag...@ed...\n jer...@ir...\n ale...@ed...";
- isPIV_.http="http://www.fudaa.fr/lspiv/";
+ isPIV_.http="http://forge.irstea.fr/projects/fudaa-lspiv";
isPIV_.logo = PivResource.PIV.getIcon("iconepiv.gif");
isPIV_.banner = PivResource.PIV.getIcon("banniere.jpg");
@@ -164,7 +165,7 @@
private void initStaticLanguageDependant() {
FILE_FLT_PROJ=new BuFileFilter("lspiv.zip",PivResource.getS("Fichier projet"));
FILE_FLT_PGM=new BuFileFilter("pgm",PivResource.getS("Fichiers images en niveaux de gris"));
- FILE_FLT_IMAGES=new BuFileFilter(new String[]{"jpg","gif","png","pgm"},PivResource.getS("Fichiers images"));
+ FILE_FLT_IMAGES=new BuFileFilter(new String[]{"jpg","jpeg","gif","png","pgm","tif","tiff","bmp"},PivResource.getS("Fichiers images"));
FILE_FLT_GRID=new BuFileFilter("dat",PivResource.getS("Fichier grid"));
FILE_FLT_GRP=new BuFileFilter("dat",PivResource.getS("Fichier GRP"));
FILE_FLT_BATHY=new BuFileFilter("dat",PivResource.getS("Fichier bathy"));
@@ -207,7 +208,7 @@
setEnabledForAction("CREATE_GRP", bprjOpen && bprjHasSrcImg);
setEnabledForAction("IMPORT_GRP", bprjOpen && bprjHasSrcImg);
setEnabledForAction("VERIFY_GRP", bprjOpen && project.getOrthoPoints()!=null);
- setEnabledForAction("DEFINE_ORTHO_PARAM", bprjOpen && project.getOrthoPoints()!=null && project.hasTransformableImages());
+ setEnabledForAction("DEFINE_ORTHO_PARAM", bprjOpen && project.getOrthoPoints()!=null && bprjHasSrcImg);
setEnabledForAction("COMPUTE_ORTHO", bprjOpen);
setEnabledForAction("DEFINE_PIV_PARAM", bprjOpen && bprjHasTransfImg);
setEnabledForAction("DEFINE_GRID", bprjOpen && bprjHasTransfImg);
@@ -220,6 +221,7 @@
setEnabledForAction("COMPUTE_AVERAGE", bprjOpen);
setEnabledForAction("SHOW_VELOCITIES_RESULTS", bprjOpen && project.getAverageResults()!=null);
setEnabledForAction("SHOW_FLOW_RESULTS", bprjOpen && project.getFlowResults()!=null);
+ setEnabledForAction("EXPORT_TRANSF_IMAGES", bprjOpen && bprjHasTransfImg);
refreshTitle();
}
@@ -815,6 +817,8 @@
BuMenuItem itExportImageToClip = new BuMenuItem();
super.initExportImageToClipborad(itExportImageToClip);
mnExport.add(itExportImageToClip);
+ mnExport.addSeparator();
+ mnExport.add(new PivExportTransfImagesAction(this));
}
/**
Added: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportTransfImagesAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportTransfImagesAction.java (rev 0)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportTransfImagesAction.java 2015-01-23 14:32:27 UTC (rev 8994)
@@ -0,0 +1,126 @@
+/*
+ * @creation 3 juil. 2008
+ * @modification $Date:$
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2008 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.fudaa.piv.action;
+
+import java.awt.event.ActionEvent;
+import java.io.File;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.gui.CtuluDialog;
+import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.fudaa.piv.PivExePanel;
+import org.fudaa.fudaa.piv.PivExportTranfFilesPanel;
+import org.fudaa.fudaa.piv.PivImplementation;
+import org.fudaa.fudaa.piv.PivManageOriginalFilesPanel;
+import org.fudaa.fudaa.piv.PivPreferences;
+import org.fudaa.fudaa.piv.PivProgressionPanel;
+import org.fudaa.fudaa.piv.PivResource;
+import org.fudaa.fudaa.piv.PivVisuPanel;
+import org.fudaa.fudaa.piv.io.PivExeLauncher;
+
+/**
+ * Une action pour eporter les images transform\xE9es.
+ *
+ * @author Bertrand Marchand (mar...@de...)
+ * @version $Id$
+ */
+public class PivExportTransfImagesAction extends EbliActionSimple {
+ PivImplementation impl;
+ PivExportTranfFilesPanel pnExportImages;
+ CtuluDialog diProgress_;
+
+ /**
+ * Constructeur.
+ * @param _impl L'implementation.
+ */
+ public PivExportTransfImagesAction(PivImplementation _impl) {
+ super(PivResource.getS("Export des images transform\xE9es..."), null, "EXPORT_TRANSF_IMAGES");
+
+ impl=_impl;
+ setEnabled(false);
+ }
+
+ /**
+ * Exporte les images transform\xE9es au format pgm.
+ * @param _e L'evenement pour l'action.
+ */
+ @Override
+ public void actionPerformed(final ActionEvent _e) {
+ if (!isValide()) {
+ return;
+ }
+
+// if (!PivExeLauncher.instance().areExeOK()) {
+// PivExePanel pnExe = new PivExePanel();
+//
+// // TODO BM : Verifier que les nouvelles images sont compatibles avec les donn\xE9es d'ortho ou message.
+//
+// if (!pnExe.afficheModaleOk(impl.getFrame(), PivResource.getS("R\xE9pertoire contenant les executables"))) {
+// return;
+// }
+// }
+
+ // Selection des images
+ if (pnExportImages==null)
+ pnExportImages = new PivExportTranfFilesPanel(impl);
+ pnExportImages.setRootProject(impl.getCurrentProject().getRoot());
+ pnExportImages.setFiles(impl.getCurrentProject().getTransfImageFiles());
+ if (!pnExportImages.afficheModaleOk(impl.getFrame(), PivResource.getS("Export des images"), CtuluDialog.OK_CANCEL_OPTION)) {
+ return;
+ }
+
+ final File[] exportImgFiles=pnExportImages.getFiles();
+
+// // Le reconditionnement des images.
+// CtuluTaskOperationGUI r=new CtuluTaskOperationGUI(impl, PivResource.getS("Traitement des images sources")) {
+//
+// @Override
+// public void act() {
+// try {
+// CtuluAnalyze ana=new CtuluAnalyze();
+// ana.setDesc(getName());
+// impl.getCurrentProject().setSrcImagesFiles(exportImgFiles, this, ana);
+//
+// if (ana.containsErrorOrFatalError()) {
+// impl.error(ana.getResume());
+// return;
+// }
+//
+// }
+// finally {
+// diProgress_.dispose();
+// }
+//
+// impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_ORIGINAL_VIEW);
+//// impl.message(PivResource.getS("{0} images ont \xE9t\xE9 reconditionn\xE9es avec succ\xE8s",impl.getCurrentProject().getSrcImageFiles().length));
+// }
+// };
+//
+// PivProgressionPanel pnProgress_=new PivProgressionPanel(r);
+// diProgress_ = pnProgress_.createDialog(impl.getParentComponent());
+// diProgress_.setOption(CtuluDialog.ZERO_OPTION);
+// diProgress_.setDefaultCloseOperation(CtuluDialog.DO_NOTHING_ON_CLOSE);
+// diProgress_.setTitle(r.getName());
+//
+// r.start();
+// diProgress_.afficheDialogModal();
+ }
+
+ /**
+ * @return true Si toutes les donn\xE9es sont pr\xE9sentes pour un lancement.
+ */
+ public boolean isValide() {
+ return true;
+ }
+
+ @Override
+ public String getEnableCondition() {
+ return PivResource.getS("Les images transform\xE9es doivent exister");
+ }
+}
Property changes on: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivExportTransfImagesAction.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoLaunchAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoLaunchAction.java 2015-01-22 08:33:35 UTC (rev 8993)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoLaunchAction.java 2015-01-23 14:32:27 UTC (rev 8994)
@@ -103,8 +103,8 @@
impl.error(PivResource.getS("Erreur"), PivResource.getS("Les param\xE8tres d'orthorectification n'ont pas \xE9t\xE9 donn\xE9s"));
return false;
}
- if (!impl.getCurrentProject().hasTransformableImages()) {
- impl.error(PivResource.getS("Erreur"), PivResource.getS("Le projet ne contient aucune image \xE0 transformer"));
+ if (!impl.getCurrentProject().hasSrcImages()) {
+ impl.error(PivResource.getS("Erreur"), PivResource.getS("Le projet ne contient aucune image source"));
return false;
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java 2015-01-22 08:33:35 UTC (rev 8993)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java 2015-01-23 14:32:27 UTC (rev 8994)
@@ -229,7 +229,7 @@
}
/**
- * Lance le calcul des images transform\xE9es a partir des coefficients
+ * Lance le calcul de transformation des images sources a partir des coefficients
* d'orthorectification.
*
* @param _ana L'analyse pour la tache ex\xE9cut\xE9e.
@@ -268,7 +268,7 @@
// copyFile(prjOutputs, exeOutputs, "coeff.dat");
// Les images
- File[] imgInp = _prj.getTransformableImageFiles();
+ File[] imgInp = _prj.getSrcImageFiles();
// Si une image1.pgm existe, on la renomme pour eviter qu'elle soit \xE9cras\xE9e.
int indImgInpExe=Arrays.asList(imgInp).indexOf(fimgInpExe);
@@ -290,6 +290,7 @@
new PivPGMWriter().write(new File(prjImgInp, fimgInpExe.getName()), buffer);
}
else {
+ // TODO : Ne devrait plus passer par la...
// Attention : Le nom ne doit pas etre le m\xEAme que les images d\xE9ja
// stock\xE9es
String srcFileName = imgInp[i].getName();
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java 2015-01-22 08:33:35 UTC (rev 8993)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java 2015-01-23 14:32:27 UTC (rev 8994)
@@ -177,10 +177,6 @@
public boolean hasSrcImages() {
return getSrcImageFiles().length>0;
}
-
- public boolean hasTransformableImages() {
- return getTransformableImageFiles().length>0;
- }
/**
* Le projet contient-il des r\xE9sultats de vitesse brutes ?
@@ -235,19 +231,6 @@
}
/**
- * @return Le chemins des images transformables uniquement parmis les images sources, dans
- * l'ordre utilisateur.
- */
- public File[] getTransformableImageFiles() {
- List<File> files = new ArrayList<File>();
- for (File f : srcFiles_) {
- if (FLT_PGM_FILES.accept(f))
- files.add(f);
- }
- return files.toArray(new File[0]);
- }
-
- /**
* Reconstruit les caches si necessaire.
* @param _task La progression.
* @return false : Si un probl\xE8me s'est produit lors de la production.
Modified: trunk/soft/fudaa-lspiv/src/main/resources/org/fudaa/fudaa/piv/banniere.jpg
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-12-09 21:55:36
|
Revision: 8971
http://sourceforge.net/p/fudaa/svn/8971
Author: deniger
Date: 2014-12-09 21:55:28 +0000 (Tue, 09 Dec 2014)
Log Message:
-----------
utilisation snapshot
Modified Paths:
--------------
trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceComparator.java
Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceComparator.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceComparator.java 2014-12-09 15:33:54 UTC (rev 8970)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceComparator.java 2014-12-09 21:55:28 UTC (rev 8971)
@@ -176,7 +176,7 @@
if (compVar_ != null && compVar_.containsKey(src)) {
srcProj = (H2dVariableType) compVar_.get(src);
}
- final double res = ref_.getData(src, _timeIdx, _ptIdx) - proj_.getData(srcProj, _timeIdx, _ptIdx);
+ final double res = proj_.getData(src, _timeIdx, _ptIdx) - ref_.getData(srcProj, _timeIdx, _ptIdx);
return inv_ ? -res : res;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-12-07 22:25:14
|
Revision: 8969
http://sourceforge.net/p/fudaa/svn/8969
Author: deniger
Date: 2014-12-07 22:25:07 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
utilisation snapshot
Modified Paths:
--------------
trunk/soft/fudaa-sipor/pom.xml
Modified: trunk/soft/fudaa-sipor/pom.xml
===================================================================
--- trunk/soft/fudaa-sipor/pom.xml 2014-12-07 22:24:46 UTC (rev 8968)
+++ trunk/soft/fudaa-sipor/pom.xml 2014-12-07 22:25:07 UTC (rev 8969)
@@ -1,72 +1,64 @@
<?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>
+ <modelVersion>4.0.0</modelVersion>
- <properties>
- <fudaa-common-corba.version>1.0</fudaa-common-corba.version>
- </properties>
+ <properties>
+ <fudaa-common-corba.version>1.3</fudaa-common-corba.version>
+ </properties>
- <parent>
- <groupId>org.fudaa.pom</groupId>
- <artifactId>soft-pom</artifactId>
- <version>0.4</version>
- </parent>
- <groupId>org.fudaa.soft.fudaa-sipor</groupId>
- <artifactId>fudaa-sipor</artifactId>
- <version>0.41-SNAPSHOT</version>
- <name>Fudaa-Sipor</name>
- <packaging>pom</packaging>
- <modules>
- <module>server</module>
- <module>client</module>
- </modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business</groupId>
- <artifactId>fudaa-common-corba</artifactId>
- <version>${fudaa-common-corba.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business</groupId>
- <artifactId>fudaa-common-corba</artifactId>
- <version>${fudaa-common-corba.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-sipor</groupId>
- <artifactId>sipor-server</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-sipor</groupId>
- <artifactId>sipor-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business</groupId>
- <artifactId>dodico-corba</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.3.2</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <descriptor>src/assembly/dep.xml</descriptor>
- </configuration>
- </plugin>
- </plugins>
-
-
- </build>
+ <parent>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>soft-pom</artifactId>
+ <version>1.5</version>
+ </parent>
+ <groupId>org.fudaa.soft.fudaa-sipor</groupId>
+ <artifactId>fudaa-sipor</artifactId>
+ <version>0.41-SNAPSHOT</version>
+ <name>Fudaa-Sipor</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>server</module>
+ <module>client</module>
+ </modules>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <modules>
+ <module>server</module>
+ <module>client</module>
+ <module>launcher</module>
+ </modules>
+ </profile>
+ </profiles>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business</groupId>
+ <artifactId>fudaa-common-corba</artifactId>
+ <version>${fudaa-common-corba.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business</groupId>
+ <artifactId>fudaa-common-corba</artifactId>
+ <version>${fudaa-common-corba.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-sipor</groupId>
+ <artifactId>sipor-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-sipor</groupId>
+ <artifactId>sipor-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.3.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-12-07 22:24:54
|
Revision: 8968
http://sourceforge.net/p/fudaa/svn/8968
Author: deniger
Date: 2014-12-07 22:24:46 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
utilisation snapshot
Modified Paths:
--------------
trunk/soft/fudaa-sinavi/client/pom.xml
Modified: trunk/soft/fudaa-sinavi/client/pom.xml
===================================================================
--- trunk/soft/fudaa-sinavi/client/pom.xml 2014-12-07 22:24:30 UTC (rev 8967)
+++ trunk/soft/fudaa-sinavi/client/pom.xml 2014-12-07 22:24:46 UTC (rev 8968)
@@ -50,41 +50,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <!-- packaging de l'application -->
- <plugin>
- <!-- NOTE: We don't need a groupId specification because the group is org.apache.maven.plugins ...which is assumed by default. -->
- <artifactId>maven-assembly-plugin</artifactId>
- <!--<version>2.3</version>-->
- <configuration>
- <descriptors>
- <descriptor>src/assembly/dep.xml</descriptor>
- </descriptors>
- <archive>
- <manifest>
- <mainClass>org.fudaa.fudaa.sinavi3.Sinavi3</mainClass>
- </manifest>
- </archive>
- </configuration>
- <executions>
- <execution>
- <id>executable</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <finalName>sinavi3</finalName>
- </build>
-
- </profile>
- </profiles>
-
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-12-07 22:24:38
|
Revision: 8967
http://sourceforge.net/p/fudaa/svn/8967
Author: deniger
Date: 2014-12-07 22:24:30 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
utilisation snapshot
Modified Paths:
--------------
trunk/soft/fudaa-sipor/launcher/launch.bat
trunk/soft/fudaa-sipor/launcher/launch.sh
Added Paths:
-----------
trunk/soft/fudaa-sipor/launcher/pom.xml
trunk/soft/fudaa-sipor/launcher/src/
trunk/soft/fudaa-sipor/launcher/src/assembly/
trunk/soft/fudaa-sipor/launcher/src/assembly/dep.xml
trunk/soft/fudaa-sipor/launcher/src/assembly/jar-exe.xml
trunk/soft/fudaa-sipor/launcher/src/assembly/launcher/
trunk/soft/fudaa-sipor/launcher/src/assembly/launcher/launch.bat
trunk/soft/fudaa-sipor/launcher/src/assembly/launcher/launch.sh
trunk/soft/fudaa-sipor/launcher/src/assembly/launcher/noyaucalcul/
trunk/soft/fudaa-sipor/launcher/src/assembly/launcher/noyaucalcul/lisezmoi.txt
Property Changed:
----------------
trunk/soft/fudaa-sipor/launcher/
Index: trunk/soft/fudaa-sipor/launcher
===================================================================
--- trunk/soft/fudaa-sipor/launcher 2014-12-07 22:23:58 UTC (rev 8966)
+++ trunk/soft/fudaa-sipor/launcher 2014-12-07 22:24:30 UTC (rev 8967)
Property changes on: trunk/soft/fudaa-sipor/launcher
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+target
Modified: trunk/soft/fudaa-sipor/launcher/launch.bat
===================================================================
--- trunk/soft/fudaa-sipor/launcher/launch.bat 2014-12-07 22:23:58 UTC (rev 8966)
+++ trunk/soft/fudaa-sipor/launcher/launch.bat 2014-12-07 22:24:30 UTC (rev 8967)
@@ -1 +1 @@
-start javaw -Xms512m -Xmx1024m -jar jar\sipor-executable.jar
\ No newline at end of file
+start javaw -Xms512m -Xmx1024m -jar jar\sipor-exe.jar
\ No newline at end of file
Modified: trunk/soft/fudaa-sipor/launcher/launch.sh
===================================================================
--- trunk/soft/fudaa-sipor/launcher/launch.sh 2014-12-07 22:23:58 UTC (rev 8966)
+++ trunk/soft/fudaa-sipor/launcher/launch.sh 2014-12-07 22:24:30 UTC (rev 8967)
@@ -1 +1 @@
-java -jar -Xms512m -Xmx1024m -jar jar/sipor-executable.jar
\ No newline at end of file
+java -jar -Xms512m -Xmx1024m -jar jar/sipor-exe.jar
\ No newline at end of file
Copied: trunk/soft/fudaa-sipor/launcher/pom.xml (from rev 8962, trunk/soft/fudaa-sinavi/launcher/pom.xml)
===================================================================
--- trunk/soft/fudaa-sipor/launcher/pom.xml (rev 0)
+++ trunk/soft/fudaa-sipor/launcher/pom.xml 2014-12-07 22:24:30 UTC (rev 8967)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.fudaa.soft.fudaa-sipor</groupId>
+ <artifactId>fudaa-sipor</artifactId>
+ <version>0.41-SNAPSHOT</version>
+ </parent>
+ <artifactId>sipor-launcher</artifactId>
+ <name>sipor-launcher</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-sipor</groupId>
+ <artifactId>sipor-client</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/jar-exe.xml</descriptor>
+ <descriptor>src/assembly/dep.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifest>
+ <mainClass>org.fudaa.fudaa.sipor.Sipor</mainClass>
+ </manifest>
+ </archive>
+ <finalName>sipor</finalName>
+ </configuration>
+ <executions>
+ <execution>
+ <id>executable</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+
+ </build>
+</project>
Copied: trunk/soft/fudaa-sipor/launcher/src/assembly/dep.xml (from rev 8959, trunk/soft/fudaa-sinavi/launcher/src/assembly/dep.xml)
===================================================================
--- trunk/soft/fudaa-sipor/launcher/src/assembly/dep.xml (rev 0)
+++ trunk/soft/fudaa-sipor/launcher/src/assembly/dep.xml 2014-12-07 22:24:30 UTC (rev 8967)
@@ -0,0 +1,50 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+<!-- <dependencySets>
+ <dependencySet>
+
+ decompresse les dependances avant de les inclure dans le jar executable
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>-->
+ <fileSets>
+
+ <fileSet>
+ <directory>${project.basedir}/target</directory>
+ <outputDirectory>jar</outputDirectory>
+ <includes>
+ <include>sipor-exe.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/assembly/launcher</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.bat</include>
+ <include>*.sh</include>
+ </includes>
+ <excludes>
+ <exclude>noyaucalcul</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/assembly/launcher/noyaucalcul</directory>
+ <outputDirectory>serveurs</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/src/assembly/site</directory>
+ <outputDirectory>docs</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Copied: trunk/soft/fudaa-sipor/launcher/src/assembly/jar-exe.xml (from rev 8959, trunk/soft/fudaa-sinavi/launcher/src/assembly/jar-exe.xml)
===================================================================
--- trunk/soft/fudaa-sipor/launcher/src/assembly/jar-exe.xml (rev 0)
+++ trunk/soft/fudaa-sipor/launcher/src/assembly/jar-exe.xml 2014-12-07 22:24:30 UTC (rev 8967)
@@ -0,0 +1,22 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>exe</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory></outputDirectory>
+
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Copied: trunk/soft/fudaa-sipor/launcher/src/assembly/launcher/launch.bat (from rev 8959, trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/launch.bat)
===================================================================
--- trunk/soft/fudaa-sipor/launcher/src/assembly/launcher/launch.bat (rev 0)
+++ trunk/soft/fudaa-sipor/launcher/src/assembly/launcher/launch.bat 2014-12-07 22:24:30 UTC (rev 8967)
@@ -0,0 +1 @@
+start javaw -Xms512m -Xmx1024m -jar jar\sinavi3-exe.jar
\ No newline at end of file
Copied: trunk/soft/fudaa-sipor/launcher/src/assembly/launcher/launch.sh (from rev 8959, trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/launch.sh)
===================================================================
--- trunk/soft/fudaa-sipor/launcher/src/assembly/launcher/launch.sh (rev 0)
+++ trunk/soft/fudaa-sipor/launcher/src/assembly/launcher/launch.sh 2014-12-07 22:24:30 UTC (rev 8967)
@@ -0,0 +1 @@
+java -jar -Xms512m -Xmx1024m -jar jar/sinavi3-exe.jar
\ No newline at end of file
Copied: trunk/soft/fudaa-sipor/launcher/src/assembly/launcher/noyaucalcul/lisezmoi.txt (from rev 8959, trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/noyaucalcul/lisezmoi.txt)
===================================================================
--- trunk/soft/fudaa-sipor/launcher/src/assembly/launcher/noyaucalcul/lisezmoi.txt (rev 0)
+++ trunk/soft/fudaa-sipor/launcher/src/assembly/launcher/noyaucalcul/lisezmoi.txt 2014-12-07 22:24:30 UTC (rev 8967)
@@ -0,0 +1 @@
+Mettre les serveurs sinavi ici
\ 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...> - 2014-12-07 22:24:00
|
Revision: 8966
http://sourceforge.net/p/fudaa/svn/8966
Author: deniger
Date: 2014-12-07 22:23:58 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
utilisation snapshot
Modified Paths:
--------------
trunk/soft/fudaa-sipor/server/pom.xml
Modified: trunk/soft/fudaa-sipor/server/pom.xml
===================================================================
--- trunk/soft/fudaa-sipor/server/pom.xml 2014-12-07 22:23:46 UTC (rev 8965)
+++ trunk/soft/fudaa-sipor/server/pom.xml 2014-12-07 22:23:58 UTC (rev 8966)
@@ -1,25 +1,24 @@
<?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>
- <parent>
- <groupId>org.fudaa.soft.fudaa-sipor</groupId>
- <artifactId>fudaa-sipor</artifactId>
- <version>0.41-SNAPSHOT</version>
- </parent>
- <artifactId>sipor-server</artifactId>
- <name>sipor-server</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business</groupId>
- <artifactId>dodico-corba</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ 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>
+ <parent>
+ <groupId>org.fudaa.soft.fudaa-sipor</groupId>
+ <artifactId>fudaa-sipor</artifactId>
+ <version>0.41-SNAPSHOT</version>
+ </parent>
+ <artifactId>sipor-server</artifactId>
+ <name>sipor-server</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business</groupId>
+ <artifactId>dodico-corba</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...> - 2014-12-07 22:23:48
|
Revision: 8965
http://sourceforge.net/p/fudaa/svn/8965
Author: deniger
Date: 2014-12-07 22:23:46 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
utilisation snapshot
Modified Paths:
--------------
trunk/soft/fudaa-sipor/client/pom.xml
trunk/soft/fudaa-sipor/client/src/main/java/org/fudaa/fudaa/sipor/ui/frame/SiporFrameSaisieMaree.java
Modified: trunk/soft/fudaa-sipor/client/pom.xml
===================================================================
--- trunk/soft/fudaa-sipor/client/pom.xml 2014-12-07 22:22:59 UTC (rev 8964)
+++ trunk/soft/fudaa-sipor/client/pom.xml 2014-12-07 22:23:46 UTC (rev 8965)
@@ -27,7 +27,7 @@
<dependency>
<groupId>${ebliGroupId}</groupId>
<artifactId>ebli-network</artifactId>
- <version>1.0</version>
+ <version>1.6</version>
</dependency>
<dependency>
<groupId>jfree</groupId>
@@ -53,40 +53,5 @@
<artifactId>xstream</artifactId>
<version>1.4</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.3.2</version>
- </dependency>
</dependencies>
- <build>
- <plugins>
- <!-- packaging de l'application -->
- <plugin>
- <!-- NOTE: We don't need a groupId specification because the group is org.apache.maven.plugins ...which is assumed by default. -->
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/dep.xml</descriptor>
- </descriptors>
- <archive>
- <manifest>
- <mainClass>org.fudaa.fudaa.sipor.Sipor</mainClass>
- </manifest>
- </archive>
- </configuration>
- <executions>
- <execution>
- <id>executable</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <finalName>sipor</finalName>
- </build>
</project>
Modified: trunk/soft/fudaa-sipor/client/src/main/java/org/fudaa/fudaa/sipor/ui/frame/SiporFrameSaisieMaree.java
===================================================================
--- trunk/soft/fudaa-sipor/client/src/main/java/org/fudaa/fudaa/sipor/ui/frame/SiporFrameSaisieMaree.java 2014-12-07 22:22:59 UTC (rev 8964)
+++ trunk/soft/fudaa-sipor/client/src/main/java/org/fudaa/fudaa/sipor/ui/frame/SiporFrameSaisieMaree.java 2014-12-07 22:23:46 UTC (rev 8965)
@@ -41,8 +41,8 @@
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuTable;
import com.memoire.fu.FuLog;
+import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang3.StringUtils;
import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.dodico.corba.sipor.SParametresMaree2;
import org.fudaa.ebli.graphe.BGraphe;
@@ -619,7 +619,7 @@
resGraphe = md.generateGrapheDouziemes(basseMer, hauteMer, periodeMer, douziemes,basseMerMorte,hauteMerMorte, douziemes);
- if(StringUtils.isNotBlank(resGraphe))
+ if (StringUtils.isNotBlank(resGraphe))
schema.setFluxDonnees(new ByteArrayInputStream(resGraphe.getBytes()));
}catch(Exception e) {
FuLog.error(e.getMessage());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-12-07 22:23:02
|
Revision: 8964
http://sourceforge.net/p/fudaa/svn/8964
Author: deniger
Date: 2014-12-07 22:22:59 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
utilisation snapshot
Removed Paths:
-------------
trunk/soft/fudaa-sipor/src/assembly/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-12-07 22:11:24
|
Revision: 8963
http://sourceforge.net/p/fudaa/svn/8963
Author: deniger
Date: 2014-12-07 22:11:22 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
utilisation snapshot
Removed Paths:
-------------
trunk/framework/ebli-network/src/main/java/org/fudaa/ebli/network/simulationNetwork/images/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-12-07 22:10:21
|
Revision: 8962
http://sourceforge.net/p/fudaa/svn/8962
Author: deniger
Date: 2014-12-07 22:10:13 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
utilisation snapshot
Modified Paths:
--------------
trunk/soft/fudaa-sinavi/client/pom.xml
trunk/soft/fudaa-sinavi/launcher/pom.xml
trunk/soft/fudaa-sinavi/server/pom.xml
Modified: trunk/soft/fudaa-sinavi/client/pom.xml
===================================================================
--- trunk/soft/fudaa-sinavi/client/pom.xml 2014-12-07 22:09:39 UTC (rev 8961)
+++ trunk/soft/fudaa-sinavi/client/pom.xml 2014-12-07 22:10:13 UTC (rev 8962)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-sinavi</groupId>
<artifactId>fudaa-sinavi</artifactId>
- <version>3.1-beta3</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
Modified: trunk/soft/fudaa-sinavi/launcher/pom.xml
===================================================================
--- trunk/soft/fudaa-sinavi/launcher/pom.xml 2014-12-07 22:09:39 UTC (rev 8961)
+++ trunk/soft/fudaa-sinavi/launcher/pom.xml 2014-12-07 22:10:13 UTC (rev 8962)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-sinavi</groupId>
<artifactId>fudaa-sinavi</artifactId>
- <version>3.1-beta3</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>sinavi-launcher</artifactId>
<name>sinavi-launcher</name>
Modified: trunk/soft/fudaa-sinavi/server/pom.xml
===================================================================
--- trunk/soft/fudaa-sinavi/server/pom.xml 2014-12-07 22:09:39 UTC (rev 8961)
+++ trunk/soft/fudaa-sinavi/server/pom.xml 2014-12-07 22:10:13 UTC (rev 8962)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.fudaa.soft.fudaa-sinavi</groupId>
<artifactId>fudaa-sinavi</artifactId>
- <version>3.1-beta3</version>
+ <version>3.1-SNAPSHOT</version>
</parent>
<artifactId>sinavi-server</artifactId>
<name>sinavi-server</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-12-07 22:09:41
|
Revision: 8961
http://sourceforge.net/p/fudaa/svn/8961
Author: deniger
Date: 2014-12-07 22:09:39 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
utilisation snapshot
Modified Paths:
--------------
trunk/soft/fudaa-sinavi/pom.xml
Modified: trunk/soft/fudaa-sinavi/pom.xml
===================================================================
--- trunk/soft/fudaa-sinavi/pom.xml 2014-12-07 22:06:43 UTC (rev 8960)
+++ trunk/soft/fudaa-sinavi/pom.xml 2014-12-07 22:09:39 UTC (rev 8961)
@@ -14,7 +14,7 @@
</parent>
<groupId>org.fudaa.soft.fudaa-sinavi</groupId>
<artifactId>fudaa-sinavi</artifactId>
- <version>3.1-beta3</version>
+ <version>3.1-SNAPSHOT</version>
<name>Fudaa-Sinavi</name>
<packaging>pom</packaging>
<modules>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-12-07 22:06:46
|
Revision: 8960
http://sourceforge.net/p/fudaa/svn/8960
Author: deniger
Date: 2014-12-07 22:06:43 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
maj version pour network
Modified Paths:
--------------
trunk/soft/fudaa-sinavi/pom.xml
Modified: trunk/soft/fudaa-sinavi/pom.xml
===================================================================
--- trunk/soft/fudaa-sinavi/pom.xml 2014-12-07 22:05:53 UTC (rev 8959)
+++ trunk/soft/fudaa-sinavi/pom.xml 2014-12-07 22:06:43 UTC (rev 8960)
@@ -1,69 +1,62 @@
<?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>
+ 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-common-corba.version>1.0</fudaa-common-corba.version>
- </properties>
- <parent>
- <groupId>org.fudaa.pom</groupId>
- <artifactId>soft-pom</artifactId>
- <version>0.4</version>
- </parent>
- <groupId>org.fudaa.soft.fudaa-sinavi</groupId>
- <artifactId>fudaa-sinavi</artifactId>
- <version>3.1-beta3</version>
- <name>Fudaa-Sinavi</name>
- <packaging>pom</packaging>
- <modules>
- <module>server</module>
- <module>client</module>
- </modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business</groupId>
- <artifactId>fudaa-common-corba</artifactId>
- <version>${fudaa-common-corba.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business</groupId>
- <artifactId>fudaa-common-corba</artifactId>
- <version>${fudaa-common-corba.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-sinavi</groupId>
- <artifactId>sinavi-server</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.soft.fudaa-sinavi</groupId>
- <artifactId>sinavi-client</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business</groupId>
- <artifactId>dodico-corba</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <descriptor>src/assembly/dep.xml</descriptor>
- </configuration>
- </plugin>
- </plugins>
-
-
- </build>
+ <properties>
+ <fudaa-common-corba.version>1.3</fudaa-common-corba.version>
+ </properties>
+ <parent>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>soft-pom</artifactId>
+ <version>1.5</version>
+ </parent>
+ <groupId>org.fudaa.soft.fudaa-sinavi</groupId>
+ <artifactId>fudaa-sinavi</artifactId>
+ <version>3.1-beta3</version>
+ <name>Fudaa-Sinavi</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>server</module>
+ <module>client</module>
+ </modules>
+ <profiles>
+ <profile>
+ <id>release</id>
+ <modules>
+ <module>server</module>
+ <module>client</module>
+ <module>launcher</module>
+ </modules>
+ </profile>
+ </profiles>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business</groupId>
+ <artifactId>fudaa-common-corba</artifactId>
+ <version>${fudaa-common-corba.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business</groupId>
+ <artifactId>fudaa-common-corba</artifactId>
+ <version>${fudaa-common-corba.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-sinavi</groupId>
+ <artifactId>sinavi-server</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-sinavi</groupId>
+ <artifactId>sinavi-client</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-12-07 22:05:57
|
Revision: 8959
http://sourceforge.net/p/fudaa/svn/8959
Author: deniger
Date: 2014-12-07 22:05:53 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
maj version pour network
Modified Paths:
--------------
trunk/soft/fudaa-sinavi/server/pom.xml
Modified: trunk/soft/fudaa-sinavi/server/pom.xml
===================================================================
--- trunk/soft/fudaa-sinavi/server/pom.xml 2014-12-07 22:05:29 UTC (rev 8958)
+++ trunk/soft/fudaa-sinavi/server/pom.xml 2014-12-07 22:05:53 UTC (rev 8959)
@@ -14,7 +14,6 @@
<dependency>
<groupId>org.fudaa.business</groupId>
<artifactId>dodico-corba</artifactId>
- <version>1.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-12-07 22:05:32
|
Revision: 8958
http://sourceforge.net/p/fudaa/svn/8958
Author: deniger
Date: 2014-12-07 22:05:29 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
maj version pour network
Added Paths:
-----------
trunk/soft/fudaa-sinavi/launcher/pom.xml
trunk/soft/fudaa-sinavi/launcher/src/
trunk/soft/fudaa-sinavi/launcher/src/assembly/
trunk/soft/fudaa-sinavi/launcher/src/assembly/dep.xml
trunk/soft/fudaa-sinavi/launcher/src/assembly/jar-exe.xml
trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/
trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/launch.bat
trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/launch.sh
trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/noyaucalcul/
trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/noyaucalcul/lisezmoi.txt
Removed Paths:
-------------
trunk/soft/fudaa-sinavi/client/src/assembly/dep.xml
trunk/soft/fudaa-sinavi/launcher/launch.bat
trunk/soft/fudaa-sinavi/launcher/launch.sh
Property Changed:
----------------
trunk/soft/fudaa-sinavi/launcher/
Deleted: trunk/soft/fudaa-sinavi/client/src/assembly/dep.xml
===================================================================
--- trunk/soft/fudaa-sinavi/client/src/assembly/dep.xml 2014-12-07 22:04:37 UTC (rev 8957)
+++ trunk/soft/fudaa-sinavi/client/src/assembly/dep.xml 2014-12-07 22:05:29 UTC (rev 8958)
@@ -1,23 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>executable</id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
- <dependencySet>
- <!-- décompresse les dépendances avant de les inclure dans le jar exécutable -->
- <unpack>true</unpack>
- <scope>runtime</scope>
- <useProjectArtifact>false</useProjectArtifact>
-
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>${project.build.outputDirectory}</directory>
- <outputDirectory></outputDirectory>
-
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Index: trunk/soft/fudaa-sinavi/launcher
===================================================================
--- trunk/soft/fudaa-sinavi/launcher 2014-12-07 22:04:37 UTC (rev 8957)
+++ trunk/soft/fudaa-sinavi/launcher 2014-12-07 22:05:29 UTC (rev 8958)
Property changes on: trunk/soft/fudaa-sinavi/launcher
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+target
Deleted: trunk/soft/fudaa-sinavi/launcher/launch.bat
===================================================================
--- trunk/soft/fudaa-sinavi/launcher/launch.bat 2014-12-07 22:04:37 UTC (rev 8957)
+++ trunk/soft/fudaa-sinavi/launcher/launch.bat 2014-12-07 22:05:29 UTC (rev 8958)
@@ -1 +0,0 @@
-start javaw -Xms512m -Xmx1024m -jar jar\sinavi3-executable.jar
\ No newline at end of file
Deleted: trunk/soft/fudaa-sinavi/launcher/launch.sh
===================================================================
--- trunk/soft/fudaa-sinavi/launcher/launch.sh 2014-12-07 22:04:37 UTC (rev 8957)
+++ trunk/soft/fudaa-sinavi/launcher/launch.sh 2014-12-07 22:05:29 UTC (rev 8958)
@@ -1 +0,0 @@
-java -jar -Xms512m -Xmx1024m -jar jar/sinavi3-executable.jar
\ No newline at end of file
Copied: trunk/soft/fudaa-sinavi/launcher/pom.xml (from rev 8951, trunk/soft/fudaa-sinavi/server/pom.xml)
===================================================================
--- trunk/soft/fudaa-sinavi/launcher/pom.xml (rev 0)
+++ trunk/soft/fudaa-sinavi/launcher/pom.xml 2014-12-07 22:05:29 UTC (rev 8958)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.fudaa.soft.fudaa-sinavi</groupId>
+ <artifactId>fudaa-sinavi</artifactId>
+ <version>3.1-beta3</version>
+ </parent>
+ <artifactId>sinavi-launcher</artifactId>
+ <name>sinavi-launcher</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.soft.fudaa-sinavi</groupId>
+ <artifactId>sinavi-client</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/jar-exe.xml</descriptor>
+ <descriptor>src/assembly/dep.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifest>
+ <mainClass>org.fudaa.fudaa.sinavi3.Sinavi3</mainClass>
+ </manifest>
+ </archive>
+ <finalName>sinavi3</finalName>
+ </configuration>
+ <executions>
+ <execution>
+ <id>executable</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+
+ </build>
+</project>
Copied: trunk/soft/fudaa-sinavi/launcher/src/assembly/dep.xml (from rev 8951, trunk/soft/fudaa-sinavi/src/assembly/dep.xml)
===================================================================
--- trunk/soft/fudaa-sinavi/launcher/src/assembly/dep.xml (rev 0)
+++ trunk/soft/fudaa-sinavi/launcher/src/assembly/dep.xml 2014-12-07 22:05:29 UTC (rev 8958)
@@ -0,0 +1,50 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+<!-- <dependencySets>
+ <dependencySet>
+
+ decompresse les dependances avant de les inclure dans le jar executable
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>-->
+ <fileSets>
+
+ <fileSet>
+ <directory>${project.basedir}/target</directory>
+ <outputDirectory>jar</outputDirectory>
+ <includes>
+ <include>sinavi3-exe.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/assembly/launcher</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.bat</include>
+ <include>*.sh</include>
+ </includes>
+ <excludes>
+ <exclude>noyaucalcul</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/src/assembly/launcher/noyaucalcul</directory>
+ <outputDirectory>serveurs</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/src/assembly/site</directory>
+ <outputDirectory>docs</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Copied: trunk/soft/fudaa-sinavi/launcher/src/assembly/jar-exe.xml (from rev 8951, trunk/soft/fudaa-sinavi/client/src/assembly/dep.xml)
===================================================================
--- trunk/soft/fudaa-sinavi/launcher/src/assembly/jar-exe.xml (rev 0)
+++ trunk/soft/fudaa-sinavi/launcher/src/assembly/jar-exe.xml 2014-12-07 22:05:29 UTC (rev 8958)
@@ -0,0 +1,23 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>exe</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <!-- décompresse les dépendances avant de les inclure dans le jar exécutable -->
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <useProjectArtifact>false</useProjectArtifact>
+
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory></outputDirectory>
+
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Copied: trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/launch.bat (from rev 8951, trunk/soft/fudaa-sinavi/launcher/launch.bat)
===================================================================
--- trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/launch.bat (rev 0)
+++ trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/launch.bat 2014-12-07 22:05:29 UTC (rev 8958)
@@ -0,0 +1 @@
+start javaw -Xms512m -Xmx1024m -jar jar\sinavi3-exe.jar
\ No newline at end of file
Copied: trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/launch.sh (from rev 8951, trunk/soft/fudaa-sinavi/launcher/launch.sh)
===================================================================
--- trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/launch.sh (rev 0)
+++ trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/launch.sh 2014-12-07 22:05:29 UTC (rev 8958)
@@ -0,0 +1 @@
+java -jar -Xms512m -Xmx1024m -jar jar/sinavi3-exe.jar
\ No newline at end of file
Copied: trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/noyaucalcul/lisezmoi.txt (from rev 8951, trunk/soft/fudaa-sinavi/launcher/noyaucalcul/lisezmoi.txt)
===================================================================
--- trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/noyaucalcul/lisezmoi.txt (rev 0)
+++ trunk/soft/fudaa-sinavi/launcher/src/assembly/launcher/noyaucalcul/lisezmoi.txt 2014-12-07 22:05:29 UTC (rev 8958)
@@ -0,0 +1 @@
+Mettre les serveurs sinavi ici
\ 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...> - 2014-12-07 22:04:40
|
Revision: 8957
http://sourceforge.net/p/fudaa/svn/8957
Author: deniger
Date: 2014-12-07 22:04:37 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
maj version pour network
Removed Paths:
-------------
trunk/soft/fudaa-sinavi/launcher/noyaucalcul/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-12-07 22:04:18
|
Revision: 8956
http://sourceforge.net/p/fudaa/svn/8956
Author: deniger
Date: 2014-12-07 22:04:15 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
maj version pour network
Removed Paths:
-------------
trunk/soft/fudaa-sinavi/src/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-12-07 22:02:41
|
Revision: 8955
http://sourceforge.net/p/fudaa/svn/8955
Author: deniger
Date: 2014-12-07 22:02:34 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
maj version pour network
Modified Paths:
--------------
trunk/framework/pom.xml
Modified: trunk/framework/pom.xml
===================================================================
--- trunk/framework/pom.xml 2014-12-07 21:52:25 UTC (rev 8954)
+++ trunk/framework/pom.xml 2014-12-07 22:02:34 UTC (rev 8955)
@@ -37,6 +37,7 @@
<module>ebli-1d</module>
<module>ebli-2d</module>
<module>ebli-3d</module>
+ <module>ebli-network</module>
<module>ebli-visuallibrary</module>
<module>fudaa-common</module>
<module>fudaa-common-courbe</module>
@@ -137,6 +138,11 @@
</dependency>
<dependency>
<groupId>${ebliGroupId}</groupId>
+ <artifactId>ebli-network</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${ebliGroupId}</groupId>
<artifactId>ebli-3d</artifactId>
<version>${project.version}</version>
<!--
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2014-12-07 21:52:28
|
Revision: 8954
http://sourceforge.net/p/fudaa/svn/8954
Author: deniger
Date: 2014-12-07 21:52:25 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
maj version pour network
Modified Paths:
--------------
trunk/framework/ebli-network/pom.xml
Modified: trunk/framework/ebli-network/pom.xml
===================================================================
--- trunk/framework/ebli-network/pom.xml 2014-12-07 21:46:55 UTC (rev 8953)
+++ trunk/framework/ebli-network/pom.xml 2014-12-07 21:52:25 UTC (rev 8954)
@@ -4,12 +4,11 @@
<parent>
<groupId>org.fudaa.framework</groupId>
<artifactId>fudaa-framework</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.7-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.framework.ebli</groupId>
<artifactId>ebli-network</artifactId>
<name>ebli-network</name>
- <version>1.0</version>
<dependencies>
<dependency>
<groupId>jgraph</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
