Develop

src/org/ohdsi/usagi/CodeMapping.java

@@ -16,6 +16,7 @@
 package org.ohdsi.usagi;
 
 import org.ohdsi.usagi.ui.Global;
+import org.ohdsi.usagi.Equivalence;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,10 +32,6 @@ public enum MappingStatus {
         APPROVED, UNCHECKED, AUTO_MAPPED, AUTO_MAPPED_TO_1, INVALID_TARGET, FLAGGED, IGNORED
     }
 
-    public enum Equivalence {
-        EQUAL, EQUIVALENT, WIDER, NARROWER, INEXACT, UNMATCHED, UNREVIEWED
-    }
-
     private SourceCode sourceCode;
     private double matchScore;
     private MappingStatus mappingStatus;

src/org/ohdsi/usagi/Equivalence.java

@@ -0,0 +1,48 @@
+package org.ohdsi.usagi;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public enum Equivalence {
+    EQUAL("exactMatch"), 
+    EQUIVALENT("closeMatch"), 
+    WIDER("broadMatch"), 
+    NARROWER("narrowMatch"), 
+    INEXACT("relatedMatch"), 
+    UNMATCHED("unmatched"), 
+    UNREVIEWED("unreviewed");
+
+    private String displayName;
+
+    private Equivalence(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public static Equivalence fromDisplayName(String displayName) {
+        for (Equivalence equivalence : Equivalence.values()) {
+            if (equivalence.getDisplayName().equals(displayName)) {
+                return equivalence;
+            }
+        }
+        return null;
+    }
+
+    public static List<String> getAllDisplayNames() {
+        List<String> names = new ArrayList<>();
+        for (Equivalence equivalence : Equivalence.values()) {
+            names.add(equivalence.getDisplayName());
+        }
+        return names;
+    }
+
+
+    public static void main(String[] args) {
+        System.out.println(Equivalence.getAllDisplayNames());
+        String spam = Equivalence.getAllDisplayNames().get(3);
+        System.out.println(Equivalence.fromDisplayName(spam));
+    }
+}

src/org/ohdsi/usagi/ReadCodeMappingsFromFile.java

@@ -18,7 +18,7 @@
 import java.util.Iterator;
 
 import org.ohdsi.usagi.CodeMapping.MappingStatus;
-import org.ohdsi.usagi.CodeMapping.Equivalence;
+import org.ohdsi.usagi.Equivalence;
 import org.ohdsi.usagi.ui.Global;
 import org.ohdsi.utilities.files.ReadCSVFileWithHeader;
 import org.ohdsi.utilities.files.Row;

src/org/ohdsi/usagi/dataImport/ImportData.java

@@ -86,7 +86,7 @@ private void createInitialMapping(List<SourceCode> sourceCodes, ImportSettings s
 			} else if (sourceCode.sourceAutoAssignedConceptIds.size() > 1 && concepts.size() > 0) {
 				codeMapping.setMappingStatus(MappingStatus.AUTO_MAPPED);
 			}
-			codeMapping.setEquivalence(CodeMapping.Equivalence.UNREVIEWED);
+			codeMapping.setEquivalence(Equivalence.UNREVIEWED);
 			out.write(codeMapping);
 		}
 		out.close();

src/org/ohdsi/usagi/ui/FilterPanel.java

@@ -148,6 +148,10 @@ public boolean getFilterByAuto() {
 		return filterByAutoCheckBox.isSelected();
 	}
 
+	public void setFilterByAuto() {
+		filterByAutoCheckBox.setSelected(true);
+	}
+
 	public boolean getFilterStandard() {
 		return filterStandardCheckBox.isSelected();
 	}

src/org/ohdsi/usagi/ui/ImportDialog.java

