archive/blender-benchmark-bundle
Archived
1
0
Fork 0
Code Issues 12 Pull Requests Projects Releases Wiki Activity

Tweak wording in the interface, hopefulyl to make it more obvious

Browse Source
This commit is contained in:
Sergey Sharybin
2018-08-07 11:11:48 +02:00
parent 24c6749a83
commit f391aafb27
1 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
benchmark/space/__init__.py
View File

@@ -447,16 +447,14 @@ class BENCHMARK_PT_main(Panel):
sub = col.row()
sub.scale_y = 2.25
props = sub.operator("benchmark.run", text="QUICK BENCHMARK")
props.run_type = 'QUICK'
sub.operator("benchmark.run_quick", text="QUICK BENCHMARK")
col.separator()
sub = col.row()
sub.emboss = 'NONE'
sub.scale_y = 1.5
props = sub.operator("benchmark.run", text="COMPLETE BENCHMARK (approx. 1.h)")
props.run_type = 'COMPLETE'
sub.operator("benchmark.run_complete", text="RUN COMPLETE BENCHMARK")
split.label()
@@ -474,17 +472,17 @@ class BENCHMARK_PT_main(Panel):
sub = col.row()
sub.scale_y = 2.25
sub.operator("benchmark.share", text="SHARE")
sub.operator("benchmark.share", text="SHARE ONLINE")
sub = col.row()
sub.emboss = 'NONE'
sub.scale_y = 1.5
sub.operator("benchmark.save", text="SAVE")
sub.operator("benchmark.save", text="SAVE LOCALLY")
sub = col.row()
sub.emboss = 'NONE'
sub.scale_y = 1.5
sub.operator("benchmark.restart", text="RESTART")
sub.operator("benchmark.restart", text="START AGAIN")
split.label()
@@ -530,23 +528,8 @@ def configure_script_get():
benchmark_script_directory = os.path.dirname(script_directory)
return os.path.join(benchmark_script_directory, "configure.py")
class BENCHMARK_OT_run(bpy.types.Operator):
"Run Blender benchmark"
bl_label = "Run Benchmark"
bl_idname = "benchmark.run"
enum_run_type = (
('QUICK', "QUICK", ""),
('COMPLETE', "COMPLETE", ""),
)
run_type: EnumProperty(
name="Run Type",
description="",
items=enum_run_type,
default='QUICK',
)
class BENCHMARK_OT_run_base(bpy.types.Operator):
run_type = 'QUICK' # or 'COMPLETE'
benchmark_context = None
thread = None
timer = None
@@ -711,6 +694,20 @@ class BENCHMARK_OT_run(bpy.types.Operator):
if self.thread:
self.thread.join()
class BENCHMARK_OT_run_quick(BENCHMARK_OT_run_base):
"Run quick Blender benchmark"
bl_label = "Run Benchmark"
bl_idname = "benchmark.run_quick"
run_type = 'QUICK'
class BENCHMARK_OT_run_complete(BENCHMARK_OT_run_base):
"Run complete Blender benchmark (might take 1 hour to finish)"
bl_label = "Run Benchmark"
bl_idname = "benchmark.run_complete"
run_type = 'COMPLETE'
class BENCHMARK_OT_save(bpy.types.Operator):
bl_idname = "benchmark.save"
@@ -749,7 +746,7 @@ class BENCHMARK_OT_share(bpy.types.Operator):
class BENCHMARK_OT_restart(bpy.types.Operator):
bl_idname = "benchmark.restart"
bl_label = "Start new benchmark round"
bl_label = "Go to a home screen and choose another benchmark to run"
def invoke(self, context, event):
reset_global_state()
@@ -800,7 +797,8 @@ style.widget.points = 12
classes = (
BENCHMARK_PT_main,
BENCHMARK_OT_restart,
BENCHMARK_OT_run,
BENCHMARK_OT_run_quick,
BENCHMARK_OT_run_complete,
BENCHMARK_OT_save,
BENCHMARK_OT_share,
)