celldetective 1.3.9.post5__py3-none-any.whl → 1.4.1__py3-none-any.whl

celldetective/gui/base_components.py

@@ -0,0 +1,23 @@
+from PyQt5.QtWidgets import QMainWindow, QWidget, QDialog
+from PyQt5.QtCore import Qt
+from celldetective.gui import Styles
+
+
+class CelldetectiveWidget(QWidget, Styles):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.setWindowIcon(self.celldetective_icon)
+        self.setAttribute(Qt.WA_DeleteOnClose)
+
+
+class CelldetectiveMainWindow(QMainWindow, Styles):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.setWindowIcon(self.celldetective_icon)
+        self.setAttribute(Qt.WA_DeleteOnClose)
+
+
+class CelldetectiveDialog(QDialog, Styles):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.setWindowIcon(self.celldetective_icon)

celldetective/gui/classifier_widget.py

@@ -1,7 +1,7 @@
-from PyQt5.QtWidgets import QWidget, QLineEdit, QMessageBox, QHBoxLayout, QVBoxLayout, QPushButton, QLabel, \
+from PyQt5.QtWidgets import QLineEdit, QMessageBox, QHBoxLayout, QVBoxLayout, QPushButton, QLabel, \
 	QCheckBox, QRadioButton, QButtonGroup, QComboBox
 from PyQt5.QtCore import Qt, QSize
-from superqt import QLabeledSlider,QLabeledDoubleSlider, QSearchableComboBox
+from superqt import QLabeledSlider, QLabeledDoubleSlider, QSearchableComboBox
 from superqt.fonticon import icon
 from fonticon_mdi6 import MDI6
 
@@ -10,12 +10,13 @@ import numpy as np
 import matplotlib.pyplot as plt
 import json
 
+from celldetective.exceptions import EmptyQueryError, MissingColumnsError, QueryError
 from celldetective.gui.gui_utils import FigureCanvas, center_window, color_from_status, help_generic
-from celldetective.gui import Styles
+from celldetective.gui.base_components import CelldetectiveWidget
 from celldetective.utils import get_software_location
 from celldetective.measure import classify_cells_from_query, interpret_track_classification
 
-class ClassifierWidget(QWidget, Styles):
+class ClassifierWidget(CelldetectiveWidget):
 
 	def __init__(self, parent_window):
 
@@ -33,7 +34,7 @@ class ClassifierWidget(QWidget, Styles):
 
 		is_number = np.vectorize(lambda x: np.issubdtype(x, np.number))
 		is_number_test = is_number(self.df.dtypes)
-		self.cols = [col for t,col in zip(is_number_test,self.df.columns) if t]
+		self.cols = [col for t, col in zip(is_number_test, self.df.columns) if t]
 
 		self.class_name = 'custom'
 		self.name_le = QLineEdit(self.class_name)
@@ -44,7 +45,7 @@ class ClassifierWidget(QWidget, Styles):
 
 		
 		layout = QVBoxLayout(self)
-		layout.setContentsMargins(30,30,30,30)
+		layout.setContentsMargins(30, 30, 30, 30)
 
 		name_layout = QHBoxLayout()
 		name_layout.addWidget(QLabel('class name: '), 33)
@@ -55,7 +56,7 @@ class ClassifierWidget(QWidget, Styles):
 		fig_btn_hbox.addWidget(QLabel(''), 95)
 		self.project_times_btn = QPushButton('')
 		self.project_times_btn.setStyleSheet(self.parent_window.parent_window.parent_window.button_select_all)
-		self.project_times_btn.setIcon(icon(MDI6.math_integral,color="black"))
+		self.project_times_btn.setIcon(icon(MDI6.math_integral, color="black"))
 		self.project_times_btn.setToolTip("Project measurements at all times.")
 		self.project_times_btn.setIconSize(QSize(20, 20))
 		self.project_times = False
@@ -70,8 +71,8 @@ class ClassifierWidget(QWidget, Styles):
 		# slider
 		self.frame_slider = QLabeledSlider()
 		self.frame_slider.setSingleStep(1)
-		self.frame_slider.setOrientation(1)
-		self.frame_slider.setRange(0,int(self.df.FRAME.max()) - 1)
+		self.frame_slider.setOrientation(Qt.Horizontal)
+		self.frame_slider.setRange(0, int(self.df.FRAME.max()) - 1)
 		self.frame_slider.setValue(0)
 		self.currentFrame = 0
 
