From: <bma...@us...> - 2009-06-03 13:10:48
|
Revision: 4835 http://fudaa.svn.sourceforge.net/fudaa/?rev=4835&view=rev Author: bmarchan Date: 2009-06-03 13:10:45 +0000 (Wed, 03 Jun 2009) Log Message: ----------- Acc?\195?\169l?\195?\169ration du traitement pour cr?\195?\169ation profil a partir d'une trace. Modified Paths: -------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/interpolation/profile/GISDataModelToPointCloudAdapter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExportPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlInterpolateProfilePanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/interpolation/profile/GISDataModelToPointCloudAdapter.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/interpolation/profile/GISDataModelToPointCloudAdapter.java 2009-06-03 10:42:07 UTC (rev 4834) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/interpolation/profile/GISDataModelToPointCloudAdapter.java 2009-06-03 13:10:45 UTC (rev 4835) @@ -21,7 +21,7 @@ * tout sous forme d'un nuage de points. * * @author Emmanuel MARTIN - * @version $Id:$ + * @version $Id$ */ public class GISDataModelToPointCloudAdapter implements PointCloudI{ @@ -46,7 +46,7 @@ attributeZ_=_attrZ; for(int i=0;i<model_.getNumGeometries();i++) if(model_.getGeometry(i) instanceof GISMultiPoint) - for(int j=0;j<((GISMultiPoint)model_.getGeometry(i)).getNumPoints();j++) + for(int j=0, jend=model_.getGeometry(i).getNumPoints(); j<jend; j++) correspondance_.put(idxCorrespondance++, new Integer[]{i, j}); } Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExportPanel.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExportPanel.java 2009-06-03 10:42:07 UTC (rev 4834) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExportPanel.java 2009-06-03 13:10:45 UTC (rev 4835) @@ -254,7 +254,7 @@ initZoom_ = pn_.getVueCalque().getViewBoite(); cqTmp_ = new ZCalqueGeometry(mdl); cqTmp_.setDestructible(true); - final TraceIconModel model = new TraceIconModel(TraceIcon.PLUS_DOUBLE, 4, Color.RED); + final TraceIconModel model = new TraceIconModel(TraceIcon.PLUS, 4, Color.RED); cqTmp_.setIconModel(0, model); cqTmp_.setIconModel(1, model); final TraceLigneModel ligne = new TraceLigneModel(TraceLigne.INVISIBLE, 2, Color.RED); Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlInterpolateProfilePanel.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlInterpolateProfilePanel.java 2009-06-03 10:42:07 UTC (rev 4834) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlInterpolateProfilePanel.java 2009-06-03 13:10:45 UTC (rev 4835) @@ -171,7 +171,7 @@ initZoom_ = pn_.getVueCalque().getViewBoite(); cqTmp_ = new ZCalqueGeometry(mdl); cqTmp_.setDestructible(true); - final TraceIconModel model = new TraceIconModel(TraceIcon.PLUS_DOUBLE, 4, Color.RED); + final TraceIconModel model = new TraceIconModel(TraceIcon.PLUS, 4, Color.RED); cqTmp_.setIconModel(0, model); cqTmp_.setIconModel(1, model); final TraceLigneModel ligne = new TraceLigneModel(TraceLigne.INVISIBLE, 2, Color.RED); Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java 2009-06-03 10:42:07 UTC (rev 4834) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectionPanel.java 2009-06-03 13:10:45 UTC (rev 4835) @@ -133,7 +133,7 @@ initZoom_ = pn_.getVueCalque().getViewBoite(); cqTmp_ = new ZCalqueGeometry(mdl); cqTmp_.setDestructible(true); - final TraceIconModel model = new TraceIconModel(TraceIcon.PLUS_DOUBLE, 4, Color.RED); + final TraceIconModel model = new TraceIconModel(TraceIcon.PLUS, 4, Color.RED); cqTmp_.setIconModel(0, model); cqTmp_.setIconModel(1, model); final TraceLigneModel ligne = new TraceLigneModel(TraceLigne.INVISIBLE, 2, Color.RED); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |