Menu
▾
▴
fudaa-cvs-commit
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31543/src/org/fudaa/dodico/geometrie Modified Files: DVolumique.java DPonctuel.java DGrilleIrreguliere.java DPoint.java DTriangle.java DPolygone.java DVolumiqueFini.java DSurfaciqueFini.java DPolyligne.java DLineaireFini.java DSphere.java DPonctuelFini.java DSpatialInfini.java DSurfaceComposee.java DGrille.java DBoite.java DSurfacique.java DLineaire.java DSpatial.java DGrilleReguliere.java DSpatialFini.java DGeometrie.java DPolyedre.java Log Message: Modif DObjets Index: DSphere.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSphere.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DSphere.java 25 Nov 2003 10:11:35 -0000 1.5 --- DSphere.java 27 Apr 2004 16:00:42 -0000 1.6 *************** *** 1,3 **** ! /* * @file DSphere.java * @creation 2001-07-17 --- 1,3 ---- ! /** * @file DSphere.java * @creation 2001-07-17 *************** *** 8,16 **** */ package org.fudaa.dodico.geometrie; ! import org.fudaa.dodico.corba.geometrie.*; ! import org.fudaa.dodico.corba.objet.*; ! import org.fudaa.dodico.corba.usine.IUsine; ! import org.fudaa.dodico.objet.CDodico; ! import org.fudaa.dodico.usine.UsineHelper; /** * Une classe definissant une sphere. --- 8,17 ---- */ package org.fudaa.dodico.geometrie; ! import org.fudaa.dodico.boony.BoonyLib; ! import org.fudaa.dodico.corba.boony.IUsine; ! import org.fudaa.dodico.corba.geometrie.IBoite; ! import org.fudaa.dodico.corba.geometrie.IPoint; ! import org.fudaa.dodico.corba.geometrie.ISphere; ! import org.fudaa.dodico.corba.geometrie.ISphereOperations; /** * Une classe definissant une sphere. *************** *** 19,23 **** * @author Fred Deniger */ ! public class DSphere extends DVolumiqueFini implements ISphereOperations { /** * Centre de la sphere. --- 20,24 ---- * @author Fred Deniger */ ! public class DSphere extends DVolumiqueFini implements ISphere,ISphereOperations { /** * Centre de la sphere. *************** *** 33,37 **** */ public DSphere() { ! centre_= UsineHelper.findUsine().creeGeometriePoint(); rayon_= 0.0; } --- 34,38 ---- */ public DSphere() { ! centre_= BoonyLib.findUsine().creeGeometriePoint(); rayon_= 0.0; } *************** *** 94,98 **** // REM: faire une methode d'acces indicee a un IPoint double[] cen= centre_.coordonnees(); ! IUsine u= UsineHelper.findUsine(); IBoite boite= u.creeGeometrieBoite(); IPoint pmax= u.creeGeometriePoint(); --- 95,99 ---- // REM: faire une methode d'acces indicee a un IPoint double[] cen= centre_.coordonnees(); ! IUsine u= BoonyLib.findUsine(); IBoite boite= u.creeGeometrieBoite(); IPoint pmax= u.creeGeometriePoint(); Index: DPonctuel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPonctuel.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DPonctuel.java 25 Nov 2003 10:11:35 -0000 1.4 --- DPonctuel.java 27 Apr 2004 16:00:42 -0000 1.5 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.corba.geometrie.IPonctuel; import org.fudaa.dodico.corba.geometrie.IPonctuelOperations; /** *************** *** 15,17 **** public abstract class DPonctuel extends DGeometrie ! implements IPonctuelOperations {} --- 16,18 ---- public abstract class DPonctuel extends DGeometrie ! implements IPonctuel,IPonctuelOperations {} Index: DTriangle.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DTriangle.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DTriangle.java 25 Nov 2003 10:11:35 -0000 1.4 --- DTriangle.java 27 Apr 2004 16:00:42 -0000 1.5 *************** *** 1,3 **** ! /* * @file DTriangle.java * @creation 1998-06-12 --- 1,3 ---- ! /** * @file DTriangle.java * @creation 1998-06-12 *************** *** 8,14 **** */ package org.fudaa.dodico.geometrie; import org.fudaa.dodico.objet.CDodico; - import org.fudaa.dodico.corba.objet.IObjet; - import org.fudaa.dodico.corba.geometrie.*; /** * Une classe definissant un triangle. --- 8,15 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.corba.geometrie.IPolyligne; + import org.fudaa.dodico.corba.geometrie.ITriangle; + import org.fudaa.dodico.corba.geometrie.ITriangleOperations; import org.fudaa.dodico.objet.CDodico; /** * Une classe definissant un triangle. *************** *** 17,21 **** * @author Axel von Arnim */ ! public class DTriangle extends DPolygone implements ITriangleOperations { /** * Constructeur de l objet DTriangle --- 18,22 ---- * @author Axel von Arnim */ ! public class DTriangle extends DPolygone implements ITriangle,ITriangleOperations { /** * Constructeur de l objet DTriangle Index: DSurfaciqueFini.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSurfaciqueFini.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DSurfaciqueFini.java 25 Nov 2003 10:11:35 -0000 1.4 --- DSurfaciqueFini.java 27 Apr 2004 16:00:42 -0000 1.5 *************** *** 1,3 **** ! /* * @file DSurfaciqueFini.java * @creation 2001-07-17 --- 1,3 ---- ! /** * @file DSurfaciqueFini.java * @creation 2001-07-17 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.corba.geometrie.ISurfaciqueFini; import org.fudaa.dodico.corba.geometrie.ISurfaciqueFiniOperations; /** *************** *** 15,17 **** public abstract class DSurfaciqueFini extends DSpatialFini ! implements ISurfaciqueFiniOperations {} --- 16,18 ---- public abstract class DSurfaciqueFini extends DSpatialFini ! implements ISurfaciqueFini,ISurfaciqueFiniOperations {} Index: DGrille.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGrille.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DGrille.java 25 Nov 2003 10:11:35 -0000 1.5 --- DGrille.java 27 Apr 2004 16:00:42 -0000 1.6 *************** *** 9,12 **** --- 9,13 ---- package org.fudaa.dodico.geometrie; import org.fudaa.dodico.corba.geometrie.IBoite; + import org.fudaa.dodico.corba.geometrie.IGrille; import org.fudaa.dodico.corba.geometrie.IGrilleOperations; import org.fudaa.dodico.corba.geometrie.IPoint; *************** *** 17,21 **** public abstract class DGrille extends DSurfaciqueFini ! implements IGrilleOperations { /** * Description du champ --- 18,22 ---- public abstract class DGrille extends DSurfaciqueFini ! implements IGrille,IGrilleOperations { /** * Description du champ Index: DGrilleIrreguliere.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGrilleIrreguliere.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DGrilleIrreguliere.java 25 Nov 2003 10:11:35 -0000 1.5 --- DGrilleIrreguliere.java 27 Apr 2004 16:00:42 -0000 1.6 *************** *** 8,15 **** */ package org.fudaa.dodico.geometrie; import org.fudaa.dodico.objet.CDodico; - import org.fudaa.dodico.usine.UsineHelper; - import org.fudaa.dodico.corba.usine.IUsine; - import org.fudaa.dodico.corba.geometrie.*; /** * @version $Revision$ $Date$ by $Author$ --- 8,18 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.boony.BoonyLib; + import org.fudaa.dodico.corba.boony.IUsine; + import org.fudaa.dodico.corba.geometrie.IBoite; + import org.fudaa.dodico.corba.geometrie.IGrilleIrreguliere; + import org.fudaa.dodico.corba.geometrie.IGrilleIrreguliereOperations; + import org.fudaa.dodico.corba.geometrie.IPoint; import org.fudaa.dodico.objet.CDodico; /** * @version $Revision$ $Date$ by $Author$ *************** *** 18,22 **** public class DGrilleIrreguliere extends DGrille ! implements IGrilleIrreguliereOperations { /** * Description du champ --- 21,25 ---- public class DGrilleIrreguliere extends DGrille ! implements IGrilleIrreguliere,IGrilleIrreguliereOperations { /** * Description du champ *************** *** 46,50 **** } IGrilleIrreguliere r= ! UsineHelper.findUsine().creeGeometrieGrilleIrreguliere(); r.vvz(z_); r.vy(y_); --- 49,53 ---- } IGrilleIrreguliere r= ! BoonyLib.findUsine().creeGeometrieGrilleIrreguliere(); r.vvz(z_); r.vy(y_); *************** *** 136,140 **** } } ! IUsine u= UsineHelper.findUsine(); IBoite boite= u.creeGeometrieBoite(); IPoint pmax= u.creeGeometriePoint(); --- 139,143 ---- } } ! IUsine u= BoonyLib.findUsine(); IBoite boite= u.creeGeometrieBoite(); IPoint pmax= u.creeGeometriePoint(); *************** *** 171,175 **** ymoy /= x_.length * y_.length; zmoy /= x_.length * y_.length; ! IUsine u= UsineHelper.findUsine(); IPoint r= u.creeGeometriePoint(); r.coordonnees(new double[] { xmoy, ymoy, zmoy }); --- 174,178 ---- ymoy /= x_.length * y_.length; zmoy /= x_.length * y_.length; ! IUsine u= BoonyLib.findUsine(); IPoint r= u.creeGeometriePoint(); r.coordonnees(new double[] { xmoy, ymoy, zmoy }); *************** *** 315,319 **** public IPoint[] points() { IPoint[] pts= new IPoint[x_.length * y_.length]; ! IUsine u= UsineHelper.findUsine(); for (int j= 0; j < x_.length; j++) { for (int i= 0; i < y_.length; i++) { --- 318,322 ---- public IPoint[] points() { IPoint[] pts= new IPoint[x_.length * y_.length]; ! IUsine u= BoonyLib.findUsine(); for (int j= 0; j < x_.length; j++) { for (int i= 0; i < y_.length; i++) { Index: DVolumique.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DVolumique.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DVolumique.java 25 Nov 2003 10:11:35 -0000 1.4 --- DVolumique.java 27 Apr 2004 16:00:42 -0000 1.5 *************** *** 1,3 **** ! /* * @file DVolumique.java * @creation 2001-03-01 --- 1,3 ---- ! /** * @file DVolumique.java * @creation 2001-03-01 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.corba.geometrie.IVolumique; import org.fudaa.dodico.corba.geometrie.IVolumiqueOperations; /** *************** *** 15,17 **** public abstract class DVolumique extends DGeometrie ! implements IVolumiqueOperations {} --- 16,18 ---- public abstract class DVolumique extends DGeometrie ! implements IVolumique,IVolumiqueOperations {} Index: DLineaire.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DLineaire.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DLineaire.java 25 Nov 2003 10:11:35 -0000 1.4 --- DLineaire.java 27 Apr 2004 16:00:42 -0000 1.5 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.corba.geometrie.ILineaire; import org.fudaa.dodico.corba.geometrie.ILineaireOperations; /** *************** *** 15,17 **** public abstract class DLineaire extends DGeometrie ! implements ILineaireOperations {} --- 16,18 ---- public abstract class DLineaire extends DGeometrie ! implements ILineaire,ILineaireOperations {} Index: DSpatialInfini.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSpatialInfini.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DSpatialInfini.java 25 Nov 2003 10:11:35 -0000 1.4 --- DSpatialInfini.java 27 Apr 2004 16:00:42 -0000 1.5 *************** *** 1,3 **** ! /* * @file DSpatialInfini.java * @creation 2001-07-17 --- 1,3 ---- ! /** * @file DSpatialInfini.java * @creation 2001-07-17 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.corba.geometrie.ISpatialInfini; import org.fudaa.dodico.corba.geometrie.ISpatialInfiniOperations; /** *************** *** 15,17 **** public abstract class DSpatialInfini extends DSpatial ! implements ISpatialInfiniOperations {} --- 16,18 ---- public abstract class DSpatialInfini extends DSpatial ! implements ISpatialInfini,ISpatialInfiniOperations {} Index: DGrilleReguliere.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGrilleReguliere.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DGrilleReguliere.java 25 Nov 2003 10:11:35 -0000 1.5 --- DGrilleReguliere.java 27 Apr 2004 16:00:42 -0000 1.6 *************** *** 8,17 **** */ package org.fudaa.dodico.geometrie; import org.fudaa.dodico.corba.geometrie.IBoite; import org.fudaa.dodico.corba.geometrie.IGrilleReguliereOperations; import org.fudaa.dodico.corba.geometrie.IPoint; - import org.fudaa.dodico.corba.usine.IUsine; import org.fudaa.dodico.objet.CDodico; - import org.fudaa.dodico.usine.UsineHelper; /** * @version $Revision$ $Date$ by $Author$ --- 8,18 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.boony.BoonyLib; + import org.fudaa.dodico.corba.boony.IUsine; import org.fudaa.dodico.corba.geometrie.IBoite; + import org.fudaa.dodico.corba.geometrie.IGrilleReguliere; import org.fudaa.dodico.corba.geometrie.IGrilleReguliereOperations; import org.fudaa.dodico.corba.geometrie.IPoint; import org.fudaa.dodico.objet.CDodico; /** * @version $Revision$ $Date$ by $Author$ *************** *** 20,24 **** public class DGrilleReguliere extends DGrille ! implements IGrilleReguliereOperations { /** * Description du champ --- 21,25 ---- public class DGrilleReguliere extends DGrille ! implements IGrilleReguliere,IGrilleReguliereOperations { /** * Description du champ *************** *** 105,109 **** } } ! IUsine u= UsineHelper.findUsine(); IBoite boite= u.creeGeometrieBoite(); IPoint pmax= u.creeGeometriePoint(); --- 106,110 ---- } } ! IUsine u= BoonyLib.findUsine(); IBoite boite= u.creeGeometrieBoite(); IPoint pmax= u.creeGeometriePoint(); *************** *** 130,134 **** } zmoy /= nbX_ * nbY_; ! IPoint r= UsineHelper.findUsine().creeGeometriePoint(); r.coordonnees( new double[] {(xmax_ - xmin_) / 2, (ymax_ - ymin_) / 2, zmoy }); --- 131,135 ---- } zmoy /= nbX_ * nbY_; ! IPoint r= BoonyLib.findUsine().creeGeometriePoint(); r.coordonnees( new double[] {(xmax_ - xmin_) / 2, (ymax_ - ymin_) / 2, zmoy }); *************** *** 260,264 **** double ypas= (ymax_ - ymin_) / nbY_; IPoint[] pts= new IPoint[nbX_ * nbY_]; ! IUsine u= UsineHelper.findUsine(); for (int j= 0; j < nbX_; j++) { for (int i= 0; i < nbY_; i++) { --- 261,265 ---- double ypas= (ymax_ - ymin_) / nbY_; IPoint[] pts= new IPoint[nbX_ * nbY_]; ! IUsine u= BoonyLib.findUsine(); for (int j= 0; j < nbX_; j++) { for (int i= 0; i < nbY_; i++) { Index: DSpatial.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSpatial.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DSpatial.java 25 Nov 2003 10:11:35 -0000 1.4 --- DSpatial.java 27 Apr 2004 16:00:42 -0000 1.5 *************** *** 1,3 **** ! /* * @file DSpatial.java * @creation 2001-07-17 --- 1,3 ---- ! /** * @file DSpatial.java * @creation 2001-07-17 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.corba.geometrie.ISpatial; import org.fudaa.dodico.corba.geometrie.ISpatialOperations; /** *************** *** 15,17 **** public abstract class DSpatial extends DGeometrie ! implements ISpatialOperations {} --- 16,18 ---- public abstract class DSpatial extends DGeometrie ! implements ISpatial,ISpatialOperations {} Index: DPolyligne.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPolyligne.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DPolyligne.java 25 Nov 2003 10:11:35 -0000 1.5 --- DPolyligne.java 27 Apr 2004 16:00:42 -0000 1.6 *************** *** 8,24 **** */ package org.fudaa.dodico.geometrie; import org.fudaa.dodico.corba.collection.ITableau; import org.fudaa.dodico.corba.geometrie.IBoite; import org.fudaa.dodico.corba.geometrie.IPoint; import org.fudaa.dodico.corba.geometrie.IPointHelper; import org.fudaa.dodico.corba.geometrie.IPolyligneOperations; - import org.fudaa.dodico.corba.usine.IUsine; - import org.fudaa.dodico.objet.CDodico; - import org.fudaa.dodico.usine.UsineHelper; /** * @version $Revision$ $Date$ by $Author$ * @author Guillaume Desnoix */ ! public class DPolyligne extends DLineaireFini implements IPolyligneOperations { /** * Description du champ --- 8,24 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.boony.BoonyLib; + import org.fudaa.dodico.corba.boony.IUsine; import org.fudaa.dodico.corba.collection.ITableau; import org.fudaa.dodico.corba.geometrie.IBoite; import org.fudaa.dodico.corba.geometrie.IPoint; import org.fudaa.dodico.corba.geometrie.IPointHelper; + import org.fudaa.dodico.corba.geometrie.IPolyligne; import org.fudaa.dodico.corba.geometrie.IPolyligneOperations; /** * @version $Revision$ $Date$ by $Author$ * @author Guillaume Desnoix */ ! public class DPolyligne extends DLineaireFini implements IPolyligne,IPolyligneOperations { /** * Description du champ *************** *** 29,33 **** */ public DPolyligne() { ! points_= UsineHelper.findUsine().creeCollectionTableau(); } /** --- 29,33 ---- */ public DPolyligne() { ! points_= BoonyLib.findUsine().creeCollectionTableau(); } /** *************** *** 95,99 **** public void H4(double[][] _r) { points_.vide(); ! IUsine u= UsineHelper.findUsine(); for (int i= 0; i < _r.length; i++) { IPoint p= u.creeGeometriePoint(); --- 95,99 ---- public void H4(double[][] _r) { points_.vide(); ! IUsine u= BoonyLib.findUsine(); for (int i= 0; i < _r.length; i++) { IPoint p= u.creeGeometriePoint(); *************** *** 123,127 **** if (points_.taille() > 0) { IPoint p0= point(0); ! r= UsineHelper.findUsine().creeGeometrieBoite(); r.pmin(p0); r.pmax(p0); --- 123,127 ---- if (points_.taille() > 0) { IPoint p0= point(0); ! r= BoonyLib.findUsine().creeGeometrieBoite(); r.pmin(p0); r.pmax(p0); *************** *** 153,157 **** c[i] /= l * longueur; } ! r= UsineHelper.findUsine().creeGeometriePoint(); r.coordonnees(c); } --- 153,157 ---- c[i] /= l * longueur; } ! r= BoonyLib.findUsine().creeGeometriePoint(); r.coordonnees(c); } *************** *** 176,180 **** c[i] /= (double)l; } ! r= UsineHelper.findUsine().creeGeometriePoint(); r.coordonnees(c); } --- 176,180 ---- c[i] /= (double)l; } ! r= BoonyLib.findUsine().creeGeometriePoint(); r.coordonnees(c); } Index: DPonctuelFini.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPonctuelFini.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DPonctuelFini.java 25 Nov 2003 10:11:35 -0000 1.4 --- DPonctuelFini.java 27 Apr 2004 16:00:42 -0000 1.5 *************** *** 1,3 **** ! /* * @file DPonctuelFini.java * @creation 2001-07-17 --- 1,3 ---- ! /** * @file DPonctuelFini.java * @creation 2001-07-17 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.corba.geometrie.IPonctuelFini; import org.fudaa.dodico.corba.geometrie.IPonctuelFiniOperations; /** *************** *** 15,17 **** public abstract class DPonctuelFini extends DSpatialFini ! implements IPonctuelFiniOperations {} --- 16,18 ---- public abstract class DPonctuelFini extends DSpatialFini ! implements IPonctuelFini,IPonctuelFiniOperations {} Index: DVolumiqueFini.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DVolumiqueFini.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DVolumiqueFini.java 25 Nov 2003 10:11:35 -0000 1.4 --- DVolumiqueFini.java 27 Apr 2004 16:00:42 -0000 1.5 *************** *** 1,3 **** ! /* * @file DVolumiqueFini.java * @creation 2001-07-17 --- 1,3 ---- ! /** * @file DVolumiqueFini.java * @creation 2001-07-17 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.corba.geometrie.IVolumiqueFini; import org.fudaa.dodico.corba.geometrie.IVolumiqueFiniOperations; /** *************** *** 15,17 **** public abstract class DVolumiqueFini extends DSpatialFini ! implements IVolumiqueFiniOperations {} --- 16,18 ---- public abstract class DVolumiqueFini extends DSpatialFini ! implements IVolumiqueFini,IVolumiqueFiniOperations {} Index: DPolygone.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPolygone.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DPolygone.java 25 Nov 2003 10:11:35 -0000 1.5 --- DPolygone.java 27 Apr 2004 16:00:42 -0000 1.6 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.boony.BoonyLib; import org.fudaa.dodico.corba.geometrie.IBoite; import org.fudaa.dodico.corba.geometrie.IPoint; *************** *** 16,20 **** import org.fudaa.dodico.corba.objet.IObjet; import org.fudaa.dodico.objet.CDodico; - import org.fudaa.dodico.usine.UsineHelper; /** * Une classe definissant un polygone --- 17,20 ---- *************** *** 23,27 **** * @author Axel von Arnim */ ! public class DPolygone extends DSurfaciqueFini implements IPolygoneOperations { /** * Description du champ --- 23,27 ---- * @author Axel von Arnim */ ! public class DPolygone extends DSurfaciqueFini implements IPolygone,IPolygoneOperations { /** * Description du champ *************** *** 32,36 **** */ public DPolygone() { ! sommets_= UsineHelper.findUsine().creeGeometriePolyligne(); } /** --- 32,36 ---- */ public DPolygone() { ! sommets_= BoonyLib.findUsine().creeGeometriePolyligne(); } /** Index: DBoite.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DBoite.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DBoite.java 25 Nov 2003 10:11:35 -0000 1.5 --- DBoite.java 27 Apr 2004 16:00:42 -0000 1.6 *************** *** 1,3 **** ! /* * @file DBoite.java * @creation 2001-07-17 --- 1,3 ---- ! /** * @file DBoite.java * @creation 2001-07-17 *************** *** 8,22 **** */ package org.fudaa.dodico.geometrie; ! import org.fudaa.dodico.corba.geometrie.*; ! import org.fudaa.dodico.objet.DObjet; ! import org.fudaa.dodico.objet.CDodico; ! import org.fudaa.dodico.usine.UsineHelper; import org.fudaa.dodico.corba.objet.IObjet; ! import org.fudaa.dodico.corba.usine.IUsine; /** * @version $Revision$ $Date$ by $Author$ * @author Fred Deniger */ ! public class DBoite extends DObjet implements IBoiteOperations { /** * Description du champ --- 8,26 ---- */ package org.fudaa.dodico.geometrie; ! import org.fudaa.dodico.boony.BoonyLib; ! import org.fudaa.dodico.corba.boony.IUsine; ! import org.fudaa.dodico.corba.geometrie.IBoite; ! import org.fudaa.dodico.corba.geometrie.IBoiteHelper; ! import org.fudaa.dodico.corba.geometrie.IBoiteOperations; ! import org.fudaa.dodico.corba.geometrie.IPoint; ! import org.fudaa.dodico.corba.geometrie.ISpatialFini; import org.fudaa.dodico.corba.objet.IObjet; ! import org.fudaa.dodico.objet.CDodico; ! import org.fudaa.dodico.objet.DObjet; /** * @version $Revision$ $Date$ by $Author$ * @author Fred Deniger */ ! public class DBoite extends DObjet implements IBoite,IBoiteOperations { /** * Description du champ *************** *** 31,35 **** */ public DBoite() { ! IUsine u= UsineHelper.findUsine(); pmin_= u.creeGeometriePoint(); pmax_= u.creeGeometriePoint(); --- 35,39 ---- */ public DBoite() { ! IUsine u= BoonyLib.findUsine(); pmin_= u.creeGeometriePoint(); pmax_= u.creeGeometriePoint(); *************** *** 118,122 **** c[i]= (cmin[i] + cmax[i]) / 2.; } ! IPoint r= UsineHelper.findUsine().creeGeometriePoint(); r.coordonnees(c); return r; --- 122,126 ---- c[i]= (cmin[i] + cmax[i]) / 2.; } ! IPoint r= BoonyLib.findUsine().creeGeometriePoint(); r.coordonnees(c); return r; *************** *** 358,362 **** rcmax[i]= Math.min(bcmax[i], tcmax[i]); } ! IUsine u= UsineHelper.findUsine(); r= u.creeGeometrieBoite(); IPoint tempMax= u.creeGeometriePoint(); --- 362,366 ---- rcmax[i]= Math.min(bcmax[i], tcmax[i]); } ! IUsine u= BoonyLib.findUsine(); r= u.creeGeometrieBoite(); IPoint tempMax= u.creeGeometriePoint(); *************** *** 402,406 **** rcmax[i]= Math.min(bcmax[i], tcmax[i]); } ! IUsine u= UsineHelper.findUsine(); r= u.creeGeometrieBoite(); IPoint tempMax= u.creeGeometriePoint(); --- 406,410 ---- rcmax[i]= Math.min(bcmax[i], tcmax[i]); } ! IUsine u= BoonyLib.findUsine(); r= u.creeGeometrieBoite(); IPoint tempMax= u.creeGeometriePoint(); *************** *** 450,454 **** r= _b; } else { ! r= UsineHelper.findUsine().creeGeometrieBoite(); r.pmin(pmin_); r.pmax(pmax_); --- 454,458 ---- r= _b; } else { ! r= BoonyLib.findUsine().creeGeometrieBoite(); r.pmin(pmin_); r.pmax(pmax_); Index: DSurfacique.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSurfacique.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DSurfacique.java 25 Nov 2003 10:11:35 -0000 1.4 --- DSurfacique.java 27 Apr 2004 16:00:42 -0000 1.5 *************** *** 1,3 **** ! /* * @file DSurfacique.java * @creation 2001-07-17 --- 1,3 ---- ! /** * @file DSurfacique.java * @creation 2001-07-17 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.corba.geometrie.ISurfacique; import org.fudaa.dodico.corba.geometrie.ISurfaciqueOperations; /** *************** *** 15,17 **** public abstract class DSurfacique extends DGeometrie ! implements ISurfaciqueOperations {} --- 16,18 ---- public abstract class DSurfacique extends DGeometrie ! implements ISurfacique,ISurfaciqueOperations {} Index: DPolyedre.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPolyedre.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DPolyedre.java 25 Nov 2003 10:11:35 -0000 1.4 --- DPolyedre.java 27 Apr 2004 16:00:42 -0000 1.5 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.corba.geometrie.IPolyedre; import org.fudaa.dodico.corba.geometrie.IPolyedreOperations; /** *************** *** 15,17 **** public abstract class DPolyedre extends DVolumiqueFini ! implements IPolyedreOperations {} --- 16,18 ---- public abstract class DPolyedre extends DVolumiqueFini ! implements IPolyedre,IPolyedreOperations {} Index: DSurfaceComposee.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSurfaceComposee.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DSurfaceComposee.java 25 Nov 2003 10:11:35 -0000 1.5 --- DSurfaceComposee.java 27 Apr 2004 16:00:42 -0000 1.6 *************** *** 1,3 **** ! /* * @file DSurfaceComposee.java * @creation 1998-06-12 --- 1,3 ---- ! /** * @file DSurfaceComposee.java * @creation 1998-06-12 *************** *** 8,24 **** */ package org.fudaa.dodico.geometrie; ! import org.fudaa.dodico.objet.CDodico; ! import org.fudaa.dodico.usine.UsineHelper; ! import org.fudaa.dodico.corba.usine.IUsine; ! import org.fudaa.dodico.corba.objet.IObjet; ! import org.fudaa.dodico.corba.geometrie.*; import org.fudaa.dodico.corba.collection.ITableau; /** ! * @version $Revision$ $Date$ by $Author$ * @author Axel von Arnim */ public class DSurfaceComposee extends DSurfacique ! implements ISurfaceComposeeOperations { /** * Description du champ --- 8,27 ---- */ package org.fudaa.dodico.geometrie; ! import org.fudaa.dodico.boony.BoonyLib; ! import org.fudaa.dodico.corba.boony.IUsine; import org.fudaa.dodico.corba.collection.ITableau; + import org.fudaa.dodico.corba.geometrie.IPoint; + import org.fudaa.dodico.corba.geometrie.ISurfaceComposee; + import org.fudaa.dodico.corba.geometrie.ISurfaceComposeeOperations; + import org.fudaa.dodico.corba.geometrie.ISurfacique; + import org.fudaa.dodico.corba.geometrie.ISurfaciqueHelper; + import org.fudaa.dodico.corba.objet.IObjet; /** ! * @version $Id$ * @author Axel von Arnim */ public class DSurfaceComposee extends DSurfacique ! implements ISurfaceComposee,ISurfaceComposeeOperations { /** * Description du champ *************** *** 34,38 **** */ public DSurfaceComposee() { ! IUsine u= UsineHelper.findUsine(); positives_= u.creeCollectionTableau(); negatives_= u.creeCollectionTableau(); --- 37,41 ---- */ public DSurfaceComposee() { ! IUsine u= BoonyLib.findUsine(); positives_= u.creeCollectionTableau(); negatives_= u.creeCollectionTableau(); Index: DGeometrie.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGeometrie.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DGeometrie.java 25 Nov 2003 10:11:35 -0000 1.4 --- DGeometrie.java 27 Apr 2004 16:00:42 -0000 1.5 *************** *** 1,3 **** ! /* * @file DGeometrie.java * @creation 2001-07-17 --- 1,3 ---- ! /** * @file DGeometrie.java * @creation 2001-07-17 *************** *** 8,13 **** */ package org.fudaa.dodico.geometrie; ! import org.fudaa.dodico.objet.DObjet; import org.fudaa.dodico.corba.geometrie.IGeometrieOperations; /** * @version $Revision$ $Date$ by $Author$ --- 8,14 ---- */ package org.fudaa.dodico.geometrie; ! import org.fudaa.dodico.corba.geometrie.IGeometrie; import org.fudaa.dodico.corba.geometrie.IGeometrieOperations; + import org.fudaa.dodico.objet.DObjet; /** * @version $Revision$ $Date$ by $Author$ *************** *** 16,20 **** public abstract class DGeometrie extends DObjet ! implements IGeometrieOperations { public abstract int dimension(); } --- 17,21 ---- public abstract class DGeometrie extends DObjet ! implements IGeometrie,IGeometrieOperations { public abstract int dimension(); } Index: DSpatialFini.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSpatialFini.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DSpatialFini.java 25 Nov 2003 10:11:35 -0000 1.4 --- DSpatialFini.java 27 Apr 2004 16:00:42 -0000 1.5 *************** *** 1,3 **** ! /* * @file DSpatialFini.java * @creation 2001-07-16 --- 1,3 ---- ! /** * @file DSpatialFini.java * @creation 2001-07-16 *************** *** 8,12 **** */ package org.fudaa.dodico.geometrie; ! import org.fudaa.dodico.corba.geometrie.*; /** * --- 8,15 ---- */ package org.fudaa.dodico.geometrie; ! import org.fudaa.dodico.corba.geometrie.IBoite; ! import org.fudaa.dodico.corba.geometrie.IPoint; ! import org.fudaa.dodico.corba.geometrie.ISpatialFini; ! import org.fudaa.dodico.corba.geometrie.ISpatialFiniOperations; /** * *************** *** 16,20 **** public abstract class DSpatialFini extends DSpatial ! implements ISpatialFiniOperations { /** * Constructeur de l'objet SpatialFini. --- 19,23 ---- public abstract class DSpatialFini extends DSpatial ! implements ISpatialFini,ISpatialFiniOperations { /** * Constructeur de l'objet SpatialFini. Index: DLineaireFini.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DLineaireFini.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DLineaireFini.java 25 Nov 2003 10:11:35 -0000 1.4 --- DLineaireFini.java 27 Apr 2004 16:00:42 -0000 1.5 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.geometrie; + import org.fudaa.dodico.corba.geometrie.ILineaireFini; import org.fudaa.dodico.corba.geometrie.ILineaireFiniOperations; /** *************** *** 15,17 **** public abstract class DLineaireFini extends DSpatialFini ! implements ILineaireFiniOperations {} --- 16,18 ---- public abstract class DLineaireFini extends DSpatialFini ! implements ILineaireFini,ILineaireFiniOperations {} Index: DPoint.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPoint.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DPoint.java 25 Nov 2003 10:11:35 -0000 1.5 --- DPoint.java 27 Apr 2004 16:00:42 -0000 1.6 *************** *** 16,20 **** * @author Fred Deniger */ ! public class DPoint extends DPonctuelFini implements IPointOperations { /** * Les coordonnees du point. --- 16,20 ---- * @author Fred Deniger */ ! public class DPoint extends DPonctuelFini implements IPoint,IPointOperations { /** * Les coordonnees du point. |
×
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