Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[9624] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv
|
From: <bma...@us...> - 2017-06-01 16:08:47
|
Revision: 9624
http://sourceforge.net/p/fudaa/svn/9624
Author: bmarchan
Date: 2017-06-01 16:08:44 +0000 (Thu, 01 Jun 2017)
Log Message:
-----------
Chgt des parametres par defaut pour les calques
Modified Paths:
--------------
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivTransfView.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsLayer.java
trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectLayer.java
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.java 2017-06-01 15:50:25 UTC (rev 9623)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOriginalView.java 2017-06-01 16:08:44 UTC (rev 9624)
@@ -98,10 +98,12 @@
// Layer des ortho points
cqOrthoPoints_=new ZCalquePointEditable(null, null);
cqOrthoPoints_.setTitle(PivResource.getS("Points r\xE9f\xE9rence"));
- cqOrthoPoints_.setIconModel(0, new TraceIconModel(TraceIcon.PLUS_DOUBLE, 3, Color.RED));
+ cqOrthoPoints_.setIconModel(0, new TraceIconModel(TraceIcon.PLUS, 4, Color.RED));
cqOrthoPoints_.setName("cqOrthoPoints");
cqOrthoPoints_.setDestructible(false);
cqOrthoPoints_.setAttributForLabels(PivVisuPanel.ATT_LABEL);
+ // Legerement transparent.
+ cqOrthoPoints_.setLabelsBackgroundColor(new Color(255, 255, 255, 75));
cqOrthoPoints_.setEditor(pnLayers_.getEditor());
getOrthoGRPAction().setCalqueOrthoPoints(cqOrthoPoints_);
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java 2017-06-01 15:50:25 UTC (rev 9623)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivRealView.java 2017-06-01 16:08:44 UTC (rev 9624)
@@ -219,10 +219,12 @@
cqRealOrthoPoints_=new ZCalquePointEditable(null,null);
cqRealOrthoPoints_.setTitle(PivResource.getS("Points r\xE9f\xE9rence"));
cqRealOrthoPoints_.setLongTitle(PivResource.getS("Points r\xE9f\xE9rence"));
- cqRealOrthoPoints_.setIconModel(0, new TraceIconModel(TraceIcon.PLUS_DOUBLE, 3, Color.RED));
+ cqRealOrthoPoints_.setIconModel(0, new TraceIconModel(TraceIcon.PLUS, 4, Color.RED));
cqRealOrthoPoints_.setName("cqRealOrthoPoints");
cqRealOrthoPoints_.setDestructible(false);
cqRealOrthoPoints_.setAttributForLabels(PivVisuPanel.ATT_LABEL);
+ // Legerement transparent.
+ cqRealOrthoPoints_.setLabelsBackgroundColor(new Color(255, 255, 255, 75));
cqRealOrthoPoints_.setEditor(pnLayers_.getEditor());
// Layer des ortho points recalcul\xE9s (ajout\xE9 a la demande)
@@ -229,7 +231,7 @@
cqRealControlPoints_=new ZCalqueMultiPointEditable(null,null);
cqRealControlPoints_.setTitle(PivResource.getS("Points de contr\xF4le"));
cqRealControlPoints_.setLongTitle(PivResource.getS("Points de contr\xF4le"));
- cqRealControlPoints_.setIconModel(0, new TraceIconModel(TraceIcon.PLUS_DOUBLE, 3, Color.BLUE));
+ cqRealControlPoints_.setIconModel(0, new TraceIconModel(TraceIcon.CERCLE, 4, Color.BLUE));
cqRealControlPoints_.setName("cqRealControlPoints");
cqRealControlPoints_.setDestructible(false);
@@ -259,6 +261,9 @@
cqVelResults.setName("cqRealVel");
// Donne la couleur des fl\xE8ches si pas de palette de couleurs.
cqVelResults.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1, Color.RED));
+ // On force la taille de vecteur \xE0 2.5 m/s
+ cqVelResults.getScaleData().setLegendFixRealNorm(2.5);
+ cqVelResults.getScaleData().setLegendUseFixRealNorm(true);
cqVelResults.setVisible(false);
cqVelResults.addPropertyChangeListener(new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -277,6 +282,9 @@
// Donne la couleur des fl\xE8ches si pas de palette de couleurs.
cqInstantVelResults_.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1, Color.ORANGE));
cqInstantVelResults_.setTitleModifiable(true);
+ // On force la taille de vecteur \xE0 2.5 m/s
+ cqInstantVelResults_.getScaleData().setLegendFixRealNorm(2.5);
+ cqInstantVelResults_.getScaleData().setLegendUseFixRealNorm(true);
cqInstantVelResults_.setVisible(false);
// Layer des vitesses instantan\xE9es filtr\xE9es.
@@ -289,6 +297,9 @@
// Donne la couleur des fl\xE8ches si pas de palette de couleurs.
cqInstantVelFltResults_.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 1, Color.GREEN.darker()));
cqInstantVelFltResults_.setTitleModifiable(true);
+ // On force la taille de vecteur \xE0 2.5 m/s
+ cqInstantVelFltResults_.getScaleData().setLegendFixRealNorm(2.5);
+ cqInstantVelFltResults_.getScaleData().setLegendUseFixRealNorm(true);
cqInstantVelFltResults_.setVisible(false);
// Layer des d\xE9bits.
@@ -299,6 +310,9 @@
cqFlowResults.setName("cqRealFlow");
// Donne la couleur des fl\xE8ches si pas de palette de couleurs.
cqFlowResults.setLineModel(0, new TraceLigneModel(TraceLigne.LISSE, 2, Color.ORANGE));
+ // On force la taille de vecteur \xE0 2.5 m/s
+ cqFlowResults.getScaleData().setLegendFixRealNorm(2.5);
+ cqFlowResults.getScaleData().setLegendUseFixRealNorm(true);
// Layer des transect
cqTransect_= new PivTransectLayer();
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivTransfView.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivTransfView.java 2017-06-01 15:50:25 UTC (rev 9623)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivTransfView.java 2017-06-01 16:08:44 UTC (rev 9624)
@@ -126,6 +126,8 @@
cqCntGrille_.setName("cqCntGrille");
cqCntGrille_.setDestructible(false);
cqCntGrille_.setAttributForLabels(PivVisuPanel.ATT_LABEL);
+ // Legerement transparent.
+ cqCntGrille_.setLabelsBackgroundColor(new Color(255, 255, 255, 75));
cqCntGrille_.setEditor(pnLayers_.getEditor());
// Layer des points de grille
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsLayer.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsLayer.java 2017-06-01 15:50:25 UTC (rev 9623)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivResultsLayer.java 2017-06-01 16:08:44 UTC (rev 9624)
@@ -182,14 +182,22 @@
CtuluVariable var=mdl.getCurrentVar();
-
// on initialise le min/max;
_b.setToNill();
- for (int tidx = mdl.getNbTime() - 1; tidx >= 0; tidx--) {
- for (int i = mdl.getNbPoint() - 1; i >= 0; i--) {
- _b.expandTo(mdl.getData(var, tidx, i));
+
+ // Pour la correlation, on initialise entre 0 et 1.
+ if (var==ResultType.CORREL) {
+ _b.expandTo(0);
+ _b.expandTo(1);
+ }
+ else {
+ for (int tidx = mdl.getNbTime() - 1; tidx >= 0; tidx--) {
+ for (int i = mdl.getNbPoint() - 1; i >= 0; i--) {
+ _b.expandTo(mdl.getData(var, tidx, i));
+ }
}
}
+
return true;
}
@@ -205,9 +213,17 @@
// on initialise le min/max;
_b.setToNill();
- for (int i = mdl.getNbPoint() - 1; i >= 0; i--) {
- _b.expandTo(mdl.getData(var, mdl.getCurrentTimeIdx(), i));
+
+ if (var==ResultType.CORREL) {
+ _b.expandTo(0);
+ _b.expandTo(1);
}
+ else {
+ for (int i=mdl.getNbPoint() - 1; i >= 0; i--) {
+ _b.expandTo(mdl.getData(var, mdl.getCurrentTimeIdx(), i));
+ }
+ }
+
return true;
}
@@ -227,11 +243,17 @@
*/
private void initPalette() {
BPalettePlage palette=(BPalettePlage)getPaletteCouleur();
- if (palette==null) palette = (BPalettePlage)this.createPaletteCouleur();
+ if (palette==null) {
+ palette = (BPalettePlage)this.createPaletteCouleur();
+ palette.setReduit(true);
+ palette.initPlages(30, 0, 1);
+ }
+ else {
+ CtuluRange range=new CtuluRange();
+ this.getRange(range);
+ palette.initPlages(palette.getNbPlages(), range.min_, range.max_);
+ }
- CtuluRange range = new CtuluRange();
- this.getRange(range);
- palette.initPlages(10, range.min_, range.max_);
palette.setSousTitre((modele()==null || modele().getCurrentVar()==null) ? null:modele().getCurrentVar().getName());
this.setPaletteCouleurPlages(palette);
}
Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectLayer.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectLayer.java 2017-06-01 15:50:25 UTC (rev 9623)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/layer/PivTransectLayer.java 2017-06-01 16:08:44 UTC (rev 9624)
@@ -1,5 +1,6 @@
package org.fudaa.fudaa.piv.layer;
+import java.awt.Color;
import java.awt.Graphics2D;
import org.fudaa.ebli.calque.edition.ZCalqueLigneBriseeEditable;
@@ -26,6 +27,8 @@
public PivTransectLayer() {
super(new PivTransectModel(),null);
setAttributForLabels(PivVisuPanel.ATT_LABEL);
+ // Legerement transparent.
+ setLabelsBackgroundColor(new Color(255, 255, 255, 75));
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
