Rating persistence. better code: registered output param

buthanoid · Sep 28, 2021 · 8f169c3 · 8f169c3
1 parent ec04446
commit 8f169c3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/src/main/java/fr/jmmc/oimaging/gui/ResultSetTablePanel.java b/src/main/java/fr/jmmc/oimaging/gui/ResultSetTablePanel.java
@@ -10,10 +10,10 @@
 import fr.jmmc.jmcs.model.TableEditorPanel;
 import fr.jmmc.jmcs.util.NumberUtils;
 import fr.jmmc.oimaging.Preferences;
-import fr.jmmc.oimaging.model.IRModel;
 import fr.jmmc.oimaging.model.ResultSetTableModel;
 import fr.jmmc.oimaging.model.RatingCell;
 import fr.jmmc.oimaging.services.ServiceResult;
+import static fr.jmmc.oitools.image.ImageOiConstants.KEYWORD_RATING;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.text.SimpleDateFormat;
@@ -196,7 +196,7 @@ private void jButtonShowTableEditorActionPerformed(java.awt.event.ActionEvent ev
     public void updateTableRenderers() {
         // update renderer since the TableColumn object is different
         try {
-            final TableColumn columnRating = jResultSetTable.getColumn(IRModel.KEYWORD_RATING.getName());
+            final TableColumn columnRating = jResultSetTable.getColumn(KEYWORD_RATING);
             columnRating.setCellRenderer(ratingCell);
             columnRating.setCellEditor(ratingCell);
         } catch (IllegalArgumentException iae) {

diff --git a/src/main/java/fr/jmmc/oimaging/model/IRModel.java b/src/main/java/fr/jmmc/oimaging/model/IRModel.java
@@ -16,9 +16,7 @@
 import fr.jmmc.oitools.image.FitsImageHDU;
 import fr.jmmc.oitools.image.ImageOiData;
 import fr.jmmc.oitools.image.ImageOiInputParam;
-import fr.jmmc.oitools.meta.KeywordMeta;
 import fr.jmmc.oitools.meta.OIFitsStandard;
-import fr.jmmc.oitools.meta.Types;
 import fr.jmmc.oitools.model.OIFitsChecker;
 import fr.jmmc.oitools.model.OIFitsFile;
 import fr.jmmc.oitools.model.OIFitsLoader;
@@ -64,8 +62,6 @@ public class IRModel {
     /** List of results */
     private final List<ServiceResult> serviceResults = new LinkedList<ServiceResult>();
 
-    public static final KeywordMeta KEYWORD_RATING = new KeywordMeta("RATING", "user rating of the result", Types.TYPE_INT);
-
     /** status flag : set by RunAction */
     private boolean running;
 
@@ -485,14 +481,6 @@ public void addServiceResult(ServiceResult serviceResult) {
             addFitsImageHDUs(serviceResult.getOifitsFile().getFitsImageHDUs(), serviceResult.getInputFile().getName());
         }
 
-        // add OImaging keywords if they are not present
-
-        ImageOiInputParam inputParams = serviceResult.getOifitsFile().getImageOiData().getInputParam();
-
-        // addKeyword will also convert headercard to keyword
-        inputParams.addKeyword(KEYWORD_RATING);
-        inputParams.setKeywordDefault(KEYWORD_RATING.getName(), 0);
-
         // notify model update
         IRModelManager.getInstance().fireIRModelUpdated(this, null);
     }

diff --git a/src/main/java/fr/jmmc/oimaging/model/ResultSetTableModel.java b/src/main/java/fr/jmmc/oimaging/model/ResultSetTableModel.java
@@ -18,6 +18,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import fr.jmmc.oitools.fits.FitsUtils;
+import static fr.jmmc.oitools.image.ImageOiConstants.KEYWORD_RATING;
 import fr.jmmc.oitools.model.OIFitsFile;
 import fr.jmmc.oitools.model.OIFitsWriter;
 import fr.nom.tam.fits.FitsException;
@@ -174,7 +175,7 @@ public boolean isCellEditable(int rowIndex, int columnIndex) {
         }
         final ColumnDesc columnDesc = getColumnDesc(columnIndex);
         return columnDesc.equals(HardCodedColumn.COMMENTS.getColumnDesc())
-                || columnDesc.getName().equals(IRModel.KEYWORD_RATING.getName());
+                || columnDesc.getName().equals(KEYWORD_RATING);
     }
 
     @Override
@@ -187,8 +188,8 @@ public void setValueAt(Object value, int rowIndex, int columnIndex) {
         if (columnDesc.equals(HardCodedColumn.COMMENTS.getColumnDesc())) {
             result.setComments((String) value);
         }
-        else if (columnDesc.getName().equals(IRModel.KEYWORD_RATING.getName())) {
-            setKeywordValue(result, INPUT_PARAM, IRModel.KEYWORD_RATING.getName(), (Integer) value);
+        else if (columnDesc.getName().equals(KEYWORD_RATING)) {
+            setKeywordValue(result, OUTPUT_PARAM, KEYWORD_RATING, (Integer) value);
             fileMustBeOverwritten = true;
         }