Merge pull request #9498 from saskatchewancatch:i9403

pull/9548/head
Alexander Alekhin 8 years ago
commit 7b4f323b8b
  1. 22
      modules/highgui/src/window_QT.cpp

@ -673,30 +673,20 @@ CV_IMPL void cvSetTrackbarPos(const char* name_bar, const char* window_name, int
CV_IMPL void cvSetTrackbarMax(const char* name_bar, const char* window_name, int maxval) CV_IMPL void cvSetTrackbarMax(const char* name_bar, const char* window_name, int maxval)
{ {
if (maxval >= 0) QPointer<CvTrackbar> t = icvFindTrackBarByName(name_bar, window_name);
if (t)
{ {
QPointer<CvTrackbar> t = icvFindTrackBarByName(name_bar, window_name); t->slider->setMaximum(maxval);
if (t)
{
int minval = t->slider->minimum();
maxval = (maxval>minval)?maxval:minval;
t->slider->setMaximum(maxval);
}
} }
} }
CV_IMPL void cvSetTrackbarMin(const char* name_bar, const char* window_name, int minval) CV_IMPL void cvSetTrackbarMin(const char* name_bar, const char* window_name, int minval)
{ {
if (minval >= 0) QPointer<CvTrackbar> t = icvFindTrackBarByName(name_bar, window_name);
if (t)
{ {
QPointer<CvTrackbar> t = icvFindTrackBarByName(name_bar, window_name); t->slider->setMinimum(minval);
if (t)
{
int maxval = t->slider->maximum();
minval = (maxval<minval)?maxval:minval;
t->slider->setMinimum(minval);
}
} }
} }

Loading…
Cancel
Save