fudaa-svn-commit

[Fudaa-svn-commit] SF.net SVN: fudaa:[3740] branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ ebli/visuallibrary/EbliNodeDefault.java

[<had...@us...>]

Revision: 3740
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3740&view=rev
Author:   hadouxad
Date:     2008-08-08 13:04:01 +0000 (Fri, 08 Aug 2008)

Log Message:
-----------
mise a jour de Eblinode default et test commit

Modified Paths:
--------------
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java

Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java	2008-08-07 22:45:03 UTC (rev 3739)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java	2008-08-08 13:04:01 UTC (rev 3740)
@@ -8,8 +8,8 @@
 	
 
 	EbliWidgetCreator creator;
-	Point p;
-	Dimension d;
+	Point preferedLocation;
+	Dimension preferedSize;
 	String title;
 	
 	
@@ -30,12 +30,19 @@
 		this.title = title;
 	}
 
-	public void setP(Point p) {
-		this.p = p;
+	public void setPreferedLocation(Point p) {
+		this.preferedLocation = p;
+		// repositionnement du widget si existant
+		if(getCreator()!=null && getCreator().getWidget()!=null)
+			getCreator().getWidget().setPreferredLocation(p);
 	}
 
-	public void setD(Dimension d) {
-		this.d = d;
+	public void setPreferedDimension(Dimension d) {
+		this.preferedSize = d;
+		
+		// repositionnement du widget si existant
+		if(getCreator()!=null && getCreator().getWidget()!=null)
+			getCreator().getWidget().setPreferredSize(d);
 	}
 
 
@@ -49,12 +56,12 @@
 	}
 
 	public Point getLocation() {
-		return p;
+		return preferedLocation;
 	}
 
 	public Dimension getPreferedDimension() {
 		// TODO Auto-generated method stub
-		return d;
+		return preferedSize;
 	}
 	
 	public String toString() {


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

[Fudaa-svn-commit] SF.net SVN: fudaa:[3750] branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ ebli/visuallibrary/EbliNodeDefault.java

[<had...@us...>]

Revision: 3750
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3750&view=rev
Author:   hadouxad
Date:     2008-08-09 15:14:54 +0000 (Sat, 09 Aug 2008)

Log Message:
-----------
implementation de la fonction de duplication et test pour le rectangle objet graphe

Modified Paths:
--------------
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java

Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java	2008-08-09 14:57:45 UTC (rev 3749)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java	2008-08-09 15:14:54 UTC (rev 3750)
@@ -43,8 +43,14 @@
 		}
 		
 		duplique.setPreferedSize(getPreferedSize());
-		duplique.setPreferedLocation(getPreferedLocation());
 		
+		//-- calcul nouvelle position
+		 Point nouvellePosition = new Point(
+				 getCreator().getWidget().getLocation().x, (int) (getCreator().getWidget().getLocation().y + getCreator().getWidget().getClientArea().height));
+		
+		duplique.setPreferedLocation(nouvellePosition);
+		 //duplique.setPreferedLocation(getPreferedLocation());
+			
 		return duplique;
 	}
 


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

[Fudaa-svn-commit] SF.net SVN: fudaa:[3838] branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ ebli/visuallibrary/EbliNodeDefault.java

[<de...@us...>]

Revision: 3838
          http://fudaa.svn.sourceforge.net/fudaa/?rev=3838&view=rev
Author:   deniger
Date:     2008-08-25 20:39:03 +0000 (Mon, 25 Aug 2008)

Log Message:
-----------


Modified Paths:
--------------
    branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java

Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java	2008-08-25 20:38:24 UTC (rev 3837)
+++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliNodeDefault.java	2008-08-25 20:39:03 UTC (rev 3838)
@@ -29,7 +29,8 @@
     EbliNode duplique = new EbliNodeDefault();
 
     duplique.setTitle(getTitle());
-    // FIXME cree un methode duplicate dans le creator
+    // FIXME cree un methode duplicate dans le creator.
+    // Les params doivent contenir
     // ne pas oublier de
     // duplicate(Map optionsGraphique)
     // -- duplique rectangle
@@ -43,13 +44,13 @@
       duplique
           .setCreator(new EbliWidgetCreatorGraphe(((EbliWidgetCreatorGraphe) getCreator()).getGraphe().duplicate()));
     } else if (creator instanceof EbliWidgetCreatorVueCalque) {
-      
-      Map duplicOptions=new HashMap();
+
+      Map duplicOptions = new HashMap();
       duplicOptions.put("scene", getCreator().getWidget().getEbliScene());
       duplique.setCreator(new EbliWidgetCreatorVueCalque(((EbliWidgetCreatorVueCalque) getCreator()).getCalque()
-          .duplicate(duplicOptions)));
-    
-    
+          .duplicate(duplicOptions), ((EbliWidgetCreatorVueCalque) getCreator()).getCalque().getVueCalque()
+          .getViewBoite()));
+
     } else if (creator instanceof EbliWidgetCreatorShape) {
       duplique.setCreator(new EbliWidgetCreatorShape(((EbliWidgetCreatorShape) getCreator()).getTypeObject_()));
     } else if (creator instanceof EbliWidgetCreatorImage) {
@@ -58,13 +59,10 @@
       // instance pas identifie, impossible de dupliquer
       return null;
     }
-    
-    
-     
-     
+
     // recopie des tailles
     duplique.setPreferedSize(getPreferedSize());
-    
+
     // -- calcul nouvelle position
     Point nouvellePosition = new Point(getCreator().getWidget().getLocation().x, (int) (getCreator().getWidget()
         .getLocation().y + getCreator().getWidget().getClientArea().height));
@@ -82,16 +80,14 @@
   public void setPreferedLocation(Point p) {
     this.preferedLocation = p;
     // repositionnement du widget si existant
-    if (hasWidget())
-      getCreator().getWidget().setPreferredLocation(p);
+    if (hasWidget()) getCreator().getWidget().setPreferredLocation(p);
   }
 
   public void setPreferedSize(Dimension d) {
     this.preferedSize = d;
 
     // repositionnement du widget si existant
-    if (hasWidget())
-      getCreator().getWidget().setPreferredSize(d);
+    if (hasWidget()) getCreator().getWidget().setPreferredSize(d);
   }
 
   public void setCreator(EbliWidgetCreator creator) {


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