@@ -84,8 +85,8 @@ class ClassifierWidget(QWidget, Styles):
 		# transparency slider
 		self.alpha_slider = QLabeledDoubleSlider()
 		self.alpha_slider.setSingleStep(0.001)
-		self.alpha_slider.setOrientation(1)
-		self.alpha_slider.setRange(0,1)
+		self.alpha_slider.setOrientation(Qt.Horizontal)
+		self.alpha_slider.setRange(0, 1)
 		self.alpha_slider.setValue(1.0)
 		self.alpha_slider.setDecimals(3)
 
@@ -95,8 +96,8 @@ class ClassifierWidget(QWidget, Styles):
 		layout.addLayout(slider_alpha_hbox)
 
 
-		self.features_cb = [QSearchableComboBox() for i in range(2)]
-		self.log_btns = [QPushButton() for i in range(2)]
+		self.features_cb = [QSearchableComboBox() for _ in range(2)]
+		self.log_btns = [QPushButton() for _ in range(2)]
 
 		for i in range(2):
 			hbox_feat = QHBoxLayout()
@@ -106,7 +107,7 @@ class ClassifierWidget(QWidget, Styles):
 			layout.addLayout(hbox_feat)
 
 			self.features_cb[i].clear()
-			self.features_cb[i].addItems(sorted(list(self.cols),key=str.lower))
+			self.features_cb[i].addItems(sorted(list(self.cols), key=str.lower))
 			self.features_cb[i].currentTextChanged.connect(self.update_props_scatter)
 			self.features_cb[i].setCurrentIndex(i)
 
@@ -134,15 +135,15 @@ class ClassifierWidget(QWidget, Styles):
 			self.time_corr.setEnabled(False)
 
 		time_prop_hbox = QHBoxLayout()
-		time_prop_hbox.addWidget(self.time_corr,alignment=Qt.AlignCenter)
+		time_prop_hbox.addWidget(self.time_corr, alignment=Qt.AlignCenter)
 
 		self.help_propagate_btn = QPushButton()
-		self.help_propagate_btn.setIcon(icon(MDI6.help_circle,color=self.help_color))
+		self.help_propagate_btn.setIcon(icon(MDI6.help_circle, color=self.help_color))
 		self.help_propagate_btn.setIconSize(QSize(20, 20))
 		self.help_propagate_btn.clicked.connect(self.help_propagate)
 		self.help_propagate_btn.setStyleSheet(self.button_select_all)
 		self.help_propagate_btn.setToolTip("Help.")
-		time_prop_hbox.addWidget(self.help_propagate_btn,5,alignment=Qt.AlignRight)
+		time_prop_hbox.addWidget(self.help_propagate_btn, 5, alignment=Qt.AlignRight)
 
 		layout.addLayout(time_prop_hbox)
 
@@ -154,23 +155,23 @@ class ClassifierWidget(QWidget, Styles):
 
 		time_corr_layout = QHBoxLayout()
 		time_corr_layout.addWidget(self.unique_state_btn, 33, alignment=Qt.AlignCenter)
-		time_corr_layout.addWidget(self.irreversible_event_btn, 33,alignment=Qt.AlignCenter)
-		time_corr_layout.addWidget(self.transient_event_btn, 33,alignment=Qt.AlignCenter)
+		time_corr_layout.addWidget(self.irreversible_event_btn, 33, alignment=Qt.AlignCenter)
+		time_corr_layout.addWidget(self.transient_event_btn, 33, alignment=Qt.AlignCenter)
 		layout.addLayout(time_corr_layout)
 
 		self.prereq_event_check = QCheckBox('prerequisite event:')
 		self.prereq_event_check.toggled.connect(self.activate_prereq_cb)
 		self.prereq_event_cb = QComboBox()
-		event_cols = ['--'] + [c.replace('t_','') for c in self.cols if c.startswith('t_')]
+		event_cols = ['--'] + [c.replace('t_', '') for c in self.cols if c.startswith('t_')]
 		self.prereq_event_cb.addItems(event_cols)
 		self.prereq_event_check.setEnabled(False)
 		self.prereq_event_cb.setEnabled(False)
 
 		self.r2_slider = QLabeledDoubleSlider()
 		self.r2_slider.setValue(0.75)
