mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #70151 from stmSi/fix-profiler-and-visual-profiler-start-stop-state-inconsistency

Browse Source 
Fix: Profiler and Visual Profiler start/stop state inconsistency
This commit is contained in:
Rémi Verschelde 2022-12-23 09:08:24 +01:00
commit 6ff74f07f0
No known key found for this signature in database
GPG Key ID: C3336907360768E1
5 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editor/debugger/editor_profiler.cpp
View File

@ -106,7 +106,7 @@ void EditorProfiler::clear() {
seeking = false; seeking = false;
// Ensure button text (start, stop) is correct // Ensure button text (start, stop) is correct
_set_button_text(); _update_button_text();
emit_signal(SNAME("enable_profiling"), activate->is_pressed()); emit_signal(SNAME("enable_profiling"), activate->is_pressed());
} }
@ -376,7 +376,7 @@ void EditorProfiler::_update_frame() {
updating_frame = false; updating_frame = false;
} }
void EditorProfiler::_set_button_text() { void EditorProfiler::_update_button_text() {
if (activate->is_pressed()) { if (activate->is_pressed()) {
activate->set_icon(get_theme_icon(SNAME("Stop"), SNAME("EditorIcons"))); activate->set_icon(get_theme_icon(SNAME("Stop"), SNAME("EditorIcons")));
activate->set_text(TTR("Stop")); activate->set_text(TTR("Stop"));
@ -387,7 +387,7 @@ void EditorProfiler::_set_button_text() {
} }
void EditorProfiler::_activate_pressed() { void EditorProfiler::_activate_pressed() {
_set_button_text(); _update_button_text();
if (activate->is_pressed()) { if (activate->is_pressed()) {
_clear_pressed(); _clear_pressed();
@ -510,13 +510,17 @@ void EditorProfiler::_bind_methods() {
} }
void EditorProfiler::set_enabled(bool p_enable, bool p_clear) { void EditorProfiler::set_enabled(bool p_enable, bool p_clear) {
activate->set_pressed(false);
activate->set_disabled(!p_enable); activate->set_disabled(!p_enable);
if (p_clear) { if (p_clear) {
clear(); clear();
} }
} }
void EditorProfiler::set_pressed(bool p_pressed) {
activate->set_pressed(p_pressed);
_update_button_text();
}
bool EditorProfiler::is_profiling() { bool EditorProfiler::is_profiling() {
return activate->is_pressed(); return activate->is_pressed();
} }
@ -595,6 +599,7 @@ EditorProfiler::EditorProfiler() {
add_child(hb); add_child(hb);
activate = memnew(Button); activate = memnew(Button);
activate->set_toggle_mode(true); activate->set_toggle_mode(true);
activate->set_disabled(true);
activate->set_text(TTR("Start")); activate->set_text(TTR("Start"));
activate->connect("pressed", callable_mp(this, &EditorProfiler::_activate_pressed)); activate->connect("pressed", callable_mp(this, &EditorProfiler::_activate_pressed));
hb->add_child(activate); hb->add_child(activate);

3
editor/debugger/editor_profiler.h
View File

@ -122,7 +122,7 @@ private:
Timer *frame_delay = nullptr; Timer *frame_delay = nullptr;
Timer *plot_delay = nullptr; Timer *plot_delay = nullptr;
void _set_button_text(); void _update_button_text();
void _update_frame(); void _update_frame();
void _activate_pressed(); void _activate_pressed();
@ -155,6 +155,7 @@ protected:
public: public:
void add_frame_metric(const Metric &p_metric, bool p_final = false); void add_frame_metric(const Metric &p_metric, bool p_final = false);
void set_enabled(bool p_enable, bool p_clear = true); void set_enabled(bool p_enable, bool p_clear = true);
void set_pressed(bool p_pressed);
bool is_profiling(); bool is_profiling();
bool is_seeking() { return seeking; } bool is_seeking() { return seeking; }
void disable_seeking(); void disable_seeking();

20
editor/debugger/editor_visual_profiler.cpp
View File

@ -66,6 +66,7 @@ void EditorVisualProfiler::add_frame_metric(const Metric &p_metric) {
} }
updating_frame = true; updating_frame = true;
clear_button->set_disabled(false);
cursor_metric_edit->set_max(frame_metrics[last_metric].frame_number); cursor_metric_edit->set_max(frame_metrics[last_metric].frame_number);
cursor_metric_edit->set_min(MAX(frame_metrics[last_metric].frame_number - frame_metrics.size(), 0u)); cursor_metric_edit->set_min(MAX(frame_metrics[last_metric].frame_number - frame_metrics.size(), 0u));
@ -408,6 +409,7 @@ void EditorVisualProfiler::_activate_pressed() {
activate->set_icon(get_theme_icon(SNAME("Stop"), SNAME("EditorIcons"))); activate->set_icon(get_theme_icon(SNAME("Stop"), SNAME("EditorIcons")));
activate->set_text(TTR("Stop")); activate->set_text(TTR("Stop"));
_clear_pressed(); //always clear on start _clear_pressed(); //always clear on start
clear_button->set_disabled(false);
} else { } else {
activate->set_icon(get_theme_icon(SNAME("Play"), SNAME("EditorIcons"))); activate->set_icon(get_theme_icon(SNAME("Play"), SNAME("EditorIcons")));
activate->set_text(TTR("Start")); activate->set_text(TTR("Start"));
@ -416,6 +418,7 @@ void EditorVisualProfiler::_activate_pressed() {
} }
void EditorVisualProfiler::_clear_pressed() { void EditorVisualProfiler::_clear_pressed() {
clear_button->set_disabled(true);
clear(); clear();
_update_plot(); _update_plot();
} }
@ -647,10 +650,25 @@ void EditorVisualProfiler::_bind_methods() {
ADD_SIGNAL(MethodInfo("enable_profiling", PropertyInfo(Variant::BOOL, "enable"))); ADD_SIGNAL(MethodInfo("enable_profiling", PropertyInfo(Variant::BOOL, "enable")));
} }
void EditorVisualProfiler::_update_button_text() {
if (activate->is_pressed()) {
activate->set_icon(get_theme_icon(SNAME("Stop"), SNAME("EditorIcons")));
activate->set_text(TTR("Stop"));
} else {
activate->set_icon(get_theme_icon(SNAME("Play"), SNAME("EditorIcons")));
activate->set_text(TTR("Start"));
}
}
void EditorVisualProfiler::set_enabled(bool p_enable) { void EditorVisualProfiler::set_enabled(bool p_enable) {
activate->set_disabled(!p_enable); activate->set_disabled(!p_enable);
} }
void EditorVisualProfiler::set_pressed(bool p_pressed) {
activate->set_pressed(p_pressed);
_update_button_text();
}
bool EditorVisualProfiler::is_profiling() { bool EditorVisualProfiler::is_profiling() {
return activate->is_pressed(); return activate->is_pressed();
} }
@ -714,12 +732,14 @@ EditorVisualProfiler::EditorVisualProfiler() {
add_child(hb); add_child(hb);
activate = memnew(Button); activate = memnew(Button);
activate->set_toggle_mode(true); activate->set_toggle_mode(true);
activate->set_disabled(true);
activate->set_text(TTR("Start")); activate->set_text(TTR("Start"));
activate->connect("pressed", callable_mp(this, &EditorVisualProfiler::_activate_pressed)); activate->connect("pressed", callable_mp(this, &EditorVisualProfiler::_activate_pressed));
hb->add_child(activate); hb->add_child(activate);
clear_button = memnew(Button); clear_button = memnew(Button);
clear_button->set_text(TTR("Clear")); clear_button->set_text(TTR("Clear"));
clear_button->set_disabled(true);
clear_button->connect("pressed", callable_mp(this, &EditorVisualProfiler::_clear_pressed)); clear_button->connect("pressed", callable_mp(this, &EditorVisualProfiler::_clear_pressed));
hb->add_child(clear_button); hb->add_child(clear_button);

3
editor/debugger/editor_visual_profiler.h
View File

@ -101,6 +101,8 @@ private:
Timer *frame_delay = nullptr; Timer *frame_delay = nullptr;
Timer *plot_delay = nullptr; Timer *plot_delay = nullptr;
void _update_button_text();
void _update_frame(bool p_focus_selected = false); void _update_frame(bool p_focus_selected = false);
void _activate_pressed(); void _activate_pressed();
@ -133,6 +135,7 @@ protected:
public: public:
void add_frame_metric(const Metric &p_metric); void add_frame_metric(const Metric &p_metric);
void set_enabled(bool p_enable); void set_enabled(bool p_enable);
void set_pressed(bool p_pressed);
bool is_profiling(); bool is_profiling();
bool is_seeking() { return seeking; } bool is_seeking() { return seeking; }
void disable_seeking(); void disable_seeking();

12
editor/debugger/script_editor_debugger.cpp
View File

@ -319,6 +319,7 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
tabs->set_current_tab(0); tabs->set_current_tab(0);
} }
profiler->set_enabled(false, false); profiler->set_enabled(false, false);
visual_profiler->set_enabled(false);
inspector->clear_cache(); // Take a chance to force remote objects update. inspector->clear_cache(); // Take a chance to force remote objects update.
} else if (p_msg == "debug_exit") { } else if (p_msg == "debug_exit") {
@ -328,8 +329,12 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
_update_buttons_state(); _update_buttons_state();
_set_reason_text(TTR("Execution resumed."), MESSAGE_SUCCESS); _set_reason_text(TTR("Execution resumed."), MESSAGE_SUCCESS);
emit_signal(SNAME("breaked"), false, false, "", false); emit_signal(SNAME("breaked"), false, false, "", false);
profiler->set_enabled(true, false); profiler->set_enabled(true, false);
profiler->disable_seeking(); profiler->disable_seeking();
visual_profiler->set_enabled(true);
} else if (p_msg == "set_pid") { } else if (p_msg == "set_pid") {
ERR_FAIL_COND(p_data.size() < 1); ERR_FAIL_COND(p_data.size() < 1);
remote_pid = p_data[0]; remote_pid = p_data[0];
@ -901,6 +906,7 @@ void ScriptEditorDebugger::start(Ref<RemoteDebuggerPeer> p_peer) {
stop(); stop();
profiler->set_enabled(true, true); profiler->set_enabled(true, true);
visual_profiler->set_enabled(true);
peer = p_peer; peer = p_peer;
ERR_FAIL_COND(p_peer.is_null()); ERR_FAIL_COND(p_peer.is_null());
@ -957,7 +963,11 @@ void ScriptEditorDebugger::stop() {
res_path_cache.clear(); res_path_cache.clear();
profiler_signature.clear(); profiler_signature.clear();
profiler->set_enabled(true, false); profiler->set_enabled(false, false);
profiler->set_pressed(false);
visual_profiler->set_enabled(false);
visual_profiler->set_pressed(false);
inspector->edit(nullptr); inspector->edit(nullptr);
_update_buttons_state(); _update_buttons_state();