change padding and call onResize when GeneViewer is displayed

Author: timeu

src/at/gmi/nordborglab/widgets/gwasgeneviewer/client/GWASGeneViewer.java

@@ -26,13 +26,14 @@
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTMLPanel;
+import com.google.gwt.user.client.ui.RequiresResize;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.visualization.client.DataTable;
 import com.google.gwt.visualization.client.Selection;
 
-public class GWASGeneViewer extends Composite {
+public class GWASGeneViewer extends Composite implements RequiresResize{
 
 	private static ScatterGenomeChartUiBinder uiBinder = GWT
 			.create(ScatterGenomeChartUiBinder.class);
@@ -69,7 +70,7 @@ interface ScatterGenomeChartUiBinder extends UiBinder<Widget, GWASGeneViewer> {
 	//General settings
 	protected String chromosome;
 	protected int width = 1000;
-	protected int geneViewerHeight = 200;
+	protected int geneViewerHeight = 300;
 	protected DataSource datasource = null;
 	protected int viewStart = 0;
 	protected int viewEnd = 0;
@@ -183,8 +184,8 @@ public void onZoom(ZoomEvent event) {
 				{
 					if (event.maxX - event.minX<= minZoomLevelForGenomeView)
 					{
-						geneViewer.updateZoom(event.minX, event.maxX);
 						toggleGenomeViewVisible(true);
+						geneViewer.updateZoom(event.minX, event.maxX);
 					}
 					else	
 						toggleGenomeViewVisible(false);
@@ -307,7 +308,12 @@ protected Options setOptions(Dygraphs.Options options){
 
 
 	public void toggleGenomeViewVisible(boolean visible) {
-			geneViewerContainer.setVisible(visible);
+			//geneViewerContainer.setVisible(visible);
+			geneViewer.setVisible(visible);
+			if (visible) {
+				geneViewer.setSize(width - DYGRAPHOFFSET, geneViewerHeight);
+				geneViewer.onResize();
+			}
 	}
 
 	public void setMinZoomLevelForGenomeView(Integer minZoomLevelForGenomeView) {
@@ -405,4 +411,10 @@ public Selection getTopSNP() {
 			return null;
 		return getTopSNP(dataTable);
 	}
+
+	@Override
+	public void onResize() {
+		geneViewer.onResize();
+		scatterChart.onResize();
+	}
 }

src/at/gmi/nordborglab/widgets/gwasgeneviewer/client/GWASGeneViewer.ui.xml

@@ -5,16 +5,16 @@
 	xmlns:gview="urn:import:at.gmi.nordborglab.widgets.geneviewer.client">
 	<ui:style>
 		.genomeView {
-      margin: 0px 5px 0px 26px; 
+      margin: 0px 5px 0px 0px; 
     }
 	</ui:style>
 	<g:FlowPanel height="100%" >
 		<g:HTMLPanel>
 			<g:Label horizontalAlignment="ALIGN_LEFT" ui:field="chromosome_label"/>
 		</g:HTMLPanel>
 		<dyg:Dygraphs ui:field="scatterChart"></dyg:Dygraphs>
-		<g:HTMLPanel ui:field="geneViewerContainer" visible="false">
-	  	   <gview:GeneViewer ui:field="geneViewer" addStyleNames='{style.genomeView}'></gview:GeneViewer>
+		<g:HTMLPanel ui:field="geneViewerContainer" visible="true">
+	  	   <gview:GeneViewer ui:field="geneViewer" visible="false" addStyleNames='{style.genomeView}'></gview:GeneViewer>
 	  	</g:HTMLPanel>
 	</g:FlowPanel>
 </ui:UiBinder>