-		self.r2_slider.setRange(0,1)
+		self.r2_slider.setRange(0, 1)
 		self.r2_slider.setSingleStep(0.01)
-		self.r2_slider.setOrientation(1)
+		self.r2_slider.setOrientation(Qt.Horizontal)
 		self.r2_label = QLabel('R2 tolerance:')
 		self.r2_label.setToolTip('Minimum R2 between the fit sigmoid and the binary response to the filters to accept the event.')
 
@@ -196,7 +197,7 @@ class ClassifierWidget(QWidget, Styles):
 			wg.setEnabled(False)
 
 		prereq_layout = QHBoxLayout()
-		prereq_layout.setContentsMargins(30,0,0,0)
+		prereq_layout.setContentsMargins(30, 0, 0, 0)
 		prereq_layout.addWidget(self.prereq_event_check, 20)
 		prereq_layout.addWidget(self.prereq_event_cb, 80)
 		layout.addLayout(prereq_layout)
@@ -212,7 +213,6 @@ class ClassifierWidget(QWidget, Styles):
 		self.frame_slider.valueChanged.connect(self.set_frame)
 		self.alpha_slider.valueChanged.connect(self.set_transparency)
 
-		self.setAttribute(Qt.WA_DeleteOnClose)
 
 	def activate_prereq_cb(self):
 		if self.prereq_event_check.isChecked():
