diff --git a/include/control.h b/include/control.h index c4cf792a64ffa6393ec107476ba4d8293312b1f3..f1dd613dd3a3652691960d1fc49911beb9a032ae 100644 --- a/include/control.h +++ b/include/control.h @@ -144,6 +144,8 @@ public: bool getAdaptiveLevel() const; int getFilterBorderSize() const; + void setFilterBorderSizeMin(int i); + void setFilterBorderSizeMax(int i); bool isFilterBgChecked() const; bool isFilterBgDeleteTrjChecked() const; int getFilterBgDeleteNumber() const; diff --git a/src/borderFilter.cpp b/src/borderFilter.cpp index 66c7f74d676237b81537f0514edbd358f0354eda..9f188c9af497bd3e5aabe4ee3619eb0a799d511e 100644 --- a/src/borderFilter.cpp +++ b/src/borderFilter.cpp @@ -24,7 +24,7 @@ BorderFilter::BorderFilter() : Filter() { mS.setMinimum(0.); - mS.setMaximum(200.); + mS.setMaximum(300); mS.setValue(0.); mS.setFilter(this); diff --git a/src/control.cpp b/src/control.cpp index 851d41f6982d7a03ad23b333d7d3010a095170b9..50cde5844af0c9d5b9ff7502a858776cc253c569 100644 --- a/src/control.cpp +++ b/src/control.cpp @@ -101,6 +101,9 @@ Control::Control( mUi->filterSwapV->setCheckState( (bool) mMainWindow->getSwapFilter()->getSwapVertically()->getValue() ? Qt::Checked : Qt::Unchecked); + setFilterBorderSizeMin(mMainWindow->getBorderFilter()->getBorderSize()->getMinimum()); + setFilterBorderSizeMax(mMainWindow->getBorderFilter()->getBorderSize()->getMaximum()); + setCalibFxMin(mMainWindow->getCalibFilter()->getFx()->getMinimum()); setCalibFxMax(mMainWindow->getCalibFilter()->getFx()->getMaximum()); setCalibFx(mMainWindow->getCalibFilter()->getFx()->getValue()); @@ -659,6 +662,16 @@ int Control::getFilterBorderSize() const { return mUi->filterBorderParamSize->value(); } +void Control::setFilterBorderSizeMin(int i) +{ + mUi->filterBorderParamSize->setMinimum(i); + mUi->filterBorderParamSize_spin->setMinimum(i); +} +void Control::setFilterBorderSizeMax(int i) +{ + mUi->filterBorderParamSize->setMaximum(i); + mUi->filterBorderParamSize_spin->setMaximum(i); +} bool Control::isFilterBgChecked() const { diff --git a/ui/control.ui b/ui/control.ui index 38d53ef66d0b3cc5b1e2d7164817519f06eaaa11..107709c0c86ff1d7ba036afcdfe2a744b42203a5 100644 --- a/ui/control.ui +++ b/ui/control.ui @@ -135,9 +135,9 @@ <property name="geometry"> <rect> <x>0</x> - <y>0</y> - <width>460</width> - <height>1268</height> + <y>-673</y> + <width>476</width> + <height>1399</height> </rect> </property> <property name="sizePolicy"> @@ -199,23 +199,14 @@ <layout class="QHBoxLayout" name="horizontalLayout_8"> <item> <widget class="QScrollBar" name="filterBorderParamSize"> - <property name="minimumSize"> - <size> - <width>100</width> - <height>0</height> - </size> - </property> - <property name="maximum"> - <number>500</number> - </property> - <property name="singleStep"> - <number>1</number> - </property> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> </widget> </item> + <item> + <widget class="PSpinBox" name="filterBorderParamSize_spin"/> + </item> <item> <widget class="QPushButton" name="filterBorderParamCol"> <property name="maximumSize"> @@ -437,7 +428,7 @@ <item row="2" column="0"> <widget class="QCheckBox" name="filterBorder"> <property name="text"> - <string>border:</string> + <string>border [2px]:</string> </property> </widget> </item> @@ -3510,9 +3501,9 @@ <property name="geometry"> <rect> <x>0</x> - <y>-379</y> - <width>460</width> - <height>934</height> + <y>0</y> + <width>465</width> + <height>993</height> </rect> </property> <property name="sizePolicy"> @@ -3652,6 +3643,7 @@ <widget class="QLabel" name="recoNumberNow"> <property name="font"> <font> + <weight>75</weight> <bold>true</bold> </font> </property> @@ -4808,8 +4800,8 @@ <rect> <x>0</x> <y>0</y> - <width>460</width> - <height>1138</height> + <width>465</width> + <height>1205</height> </rect> </property> <property name="sizePolicy"> @@ -4999,6 +4991,7 @@ <widget class="QLabel" name="trackNumberNow"> <property name="font"> <font> + <weight>75</weight> <bold>true</bold> </font> </property> @@ -5039,6 +5032,7 @@ <widget class="QLabel" name="trackNumberVisible"> <property name="font"> <font> + <weight>75</weight> <bold>true</bold> </font> </property> @@ -5054,6 +5048,7 @@ <widget class="QLabel" name="trackNumberAll"> <property name="font"> <font> + <weight>75</weight> <bold>true</bold> </font> </property> @@ -7280,8 +7275,8 @@ <rect> <x>0</x> <y>0</y> - <width>477</width> - <height>555</height> + <width>479</width> + <height>553</height> </rect> </property> <property name="sizePolicy"> @@ -8186,5 +8181,37 @@ </hint> </hints> </connection> + <connection> + <sender>filterBorderParamSize</sender> + <signal>valueChanged(int)</signal> + <receiver>filterBorderParamSize_spin</receiver> + <slot>setValue(int)</slot> + <hints> + <hint type="sourcelabel"> + <x>214</x> + <y>-535</y> + </hint> + <hint type="destinationlabel"> + <x>356</x> + <y>-535</y> + </hint> + </hints> + </connection> + <connection> + <sender>filterBorderParamSize_spin</sender> + <signal>valueChanged(int)</signal> + <receiver>filterBorderParamSize</receiver> + <slot>setValue(int)</slot> + <hints> + <hint type="sourcelabel"> + <x>356</x> + <y>-535</y> + </hint> + <hint type="destinationlabel"> + <x>214</x> + <y>-535</y> + </hint> + </hints> + </connection> </connections> </ui>