Skip to content

Commit

Permalink
adjustments to the UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@Noy-Zini
Noy-Zini committed Dec 25, 2024
1 parent 7e2db73 commit ed2c607
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 49 deletions.
105 changes: 59 additions & 46 deletions common/dds-model.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,37 +126,51 @@ void rs2::dds_model::ipInputText(std::string label ,rsutils::type::ip_address &i

void dds_model::render_dds_config_window(ux_window& window , std::string& error_message)
{
const auto window_name = "DDS Configuration";
if (_window_open)
{
const auto window_name = "DDS Configuration";

// Calculate window position and size
const float w = 620;
const float h = 500;
const float x0 = std::max(window.width() - w, 0.f) / 2;
const float y0 = std::max(window.height() - h, 0.f) / 2;
ImGui::SetNextWindowPos({ x0, y0 });
ImGui::SetNextWindowSize({ w, h });

auto flags = ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoTitleBar |
ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoSavedSettings;

ImGui::PushStyleColor(ImGuiCol_PopupBg, sensor_bg);
ImGui::PushStyleColor(ImGuiCol_TextSelectedBg, light_grey);
ImGui::PushStyleColor(ImGuiCol_Text, light_grey);
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(5, 5));
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 1);
ImGui::PushStyleColor(ImGuiCol_Button, button_color);
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, button_color + 0.1f);
ImGui::PushStyleColor(ImGuiCol_ButtonActive, button_color + 0.1f);
try
{
_current_config = get_eth_config(_device, ACTUAL_VALUES);
_changed_config = _current_config;
ImGui::OpenPopup(window_name);
}
catch (std::exception e)
{
error_message = e.what();
}
_window_open = false;
}

// Calculate window position and size
const float w = 620;
const float h = 500;
const float x0 = std::max(window.width() - w, 0.f) / 2;
const float y0 = std::max(window.height() - h, 0.f) / 2;
ImGui::SetNextWindowPos({ x0, y0 });
ImGui::SetNextWindowSize({ w, h });

auto flags = ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoTitleBar |
ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoSavedSettings;

ImGui::PushStyleColor(ImGuiCol_PopupBg, sensor_bg);
ImGui::PushStyleColor(ImGuiCol_TextSelectedBg, light_grey);
ImGui::PushStyleColor(ImGuiCol_Text, light_grey);
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(5, 5));
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 1);
ImGui::PushStyleColor(ImGuiCol_Button, button_color);
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, button_color + 0.1f);
ImGui::PushStyleColor(ImGuiCol_ButtonActive, button_color + 0.1f);


