Fix column name clash bug

Imageomics · Jan 31, 2024 · 37f38e8 · 37f38e8
1 parent 5157291
commit 37f38e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/andromeda-ui/components/DataExplorer.tsx b/andromeda-ui/components/DataExplorer.tsx
@@ -59,7 +59,7 @@ export default function DataExplorer(props: DataExplorerProps) {
     if (weights) {
         let highlightValues: {[key:string]: number} = {}
         if (highlightImageKey) {
-            highlightValues = images.find((x) => x.label == highlightImageKey);
+            highlightValues = images.find((x) => x.label == highlightImageKey).values;
         }
 
         weightControls = Object.keys(weights).map(key => <WeightSlider

diff --git a/andromeda/dataset.py b/andromeda/dataset.py
@@ -103,8 +103,11 @@ def dimensional_reduction(self, weights):
         )
         self.add_label_and_url_columns(image_coordinate_df)
         min_max_dataframe = self.get_min_max_scaled_dataframe()
-        final_coordinate_df = image_coordinate_df.merge(min_max_dataframe, on='Image_Label')
-        return weight_series.to_dict(), final_coordinate_df.to_dict("records")
+        coordinate_dict_ary = image_coordinate_df.to_dict("records")
+        for item in coordinate_dict_ary:
+            series = min_max_dataframe.loc[item['label']]
+            item['values'] = series.to_dict()
+        return weight_series.to_dict(), coordinate_dict_ary
 
     @staticmethod
     def create_weight_series(weights, columns):