Writing macbeth result in the same layer in a new column; Done popup …

…whem final file is wrote

othello/ui/aggregate.py

@@ -66,6 +66,9 @@ def aggregate(self):
             df = self.add_weighted_columns(df)
             gis.io.write(df, filepath[0])
 
+            popup = Popup("Done", self)
+            popup.show()
+
         except errors.LessThenTwoCriteriaError:
             popup = Popup("At least 2 criteria must be loaded", self)
             popup.show()
@@ -117,6 +120,9 @@ def add_weighted_columns(self, df: geopandas.GeoDataFrame) -> geopandas.GeoDataF
             criterion = self.table.item(row_index, 2).text()
             weight = float(self.table.item(row_index, 3).text())
 
+            # Removing the _mb suffix
+            criterion = criterion.replace('_mb', '')
+
             criterion_geoseries = gis.io.read(filepath, layer=layer)[criterion]
             df[criterion + '_np'] = criterion_geoseries
             df[criterion + '_p'] = weight * criterion_geoseries

othello/ui/criteria.py

@@ -136,12 +136,12 @@ def write_file(self):
             return
 
         try:
-            self.df['macbeth'] = evaluate_new_values(
+            self.df[self.combobox_field.currentText() + '_mb'] = evaluate_new_values(
                 series=self.df[self.combobox_field.currentText()],
                 criterion_parameters=self.criterion_parameters
             )
 
-            gis.io.write(self.df, self.geo_filepath, layer=self.layer + '_mb')
+            gis.io.write(self.df, self.geo_filepath, layer=self.layer)
 
             popup = Popup("Done", self)
             popup.show()