mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-08 01:53:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20174 from alalek:issue_20159

Browse Source
This commit is contained in:
Alexander Alekhin 2021-05-28 14:10:17 +00:00
commit 63256a00ff
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/highgui/src/window_QT.cpp
View File

@ -1219,9 +1219,6 @@ void GuiReceiver::addSlider2(QString bar_name, QString window_name, void* value,
if (t) //trackbar exists if (t) //trackbar exists
return; return;
if (!value)
CV_Error(CV_StsNullPtr, "NULL value pointer" );
if (count <= 0) //count is the max value of the slider, so must be bigger than 0 if (count <= 0) //count is the max value of the slider, so must be bigger than 0
CV_Error(CV_StsNullPtr, "Max value of the slider must be bigger than 0" ); CV_Error(CV_StsNullPtr, "Max value of the slider must be bigger than 0" );
@ -1342,7 +1339,8 @@ void CvTrackbar::create(CvWindow* arg, QString name, int* value, int _count)
slider->setMinimum(0); slider->setMinimum(0);
slider->setMaximum(_count); slider->setMaximum(_count);
slider->setPageStep(5); slider->setPageStep(5);
slider->setValue(*value); if (dataSlider)
slider->setValue(*dataSlider);
slider->setTickPosition(QSlider::TicksBelow); slider->setTickPosition(QSlider::TicksBelow);
@ -1409,7 +1407,8 @@ void CvTrackbar::update(int myvalue)
{ {
setLabel(myvalue); setLabel(myvalue);
*dataSlider = myvalue; if (dataSlider)
*dataSlider = myvalue;
if (callback) if (callback)
{ {
callback(myvalue); callback(myvalue);

2
modules/highgui/src/window_winrt_bridge.cpp
View File

@ -271,7 +271,7 @@ void CvWindow::createSlider(cv::String name, int* val, int count, CvTrackbarCall
// Image control is loaded. See callback implementation in CvWindow ctor. // Image control is loaded. See callback implementation in CvWindow ctor.
slider->Width = sliderDefaultWidth; slider->Width = sliderDefaultWidth;
} }
slider->Value = *val; slider->Value = val ? *val : 0;
slider->Maximum = count; slider->Maximum = count;
slider->Visibility = Windows::UI::Xaml::Visibility::Visible; slider->Visibility = Windows::UI::Xaml::Visibility::Visible;
slider->Margin = Windows::UI::Xaml::ThicknessHelper::FromLengths(10, 10, 10, 0); slider->Margin = Windows::UI::Xaml::ThicknessHelper::FromLengths(10, 10, 10, 0);