Skip to content

Improve movement speed button #1161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gentlegiantJGC merged 4 commits into from
Apr 29, 2025
Merged

Improve movement speed button #1161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fac11e
Improve float formatting
gentlegiantJGC Apr 29, 2025
23fef68
Change bps to b/s
gentlegiantJGC Apr 29, 2025
cb29fca
Add a space between number and unit
gentlegiantJGC Apr 29, 2025
b49075b
Merge branch '0.10' into bug-1158
gentlegiantJGC Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion amulet_map_editor/lang/en.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ program_3d_edit.goto_ui.paste_button_tooltip=Paste a previously copied coordinat
program_3d_edit.file_ui.version_tooltip=Platform and data version of the world
program_3d_edit.file_ui.projection_tooltip=Change view
program_3d_edit.file_ui.location_tooltip=Move camera
program_3d_edit.file_ui.speed_blocks_per_second=bps
program_3d_edit.file_ui.speed_blocks_per_second=b/s
program_3d_edit.file_ui.speed_tooltip=Camera speed in blocks per second
program_3d_edit.file_ui.speed_dialog_name=Set camera speed
program_3d_edit.file_ui.dim_tooltip=Select dimension
Expand Down
2 changes: 1 addition & 1 deletion amulet_map_editor/lang/es_MX.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ program_3d_edit.goto_ui.paste_button_tooltip=Pega una coordenada copiada anterio
program_3d_edit.file_ui.version_tooltip=Plataforma y versión de datos del mundo
program_3d_edit.file_ui.projection_tooltip=Cambiar vista
program_3d_edit.file_ui.location_tooltip=Mover cámara
program_3d_edit.file_ui.speed_blocks_per_second=bps
program_3d_edit.file_ui.speed_blocks_per_second=b/s
program_3d_edit.file_ui.speed_tooltip=Velocidad de la cámara en bloques por segundo
program_3d_edit.file_ui.speed_dialog_name=Asignar velocidad de cámara
program_3d_edit.file_ui.dim_tooltip=Seleccionar Dimensión
Expand Down
2 changes: 1 addition & 1 deletion amulet_map_editor/lang/id.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ program_3d_edit.goto_ui.paste_button_tooltip=Tempelkan koordinat yang sebelumnya
program_3d_edit.file_ui.version_tooltip=Platform dan versi data dunia
program_3d_edit.file_ui.projection_tooltip=Ubah tampilan
program_3d_edit.file_ui.location_tooltip=Geser Kamera
program_3d_edit.file_ui.speed_blocks_per_second=bps
program_3d_edit.file_ui.speed_blocks_per_second=b/s
program_3d_edit.file_ui.speed_tooltip=Kecepatan kamera dalam blok per detik
program_3d_edit.file_ui.speed_dialog_name=Atur kecepatan kamera
program_3d_edit.file_ui.dim_tooltip=Pilih dimensi
Expand Down
2 changes: 1 addition & 1 deletion amulet_map_editor/lang/ja.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ program_3d_edit.goto_ui.paste_button_tooltip=コピーした座標を入力に
program_3d_edit.file_ui.version_tooltip=このワールドのプラットフォームとバージョン
program_3d_edit.file_ui.projection_tooltip=視点の切替
program_3d_edit.file_ui.location_tooltip=カメラを移動
program_3d_edit.file_ui.speed_blocks_per_second=bps
program_3d_edit.file_ui.speed_blocks_per_second=b/s
program_3d_edit.file_ui.speed_tooltip=カメラ速度（ブロック/秒)
program_3d_edit.file_ui.speed_dialog_name=カメラスピードの設定
program_3d_edit.file_ui.dim_tooltip=ディメンションを選択
Expand Down
2 changes: 1 addition & 1 deletion amulet_map_editor/lang/ko.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ program_3d_edit.goto_ui.paste_button_tooltip=이전에 복사한 좌표를 입
program_3d_edit.file_ui.version_tooltip=세계의 플랫폼 및 데이터 버전
program_3d_edit.file_ui.projection_tooltip=보기 변경
program_3d_edit.file_ui.location_tooltip=카메라 이동
program_3d_edit.file_ui.speed_blocks_per_second=bps
program_3d_edit.file_ui.speed_blocks_per_second=b/s
program_3d_edit.file_ui.speed_tooltip=초당 블록 이동 속도
program_3d_edit.file_ui.speed_dialog_name=카메라 속도 설정
program_3d_edit.file_ui.dim_tooltip=차원 선택
Expand Down
2 changes: 1 addition & 1 deletion amulet_map_editor/lang/pt_BR.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ program_3d_edit.goto_ui.paste_button_tooltip=Cole uma coordenada copiada anterio
program_3d_edit.file_ui.version_tooltip=Plataforma e versão de dados do mundo
program_3d_edit.file_ui.projection_tooltip=Alterar visualização
program_3d_edit.file_ui.location_tooltip=Mover Câmera
program_3d_edit.file_ui.speed_blocks_per_second=bps
program_3d_edit.file_ui.speed_blocks_per_second=b/s
program_3d_edit.file_ui.speed_tooltip=Velocidade da câmera em blocos por segundo
program_3d_edit.file_ui.speed_dialog_name=Definir velocidade da câmera
program_3d_edit.file_ui.dim_tooltip=Selecione a dimensão
Expand Down
2 changes: 1 addition & 1 deletion amulet_map_editor/lang/vi.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ program_3d_edit.goto_ui.paste_button_tooltip=Dán một toạ độ đã đượ
program_3d_edit.file_ui.version_tooltip=Phiên bản dữ liệu và nền tảng của thế giới
program_3d_edit.file_ui.projection_tooltip=Thay đổi góc nhìn
program_3d_edit.file_ui.location_tooltip=Di chuyển máy quay
program_3d_edit.file_ui.speed_blocks_per_second=bps
program_3d_edit.file_ui.speed_blocks_per_second=b/s
program_3d_edit.file_ui.speed_tooltip=Tốc độ máy quay theo khối trên giây
program_3d_edit.file_ui.speed_dialog_name=Đặt tốc độ máy quay
program_3d_edit.file_ui.dim_tooltip=Lựa chọn chiều không gian
Expand Down
2 changes: 1 addition & 1 deletion amulet_map_editor/lang/zh_CN.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ program_3d_edit.goto_ui.paste_button_tooltip=将之前复制的坐标粘贴到
program_3d_edit.file_ui.version_tooltip=世界的平台和数据版本
program_3d_edit.file_ui.projection_tooltip=改变视图
program_3d_edit.file_ui.location_tooltip=移动相机
program_3d_edit.file_ui.speed_blocks_per_second=bps
program_3d_edit.file_ui.speed_blocks_per_second=b/s
program_3d_edit.file_ui.speed_tooltip=相机速度（每秒移动的方块数）
program_3d_edit.file_ui.speed_dialog_name=设置相机速度
program_3d_edit.file_ui.dim_tooltip=选择维度
Expand Down
2 changes: 1 addition & 1 deletion amulet_map_editor/lang/zh_TW.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ program_3d_edit.goto_ui.paste_button_tooltip=將之前複製的坐標粘貼到
program_3d_edit.file_ui.version_tooltip=世界的平臺和數據版本
program_3d_edit.file_ui.projection_tooltip=改變視圖
program_3d_edit.file_ui.location_tooltip=移動相機
program_3d_edit.file_ui.speed_blocks_per_second=bps
program_3d_edit.file_ui.speed_blocks_per_second=b/s
program_3d_edit.file_ui.speed_tooltip=相機速度（每秒移動的方塊數）
program_3d_edit.file_ui.speed_dialog_name=設置相機速度
program_3d_edit.file_ui.dim_tooltip=選擇維度
Expand Down
12 changes: 10 additions & 2 deletions amulet_map_editor/programs/edit/api/ui/file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from typing import TYPE_CHECKING, Optional
from math import floor, log10
import wx

