From 38f5dde3b84ecfb0fb4c7b60778417c92f660603 Mon Sep 17 00:00:00 2001 From: JEFF Date: Wed, 26 Feb 2025 21:46:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=B2=E5=AD=98=E5=8E=9F=E5=A7=8B=E5=BD=B1?= =?UTF-8?q?=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ScrewDrive.py | 2 -- Screwdriver_Detection.py | 9 +++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ScrewDrive.py b/ScrewDrive.py index 28d05e3..6e769c9 100644 --- a/ScrewDrive.py +++ b/ScrewDrive.py @@ -125,7 +125,6 @@ class ScrewDrive(QThread): # print(f'self.Pre_ROI_Dic = {self.Myini.Pre_ROI_Dic}') print(f'self.Identity = {self.Identity}') # print(f'self.ROI_List = {self.Myini.ROI_List}') - # 根據recipe名稱找INI檔內座標的絕對位置切割影像 切第一次圖 self.image_AI = self.image_AI[self.Myini.Pre_ROI_Dic[self.Identity][1]:self.Myini.Pre_ROI_Dic[self.Identity][1] + self.Myini.Pre_ROI_Dic[self.Identity][3], self.Myini.Pre_ROI_Dic[self.Identity][0]:self.Myini.Pre_ROI_Dic[self.Identity][0] + self.Myini.Pre_ROI_Dic[self.Identity][2]] self.Result = self.Result[self.Myini.Pre_ROI_Dic[self.Identity][1]:self.Myini.Pre_ROI_Dic[self.Identity][1] + self.Myini.Pre_ROI_Dic[self.Identity][3], self.Myini.Pre_ROI_Dic[self.Identity][0]:self.Myini.Pre_ROI_Dic[self.Identity][0] + self.Myini.Pre_ROI_Dic[self.Identity][2]] # print(f'self.Result.shape = {self.Result.shape}') @@ -169,7 +168,6 @@ class ScrewDrive(QThread): while self.AOIimage_ISREADY == False: time.sleep(0.01) print('.') - # 根據recipe名稱找INI檔內座標的絕對位置切割影像 切第二次圖 self.image_AOI = self.image_AOI[self.Myini.Pre_ROI_Dic[self.Identity][1]:self.Myini.Pre_ROI_Dic[self.Identity][1] + self.Myini.Pre_ROI_Dic[self.Identity][3], self.Myini.Pre_ROI_Dic[self.Identity][0]:self.Myini.Pre_ROI_Dic[self.Identity][0] + self.Myini.Pre_ROI_Dic[self.Identity][2]] # cv2.imwrite(f'./imageprocess/{self.Identity}.png', self.image_AOI) diff --git a/Screwdriver_Detection.py b/Screwdriver_Detection.py index 56042a0..50bc1a7 100644 --- a/Screwdriver_Detection.py +++ b/Screwdriver_Detection.py @@ -201,7 +201,7 @@ class Screwdriver_Detection(QtWidgets.QMainWindow, Ui_Screwdriver_Detection_Wind self.recipe_model = 'Milwaukee' elif self.engineer_mode_window.comboBox_recipe.currentText() == 'KleinTool': - # ----------------------20250224修改 調整為更改公單後會換成對應模型-------------------------- + # ----------------------20250224修改 調整為更改工單後會換成對應模型-------------------------- self.recipe_model = 'KleinTool' # self.awm_Key_for_Recipe = 'M11-2303002' # self.dbwindow.awm_key = 'M11-2303002' @@ -544,14 +544,14 @@ class Screwdriver_Detection(QtWidgets.QMainWindow, Ui_Screwdriver_Detection_Wind def Start(self): # if self.awm_Key_for_Recipe == 'M11-2303001' and self.dbwindow.awm_key == 'M11-2303001': # print(self.awm_Key_for_Recipe) - + self.Time_for_Record = time.strftime('%Y%m%d_%H%M%S') if self.recipe_model == 'Milwaukee': #公單為Milwaukee threading.Thread(target=self.Start_Thread_Milwaukee, args=()).start() #進入Milwaukee線程 # -------------------學長之前寫的測試工單------------------------- # if self.awm_Key_for_Recipe == 'M11-2303002': # threading.Thread(target=self.Start_Thread_KleinTools_Gray, args=()).start() # -------------------20250117修改------------------------- - if self.recipe_model == 'KleinTool' or self.recipe_model == 'KleinToolblack': #公單為KleinTool或KleinToolblack + if self.recipe_model == 'KleinTool' or self.recipe_model == 'KleinToolblack': #工單為KleinTool或KleinToolblack threading.Thread(target=self.Start_Thread_KleinTools_Gray, args=()).start() #進入KleinTool線程 self.real_detect_amount += 1 def Start_Thread_Milwaukee(self): @@ -584,6 +584,7 @@ class Screwdriver_Detection(QtWidgets.QMainWindow, Ui_Screwdriver_Detection_Wind self.inputimage = copy.deepcopy(self.camera.Image_RealTime) threading.Thread(target=self.camera.SetExposureTime, args=(self.MYINI.Camera_Setting['exposuretime_aoi'],)).start() self.Result = cv2.flip(copy.deepcopy(self.inputimage), 1) + cv2.imwrite(f'./imageprocess/Milwaukee/Origin_image/{self.Time_for_Record}.png', self.Result) #存原圖 for sd in self.screwdrives: sd.Result = self.Result sd.image_AI = cv2.cvtColor(self.Result, cv2.COLOR_BGR2GRAY) @@ -637,7 +638,7 @@ class Screwdriver_Detection(QtWidgets.QMainWindow, Ui_Screwdriver_Detection_Wind self.All_Report_count = 0 self.inputimage = copy.deepcopy(self.camera.Image_RealTime) self.Result = cv2.flip(copy.deepcopy(self.inputimage), 1) - + cv2.imwrite(f'./imageprocess/KleinTool/Origin_image/{self.Time_for_Record}.png', self.Result) #存原圖 for sd in self.screwdrives: sd.Result = self.Result sd.image_AI = cv2.cvtColor(self.Result, cv2.COLOR_BGR2GRAY)