[Fudaa-svn-commit] SF.net SVN: fudaa:[9107] trunk/soft/fudaa-mascaret/ui/src/main/java/org/ fudaa/fudaa/hydraulique1d/graphe3D

[<bma...@us...>]

Revision: 9107
          http://sourceforge.net/p/fudaa/svn/9107
Author:   bmarchan
Date:     2015-04-14 09:39:00 +0000 (Tue, 14 Apr 2015)
Log Message:
-----------
Adaptation aux modifications du package ebli-graphe-3D

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe3D/PanelGraphe3D.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe3D/PanelGraphe3Dzyx.java

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe3D/PanelGraphe3D.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe3D/PanelGraphe3D.java	2015-04-14 09:38:03 UTC (rev 9106)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe3D/PanelGraphe3D.java	2015-04-14 09:39:00 UTC (rev 9107)
@@ -6,14 +6,13 @@
 import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
 import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
 import org.fudaa.dodico.hydraulique1d.metier.MetierProfil;
-import org.fudaa.ebli.graphe3D.EbliGraphDataModel;
-import org.fudaa.ebli.graphe3D.EbliGraphDataModel.EbliGraphDataStructure;
-import org.fudaa.ebli.graphe3D.ui.panel.EbliGraphBtnPanel;
-import org.fudaa.ebli.graphe3D.ui.panel.GraphPanel;
+import org.fudaa.ebli.graphe3D.data.EG3dSurfaceProfilesModel;
+import org.fudaa.ebli.graphe3D.data.EG3dSurfaceProfilesModel.EbliGraphDataStructure;
+import org.fudaa.ebli.graphe3D.ui.panel.EG3dBtnPanel;
+import org.fudaa.ebli.graphe3D.ui.panel.EG3dGraphPanel;
 import org.fudaa.fudaa.hydraulique1d.Hydraulique1dResource;
 
 import com.memoire.bu.BuPanel;
-import com.memoire.bu.BuResource;
 
 /**
  * 
@@ -57,7 +56,7 @@
 			return;
 		
         //-- creation du model de graphe 3d
-		EbliGraphDataModel dataModel = new EbliGraphDataModel();
+		EG3dSurfaceProfilesModel dataModel = new EG3dSurfaceProfilesModel();
 		
 		int nbProfils = bief.profils().length;	
 		int nbMaxPoints = 0;
@@ -135,14 +134,14 @@
 		
 		dataModel.setValues(s);
 		
-		GraphPanel jsp = new GraphPanel();
+		EG3dGraphPanel jsp = new EG3dGraphPanel();
 		jsp.setPreferredSize(new Dimension(600,400));
 		translate3dGraph(jsp.getBtnPanel());
 		
 		grapheContainer.removeAll();
 		grapheContainer.add(jsp, BorderLayout.CENTER);
 		
-		jsp.setModel(dataModel);
+		jsp.getView().addData(dataModel);
 /*		
 		JFrame jf = new JFrame("test");
 		jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@@ -155,7 +154,7 @@
 		
 	}
 
-	public void translate3dGraph(EbliGraphBtnPanel p){
+	public void translate3dGraph(EG3dBtnPanel p){
 		p.getDensityType().setText(Hydraulique1dResource.HYDRAULIQUE1D.getString("Mode densit\xE9"));
 		p.getWireframeType().setText(Hydraulique1dResource.HYDRAULIQUE1D.getString("Type Wireframe"));
 		p.getContourType().setText(Hydraulique1dResource.HYDRAULIQUE1D.getString("Mode contour"));

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe3D/PanelGraphe3Dzyx.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe3D/PanelGraphe3Dzyx.java	2015-04-14 09:38:03 UTC (rev 9106)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/graphe3D/PanelGraphe3Dzyx.java	2015-04-14 09:39:00 UTC (rev 9107)
@@ -5,11 +5,13 @@
 
 
 
+
 import org.fudaa.dodico.hydraulique1d.metier.MetierBief;
 import org.fudaa.dodico.hydraulique1d.metier.MetierHydraulique1d;
 import org.fudaa.dodico.hydraulique1d.metier.MetierProfil;
-import org.fudaa.ebli.graphe3D.EbliGraphDataModel;
-import org.fudaa.ebli.graphe3D.EbliGraphDataModel.EbliGraphDataStructure;
+import org.fudaa.ebli.graphe3D.data.EG3dSurfaceProfilesModel;
+import org.fudaa.ebli.graphe3D.data.EG3dSurfaceProfilesModel.EbliGraphDataStructure;
+
 /*
 import javax.swing.JComponent;
 import org.jzy3d.chart.factories.AWTChartComponentFactory;
@@ -68,7 +70,7 @@
 			return;
 		
         //-- creation du model de graphe 3d
-		EbliGraphDataModel dataModel = new EbliGraphDataModel();
+		EG3dSurfaceProfilesModel dataModel = new EG3dSurfaceProfilesModel();
 		
 		int nbProfils = bief.profils().length;	
 		int nbMaxPoints = 0;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.