diff --git a/apps/mylib/application.py b/apps/mylib/application.py index 9eab68f..bc8f460 100644 --- a/apps/mylib/application.py +++ b/apps/mylib/application.py @@ -142,7 +142,7 @@ ## マルチマップyaml、結合したウェイポイント、合成した地図画像と情報yamlを取得 map_img_list, map_yaml_list = self.tools.get_map_lists() - wp_yaml, wp_yaml_list = self.tools.get_waypoints_yaml() + wp_yaml, _ = self.tools.get_waypoints_yaml() merged_img_pil, merged_yaml = self.tools.get_merged_map() ### それぞれをファイルに書き込む関数(ボタンコールバック) ### diff --git a/apps/mylib/mapdisp.py b/apps/mylib/mapdisp.py index d04627a..3d4f03f 100644 --- a/apps/mylib/mapdisp.py +++ b/apps/mylib/mapdisp.py @@ -140,8 +140,8 @@ self.canvas.bind("", self.left_click_move) self.canvas.bind("", self.left_click) self.canvas.bind("", self.left_click_release) - self.canvas.bind("", lambda event, scale=1.1: self.ctrl_click(event, scale)) - self.canvas.bind("", lambda event, scale=0.9: self.ctrl_click(event, scale)) + self.canvas.bind("", lambda event, scale=1.2: self.ctrl_click(event, scale)) + self.canvas.bind("", lambda event, scale=0.8: self.ctrl_click(event, scale)) self.canvas.bind("", self.resize_callback) self.canv_w = self.canvas.winfo_width() @@ -289,7 +289,6 @@ self.canvas.lift(self.selected_map_key+"wp") self.canvas.lift(self.selected_map_key+"fp") self.canvas.lift("origin") - # self.plot_waypoints() return @@ -359,17 +358,21 @@ key = self.selected_map_key self.map_dict[key].translate(delta_x, delta_y) self.canvas.itemconfigure(key, image=self.map_dict[key].get_draw_image((self.canv_w, self.canv_h))) + self.canvas.move(key+"wp", delta_x, delta_y) + self.canvas.move(key+"fp", delta_x, delta_y) else: # 全てのマップを移動する for key in self.map_dict.keys(): self.map_dict[key].translate(delta_x, delta_y) self.canvas.itemconfigure(key, image=self.map_dict[key].get_draw_image((self.canv_w, self.canv_h))) + self.canvas.move(key+"wp", delta_x, delta_y) + self.canvas.move(key+"fp", delta_x, delta_y) self.canvas.move("origin", delta_x, delta_y) self.canvas.move("selection_frame", delta_x, delta_y) self.canvas.lift("origin") - self.plot_waypoints() + # self.plot_waypoints() return