add resize option for spot, fixed image plot axes

Author: LAKESIDE\LindaT18

PythonGUI_apps/Image_analysis/Image_analysis.py

@@ -62,7 +62,7 @@ def __init__(self):
 		#set up ui signals
 		self.ui.load_image_pushButton.clicked.connect(self.load_image)
 		self.ui.custom_pixel_size_checkBox.stateChanged.connect(self.switch_custom_pixel_size)
-		self.ui.update_scaling_factor_pushButton.clicked.connect(self.reload_image)
+		self.ui.update_settings_pushButton.clicked.connect(self.reload_image)
 		self.ui.spot_radioButton.toggled.connect(self.update_camera)
 
 		self.update_camera() #initialize camera pixel size
@@ -88,10 +88,14 @@ def resize_to_scaling_factor(self, image):
 		"""
 		self.update_scaling_factor()
 
-		if self.ui.pixera_radioButton.isChecked():
-			image = self.original_image
-		elif self.ui.spot_radioButton.isChecked():
+		if self.ui.spot_radioButton.isChecked() and self.ui.resize_image_checkBox.isChecked():
 			image = self.original_image.resize((round(image.size[0]*self.scaling_factor), round(image.size[1]*self.scaling_factor)))
+			self.image_plot.getAxis("bottom").setScale(scale = 1)
+			self.image_plot.getAxis("left").setScale(scale = 1)
+		else:
+			image = self.original_image
+			self.image_plot.getAxis("bottom").setScale(scale = self.scaling_factor)
+			self.image_plot.getAxis("left").setScale(scale = self.scaling_factor)
 
 		if self.ui.greyscale_checkBox.isChecked():
 			image = image.convert("L") #convert to greyscale
@@ -106,8 +110,8 @@ def resize_to_scaling_factor(self, image):
 			self.img_item.setImage(image=self.image_array)
 			self.img_item.setRect(self.img_item_rect)
 
-			if self.ui.greyscale_checkBox.isChecked():
-				self.hist_lut.setImageItem(self.img_item)
+			# if self.ui.greyscale_checkBox.isChecked():
+			# 	self.hist_lut.setImageItem(self.img_item)
 
 			if self.ui.vertical_radioButton.isChecked():
 				roi_height = self.scaling_factor * height
@@ -135,11 +139,11 @@ def line_profile_update_plot(self):
 		elif self.ui.horizontal_radioButton.isChecked():
 			x_values = coords[1,0,:]
 
-		if self.ui.pixera_radioButton.isChecked():
+		if self.ui.pixera_radioButton.isChecked() or (self.ui.spot_radioButton.isChecked() and not self.ui.resize_image_checkBox.isChecked()):
 			x_values = x_values * self.scaling_factor
 
 		#calculate average along columns in region
-		if len(data.shape) == 2: #if grayscale, average intensities 
+		if len(data.shape) <= 2: #if grayscale, average intensities 
 			if self.ui.vertical_radioButton.isChecked():
 				avg_to_plot = np.mean(data, axis=-1)
 			elif self.ui.horizontal_radioButton.isChecked():
@@ -191,10 +195,12 @@ def update_camera(self):
 		if self.ui.spot_radioButton.isChecked():
 			self.camera_pixel_size = 7.4
 			self.ui.greyscale_checkBox.setChecked(False)
+			self.ui.resize_image_checkBox.setEnabled(True)
 			self.update_scaling_factor()
 		elif self.ui.pixera_radioButton.isChecked():
 			self.camera_pixel_size = 3
 			self.ui.greyscale_checkBox.setChecked(True)
+			self.ui.resize_image_checkBox.setEnabled(False)
 			self.update_scaling_factor()
 
 	def close_application(self):

PythonGUI_apps/Image_analysis/image_analysis_gui.ui

@@ -77,7 +77,7 @@
           </widget>
          </item>
          <item row="9" column="0">
-          <widget class="QPushButton" name="update_scaling_factor_pushButton">
+          <widget class="QPushButton" name="update_settings_pushButton">
            <property name="text">
             <string>Update settings</string>
            </property>
@@ -102,8 +102,8 @@
            <property name="title">
             <string>Camera</string>
            </property>
-           <layout class="QVBoxLayout" name="verticalLayout">
-            <item>
+           <layout class="QGridLayout" name="gridLayout_8">
+            <item row="1" column="0">
              <widget class="QRadioButton" name="spot_radioButton">
               <property name="text">
                <string>SPOT</string>
@@ -113,13 +113,20 @@
               </property>
              </widget>
             </item>
-            <item>
+            <item row="2" column="0">
              <widget class="QRadioButton" name="pixera_radioButton">
               <property name="text">
                <string>Pixera</string>
               </property>
              </widget>
             </item>
+            <item row="1" column="1">
+             <widget class="QCheckBox" name="resize_image_checkBox">
+              <property name="text">
+               <string>Resize image</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </widget>
          </item>