Fix: show color scale dialog and categorize values after 'add new data layer from file'

Michael P Schroeder · Michael P Schroeder · commit 865ebdb2bc0e · 2016-07-14T16:14:11.000+02:00
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/actions/edit/AddNewLayersFromFileAction.java b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/actions/edit/AddNewLayersFromFileAction.java
@@ -150,6 +150,8 @@ public void afterLoad(IResource resource, IProgressMonitor monitor) throws Comma
                     }
 
                     getHeatmap().getLayers().updateLayers();
+
+                    super.afterLoad(resource, monitor);
                 }
             }
         };
diff --git a/org.gitools.ui.core/src/main/java/org/gitools/ui/core/pages/common/AnnotationEditPage.form b/org.gitools.ui.core/src/main/java/org/gitools/ui/core/pages/common/AnnotationEditPage.form
@@ -32,15 +32,15 @@
     <colspec value="left:4dlu:noGrow"/>
     <colspec value="fill:212px:noGrow"/>
     <colspec value="left:4dlu:noGrow"/>
-    <colspec value="fill:60px:grow"/>
+    <colspec value="fill:201px:grow"/>
     <colspec value="left:4dlu:noGrow"/>
-    <colspec value="fill:209px:noGrow"/>
+    <colspec value="fill:143px:noGrow"/>
     <colspec value="left:4dlu:noGrow"/>
     <colspec value="fill:80dlu:noGrow"/>
     <colspec value="left:4dlu:noGrow"/>
     <colspec value="fill:max(d;4px):noGrow"/>
     <constraints>
-      <xy x="20" y="20" width="739" height="791"/>
+      <xy x="20" y="20" width="814" height="791"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -68,7 +68,7 @@
           <forms/>
         </constraints>
         <properties>
-          <text value="load Annotations"/>
+          <text value="load from File"/>
         </properties>
       </component>
       <component id="dd937" class="javax.swing.JButton" binding="removeSelected">
@@ -90,15 +90,6 @@
           <text value="Available Annotations"/>
         </properties>
       </component>
-      <component id="8b7c" class="javax.swing.JLabel">
-        <constraints>
-          <grid row="4" column="8" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-          <forms/>
-        </constraints>
-        <properties>
-          <text value="Add/Remove"/>
-        </properties>
-      </component>
       <component id="726" class="javax.swing.JLabel" binding="edit_titledesc">
         <constraints>
           <grid row="18" column="2" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
@@ -210,6 +201,16 @@
           <text value="Search:"/>
         </properties>
       </component>
+      <component id="a782" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="4" column="8" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <forms/>
+        </constraints>
+        <properties>
+          <font style="1"/>
+          <text value="Add/Remove annotations"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>

Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,8 @@ public void afterLoad(IResource resource, IProgressMonitor monitor) throws Comma`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`getHeatmap().getLayers().updateLayers();`
	`153`	`+`
	`154`	`+ super.afterLoad(resource, monitor);`
`153`	`155`	`}`
`154`	`156`	`}`
`155`	`157`	`};`