from amulet_map_editor.programs.edit.api.edit_canvas_container import (
Expand All @@ -24,6 +25,13 @@
from amulet_map_editor.programs.edit.api.canvas import EditCanvas


def _format_float(num: float) -> str:
if num < 100:
return f"{num:.0{max(0, 2 - floor(log10(num)))}f}".rstrip("0").rstrip(".")
else:
return f"{num:.0f}"


class FilePanel(wx.BoxSizer, EditCanvasContainer):
def __init__(self, canvas: "EditCanvas"):
wx.BoxSizer.__init__(self, wx.HORIZONTAL)
Expand Down Expand Up @@ -65,7 +73,7 @@ def set_speed(evt):

self._speed_button = wx.Button(
canvas,
label=f"{self.canvas.camera.move_speed*1000/33:.4g}{lang.get('program_3d_edit.file_ui.speed_blocks_per_second')}",
label=f"{_format_float(self.canvas.camera.move_speed * 1000 / 33)} {lang.get('program_3d_edit.file_ui.speed_blocks_per_second')}",
)
self._speed_button.SetToolTip(lang.get("program_3d_edit.file_ui.speed_tooltip"))
self._speed_button.Bind(wx.EVT_BUTTON, set_speed)
Expand Down Expand Up @@ -179,7 +187,7 @@ def _on_camera_move(self, evt):
evt.Skip()

def _on_speed_change(self, evt):
label = f"{self.canvas.camera.move_speed*1000/33:.4g}{lang.get('program_3d_edit.file_ui.speed_blocks_per_second')}"
label = f"{_format_float(self.canvas.camera.move_speed * 1000 / 33)} {lang.get('program_3d_edit.file_ui.speed_blocks_per_second')}"
old_label = self._speed_button.GetLabel()
self._speed_button.SetLabel(label)
if len(label) != len(old_label):
Expand Down