From: <bma...@us...> - 2008-06-24 14:42:02
|
Revision: 3658 http://fudaa.svn.sourceforge.net/fudaa/?rev=3658&view=rev Author: bmarchan Date: 2008-06-24 07:41:54 -0700 (Tue, 24 Jun 2008) Log Message: ----------- Suppression du d?\195?\169calage lors de l'op?\195?\169ration "dupliquer". Modified Paths: -------------- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueMultiPointEditable.java branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java =================================================================== --- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java 2008-06-24 13:23:15 UTC (rev 3657) +++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java 2008-06-24 14:41:54 UTC (rev 3658) @@ -279,7 +279,7 @@ GrSegment pdec=new GrSegment(new GrPoint(0,5,0),new GrPoint(5,0,0)); pdec.autoApplique(getVersReel()); - if (!getModelePoly().copyGlobal(selection_, pdec.getVx(), pdec.getVy(), _cmd)) return false; + if (!getModelePoly().copyGlobal(selection_, 0/*pdec.getVx()*/, 0/*pdec.getVy()*/, _cmd)) return false; // Changement de selection. int[] isels=new int[selection_.getNbSelectedIndex()]; Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueMultiPointEditable.java =================================================================== --- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueMultiPointEditable.java 2008-06-24 13:23:15 UTC (rev 3657) +++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueMultiPointEditable.java 2008-06-24 14:41:54 UTC (rev 3658) @@ -191,7 +191,7 @@ GrSegment pdec=new GrSegment(new GrPoint(0,5,0),new GrPoint(5,0,0)); pdec.autoApplique(getVersReel()); - if (!getMultiPointModel().copyGlobal(selection_, pdec.getVx(), pdec.getVy(), _cmd)) return false; + if (!getMultiPointModel().copyGlobal(selection_, 0/*pdec.getVx()*/, 0/*pdec.getVy()*/, _cmd)) return false; // Changement de selection. int[] isels=new int[selection_.getNbSelectedIndex()]; Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java =================================================================== --- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java 2008-06-24 13:23:15 UTC (rev 3657) +++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java 2008-06-24 14:41:54 UTC (rev 3658) @@ -274,7 +274,7 @@ GrSegment pdec=new GrSegment(new GrPoint(0,5,0),new GrPoint(5,0,0)); pdec.autoApplique(getVersReel()); - if (!((ZModelePointEditable)modele_).copyGlobal(selection_, pdec.getVx(), pdec.getVy(), _cmd)) return false; + if (!((ZModelePointEditable)modele_).copyGlobal(selection_, 0/*pdec.getVx()*/, 0/*pdec.getVy()*/, _cmd)) return false; // Changement de selection. int[] isels=new int[selection_.getNbSelectedIndex()]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bma...@us...> - 2008-06-27 14:41:22
|
Revision: 3660 http://fudaa.svn.sourceforge.net/fudaa/?rev=3660&view=rev Author: bmarchan Date: 2008-06-27 07:41:22 -0700 (Fri, 27 Jun 2008) Log Message: ----------- Bug#31 : Erreur d'affichage de colonne sur le tableau des valeurs. Modified Paths: -------------- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeDefault.java branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeDefault.java =================================================================== --- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeDefault.java 2008-06-24 14:43:19 UTC (rev 3659) +++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeDefault.java 2008-06-27 14:41:22 UTC (rev 3660) @@ -203,7 +203,7 @@ return EbliLib.getS("Ferm\xE9/Ouvert"); } final int r = _column - (fermeOuvert_ ? 4 : 3); - return ligne_.getAttribute(r).getLongName(); + return att_[r].getLongName(); } public int getRowCount() { Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java =================================================================== --- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java 2008-06-24 14:43:19 UTC (rev 3659) +++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java 2008-06-27 14:41:22 UTC (rev 3660) @@ -198,7 +198,7 @@ default: } final int r = _column - 3; - return ligne_.getAttribute(r).getLongName(); + return att_[r].getLongName(); } public int getRowCount() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bma...@us...> - 2008-07-14 16:44:41
|
Revision: 3686 http://fudaa.svn.sourceforge.net/fudaa/?rev=3686&view=rev Author: bmarchan Date: 2008-07-14 09:44:47 -0700 (Mon, 14 Jul 2008) Log Message: ----------- Ticket#38 : Correction suite ?\195?\160 plantage lors du d?\195?\169placement de sommets de semis. Modified Paths: -------------- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeEditable.java branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeEditable.java =================================================================== --- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeEditable.java 2008-07-11 16:26:37 UTC (rev 3685) +++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeEditable.java 2008-07-14 16:44:47 UTC (rev 3686) @@ -558,8 +558,8 @@ GISAttributeModelDoubleArray oldvals=null; if (zAtt!=null && zAtt.isAtomicValue()) { if (getGeomData().getModel(zAtt)!=null) { - oldvals=(GISAttributeModelDoubleArray)getGeomData().getModel(zAtt).getObjectValueAt(i); - newvals=(GISAttributeModelDoubleArray)zAtt.createDataForGeom(oldvals, geometries_.getGeometry(i).getNumPoints()); + oldvals=(GISAttributeModelDoubleArray)getGeomData().getModel(zAtt).getObjectValueAt(idx); + newvals=(GISAttributeModelDoubleArray)zAtt.createDataForGeom(oldvals, geometries_.getGeometry(idx).getNumPoints()); } else FuLog.warning("EBL:Pb l'attribut pour Z n'est pas dans la liste des attributs du calque!"); @@ -604,7 +604,7 @@ } if (newvals!=null) - getGeomData().getModel(zAtt).setObject(i, newvals, cmp); + getGeomData().getModel(zAtt).setObject(idx, newvals, cmp); } } if (_cmd != null) { Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java =================================================================== --- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java 2008-07-11 16:26:37 UTC (rev 3685) +++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java 2008-07-14 16:44:47 UTC (rev 3686) @@ -642,8 +642,8 @@ GISAttributeModelDoubleArray oldvals=null; if (zAtt!=null && zAtt.isAtomicValue()) { if (getGeomData().getModel(zAtt)!=null) { - oldvals=(GISAttributeModelDoubleArray)getGeomData().getModel(zAtt).getObjectValueAt(i); - newvals=(GISAttributeModelDoubleArray)zAtt.createDataForGeom(oldvals, geometries_.getGeometry(i).getNumPoints()); + oldvals=(GISAttributeModelDoubleArray)getGeomData().getModel(zAtt).getObjectValueAt(idx); + newvals=(GISAttributeModelDoubleArray)zAtt.createDataForGeom(oldvals, geometries_.getGeometry(idx).getNumPoints()); } else FuLog.warning("EBL:Pb l'attribut pour Z n'est pas dans la liste des attributs du calque!"); @@ -669,7 +669,7 @@ geometries_.setValue(idx, geo, cmp); if (newvals!=null) - getGeomData().getModel(zAtt).setObject(i, newvals, cmp); + getGeomData().getModel(zAtt).setObject(idx, newvals, cmp); } } if (_cmd != null) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |