diff --git a/.classpath b/.classpath
index 0bc30bd..c05ec44 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
-
+
@@ -30,5 +30,5 @@
-
+
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index a985160..f00fe43 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
-#Thu Mar 07 16:00:56 CET 2013
+#Thu Mar 07 19:02:40 CET 2013
eclipse.preferences.version=1
-lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.1.0-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.0.3-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false
diff --git a/pom.xml b/pom.xml
index d0977aa..32000c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
org.gcube.portlets.user
reports
war
- 4.1.0-SNAPSHOT
+ 4.0.3-SNAPSHOT
gCube Reports Portlet
gCube Reports Portlet.
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java
index 7bc0e3b..2f6c7b3 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java
@@ -164,7 +164,7 @@ public class TemplateComponent {
switch (sc.getType()) {
case DYNA_IMAGE:
- ClientImage dp = new ClientImage(sc, presenter, sc.getWidth());
+ ClientImage dp = new ClientImage(sc, presenter, sc.getWidth(), sc.getHeight());
this.content = dp;
// String possibelContent = ((String) sc.getPossibleContent());
@@ -355,6 +355,8 @@ public class TemplateComponent {
if (((String) content).compareTo("") == 0)
content = DEFAULT_IMAGE_PATH;
metadata = da.getMetadata();
+ width = da.getImageWidth();
+ height = da.getImageHeight();
break;
case BODY:
if (this.isLocked()) {
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientImage.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientImage.java
index dffb8c9..bc04f1e 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientImage.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientImage.java
@@ -49,6 +49,8 @@ public class ClientImage extends Composite {
private final String METADATA_DESC_KEY = "description";
private final String METADATA_SOURCE_KEY = "source";
+ private int imageWidth;
+ private int imageHeight;
private FocusPanel focusPanel = new FocusPanel();
private VerticalPanel mainPanel = new VerticalPanel();
@@ -78,7 +80,9 @@ public class ClientImage extends Composite {
* @param width
* @param tag
*/
- public ClientImage(BasicComponent co, Presenter presenter, int width) {
+ public ClientImage(BasicComponent co, Presenter presenter, int width, int height) {
+ imageHeight = height;
+ imageWidth = width;
this.presenter = presenter;
this.basicComponent = co;
HorizontalPanel controlPanel = getControlPanel();
@@ -104,7 +108,7 @@ public class ClientImage extends Composite {
}
else {
GWT.log("Found ImageUrl="+imageURL);
- showImage(new Image(imageURL));
+ showImage(new Image(imageURL), width, height);
}
//set style for buttons
@@ -175,7 +179,7 @@ public class ClientImage extends Composite {
}
HorizontalPanel hp1 = new HorizontalPanel();
- HTML title = new HTML("Title: * ", true);
+ HTML title = new HTML("Title: *
", true);
hp1.add(title);
hp1.add(titleTB);
titleTB.setWidth("135px");
@@ -221,6 +225,8 @@ public class ClientImage extends Composite {
toShow.setWidth(checkedWidth+"px");
imagePanel.setSize(checkedWidth+"px", checkedHeight+"px");
imagePanel.add(toShow);
+ imageWidth = checkedWidth;
+ imageHeight = checkedHeight;
saveStatus();
}
@@ -327,7 +333,13 @@ public class ClientImage extends Composite {
public String getIdInBasket() {
return idInBasket;
}
+ public int getImageWidth() {
+ return imageWidth;
+ }
+ public int getImageHeight() {
+ return imageHeight;
+ }
/**
*
* @param idInBasket .