ImGui::Begin(window_name, &_window_open, flags);
if (ImGui::BeginPopupModal(window_name, nullptr, flags))
{
if (error_message != "") ImGui::CloseCurrentPopup();

// Title
const char* title_message = window_name;
ImVec2 title_size = ImGui::CalcTextSize(title_message);
float title_x = (w - title_size.x-10) / 2.0f;
float title_x = (w - title_size.x - 10) / 2.0f;
ImGui::SetCursorPos({ title_x, 10.0f });
ImGui::PushFont(window.get_large_font());
ImGui::PushStyleColor(ImGuiCol_Text, white);
Expand All @@ -167,10 +181,10 @@ void dds_model::render_dds_config_window(ux_window& window , std::string& error_
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 15);

// Version Display
ImGui::Text("Version: %s" , RS2_API_FULL_VERSION_STR);
ImGui::Text("Version: %s", RS2_API_FULL_VERSION_STR);

// Main Scrollable Section
ImGui::BeginChild("MainContent", ImVec2(w-10, h - 120), true);
ImGui::BeginChild("MainContent", ImVec2(w - 10, h - 120), true);
ImGui::PushItemWidth(150.0f);

// Connection Priority Section
Expand All @@ -191,15 +205,15 @@ void dds_model::render_dds_config_window(ux_window& window , std::string& error_
ImGui::RadioButton("USB First", reinterpret_cast<int*>(&connection_priority), 1);
ImGui::RadioButton("Dynamic Priority", reinterpret_cast<int*>(&connection_priority), 2);
switch (connection_priority) {
case ETH_FIRST:
_changed_config.link.priority = link_priority::eth_first;
break;
case USB_FIRST:
_changed_config.link.priority = link_priority::usb_first;
break;
case DYNAMIC:
_changed_config.link.priority = _current_config.link.speed ? link_priority::dynamic_eth_first : link_priority::dynamic_usb_first;
break;
case ETH_FIRST:
_changed_config.link.priority = link_priority::eth_first;
break;
case USB_FIRST:
_changed_config.link.priority = link_priority::usb_first;
break;
case DYNAMIC:
_changed_config.link.priority = _current_config.link.speed ? link_priority::dynamic_eth_first : link_priority::dynamic_usb_first;
break;
}
}

Expand Down Expand Up @@ -234,7 +248,7 @@ void dds_model::render_dds_config_window(ux_window& window , std::string& error_
if (ImGui::InputInt("##Domain ID", &_changed_config.dds.domain_id)) {
if (_changed_config.dds.domain_id < 0)
_changed_config.dds.domain_id = 0;
else if(_changed_config.dds.domain_id > 232)
else if (_changed_config.dds.domain_id > 232)
_changed_config.dds.domain_id = 232;
}
ImGui::Checkbox("No Reset after changes", &_no_reset);
Expand All @@ -250,9 +264,9 @@ void dds_model::render_dds_config_window(ux_window& window , std::string& error_
ImGui::EndChild();

//window buttons
float button_width = 105.0f;
float spacing = 10.0f;
float total_buttons_width = button_width * 4 + spacing * 2;
float button_width = 105.0f;
float spacing = 10.0f;
float total_buttons_width = button_width * 4 + spacing * 2;
float start_x = (w - total_buttons_width) / 2.0f;
bool hasChanges = (_changed_config != _current_config);

Expand All @@ -270,7 +284,7 @@ void dds_model::render_dds_config_window(ux_window& window , std::string& error_
ImGui::SameLine();
if (ImGui::Button("Factory Reset", ImVec2(button_width, 25))) {
enable_dds(error_message);
set_eth_config(_defult_config , error_message);
set_eth_config(_defult_config, error_message);
close_window();
}
if (ImGui::IsItemHovered()) {
Expand All @@ -280,7 +294,7 @@ void dds_model::render_dds_config_window(ux_window& window , std::string& error_
ImGui::SameLine();
RsImGui::RsImButton([&]() {if (ImGui::ButtonEx("Revert changes", ImVec2(button_width, 25))) {
_changed_config = _current_config;
};}, hasChanges);
};}, !hasChanges);
if (ImGui::IsItemHovered()) {
window.link_hovered();
ImGui::SetTooltip("%s", "Revert to current configuration values");
Expand All @@ -290,7 +304,7 @@ void dds_model::render_dds_config_window(ux_window& window , std::string& error_
enable_dds(error_message);
set_eth_config(_changed_config, error_message);
close_window();
};}, hasChanges);
};}, !hasChanges);
if (ImGui::IsItemHovered()) {
window.link_hovered();
ImGui::SetTooltip("%s", "Apply changes");
Expand All @@ -303,17 +317,16 @@ void dds_model::render_dds_config_window(ux_window& window , std::string& error_
}
ImGui::EndPopup();
}
ImGui::End();
ImGui::PopStyleColor(6);
ImGui::PopStyleVar(2);
ImGui::EndPopup();

}
ImGui::PopStyleColor(6);
ImGui::PopStyleVar(2);

}

void rs2::dds_model::open_dds_tool_window()
{
_current_config = get_eth_config(_device, ACTUAL_VALUES);
_changed_config = _current_config;
_window_open = true;
}

2 changes: 1 addition & 1 deletion common/dds-model.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ namespace rs2

void open_dds_tool_window();

void close_window() { _window_open = false; }
void close_window() { ImGui::CloseCurrentPopup(); }

eth_config get_eth_config(rs2::debug_protocol dev, bool defult_val);

Expand Down
4 changes: 2 additions & 2 deletions third-party/rsutils/include/rsutils/type/eth-config.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ bool eth_config::operator==( eth_config const & other ) const noexcept
// Only compare those items that are configurable
return configured.ip == other.configured.ip && configured.netmask == other.configured.netmask
&& configured.gateway == other.configured.gateway && dds.domain_id == other.dds.domain_id
&& dhcp.on == other.dhcp.on && link.priority == other.link.priority && link.timeout == other.link.timeout;
&& dhcp.on == other.dhcp.on && link.priority == other.link.priority && link.timeout == other.link.timeout && dhcp.timeout != other.dhcp.timeout;
}


Expand All @@ -114,7 +114,7 @@ bool eth_config::operator!=( eth_config const & other ) const noexcept
// Only compare those items that are configurable
return configured.ip != other.configured.ip || configured.netmask != other.configured.netmask
|| configured.gateway != other.configured.gateway || dds.domain_id != other.dds.domain_id
|| dhcp.on != other.dhcp.on || link.priority != other.link.priority || link.timeout != other.link.timeout;
|| dhcp.on != other.dhcp.on || link.priority != other.link.priority || link.timeout != other.link.timeout || dhcp.timeout != other.dhcp.timeout;
}


Expand Down

0 comments on commit ed2c607

Please sign in to comment.