@@ -232,6 +232,11 @@ private Component createColumnMappingPanel() {
 		autoConceptIdColumn = new JComboBox<>(comboBoxOptions);
 		autoConceptIdColumn.setToolTipText("The column containing a (semicolon-delimited) list of concept IDs to which the search will be restricted");
 		columnMappingPanel.add(autoConceptIdColumn, cBox);
+		autoConceptIdColumn.addActionListener(e -> {
+			if (!autoConceptIdColumn.getSelectedItem().toString().isEmpty()) {
+				filterPanel.setFilterByAuto();
+			}
+		});
 
 		gridY = cLabel.gridy + 1;
 		addExtraColumnMapping();
@@ -439,7 +444,7 @@ public void run() {
 						} else if (sourceCode.sourceAutoAssignedConceptIds.size() > 1 && concepts.size() > 0) {
 							codeMapping.setMappingStatus(MappingStatus.AUTO_MAPPED);
 						}
-						codeMapping.setEquivalence(CodeMapping.Equivalence.UNREVIEWED);
+						codeMapping.setEquivalence(Equivalence.UNREVIEWED);
 						synchronized (globalMappingList) {
 							globalMappingList.add(codeMapping);
 							progressBar.setValue(Math.round(100 * globalMappingList.size() / sourceCodes.size()));

src/org/ohdsi/usagi/ui/MappingDetailPanel.java

@@ -33,6 +33,7 @@
 import org.ohdsi.usagi.CodeMapping;
 import org.ohdsi.usagi.CodeMapping.MappingStatus;
 import org.ohdsi.usagi.Concept;
+import org.ohdsi.usagi.Equivalence;
 import org.ohdsi.usagi.MappingTarget;
 import org.ohdsi.usagi.UsagiSearchEngine.ScoredConcept;
 
@@ -177,20 +178,21 @@ private Component createSearchResultsPanel() {
 		searchTable.getSelectionModel().addListSelectionListener(event -> {
 			int viewRow = searchTable.getSelectedRow();
 			// Don't enable the buttons if no row selected or status is approved
-			if (viewRow == -1 || codeMapping.getMappingStatus() == MappingStatus.APPROVED) {
+			if (viewRow == -1) {
 				addButtons.forEach(x -> x.setEnabled(false));
 				replaceButton.setEnabled(false);
 				addMappingsTypesChooser.setEnabled(false);
 			} else {
-				addButtons.forEach(x -> x.setEnabled(true));
-				replaceButton.setEnabled(true);
-				addMappingsTypesChooser.setEnabled(true);
+				if (codeMapping != null && codeMapping.getMappingStatus() != MappingStatus.APPROVED) {
+					addButtons.forEach(x -> x.setEnabled(true));
+					replaceButton.setEnabled(true);
+					addMappingsTypesChooser.setEnabled(true);
+				}
 				int modelRow = searchTable.convertRowIndexToModel(viewRow);
 				Global.conceptInfoAction.setEnabled(true);
 				Global.conceptInformationDialog.setActiveConcept(searchTableModel.getConcept(modelRow));
 				Global.athenaAction.setEnabled(true);
 				Global.athenaAction.setConcept(searchTableModel.getConcept(modelRow));
-				Global.googleSearchAction.setEnabled(false);
 			}
 		});
 		// searchTable.hideColumn("Synonym");
@@ -276,7 +278,7 @@ public void changedUpdate(DocumentEvent arg0) {
 		flagButton.setBackground(new Color(151, 220, 141));
 		panel.add(flagButton);
 
-		equivalenceOptionChooser = new JComboBox<>(CodeMapping.Equivalence.values());
+		equivalenceOptionChooser = new JComboBox<>(Equivalence.getAllDisplayNames().toArray());
 		equivalenceOptionChooser.setToolTipText("Choose mapping equivalence");
 		equivalenceOptionChooser.setMaximumSize(equivalenceOptionChooser.getPreferredSize());
 		panel.add(equivalenceOptionChooser);
@@ -331,7 +333,6 @@ private JPanel createTargetConceptsPanel() {
 				Global.conceptInformationDialog.setActiveConcept(mappingTarget.getConcept());
 				Global.athenaAction.setEnabled(true);
 				Global.athenaAction.setConcept(mappingTarget.getConcept());
-				Global.googleSearchAction.setEnabled(false);
 			}
 		});
 		targetConceptTable.hideColumn("Valid start date");
@@ -407,7 +408,8 @@ public void flagOrUnflag() {
 	}
 
 	public void approveSelected() {
-		CodeMapping.Equivalence equivalenceToApply = (CodeMapping.Equivalence) equivalenceOptionChooser.getSelectedItem();
+		Equivalence equivalenceToApply = Equivalence.fromDisplayName((String) equivalenceOptionChooser.getSelectedItem());
+
 		codeMapping.approve(equivalenceToApply);
 		for (CodeMapping codeMappingMulti : codeMappingsFromMulti) {
 			codeMappingMulti.approve(equivalenceToApply);
@@ -420,7 +422,7 @@ public void approveSelected() {
 	}
 
 	public void flagSelected() {
-		CodeMapping.Equivalence equivalenceToApply = (CodeMapping.Equivalence) equivalenceOptionChooser.getSelectedItem();
+		Equivalence equivalenceToApply = Equivalence.fromDisplayName((String) equivalenceOptionChooser.getSelectedItem());
 		codeMapping.flag(equivalenceToApply);
 		for (CodeMapping codeMappingMulti : codeMappingsFromMulti) {
 			codeMappingMulti.flag(equivalenceToApply);

src/org/ohdsi/usagi/ui/MappingTablePanel.java

@@ -32,7 +32,7 @@
 import javax.swing.table.TableRowSorter;
 
 import org.ohdsi.usagi.CodeMapping;
-import org.ohdsi.usagi.CodeMapping.Equivalence;
+import org.ohdsi.usagi.Equivalence;
 import org.ohdsi.usagi.CodeMapping.MappingStatus;
 import org.ohdsi.usagi.Concept;
 
@@ -202,7 +202,7 @@ public Object getValueAt(int row, int col) {
 					case ASSIGNED_REVIEWER_COL:
 						return codeMapping.getAssignedReviewer();
 					case 18:
-						if (codeMapping.getEquivalence() != CodeMapping.Equivalence.UNREVIEWED) {
+						if (codeMapping.getEquivalence() != Equivalence.UNREVIEWED) {
 							return codeMapping.getEquivalence();
 						} else {
 							return null;

src/org/ohdsi/usagi/ui/ShowReviewStatsDialog.java

@@ -62,7 +62,7 @@ public ShowReviewStatsDialog() {
 		// Equivalence status
 		addHeaderLabel(g,"By equivalence status:");
 
-		Map<CodeMapping.Equivalence, Long> countByEquivalence = codeMappings.stream()
+		Map<Equivalence, Long> countByEquivalence = codeMappings.stream()
 				.collect(Collectors.groupingBy(CodeMapping::getEquivalence, Collectors.counting()));
 
 		countByEquivalence.forEach((key, value) -> addLabel(g, String.format("%s - %d", key, value)));

src/org/ohdsi/usagi/ui/UsagiMain.java

@@ -41,7 +41,7 @@
  */
 public class UsagiMain implements ActionListener {
 
-	public static String version = "1.4.3";
+	public static String version = "1.5.0-SNAPSHOT";
 
 	public static void main(String[] args) {
 		new UsagiMain(args);

src/org/ohdsi/usagi/ui/UsagiTable.java

@@ -31,7 +31,7 @@
 import javax.swing.table.TableModel;
 
 import org.ohdsi.usagi.CodeMapping.MappingStatus;
-import org.ohdsi.usagi.CodeMapping.Equivalence;
+import org.ohdsi.usagi.Equivalence;
 
 
 public class UsagiTable extends JTable {