diff --git a/EndoCalibrator.py b/EndoCalibrator.py index 26eb09d..d505c09 100644 --- a/EndoCalibrator.py +++ b/EndoCalibrator.py @@ -53,10 +53,8 @@ zoom_y = resize_size[1] / gray.shape[0] intrinsics_scaled = self.scale_intrinsics(mtx, zoom_x, zoom_y) os.makedirs(self.args.npy_outdir, exist_ok=True) - np.save(os.path.join(self.args.npy_outdir, 'intrinsics_row.npy'), mtx) np.save(os.path.join(self.args.npy_outdir, 'intrinsics_scaled.npy'), intrinsics_scaled) np.save(os.path.join(self.args.npy_outdir, 'dist_coeffs.npy'), dist) - np.save(os.path.join(self.args.npy_outdir, 'caribrate_img_size.npy'), np.array([gray.shape[1], gray.shape[0]])) def scale_intrinsics(self, mat, sx, sy): out = np.copy(mat) diff --git a/Movie2imgConverter.py b/Movie2imgConverter.py index 309b7d7..8002aa9 100644 --- a/Movie2imgConverter.py +++ b/Movie2imgConverter.py @@ -6,9 +6,8 @@ class Movie2imgConverter: def __init__(self, args): self.args = args - self.calibrate_img_size = np.load(os.path.join(self.args.param_dir, 'caribrate_img_size.npy')) self.dist_coeffs = np.load(os.path.join(self.args.param_dir, 'dist_coeffs.npy')) - self.intrinsics_row = np.load(os.path.join(self.args.param_dir, 'intrinsics_row.npy')) + self.intrinsics_scaled = np.load(os.path.join(self.args.param_dir, 'intrinsics_scaled.npy')) self.resized_size = (self.args.resized_width, self.args.resized_height) def convert_endo_movie2img(self): @@ -42,15 +41,14 @@ while True: ret, frame = cap.read() if not ret: - print('{} / {}'.format(sum_frame, sum_frame)) + print('{} / {}'.format(sum_frame, int(sum_frame))) break if (cur_frame % self.args.pass_num) == 0: frame = self.trim_endo_movie(frame) # cv2.imshow("a", frame) # cv2.waitKey() - frame = cv2.undistort(frame, self.intrinsics_row, self.dist_coeffs) - frame = cv2.resize(frame, self.resized_size, cv2.INTER_LANCZOS4) + frame = cv2.undistort(frame, self.intrinsics_scaled, self.dist_coeffs) # cv2.imshow("a", frame) # cv2.waitKey() frame = self.inpaint_endo_img(frame) @@ -59,14 +57,13 @@ file_name_num += 1 if (cur_frame % 300) == 0: - print('{} / {}'.format(cur_frame, sum_frame)) + print('{} / {}'.format(cur_frame, int(sum_frame))) cur_frame += 1 def trim_endo_movie(self, frame): frame = frame[32:989, 323:1599, :] - frame = cv2.resize(frame, (self.calibrate_img_size[0], self.calibrate_img_size[1]), - interpolation=cv2.INTER_LANCZOS4) + frame = cv2.resize(frame, self.resized_size, interpolation=cv2.INTER_LANCZOS4) return frame def inpaint_endo_img(self, frame): diff --git a/__pycache__/EndoCalibrator.cpython-36.pyc b/__pycache__/EndoCalibrator.cpython-36.pyc index 8c705ee..a68f0c0 100644 --- a/__pycache__/EndoCalibrator.cpython-36.pyc +++ b/__pycache__/EndoCalibrator.cpython-36.pyc Binary files differ diff --git a/__pycache__/Movie2imgConverter.cpython-36.pyc b/__pycache__/Movie2imgConverter.cpython-36.pyc index 60f25b5..ec062f3 100644 --- a/__pycache__/Movie2imgConverter.cpython-36.pyc +++ b/__pycache__/Movie2imgConverter.cpython-36.pyc Binary files differ diff --git a/module_test.py b/module_test.py index f276f23..adcfdf7 100644 --- a/module_test.py +++ b/module_test.py @@ -2,5 +2,4 @@ intrinsics = np.load("./tmp/intrinsics_scaled.npy") dist = np.load("./tmp/dist_coeffs.npy") -a = np.load("./tmp/caribrate_img_size.npy") print("a") diff --git a/params/caribrate_img_size.npy b/params/caribrate_img_size.npy deleted file mode 100644 index 6cf44b9..0000000 --- a/params/caribrate_img_size.npy +++ /dev/null Binary files differ diff --git a/params/intrinsics_row.npy b/params/intrinsics_row.npy deleted file mode 100644 index 37715d3..0000000 --- a/params/intrinsics_row.npy +++ /dev/null Binary files differ