From 63198f1c0f07107d569a35bd23b81a166ccf320e Mon Sep 17 00:00:00 2001 From: JE-Chen <33644111+JE-Chen@users.noreply.github.com> Date: Fri, 11 Jul 2025 02:47:36 +0800 Subject: [PATCH 1/2] Update dev version Update dev version * Fix some str on multi language * Rename Class * Remove if name == __main__ call --- .../gui/language_wrapper/traditional_chinese.py | 2 +- .../{execute_thread.py => load_density_gui_thread.py} | 2 +- je_load_density/{ => gui}/log_to_ui_filter.py | 0 je_load_density/gui/main_widget.py | 6 +++--- je_load_density/gui/main_window.py | 6 ------ pyproject.toml | 10 +++++----- dev.toml => stable.toml | 10 +++++----- 7 files changed, 15 insertions(+), 21 deletions(-) rename je_load_density/gui/{execute_thread.py => load_density_gui_thread.py} (94%) rename je_load_density/{ => gui}/log_to_ui_filter.py (100%) rename dev.toml => stable.toml (87%) diff --git a/je_load_density/gui/language_wrapper/traditional_chinese.py b/je_load_density/gui/language_wrapper/traditional_chinese.py index 00c4e27..2c5561d 100644 --- a/je_load_density/gui/language_wrapper/traditional_chinese.py +++ b/je_load_density/gui/language_wrapper/traditional_chinese.py @@ -2,7 +2,7 @@ # Main "application_name": "LoadDensity", # Widget - "url": "連結: ", + "url": "URL: ", "test_time": "測試時間: ", "user_count": "測試使用者總數: ", "spawn_rate": "產生速率: ", diff --git a/je_load_density/gui/execute_thread.py b/je_load_density/gui/load_density_gui_thread.py similarity index 94% rename from je_load_density/gui/execute_thread.py rename to je_load_density/gui/load_density_gui_thread.py index 3382694..ed20b54 100644 --- a/je_load_density/gui/execute_thread.py +++ b/je_load_density/gui/load_density_gui_thread.py @@ -2,7 +2,7 @@ from je_load_density.wrapper.start_wrapper.start_test import start_test -class LoadDensityThread(QThread): +class LoadDensityGUIThread(QThread): def __init__(self): super().__init__() diff --git a/je_load_density/log_to_ui_filter.py b/je_load_density/gui/log_to_ui_filter.py similarity index 100% rename from je_load_density/log_to_ui_filter.py rename to je_load_density/gui/log_to_ui_filter.py diff --git a/je_load_density/gui/main_widget.py b/je_load_density/gui/main_widget.py index ff474a7..99f8534 100644 --- a/je_load_density/gui/main_widget.py +++ b/je_load_density/gui/main_widget.py @@ -4,9 +4,9 @@ from PySide6.QtGui import QIntValidator from PySide6.QtWidgets import QWidget, QFormLayout, QLineEdit, QComboBox, QPushButton, QTextEdit, QVBoxLayout, QLabel -from je_load_density.gui.execute_thread import LoadDensityThread +from je_load_density.gui.load_density_gui_thread import LoadDensityGUIThread from je_load_density.gui.language_wrapper.multi_language_wrapper import language_wrapper -from je_load_density.log_to_ui_filter import InterceptAllFilter, locust_log_queue +from je_load_density.gui.log_to_ui_filter import InterceptAllFilter, locust_log_queue class LoadDensityWidget(QWidget): @@ -61,7 +61,7 @@ def __init__(self, parent=None): self.setLayout(main_layout) def run_load_density(self): - self.run_load_density_thread = LoadDensityThread() + self.run_load_density_thread = LoadDensityGUIThread() self.run_load_density_thread.url = self.url_input.text() self.run_load_density_thread.test_time = int(self.test_time_input.text()) self.run_load_density_thread.user_count = int(self.user_count_input.text()) diff --git a/je_load_density/gui/main_window.py b/je_load_density/gui/main_window.py index 395f9ed..2c4e167 100644 --- a/je_load_density/gui/main_window.py +++ b/je_load_density/gui/main_window.py @@ -23,9 +23,3 @@ def __init__(self): self.load_density_widget = LoadDensityWidget() self.setCentralWidget(self.load_density_widget) - -if __name__ == "__main__": - app = QApplication(sys.argv) - window = LoadDensityUI() - window.show() - sys.exit(app.exec()) diff --git a/pyproject.toml b/pyproject.toml index 2e8d2d0..6aef9f5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,12 @@ -# Rename to stable version -# This is stable version +# Rename to dev version +# This is dev version [build-system] requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "je_load_density" -version = "0.0.59" +name = "je_load_density_dev" +version = "0.0.73" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" }, ] @@ -38,4 +38,4 @@ content-type = "text/markdown" find = { namespaces = false } [project.optional-dependencies] -gui = ["PySide6==6.9.1", "qt-material"] +gui = ["PySide6==6.9.1", "qt-material"] \ No newline at end of file diff --git a/dev.toml b/stable.toml similarity index 87% rename from dev.toml rename to stable.toml index d40691c..2e8d2d0 100644 --- a/dev.toml +++ b/stable.toml @@ -1,12 +1,12 @@ -# Rename to dev version -# This is dev version +# Rename to stable version +# This is stable version [build-system] requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "je_load_density_dev" -version = "0.0.71" +name = "je_load_density" +version = "0.0.59" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" }, ] @@ -38,4 +38,4 @@ content-type = "text/markdown" find = { namespaces = false } [project.optional-dependencies] -gui = ["PySide6==6.9.1", "qt-material"] \ No newline at end of file +gui = ["PySide6==6.9.1", "qt-material"] From 18858ed53eeb0d762ebe83edf6b9f557ff0f7f4a Mon Sep 17 00:00:00 2001 From: JE-Chen <33644111+JE-Chen@users.noreply.github.com> Date: Fri, 11 Jul 2025 03:03:52 +0800 Subject: [PATCH 2/2] Update stable version Update stable version --- stable.toml => dev.toml | 10 +++++----- pyproject.toml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) rename stable.toml => dev.toml (87%) diff --git a/stable.toml b/dev.toml similarity index 87% rename from stable.toml rename to dev.toml index 2e8d2d0..6aef9f5 100644 --- a/stable.toml +++ b/dev.toml @@ -1,12 +1,12 @@ -# Rename to stable version -# This is stable version +# Rename to dev version +# This is dev version [build-system] requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "je_load_density" -version = "0.0.59" +name = "je_load_density_dev" +version = "0.0.73" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" }, ] @@ -38,4 +38,4 @@ content-type = "text/markdown" find = { namespaces = false } [project.optional-dependencies] -gui = ["PySide6==6.9.1", "qt-material"] +gui = ["PySide6==6.9.1", "qt-material"] \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 6aef9f5..416a019 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,12 @@ -# Rename to dev version -# This is dev version +# Rename to stable version +# This is stable version [build-system] requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "je_load_density_dev" -version = "0.0.73" +name = "je_load_density" +version = "0.0.60" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" }, ] @@ -38,4 +38,4 @@ content-type = "text/markdown" find = { namespaces = false } [project.optional-dependencies] -gui = ["PySide6==6.9.1", "qt-material"] \ No newline at end of file +gui = ["PySide6==6.9.1", "qt-material"]