Skip to content
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

Jump to bottom

Remove AC #8979

Merged
merged 10 commits into from
May 10, 2021
Merged

Remove AC #8979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4fa6bb0
remove unit-tests/algo/d2rgb/
maloel Apr 27, 2021
49b77bc
remove CAH from Viewer, DQT
maloel Apr 28, 2021
c09465b
remove warning in calibration-model.cpp
maloel Apr 28, 2021
d02e103
remove AC from librs
maloel May 5, 2021
5f97232
remove CAH-related from LRS & wrappers
maloel Apr 28, 2021
2a13f87
reduce warning count to 65
maloel May 6, 2021
ee75e05
bring back node.js CAH options (trigger,reset) because of enums.py error
maloel May 6, 2021
0723a83
removed CAH trigger, reset from test-set-option.py
maloel May 7, 2021
04f0f11
CR fixes
maloel May 9, 2021
f522e2f
fix error
maloel May 9, 2021
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
12 changes: 4 additions & 8 deletions common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,7 @@ set(COMMON_SRC
"${CMAKE_CURRENT_LIST_DIR}/decompress-huffman.h"
"${CMAKE_CURRENT_LIST_DIR}/updates-model.h"
"${CMAKE_CURRENT_LIST_DIR}/updates-model.cpp"
"${CMAKE_CURRENT_LIST_DIR}/cah-model.h"
"${CMAKE_CURRENT_LIST_DIR}/cah-model.cpp"


)
)

set(SW_UPDATE_FILES
"${CMAKE_CURRENT_LIST_DIR}/sw-update/http-downloader.h"
Expand All @@ -50,20 +46,20 @@ set(COMMON_SRC
"${CMAKE_CURRENT_LIST_DIR}/sw-update/versions-db-manager.h"
"${CMAKE_CURRENT_LIST_DIR}/sw-update/versions-db-manager.cpp"
)

set(REFLECTIVITY_FILES
"${CMAKE_CURRENT_LIST_DIR}/reflectivity/reflectivity.h"
"${CMAKE_CURRENT_LIST_DIR}/reflectivity/reflectivity.cpp"
)

set(UTILITIES_FILES
"${CMAKE_CURRENT_LIST_DIR}/utilities/number/stabilized-value.h"
"${CMAKE_CURRENT_LIST_DIR}/utilities/string/trim-newlines.h"
"${CMAKE_CURRENT_LIST_DIR}/utilities/string/split.h"
"${CMAKE_CURRENT_LIST_DIR}/utilities/imgui/wrap.h"
"${CMAKE_CURRENT_LIST_DIR}/utilities/imgui/wrap.cpp"
)

set(COMMON_SRC
${COMMON_SRC}
${SW_UPDATE_FILES}
Expand Down
218 changes: 0 additions & 218 deletions common/cah-model.cpp
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions common/cah-model.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion common/calibration-model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ void calibration_model::update(ux_window& window, std::string& error_message)
}

ImGui::PushItemWidth(120);
ImGui::Combo("##RectifiedResolutions", &selected_resolution, resolution_names_char.data(), resolution_names_char.size());
ImGui::Combo("##RectifiedResolutions", &selected_resolution, resolution_names_char.data(), int(resolution_names_char.size()));

ImGui::SetCursorPosX(10);
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + 5);
Expand Down
22 changes: 0 additions & 22 deletions common/model-views.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3822,12 +3822,6 @@ namespace rs2
_updates_profile(std::make_shared<dev_updates_profile::update_profile>()),
_allow_remove(remove)
{

if( dev.supports( RS2_CAMERA_INFO_FIRMWARE_VERSION ) && dev.is< device_calibration >() )
{
_accuracy_health_model = std::unique_ptr< cah_model >( new cah_model( *this, viewer ) );
}

auto name = get_device_name(dev);
id = to_string() << name.first << ", " << name.second;

Expand Down Expand Up @@ -5488,22 +5482,6 @@ namespace rs2
}


if (show_trigger_camera_accuracy_health_popup)
{
if (_accuracy_health_model)
{
show_trigger_camera_accuracy_health_popup = _accuracy_health_model->prompt_trigger_popup(window, error_message);
}
}

if (show_reset_camera_accuracy_health_popup)
{
if (_accuracy_health_model)
{
show_reset_camera_accuracy_health_popup = _accuracy_health_model->prompt_reset_popup(window, error_message);
}
}

if (keep_showing_advanced_mode_modal)
{
const bool is_advanced_mode_enabled = dev.as<advanced_mode>().is_enabled();
Expand Down
8 changes: 0 additions & 8 deletions common/model-views.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include "fw-update-helper.h"
#include "updates-model.h"
#include "calibration-model.h"
#include "cah-model.h"
#include <utilities/time/periodic_timer.h>
#include "reflectivity/reflectivity.h"
#include <utilities/number/stabilized-value.h>
Expand Down Expand Up @@ -789,7 +788,6 @@ namespace rs2


std::shared_ptr< atomic_objects_in_frame > get_detected_objects() const { return _detected_objects; }
bool is_cah_model_enabled() const { return _accuracy_health_model ? true : false; }

std::vector<std::shared_ptr<subdevice_model>> subdevices;
std::shared_ptr<syncer_model> syncer;
Expand All @@ -815,17 +813,11 @@ namespace rs2

std::vector<std::shared_ptr<notification_model>> related_notifications;

bool show_trigger_camera_accuracy_health_popup = false;
bool show_reset_camera_accuracy_health_popup = false;

private:
// This class is in charge of camera accuracy health window parameters,
// Needed as a member for reseting the window memory on device disconnection.


std::unique_ptr< cah_model > _accuracy_health_model; // If this device does not support CAH feature,
// the pointer will point to nullptr

void draw_info_icon(ux_window& window, ImFont* font, const ImVec2& size);
int draw_seek_bar();
int draw_playback_controls(ux_window& window, ImFont* font, viewer_model& view);
Expand Down
Loading