@@ -270,11 +270,10 @@ class ClassifierWidget(QWidget, Styles):
 		Define properties scatter.
 		"""
 
-		self.fig_props, self.ax_props = plt.subplots(figsize=(4,4),tight_layout=True)
+		self.fig_props, self.ax_props = plt.subplots(figsize=(4, 4), tight_layout=True)
 		self.propscanvas = FigureCanvas(self.fig_props, interactive=True)
 		self.fig_props.set_facecolor('none')
-		self.fig_props.canvas.setStyleSheet("background-color: transparent;")
-		self.scat_props = self.ax_props.scatter([],[], color="k", alpha=self.currentAlpha)
+		self.scat_props = self.ax_props.scatter([], [], color="k", alpha=self.currentAlpha)
 		self.propscanvas.canvas.draw_idle()
 		self.propscanvas.canvas.setMinimumHeight(self.screen_height//5)
 
@@ -295,25 +294,24 @@ class ClassifierWidget(QWidget, Styles):
 				self.log_btns[0].setEnabled(True)
 
 			if np.any(self.df[self.features_cb[1].currentText()].to_numpy() <= 0.):
-				if self.ax_props.get_xscale()=='log':
+				if self.ax_props.get_xscale() == 'log':
 					self.log_btns[1].click()
 				self.log_btns[1].setEnabled(False)
 			else:
 				self.log_btns[1].setEnabled(True)
 		except Exception as e:
-			#print(e)
-			pass
+			print(e)
 
 		class_name = self.class_name
 
 		try:
 
 			if not self.project_times:
-				self.scat_props.set_offsets(self.df.loc[self.df['FRAME']==self.currentFrame,[self.features_cb[1].currentText(),self.features_cb[0].currentText()]].to_numpy())
-				colors = [color_from_status(c) for c in self.df.loc[self.df['FRAME']==self.currentFrame,class_name].to_numpy()]
+				self.scat_props.set_offsets(self.df.loc[self.df['FRAME'] == self.currentFrame, [self.features_cb[1].currentText(), self.features_cb[0].currentText()]].to_numpy())
+				colors = [color_from_status(c) for c in self.df.loc[self.df['FRAME'] == self.currentFrame, class_name].to_numpy()]
 				self.scat_props.set_facecolor(colors)
 			else:
-				self.scat_props.set_offsets(self.df[[self.features_cb[1].currentText(),self.features_cb[0].currentText()]].to_numpy())
+				self.scat_props.set_offsets(self.df[[self.features_cb[1].currentText(), self.features_cb[0].currentText()]].to_numpy())
 				colors = [color_from_status(c) for c in self.df[class_name].to_numpy()]
 				self.scat_props.set_facecolor(colors)
 			
@@ -333,18 +331,18 @@ class ClassifierWidget(QWidget, Styles):
 				
 				x_padding = (max_x - min_x) * 0.05
 				y_padding = (max_y - min_y) * 0.05
-				if x_padding==0:
+				if x_padding == 0:
 					x_padding = 0.05
-				if y_padding==0:
+				if y_padding == 0:
 					y_padding = 0.05
 
-				if min_x==min_x and max_x==max_x:
-					if self.ax_props.get_xscale()=='linear':
+				if min_x == min_x and max_x == max_x:
+					if self.ax_props.get_xscale() == 'linear':
 						self.ax_props.set_xlim(min_x - x_padding, max_x + x_padding)
 					else:
 						self.ax_props.set_xlim(min_x, max_x)
-				if min_y==min_y and max_y==max_y:
-					if self.ax_props.get_yscale()=='linear':
+				if min_y == min_y and max_y == max_y:
+					if self.ax_props.get_yscale() == 'linear':
 						self.ax_props.set_ylim(min_y - y_padding, max_y + y_padding)
 					else:
 						self.ax_props.set_ylim(min_y, max_y)						
@@ -354,32 +352,36 @@ class ClassifierWidget(QWidget, Styles):
 			self.propscanvas.canvas.draw_idle()
 		
 		except Exception as e:
-			pass
+			print("Exception L355 ", e)
+	
+	def show_warning(self, message: str):
+		msgBox = QMessageBox()
+		msgBox.setIcon(QMessageBox.Warning)
+		link = "https://pandas.pydata.org/docs/reference/api/pandas.DataFrame.query.html"
+		msgBox.setText(f"{message}<br><br>See <a href='{link}'>documentation</a>.")
+		msgBox.setWindowTitle("Warning")
+		msgBox.setStandardButtons(QMessageBox.Ok)
+		msgBox.exec()
 
 	def apply_property_query(self):
 		
 		query = self.property_query_le.text()
-		
 		try:
 			self.df = classify_cells_from_query(self.df, self.name_le.text(), query)
+		except EmptyQueryError as e:
+			self.show_warning(str(e))
+		except MissingColumnsError as e:
+			self.show_warning(f"{e}. Please check your column names.")
+		except QueryError as e:
+			self.show_warning(f"{e}. Wrap features in backticks if needed.")
 		except Exception as e:
-			msgBox = QMessageBox()
-			msgBox.setIcon(QMessageBox.Warning)
-			link = "https://pandas.pydata.org/docs/reference/api/pandas.DataFrame.query.html"
-			msg = "The query could not be understood. Please write a valid query following <a href='%s'>the documentation</a>. Wrap features in backticks (e.g. `feature` > 1) to facilitate query interpretation. " % link
-			msgBox.setText(msg)
-			msgBox.setWindowTitle("Warning")
-			msgBox.setStandardButtons(QMessageBox.Ok)
-			returnValue = msgBox.exec()
-			if returnValue == QMessageBox.Ok:
-				self.auto_close = False
-				return None
+			self.show_warning(f"Unexpected error: {e}")
 
 		self.class_name = "status_"+self.name_le.text()
 		if self.df is None:
 			msgBox = QMessageBox()
 			msgBox.setIcon(QMessageBox.Warning)
-			msgBox.setText(f"The query could not be understood. No filtering was applied. {e}")
+			msgBox.setText(f"The query could not be understood. No filtering was applied.")
 			msgBox.setWindowTitle("Warning")
 			msgBox.setStandardButtons(QMessageBox.Ok)
 			returnValue = msgBox.exec()
@@ -390,22 +392,18 @@ class ClassifierWidget(QWidget, Styles):
 		self.update_props_scatter(feature_changed=False)
 
 	def set_frame(self, value):
-		xlim=self.ax_props.get_xlim()
-		ylim=self.ax_props.get_ylim()
+		xlim = self.ax_props.get_xlim()
+		ylim = self.ax_props.get_ylim()
 		self.currentFrame = value
 		self.update_props_scatter(feature_changed=False)
 		self.ax_props.set_xlim(xlim)
 		self.ax_props.set_ylim(ylim)
 
-
 	def set_transparency(self, value):
-		xlim=self.ax_props.get_xlim()
-		ylim=self.ax_props.get_ylim()
+		xlim = self.ax_props.get_xlim()
+		ylim = self.ax_props.get_ylim()
 		self.currentAlpha = value
-		#fc = self.scat_props.get_facecolors()
-		#fc[:, 3] = value
-		#self.scat_props.set_facecolors(fc)
-		#self.propscanvas.canvas.draw_idle()
+
 		self.update_props_scatter(feature_changed=False)
 		self.ax_props.set_xlim(xlim)
 		self.ax_props.set_ylim(ylim)
@@ -413,12 +411,12 @@ class ClassifierWidget(QWidget, Styles):
 	def switch_projection(self):
 		if self.project_times:
 			self.project_times = False
-			self.project_times_btn.setIcon(icon(MDI6.math_integral,color="black"))
+			self.project_times_btn.setIcon(icon(MDI6.math_integral, color="black"))
 			self.project_times_btn.setIconSize(QSize(20, 20))
 			self.frame_slider.setEnabled(True)
 		else:
 			self.project_times = True
-			self.project_times_btn.setIcon(icon(MDI6.math_integral_box,color="black"))
+			self.project_times_btn.setIcon(icon(MDI6.math_integral_box, color="black"))
 			self.project_times_btn.setIconSize(QSize(20, 20))
 			self.frame_slider.setEnabled(False)
 		self.update_props_scatter(feature_changed=False)
@@ -432,12 +430,13 @@ class ClassifierWidget(QWidget, Styles):
 
 		if self.time_corr.isChecked():
 			self.class_name_user = 'class_'+self.name_le.text()
-			print(f'User defined class name: {self.class_name_user}.')
+			print(f'User defined class name: {self.class_name_user}...')
 			if self.class_name_user in self.df.columns:
 
 				msgBox = QMessageBox()
 				msgBox.setIcon(QMessageBox.Information)
-				msgBox.setText(f"The class column {self.class_name_user} already exists in the table.\nProceeding will reclassify. Do you want to continue?")
+				msgBox.setText(f"The class column {self.class_name_user} already exists in the table.\nProceeding will "
+							   f"reclassify. Do you want to continue?")
 				msgBox.setWindowTitle("Warning")
 				msgBox.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
 				returnValue = msgBox.exec()
@@ -447,7 +446,6 @@ class ClassifierWidget(QWidget, Styles):
 					return None
 
 			name_map = {self.class_name: self.class_name_user}
-			print(f"{name_map=}")
 			self.df = self.df.drop(list(set(name_map.values()) & set(self.df.columns)), axis=1).rename(columns=name_map)
 			self.df.reset_index(inplace=True, drop=True)
 
@@ -455,7 +453,7 @@ class ClassifierWidget(QWidget, Styles):
 			if self.prereq_event_check.isChecked() and "t_"+self.prereq_event_cb.currentText() in self.cols:
 				pre_event = self.prereq_event_cb.currentText()
 
-			self.df = interpret_track_classification(self.df, self.class_name_user, irreversible_event=self.irreversible_event_btn.isChecked(), unique_state=self.unique_state_btn.isChecked(), transient_event=self.transient_event_btn.isChecked(),r2_threshold=self.r2_slider.value(), pre_event=pre_event)
+			self.df = interpret_track_classification(self.df, self.class_name_user, irreversible_event=self.irreversible_event_btn.isChecked(), unique_state=self.unique_state_btn.isChecked(), transient_event=self.transient_event_btn.isChecked(), r2_threshold=self.r2_slider.value(), pre_event=pre_event)
 		
 		else:
 			self.group_name_user = 'group_' + self.name_le.text()
@@ -465,7 +463,8 @@ class ClassifierWidget(QWidget, Styles):
 				msgBox = QMessageBox()
 				msgBox.setIcon(QMessageBox.Information)
 				msgBox.setText(
-					f"The group column {self.group_name_user} already exists in the table.\nProceeding will reclassify. Do you want to continue?")
+					f"The group column {self.group_name_user} already exists in the table.\nProceeding will "
+					f"reclassify. Do you want to continue?")
 				msgBox.setWindowTitle("Warning")
 				msgBox.setStandardButtons(QMessageBox.Yes | QMessageBox.No)
 				returnValue = msgBox.exec()
@@ -477,18 +476,18 @@ class ClassifierWidget(QWidget, Styles):
 			name_map = {self.class_name: self.group_name_user}
 			self.df = self.df.drop(list(set(name_map.values()) & set(self.df.columns)), axis=1).rename(columns=name_map)
 			print(self.df.columns)
-			#self.df[self.group_name_user] = self.df[self.group_name_user].replace({0: 1, 1: 0})
+			# self.df[self.group_name_user] = self.df[self.group_name_user].replace({0: 1, 1: 0})
 			self.df.reset_index(inplace=True, drop=True)
 
 		if 'custom' in list(self.df.columns):
-			self.df = self.df.drop(['custom'],axis=1)
+			self.df = self.df.drop(['custom'], axis=1)
 		
-		self.fig_props.set_size_inches(4,3)
+		self.fig_props.set_size_inches(4, 3)
 		self.fig_props.suptitle(self.property_query_le.text(), fontsize=10)
 		self.fig_props.tight_layout()
-		for pos,pos_group in self.df.groupby('position'):
-			self.fig_props.savefig(pos+os.sep.join(['output',f'{self.class_name}.png']), bbox_inches='tight', dpi=300)
-			pos_group.to_csv(pos+os.sep.join(['output', 'tables', f'trajectories_{self.mode}.csv']), index=False)
+		for pos, pos_group in self.df.groupby('position'):
+			self.fig_props.savefig(str(pos)+os.sep.join(['output', f'{self.class_name}.png']), bbox_inches='tight', dpi=300)
+			pos_group.to_csv(str(pos)+os.sep.join(['output', 'tables', f'trajectories_{self.mode}.csv']), index=False)
 
 		self.parent_window.parent_window.update_position_options()
 		self.close()
@@ -500,7 +499,7 @@ class ClassifierWidget(QWidget, Styles):
 		Helper for segmentation strategy between threshold-based and Deep learning.
 		"""
 
