Menu
▾
▴
fudaa-svn-commit
|
From: <bma...@us...> - 2011-09-14 12:30:28
|
Revision: 6432
http://fudaa.svn.sourceforge.net/fudaa/?rev=6432&view=rev
Author: bmarchan
Date: 2011-09-14 12:30:17 +0000 (Wed, 14 Sep 2011)
Log Message:
-----------
Chgt de version => 1.1_b20110914
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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 2011-09-14 12:26:00 UTC (rev 6431)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2011-09-14 12:30:17 UTC (rev 6432)
@@ -56,8 +56,8 @@
protected static BuInformationsSoftware isPIV_ = new BuInformationsSoftware();
static {
isPIV_.name = "LSPIV";
- isPIV_.version = "1.1_b20110831";
- isPIV_.date = "2011-08-31";
+ isPIV_.version = "1.1_b20110914";
+ isPIV_.date = "2011-09-14";
isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2011";
isPIV_.license = "GPL2";
isPIV_.languages = "fr";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-10-13 08:36:05
|
Revision: 6528
http://fudaa.svn.sourceforge.net/fudaa/?rev=6528&view=rev
Author: bmarchan
Date: 2011-10-13 08:35:54 +0000 (Thu, 13 Oct 2011)
Log Message:
-----------
Chgt version -> 1.1_b20111013
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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 2011-10-13 08:34:44 UTC (rev 6527)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2011-10-13 08:35:54 UTC (rev 6528)
@@ -65,8 +65,8 @@
protected static BuInformationsSoftware isPIV_ = new BuInformationsSoftware();
static {
isPIV_.name = "LSPIV";
- isPIV_.version = "1.1_b20110914";
- isPIV_.date = "2011-09-14";
+ isPIV_.version = "1.1_b20111013";
+ isPIV_.date = "2011-10-13";
isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2011";
isPIV_.license = "GPL2";
isPIV_.languages = "fr";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-10-27 13:16:21
|
Revision: 6587
http://fudaa.svn.sourceforge.net/fudaa/?rev=6587&view=rev
Author: bmarchan
Date: 2011-10-27 13:16:10 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
Chgt version -> 1.1 (Version finale)
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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 2011-10-27 13:15:36 UTC (rev 6586)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2011-10-27 13:16:10 UTC (rev 6587)
@@ -7,6 +7,7 @@
*/
package org.fudaa.fudaa.piv;
+import java.util.Observable;
import org.fudaa.fudaa.piv.io.PivExeLauncher;
import org.fudaa.fudaa.piv.metier.PivProjectStateListener;
import java.awt.Dimension;
@@ -21,6 +22,7 @@
import com.memoire.bu.*;
import com.memoire.fu.FuLog;
import java.util.Iterator;
+import java.util.Observer;
import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
import javax.swing.AbstractButton;
@@ -65,11 +67,11 @@
protected static BuInformationsSoftware isPIV_ = new BuInformationsSoftware();
static {
isPIV_.name = "LSPIV";
- isPIV_.version = "1.1_b20111017";
- isPIV_.date = "2011-10-17";
+ isPIV_.version = "1.1";
+ isPIV_.date = "2011-10-27";
isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2011";
isPIV_.license = "GPL2";
- isPIV_.languages = "fr,en";
+ isPIV_.languages = "fr";
isPIV_.authors=new String[]{"B.Marchand (DeltaCAD)"};
isPIV_.contact="mag...@ed...\n jer...@ce...\n ale...@ed...";
isPIV_.http="http://www.fudaa.fr/lspiv/";
@@ -89,8 +91,9 @@
private PivFille2d piv2dFrame;
/** Une fenetre de progression */
private CtuluDialog diProgress;
+ /** L'UI est-il modifi\xE9 ? */
+ private boolean isUIModified_=false;
-
/**
* Retourne les informations de l'application pour affichage dans "a propos".
* @return Les infos.
@@ -183,7 +186,7 @@
FuLog.trace("Project state change");
boolean bprjOpen=project!=null;
- boolean bprjMod=bprjOpen && project.isParamsModified();
+ boolean bprjMod=bprjOpen && (project.isParamsModified() || isUIModified_);
boolean bprjHasOriginalImg=bprjOpen && project.hasPgmImages();
boolean bprjHasTransfImg=bprjOpen && project.hasTransfImages();
@@ -233,7 +236,7 @@
title+=PivResource.getS("Nouveau projet");
else
title+=prjFile;
- if (project.isParamsModified())
+ if (project.isParamsModified() || isUIModified_)
title+="*";
}
setTitle(title);
@@ -343,7 +346,7 @@
project.addListener(this);
open2dFrame();
- updateActionsState();
+ setUIIsNotModified();
}
/**
@@ -371,18 +374,49 @@
try {
piv2dFrame.setMaximum(true);
piv2dFrame.getVisuPanel().restaurer();
+ setUIIsNotModified();
}
catch (PropertyVetoException ex) {
}
}
});
}
+
+ /**
+ * Affecte un statut "non modifi\xE9" \xE0 l'UI.
+ */
+ public void setUIIsNotModified() {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+
+ // Important : isUIModified doit \xEAtre initialis\xE9 tout a la fin du thread swing.
+ // Pour cela, on le place dans un invokeLater d'un code d\xE9j\xE0 lanc\xE9 \xE0 la fin.
+ // Par ce biais, on est "quasi" s\xFBr que ce sera bien en fin de file.
+ SwingUtilities.invokeLater(new Runnable() {
+
+ public void run() {
+ isUIModified_=false;
+ updateActionsState();
+ }
+ });
+ }
+ });
+ }
+
/**
* Cr\xE9e la fenetre 2D.
*/
public void create2dFrame() {
piv2dFrame=new PivFille2d(this);
+
+ // On capte toutes les modifications UI.
+ piv2dFrame.getVisuPanel().getArbreCalqueModel().getObservable().addObserver(new Observer() {
+ public void update(Observable o, Object arg) {
+ isUIModified_=true;
+ updateActionsState();
+ }
+ });
}
/**
@@ -470,15 +504,16 @@
prjFile=_f;
}
- project = new PivProject();
+ project = null;
// L'ouverture est lanc\xE9e en tache de fond.
CtuluTaskOperationGUI r=new CtuluTaskOperationGUI(this, PivResource.getS("Chargement du projet")) {
@Override
public void act() {
boolean b=true;
+ final PivPersistence persist=new PivPersistence(PivImplementation.this);
try {
- b=project.load(prjFile, this);
+ b=persist.load(prjFile, this);
}
finally {
final boolean b2=b;
@@ -490,11 +525,13 @@
project=null;
}
else {
+ project=persist.getProject();
project.addListener(PivImplementation.this);
open2dFrame();
+ piv2dFrame.getVisuPanel().setLayerProperties(persist.getLayerProperties());
updateRecentFiles(prjFile);
- updateActionsState();
+ setUIIsNotModified();
}
}
});
@@ -541,7 +578,7 @@
public void act() {
boolean b=true;
try {
- b=project.save(f, this);
+ b=new PivPersistence(PivImplementation.this).save(f, this);
prjFile=f;
}
@@ -555,7 +592,7 @@
}
else {
updateRecentFiles(prjFile);
- updateActionsState();
+ setUIIsNotModified();
}
}
});
@@ -579,7 +616,7 @@
*/
protected boolean isProjectModified() {
return project != null
- && (project.isParamsModified());
+ && (project.isParamsModified() || isUIModified_);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-12-01 14:51:50
|
Revision: 6748
http://fudaa.svn.sourceforge.net/fudaa/?rev=6748&view=rev
Author: bmarchan
Date: 2011-12-01 14:51:44 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
Mod : L'import des fichiers se fait depuis le menu principal
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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 2011-12-01 13:46:42 UTC (rev 6747)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2011-12-01 14:51:44 UTC (rev 6748)
@@ -707,25 +707,11 @@
if (mr != null) {
mr.setPreferences(PivPreferences.PIV);
mr.setResource(PivResource.PIV);
-// mr.setEnabled(true);
}
// les menus exporter et importer sont construit dynamiquement
- buildImportMenu();
+// buildImportMenu();
buildExportMenu();
-// BuMenu mnExport = (BuMenu) mb.getMenu("EXPORTER");
-
-// menu.addMenuItem(FSigImageImportAction.getCommonTitle(), "IMPORT_IMAGE", FSigImageImportAction.getCommonImage(),
-// this).setEnabled(false);
-// mmImport.addMenuItem(PivResource.getS("Importer un projet"), "IMPORT_PROJECT", BuResource.BU.getMenuIcon("importer"), this)
-// .setEnabled(false);
-//// menu.addItemListener(this);
-// setEnabledForAction("IMPORT_PROJECT", true);
-// mmImport.setEnabled(true);
-//
-// BuMenuItem itExportData = new BuMenuItem();
-// super.initExportDataButton(itExportData);
-// mnExport.add(itExportData);
BuMenu mn=buildPivMenu();
mb.addMenu(mn);
}
@@ -735,25 +721,53 @@
* @return Le menu projet.
*/
protected BuMenu buildPivMenu() {
+ AbstractButton bt;
+ BuMenu sm;
BuMenu mn=new BuMenu(PivResource.getS("LSPIV"),"mnPROJECT");
mn.add(new PivSelectImagesAction(this));
+
mn.addSeparator(PivResource.getS("Orthorectification"));
- mn.add(get2dFrame().getVisuPanel().getOrthoGRPAction());
+ sm=new BuMenu(PivResource.getS("Points de r\xE9f\xE9rence"),"mnGRP");
+ bt=get2dFrame().getVisuPanel().getOrthoGRPAction().buildMenuItem(EbliComponentFactory.INSTANCE);
+ bt.setText(PivResource.getS("D\xE9finir..."));
+ sm.add(bt);
+ bt=new PivImportGRPAction((this)).buildMenuItem(EbliComponentFactory.INSTANCE);
+ bt.setText(PivResource.getS("Importer..."));
+ sm.add(bt);
+ mn.add(sm);
mn.add(new PivOrthoVerifyGRPAction(this));
mn.add(new PivOrthoParamAction(this));
mn.add(new PivOrthoLaunchAction(this));
+
mn.addSeparator(PivResource.getS("Analyse LSPIV"));
mn.add(new PivComputeParamAction(this));
- mn.add(get2dFrame().getVisuPanel().getComputeGridDefinitionAction());
+ sm=new BuMenu(PivResource.getS("Grille"),"mnGRP");
+ bt=get2dFrame().getVisuPanel().getComputeGridDefinitionAction().buildMenuItem(EbliComponentFactory.INSTANCE);
+ bt.setText(PivResource.getS("D\xE9finir..."));
+ sm.add(bt);
+ bt=new PivImportGridAction((this)).buildMenuItem(EbliComponentFactory.INSTANCE);
+ bt.setText(PivResource.getS("Importer..."));
+ sm.add(bt);
+ mn.add(sm);
mn.add(new PivComputeLaunchAction(this));
+
mn.addSeparator(PivResource.getS("R\xE9sultats"));
mn.add(new PivComputeAverageAction(this));
mn.add(get2dFrame().getVisuPanel().getShowVelocitiesAction().buildMenuItem(EbliComponentFactory.INSTANCE));
+
mn.addSeparator(PivResource.getS("Post-traitement"));
mn.add(new PivFlowParamAction(this));
- mn.add(get2dFrame().getVisuPanel().getNewTransectAction());
+ sm=new BuMenu(PivResource.getS("Transect"),"mnGRP");
+ bt=get2dFrame().getVisuPanel().getNewTransectAction().buildMenuItem(EbliComponentFactory.INSTANCE);
+ bt.setText(PivResource.getS("D\xE9finir..."));
+ sm.add(bt);
+ bt=new PivImportTransectAction((this)).buildMenuItem(EbliComponentFactory.INSTANCE);
+ bt.setText(PivResource.getS("Importer..."));
+ sm.add(bt);
+ mn.add(sm);
mn.add(new PivComputeFlowAction(this));
mn.add(get2dFrame().getVisuPanel().getShowFlowAction().buildMenuItem(EbliComponentFactory.INSTANCE));
+
mn.addSeparator(PivResource.getS("Vue"));
ButtonGroup bg=new ButtonGroup();
AbstractButton itOriginalView=get2dFrame().getVisuPanel().getOriginalViewAction().buildMenuItem(EbliComponentFactory.INSTANCE);
@@ -783,7 +797,7 @@
}
/**
- * Constriut le menu export
+ * Construit le menu export
*/
protected void buildExportMenu() {
BuMenu mnExport = (BuMenu)getMainMenuBar().getMenu("EXPORTER");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-12-04 18:32:45
|
Revision: 6782
http://fudaa.svn.sourceforge.net/fudaa/?rev=6782&view=rev
Author: bmarchan
Date: 2011-12-04 18:32:38 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Chgt version -> 1.2
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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 2011-12-04 18:30:26 UTC (rev 6781)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2011-12-04 18:32:38 UTC (rev 6782)
@@ -79,8 +79,8 @@
protected static BuInformationsSoftware isPIV_ = new BuInformationsSoftware();
static {
isPIV_.name = "LSPIV";
- isPIV_.version = "1.2_b20111111";
- isPIV_.date = "2011-11-11";
+ isPIV_.version = "1.2";
+ isPIV_.date = "2011-12-04";
isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2011";
isPIV_.license = "GPL2";
isPIV_.languages = "en,fr";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-12-16 15:04:20
|
Revision: 6848
http://fudaa.svn.sourceforge.net/fudaa/?rev=6848&view=rev
Author: bmarchan
Date: 2011-12-16 15:04:09 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Chgt de version -> 1.2.1
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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 2011-12-16 15:02:06 UTC (rev 6847)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2011-12-16 15:04:09 UTC (rev 6848)
@@ -81,8 +81,8 @@
protected static BuInformationsSoftware isPIV_ = new BuInformationsSoftware();
static {
isPIV_.name = "LSPIV";
- isPIV_.version = "1.2";
- isPIV_.date = "2011-12-05";
+ isPIV_.version = "1.2.1";
+ isPIV_.date = "2011-12-15";
isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2011";
isPIV_.license = "GPL2";
isPIV_.languages = "en,fr";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2013-02-14 15:44:26
|
Revision: 8272
http://fudaa.svn.sourceforge.net/fudaa/?rev=8272&view=rev
Author: bmarchan
Date: 2013-02-14 15:44:17 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
Chgt version
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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 2013-02-14 15:43:35 UTC (rev 8271)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2013-02-14 15:44:17 UTC (rev 8272)
@@ -82,7 +82,7 @@
static {
isPIV_.name = "LSPIV";
isPIV_.version = "1.3.2";
- isPIV_.date = "2013-01-08";
+ isPIV_.date = "2013-02-14";
isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2013";
isPIV_.license = "GPL2";
isPIV_.languages = "en,fr";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-01-30 16:46:22
|
Revision: 9005
http://sourceforge.net/p/fudaa/svn/9005
Author: bmarchan
Date: 2015-01-30 16:46:19 +0000 (Fri, 30 Jan 2015)
Log Message:
-----------
Menu aide revu
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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-30 16:44:00 UTC (rev 9004)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-01-30 16:46:19 UTC (rev 9005)
@@ -7,11 +7,13 @@
*/
package org.fudaa.fudaa.piv;
+import java.awt.Desktop;
import java.awt.Dimension;
import java.awt.Point;
import java.awt.event.ActionEvent;
import java.beans.PropertyVetoException;
import java.io.File;
+import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.Observable;
@@ -90,6 +92,7 @@
isPIV_.authors=new String[]{"B.Marchand (mar...@de...)"};
isPIV_.contact="mag...@ed...\n jer...@ir...\n ale...@ed...";
isPIV_.http="http://forge.irstea.fr/projects/fudaa-lspiv";
+ isPIV_.man="doc/guide_Fudaa-lspiv_v0.pdf";
isPIV_.logo = PivResource.PIV.getIcon("iconepiv.gif");
isPIV_.banner = PivResource.PIV.getIcon("banniere.jpg");
@@ -293,6 +296,8 @@
saveAndCloseProjet();
} else if ("CREER".equals(action)) {
create();
+ } else if ("AIDE_INDEX".equals(action)) {
+ showHelp();
}
else if (action.startsWith("REOUVRIR")) {
FuLog.trace(action.substring(9,action.length()-1));
@@ -311,6 +316,21 @@
getMainMenuBar().addRecentFile(_fichier.getPath(),null);
PivPreferences.PIV.writeIniFile();
}
+
+ /**
+ * Affiche la documentation depuis un fichier externe (pdf, html, ...)
+ */
+ private void showHelp() {
+ File manFile=new File(getInformationsSoftware().man);
+ FuLog.trace("Affichage de la doc depuis "+manFile.getAbsolutePath());
+
+ try {
+ Desktop.getDesktop().open(manFile);
+ }
+ catch (Exception e) {
+ error(PivResource.getS("Impossible d'ouvrir le fichier {0}.\nPas d'application ou fichier introuvable.",manFile.getAbsolutePath()));
+ }
+ }
/**
* Surcharge de la m\xE9thode pour pouvoir sauvegarder les pr\xE9f\xE9rences.
@@ -836,7 +856,7 @@
*/
protected void removeUnusedActions() {
removeAction("ASSISTANT");
-// removeAction("ASTUCE");
+ removeAction("ASTUCE");
removeAction("POINTEURAIDE");
removeAction("INDEX_THEMA");
removeAction("INDEX_ALPHA");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-02-19 14:28:45
|
Revision: 9034
http://sourceforge.net/p/fudaa/svn/9034
Author: bmarchan
Date: 2015-02-19 14:28:38 +0000 (Thu, 19 Feb 2015)
Log Message:
-----------
Chgt de version => 1.4.1
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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-02-19 14:16:02 UTC (rev 9033)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-02-19 14:28:38 UTC (rev 9034)
@@ -85,8 +85,8 @@
static {
isPIV_.name = "LSPIV";
isPIV_.version = "1.4.1";
- isPIV_.date = "2014-12-10";
- isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2014";
+ isPIV_.date = "2015-02-19";
+ isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2015";
isPIV_.license = "GPL2";
isPIV_.languages = "en,fr";
isPIV_.authors=new String[]{"B.Marchand (mar...@de...)"};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-03-09 13:33:15
|
Revision: 9056
http://sourceforge.net/p/fudaa/svn/9056
Author: bmarchan
Date: 2015-03-09 13:33:08 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
Corerctions diverses
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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-03-09 13:32:34 UTC (rev 9055)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-03-09 13:33:08 UTC (rev 9056)
@@ -89,9 +89,10 @@
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_.contact="mag...@ed...\nje...@ir...\nal...@ed...";
isPIV_.http="http://forge.irstea.fr/projects/fudaa-lspiv";
isPIV_.man="doc/guide_Fudaa-lspiv_v0.pdf";
+ isPIV_.citation=PivResource.getS("Ichiro Fujita (Prof.), Universit\xE9 de Kob\xE9");
isPIV_.logo = PivResource.PIV.getIcon("iconepiv.gif");
isPIV_.banner = PivResource.PIV.getIcon("banniere.jpg");
@@ -592,7 +593,9 @@
if (_f==null) {
CtuluFileChooser fc = new CtuluFileChooser(true);
- fc.setTester(new CtuluFileChooserTestWritable(this));
+ CtuluFileChooserTestWritable tester=new CtuluFileChooserTestWritable(this);
+ tester.setAppendStrictExtension(true);
+ fc.setTester(tester);
fc.setFileFilter(FILE_FLT_PROJ);
fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
fc.setAcceptAllFileFilterUsed(false);
@@ -600,7 +603,7 @@
if (fc.showSaveDialog(this.getFrame()) == JFileChooser.CANCEL_OPTION) {
return;
}
- _f=CtuluLibFile.appendExtensionIfNeeded(fc.getSelectedFile(),FILE_FLT_PROJ.getFirstExt());
+ _f=CtuluLibFile.appendStrictExtensionIfNeeded(fc.getSelectedFile(),FILE_FLT_PROJ.getFirstExt());
}
final File f=_f;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-03-09 14:17:03
|
Revision: 9057
http://sourceforge.net/p/fudaa/svn/9057
Author: bmarchan
Date: 2015-03-09 14:17:01 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
Fix : Pb de chemin de la doc
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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-03-09 13:33:08 UTC (rev 9056)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-03-09 14:17:01 UTC (rev 9057)
@@ -83,7 +83,7 @@
protected static BuInformationsSoftware isPIV_ = new BuInformationsSoftware();
static {
isPIV_.name = "LSPIV";
- isPIV_.version = "1.4.1";
+ isPIV_.version = "1.4.2";
isPIV_.date = "2015-02-24";
isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2015";
isPIV_.license = "GPL2";
@@ -91,7 +91,7 @@
isPIV_.authors=new String[]{"B.Marchand (mar...@de...)"};
isPIV_.contact="mag...@ed...\nje...@ir...\nal...@ed...";
isPIV_.http="http://forge.irstea.fr/projects/fudaa-lspiv";
- isPIV_.man="doc/guide_Fudaa-lspiv_v0.pdf";
+ isPIV_.man="guide_Fudaa-lspiv.pdf";
isPIV_.citation=PivResource.getS("Ichiro Fujita (Prof.), Universit\xE9 de Kob\xE9");
isPIV_.logo = PivResource.PIV.getIcon("iconepiv.gif");
@@ -321,7 +321,8 @@
* Affiche la documentation depuis un fichier externe (pdf, html, ...)
*/
private void showHelp() {
- File manFile=new File(getInformationsSoftware().man);
+ String docPath=System.getProperty(PivPreferences.PIV_DOC_PATH,System.getProperty("user.dir")+"/doc");
+ File manFile=new File(docPath,getInformationsSoftware().man);
FuLog.trace("Affichage de la doc depuis "+manFile.getAbsolutePath());
try {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-03-31 14:51:30
|
Revision: 9098
http://sourceforge.net/p/fudaa/svn/9098
Author: bmarchan
Date: 2015-03-31 14:51:28 +0000 (Tue, 31 Mar 2015)
Log Message:
-----------
Chgt version -> 1.4.2
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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-03-31 14:13:30 UTC (rev 9097)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-03-31 14:51:28 UTC (rev 9098)
@@ -82,7 +82,7 @@
static {
isPIV_.name = "LSPIV";
isPIV_.version = "1.4.2";
- isPIV_.date = "2015-02-24";
+ isPIV_.date = "2015-03-31";
isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CEREMA (c)1999-2015";
isPIV_.license = "GPL2";
isPIV_.languages = "en,fr";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-04-02 12:49:13
|
Revision: 9102
http://sourceforge.net/p/fudaa/svn/9102
Author: bmarchan
Date: 2015-04-02 12:49:04 +0000 (Thu, 02 Apr 2015)
Log Message:
-----------
Add Drag&Drop
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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-04-02 07:58:24 UTC (rev 9101)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-04-02 12:49:04 UTC (rev 9102)
@@ -10,9 +10,12 @@
import java.awt.Desktop;
import java.awt.Dimension;
import java.awt.Point;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.UnsupportedFlavorException;
import java.awt.event.ActionEvent;
import java.beans.PropertyVetoException;
import java.io.File;
+import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.Observable;
@@ -23,8 +26,10 @@
import javax.swing.AbstractButton;
import javax.swing.ButtonGroup;
import javax.swing.JFileChooser;
+import javax.swing.JFrame;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
+import javax.swing.TransferHandler;
import org.fudaa.ctulu.CtuluLibFile;
import org.fudaa.ctulu.gui.CtuluDialog;
@@ -81,7 +86,7 @@
protected static BuInformationsSoftware isPIV_ = new BuInformationsSoftware();
static {
isPIV_.name = "LSPIV";
- isPIV_.version = "1.4.2";
+ isPIV_.version = "1.4.3";
isPIV_.date = "2015-03-31";
isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CEREMA (c)1999-2015";
isPIV_.license = "GPL2";
@@ -665,6 +670,9 @@
public void init() {
CtuluImageExport.removeWritableFormats(new String[]{"ps"});
+
+ // DragAndDrop
+ installDragAndDrop();
super.init();
// Pour forcer l'activation du command listener.
@@ -694,7 +702,59 @@
BuMenu mn=buildPivMenu();
mb.addMenu(mn);
}
+
+ /**
+ * Met en place le drag&drop pour les fichiers projet
+ */
+ protected void installDragAndDrop() {
+ ((JFrame) getFrame()).setTransferHandler(new TransferHandler() {
+ @Override
+ public boolean canImport(TransferSupport support) {
+ for (DataFlavor df : support.getDataFlavors()) {
+ if (df.equals(DataFlavor.javaFileListFlavor)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * L'importation de donn\xE9es.
+ */
+ @Override
+ public boolean importData(TransferSupport support) {
+ if (canImport(support)) {
+ try {
+ @SuppressWarnings("unchecked")
+ final List<File> files=(List<File>) support.getTransferable().getTransferData(DataFlavor.javaFileListFlavor);
+ if (files.size() > 1) {
+ error(PivResource.getS("Un seul fichier projet est autoris\xE9 pour le transfert"));
+ return false;
+ }
+ // Un thread est lanc\xE9, sinon l'explorer de fichier d'ou provient le fichier est bloqu\xE9
+ // durant le processus d'ouverture
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ ouvrir(files.get(0));
+ }
+ }).start();
+
+ return true;
+ }
+ catch (UnsupportedFlavorException ufe) {
+ ufe.printStackTrace();
+ }
+ catch (IOException ioe) {
+ ioe.printStackTrace();
+ }
+ }
+ return false;
+ }
+ });
+ }
+
/**
* Construit le menu projet.
* @return Le menu projet.
@@ -835,44 +895,6 @@
*/
@Override
public void start() {
-// ((JFrame)getFrame()).setTransferHandler(new TransferHandler() {
-//
-// @Override
-// public boolean canImport(TransferSupport support) {
-// for (DataFlavor df : support.getDataFlavors()) {
-// if (df.equals(DataFlavor.javaFileListFlavor)) {
-// return true;
-// }
-// }
-// return false;
-// }
-//
-// /**
-// * L'importation de donn\xE9es.
-// */
-// @Override
-// public boolean importData(TransferSupport support) {
-// if (canImport(support)) {
-// try {
-// List<File> files = (List<File>) support.getTransferable().getTransferData(DataFlavor.javaFileListFlavor);
-// if (files.size() > 1) {
-// error(PivResource.getS("Un seul fichier projet est autoris\xE9 pour le transfert"));
-// return false;
-// }
-// ouvrir(files.get(0));
-// return true;
-// }
-// catch (UnsupportedFlavorException ufe) {
-// ufe.printStackTrace();
-// }
-// catch (IOException ioe) {
-// ioe.printStackTrace();
-// }
-// }
-// return false;
-// }
-// });
-
super.start();
super.addFrameListLeft();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-04-21 21:34:14
|
Revision: 9119
http://sourceforge.net/p/fudaa/svn/9119
Author: bmarchan
Date: 2015-04-21 21:34:11 +0000 (Tue, 21 Apr 2015)
Log Message:
-----------
Add action Delete
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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-04-21 15:58:52 UTC (rev 9118)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-04-21 21:34:11 UTC (rev 9119)
@@ -707,6 +707,7 @@
mn.add(get2dFrame().getVisuPanel().getEditAction().buildMenuItem(EbliComponentFactory.INSTANCE),idx++);
mn.add(get2dFrame().getVisuPanel().getDeplacementAction().buildMenuItem(EbliComponentFactory.INSTANCE),idx++);
mn.add(get2dFrame().getVisuPanel().getRotationAction().buildMenuItem(EbliComponentFactory.INSTANCE),idx++);
+ mn.add(get2dFrame().getVisuPanel().getEditor().getActionDelete().buildMenuItem(EbliComponentFactory.INSTANCE),idx++);
mn.insertSeparator(idx++);
// les menus exporter et importer sont construit dynamiquement
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2015-08-31 14:55:12
|
Revision: 9156
http://sourceforge.net/p/fudaa/svn/9156
Author: bmarchan
Date: 2015-08-31 14:55:09 +0000 (Mon, 31 Aug 2015)
Log Message:
-----------
Chgt version => 1.4.4
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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-08-31 14:54:52 UTC (rev 9155)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2015-08-31 14:55:09 UTC (rev 9156)
@@ -87,8 +87,8 @@
protected static BuInformationsSoftware isPIV_ = new BuInformationsSoftware();
static {
isPIV_.name = "LSPIV";
- isPIV_.version = "1.4.3";
- isPIV_.date = "2015-04-23";
+ isPIV_.version = "1.4.4";
+ isPIV_.date = "2015-08-31";
isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CEREMA (c)1999-2015";
isPIV_.license = "GPL2";
isPIV_.languages = "en,fr";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2017-01-02 16:55:37
|
Revision: 9498
http://sourceforge.net/p/fudaa/svn/9498
Author: bmarchan
Date: 2017-01-02 16:55:35 +0000 (Mon, 02 Jan 2017)
Log Message:
-----------
Fudaa-LSPIV : Detection des mises a jour depuis le site de IRSTEA.
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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 2017-01-02 14:43:57 UTC (rev 9497)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2017-01-02 16:55:35 UTC (rev 9498)
@@ -106,7 +106,7 @@
isPIV_.http="http://forge.irstea.fr/projects/fudaa-lspiv";
isPIV_.man="guide_Fudaa-lspiv_"+BuPreferences.BU.getStringProperty("locale.language", System.getProperty("piv.lang", "fr"))+".pdf";
isPIV_.citation=PivResource.getS("Ichiro Fujita (Prof.), Universit\xE9 de Kob\xE9");
- isPIV_.update=System.getProperty("piv.update", "http://www.deltacad.fr/downloads");
+ isPIV_.update=System.getProperty("piv.update", "https://forge.irstea.fr/projects/fudaa-lspiv/files");
isPIV_.logo = PivResource.PIV.getIcon("iconepiv.gif");
isPIV_.banner = PivResource.PIV.getIcon("banniere.jpg");
@@ -276,7 +276,7 @@
showHelp();
} else if ("MAJ".equals(action)) {
if (!checkForUpdate(false)) {
- message(PivResource.getS("Information"),PivResource.getS("La version de Fudaa-LSPIV est \xE0 jour"),false);
+ message(PivResource.getS("Information"),PivResource.getS("Site des mise \xE0 jour : {0}\nLa version de Fudaa-LSPIV est \xE0 jour.",isPIV_.update),false);
}
}
else if (action.startsWith("REOUVRIR")) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2017-06-07 09:00:52
|
Revision: 9629
http://sourceforge.net/p/fudaa/svn/9629
Author: bmarchan
Date: 2017-06-07 09:00:49 +0000 (Wed, 07 Jun 2017)
Log Message:
-----------
LSPIV : Chgt de date de production
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
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 2017-06-06 15:30:29 UTC (rev 9628)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java 2017-06-07 09:00:49 UTC (rev 9629)
@@ -100,7 +100,7 @@
static {
isPIV_.name = "LSPIV";
isPIV_.version = "1.5.2";
- isPIV_.date = "2017-04-13";
+ isPIV_.date = "2017-06-07";
isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CEREMA (c)1999-2017";
isPIV_.license = "GPL2";
isPIV_.languages = "en,fr";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X