celldetective 1.3.4.post1__py3-none-any.whl → 1.3.5__py3-none-any.whl

celldetective/gui/tableUI.py

@@ -19,6 +19,7 @@ from fonticon_mdi6 import MDI6
 from math import floor
 
 from matplotlib import colormaps
+import matplotlib.cm
 
 
 class QueryWidget(QWidget):
@@ -473,6 +474,14 @@ class TableUI(QMainWindow, Styles):
 		self.table_view.resizeColumnsToContents()
 		self.setAttribute(Qt.WA_DeleteOnClose)
 
+	def resizeEvent(self, event):
+
+		super().resizeEvent(event)
+
+		try:
+			self.fig.tight_layout()
+		except:
+			pass
 
 	def _createActions(self):
 
@@ -718,8 +727,11 @@ class TableUI(QMainWindow, Styles):
 	def save_as_csv_inplace_per_pos(self):
 
 		print("Saving each table in its respective position folder...")
-		for pos,pos_group in self.data.groupby('position'):
-			pos_group.to_csv(pos+os.sep.join(['output', 'tables', f'trajectories_{self.population}.csv']), index=False)
+		for pos,pos_group in self.data.groupby(['position']):
+			invalid_cols = [c for c in list(pos_group.columns) if c.startswith('Unnamed')]
+			if len(invalid_cols)>0:
+				pos_group = pos_group.drop(invalid_cols, axis=1)
+			pos_group.to_csv(pos[0]+os.sep.join(['output', 'tables', f'trajectories_{self.population}.csv']), index=False)
 		print("Done...")
 
 	def differenciate_selected_feature(self):
@@ -812,7 +824,7 @@ class TableUI(QMainWindow, Styles):
 
 		num_df = self.data.select_dtypes(include=self.numerics)
 
-		timeseries = num_df.groupby("FRAME").sum().copy()
+		timeseries = num_df.groupby(["FRAME"]).sum().copy()
 		timeseries["timeline"] = timeseries.index
 		self.subtable = TableUI(timeseries,"Group by frames", plot_mode="plot_timeseries")
 		self.subtable.show()
@@ -1029,11 +1041,10 @@ class TableUI(QMainWindow, Styles):
 		layout.addLayout(hbox)
 
 		self.cmap_cb = QColormapComboBox()
-		for cm in list(colormaps):
-			try:
-				self.cmap_cb.addColormap(cm)
-			except:
-				pass
+		all_cms = list(colormaps)
+		for cm in all_cms:
+			if hasattr(matplotlib.cm, str(cm).lower()):
+				self.cmap_cb.addColormap(cm.lower())
 		
 		hbox = QHBoxLayout()
 		hbox.addWidget(QLabel('colormap: '), 33)
@@ -1324,6 +1335,9 @@ class TableUI(QMainWindow, Styles):
 		if file_name:
 			if not file_name.endswith(".csv"):
 				file_name += ".csv"
+			invalid_cols = [c for c in list(self.data.columns) if c.startswith('Unnamed')]
+			if len(invalid_cols)>0:
+				self.data = self.data.drop(invalid_cols, axis=1)	
 			self.data.to_csv(file_name, index=False)
 
 	def test_bool(self, array):
@@ -1417,8 +1431,8 @@ class TableUI(QMainWindow, Styles):
 					row_idx_i = row_idx[np.where(col_idx == unique_cols[k])[0]]
 					y = self.data.iloc[row_idx_i, unique_cols[k]]
 					print(unique_cols[k])
-					for w,well_group in self.data.groupby('well_name'):
-						for pos,pos_group in well_group.groupby('pos_name'):
+					for w,well_group in self.data.groupby(['well_name']):
+						for pos,pos_group in well_group.groupby(['pos_name']):
 							for tid,group_track in pos_group.groupby(self.groupby_cols[1:]):
 								ax.plot(group_track["FRAME"], group_track[column_names[unique_cols[k]]],label=column_names[unique_cols[k]])
 					#ax.plot(self.data["FRAME"][row_idx_i], y, label=column_names[unique_cols[k]])
@@ -1454,8 +1468,8 @@ class TableUI(QMainWindow, Styles):
 				# else:
 				# 	ref_time_col = 'FRAME'
 
-				for w,well_group in self.data.groupby('well_name'):
-					for pos,pos_group in well_group.groupby('pos_name'):
+				for w,well_group in self.data.groupby(['well_name']):
+					for pos,pos_group in well_group.groupby(['pos_name']):
 						for tid,group_track in pos_group.groupby(self.groupby_cols[1:]):
 							self.ax.plot(group_track["FRAME"], group_track[column_names[unique_cols[0]]],c="k", alpha = 0.1)
 				self.ax.set_xlabel(r"$t$ [frame]")