Fix import table with row and column annotations. Rename get/set color to from/to clipboard. Use display value when syncing colors.

jordeu · jordeu · commit 256e47732822 · 2017-03-23T18:18:02.000+01:00
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/fileimport/wizard/text/reader/TableReaderAssistant.java b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/fileimport/wizard/text/reader/TableReaderAssistant.java
@@ -68,7 +68,7 @@ public void fillMatrixAndAnnotations(IMatrix matrix, AnnotationMatrix rowAnnMatr
         }
         if (hasColAnnotation()) {
             for (int i = 0; i < colAnnFields.length; i++) {
-                rowAnnMatrix.setAnnotation(currentColId, colAnnFieldNames[i], colAnnFields[i]);
+                colAnnMatrix.setAnnotation(currentColId, colAnnFieldNames[i], colAnnFields[i]);
             }
         }
     }
@@ -126,14 +126,14 @@ public void updateAnnotationNames() {
             int[] idx = profile.getRowAnnotationColumns();
             this.rowAnnFieldNames = new String[idx.length];
             for (int i = 0; i < idx.length; i++) {
-                rowAnnFieldNames[i] = fileHeaders.get(i).toString();
+                rowAnnFieldNames[i] = fileHeaders.get(idx[i]).toString();
             }
         }
         if (hasColAnnotation()) {
             int[] idx = profile.getColumnAnnotationColumns();
             this.colAnnFieldNames = new String[idx.length];
             for (int i = 0; i < idx.length; i++) {
-                colAnnFieldNames[i] = fileHeaders.get(i).toString();
+                colAnnFieldNames[i] = fileHeaders.get(idx[i]).toString();
             }
         }
     }
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/heatmap/header/wizard/coloredlabels/ColoredLabelsGroupsPage.java b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/heatmap/header/wizard/coloredlabels/ColoredLabelsGroupsPage.java
@@ -22,6 +22,8 @@
 package org.gitools.ui.app.heatmap.header.wizard.coloredlabels;
 
 import org.gitools.heatmap.header.ColoredLabel;
+import org.gitools.ui.core.utils.FileChoose;
+import org.gitools.ui.core.utils.FileChooserUtils;
 import org.gitools.ui.platform.wizard.AbstractWizardPage;
 import org.gitools.utils.color.ColorRegistry;
 
@@ -38,19 +40,19 @@
 
 public class ColoredLabelsGroupsPage extends AbstractWizardPage {
 
-    private void setSync() {
+    private void runToClipboard() {
         ColorRegistry cr = ColorRegistry.get();
         for (ColoredLabel cl : getColoredLabels()) {
-            cr.registerId(cl.getValue(), cl.getColor());
+            cr.registerId(cl.getDisplayedLabel(), cl.getColor());
         }
     }
 
-    private void sync() {
+    private void runFromClipboard() {
         java.util.List<ColoredLabel> oldList = getColoredLabels();
         java.util.List<ColoredLabel> newList = new ArrayList<>();
         ColorRegistry cr = ColorRegistry.get();
         for (ColoredLabel cl : oldList) {
-            newList.add(new ColoredLabel(cl.getValue(), cl.getDisplayedLabel(), cr.getColor(cl.getValue(), cl.getColor())));
+            newList.add(new ColoredLabel(cl.getValue(), cl.getDisplayedLabel(), cr.getColor(cl.getDisplayedLabel(), cl.getColor())));
         }
         setColoredLabels(newList);
     }
@@ -289,16 +291,16 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             }
         });
 
-        syncBtn.setText("Get colors");
-        syncBtn.setToolTipText("Get value-color relations with other heatmaps whithin the current Gitools instance");
+        syncBtn.setText("From clipboard");
+        syncBtn.setToolTipText("Apply display-color relations from Gitools clipboard");
         syncBtn.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 syncBtnActionPerformed(evt);
             }
         });
 
-        syncBtn1.setText("Set colors");
-        syncBtn1.setToolTipText("Set value-color relations so other heatmaps can sync");
+        syncBtn1.setText("To clipboard");
+        syncBtn1.setToolTipText("Copy display-color relations to Gitools clipboard");
         syncBtn1.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 syncBtn1ActionPerformed(evt);
@@ -327,7 +329,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                     .addComponent(removeBtn, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(syncBtn, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(tableAddBtn, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addComponent(syncBtn1, javax.swing.GroupLayout.PREFERRED_SIZE, 92, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                    .addComponent(syncBtn1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -361,17 +363,18 @@ private void removeBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
     }//GEN-LAST:event_removeBtnActionPerformed
 
     private void syncBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_syncBtnActionPerformed
-        sync();
+        runFromClipboard();
     }//GEN-LAST:event_syncBtnActionPerformed
 
     private void syncBtn1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_syncBtn1ActionPerformed
-        setSync();
+        runToClipboard();
     }//GEN-LAST:event_syncBtn1ActionPerformed
 
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JScrollPane jScrollPane2;
     private javax.swing.JButton removeBtn;
+    private javax.swing.JButton importBtn;
     private javax.swing.JButton syncBtn;
     private javax.swing.JButton syncBtn1;
     private javax.swing.JTable table;

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public void fillMatrixAndAnnotations(IMatrix matrix, AnnotationMatrix rowAnnMatr`
`68`	`68`	`}`
`69`	`69`	`if (hasColAnnotation()) {`
`70`	`70`	`for (int i = 0; i < colAnnFields.length; i++) {`
`71`		`- rowAnnMatrix.setAnnotation(currentColId, colAnnFieldNames[i], colAnnFields[i]);`
	`71`	`+ colAnnMatrix.setAnnotation(currentColId, colAnnFieldNames[i], colAnnFields[i]);`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`}`
`@@ -126,14 +126,14 @@ public void updateAnnotationNames() {`
`126`	`126`	`int[] idx = profile.getRowAnnotationColumns();`
`127`	`127`	`this.rowAnnFieldNames = new String[idx.length];`
`128`	`128`	`for (int i = 0; i < idx.length; i++) {`
`129`		`- rowAnnFieldNames[i] = fileHeaders.get(i).toString();`
	`129`	`+ rowAnnFieldNames[i] = fileHeaders.get(idx[i]).toString();`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`	`if (hasColAnnotation()) {`
`133`	`133`	`int[] idx = profile.getColumnAnnotationColumns();`
`134`	`134`	`this.colAnnFieldNames = new String[idx.length];`
`135`	`135`	`for (int i = 0; i < idx.length; i++) {`
`136`		`- colAnnFieldNames[i] = fileHeaders.get(i).toString();`
	`136`	`+ colAnnFieldNames[i] = fileHeaders.get(idx[i]).toString();`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`	`}`