-		dict_path = os.sep.join([get_software_location(),'celldetective','gui','help','propagate-classification.json'])
+		dict_path = os.sep.join([get_software_location(), 'celldetective', 'gui', 'help', 'propagate-classification.json'])
 
 		with open(dict_path) as f:
 			d = json.load(f)
@@ -524,53 +523,46 @@ class ClassifierWidget(QWidget, Styles):
 		Switch threshold histogram to log scale. Auto adjust.
 		"""
 
-		if i==1:
+		if i == 1:
 			try:
 				feat_x = self.features_cb[1].currentText()
 				min_x = self.df.dropna(subset=feat_x)[feat_x].min()
 				max_x = self.df.dropna(subset=feat_x)[feat_x].max()
 				x_padding = (max_x - min_x) * 0.05
-				if x_padding==0:
+				if x_padding == 0:
 					x_padding = 0.05
 
-				if self.ax_props.get_xscale()=='linear':
+				if self.ax_props.get_xscale() == 'linear':
 					self.ax_props.set_xlim(min_x, max_x)
 					self.ax_props.set_xscale('log')
-					self.log_btns[i].setIcon(icon(MDI6.math_log,color="#1565c0"))
+					self.log_btns[i].setIcon(icon(MDI6.math_log, color="#1565c0"))
 				else:
 					self.ax_props.set_xscale('linear')
 					self.ax_props.set_xlim(min_x - x_padding, max_x + x_padding)
-					self.log_btns[i].setIcon(icon(MDI6.math_log,color="black"))
+					self.log_btns[i].setIcon(icon(MDI6.math_log, color="black"))
 			except Exception as e:
 				print(e)
-		elif i==0:
+		elif i == 0:
 			try:
 				feat_y = self.features_cb[0].currentText()
 				min_y = self.df.dropna(subset=feat_y)[feat_y].min()
 				max_y = self.df.dropna(subset=feat_y)[feat_y].max()
 				y_padding = (max_y - min_y) * 0.05
-				if y_padding==0:
+				if y_padding == 0:
 					y_padding = 0.05
 
-				if self.ax_props.get_yscale()=='linear':
+				if self.ax_props.get_yscale() == 'linear':
 					self.ax_props.set_ylim(min_y, max_y)
 					self.ax_props.set_yscale('log')
-					self.log_btns[i].setIcon(icon(MDI6.math_log,color="#1565c0"))
+					self.log_btns[i].setIcon(icon(MDI6.math_log, color="#1565c0"))
 				else:
 					self.ax_props.set_yscale('linear')
 					self.ax_props.set_ylim(min_y - y_padding, max_y + y_padding)
-					self.log_btns[i].setIcon(icon(MDI6.math_log,color="black"))
+					self.log_btns[i].setIcon(icon(MDI6.math_log, color="black"))
 			except Exception as e:
 				print(e)
 
 		self.ax_props.autoscale()
 		self.propscanvas.canvas.draw_idle()
 
-		print('Done.')
-
-
-
-
-
-
-
+		print('Done.')