Skip to content
Snippets Groups Projects
Commit 755f3d5f authored by Provot Bertrand's avatar Provot Bertrand
Browse files

Fixed bugs filter deletion + custom filter correctly applied

parent 02629a64
No related branches found
No related tags found
No related merge requests found
...@@ -376,20 +376,24 @@ void FilterChoice::validate() ...@@ -376,20 +376,24 @@ void FilterChoice::validate()
msgBox.setDefaultButton(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.exec(); msgBox.exec();
}else{ }else{
switch(_blurChoices->currentIndex()) if(!_customButton->isChecked()){
{ switch(_blurChoices->currentIndex())
case 0: {
_filtering = new Filtering(Filtering::uniformBlur(num)); case 0:
break; _filtering = new Filtering(Filtering::uniformBlur(num));
case 1: break;
_filtering = new Filtering(Filtering::gaussianBlur(num, _stdDevBox->value())); case 1:
break; _filtering = new Filtering(Filtering::gaussianBlur(num, _stdDevBox->value()));
case 2: break;
_filtering = new Filtering(Filtering::prewitt(num)); case 2:
break; _filtering = new Filtering(Filtering::prewitt(num));
default: break;
_filtering = new Filtering(_filters[_blurChoices->currentIndex()]); default:
_filtering = new Filtering(_filters[_blurChoices->currentIndex()]);
}
} }
else
_filtering = new Filtering(_filters[_blurChoices->currentIndex()]);
switch(_policyChoices->currentIndex()) switch(_policyChoices->currentIndex())
{ {
...@@ -435,14 +439,9 @@ void FilterChoice::deleteFilter() ...@@ -435,14 +439,9 @@ void FilterChoice::deleteFilter()
if(msgBox.exec() == QMessageBox::Yes) if(msgBox.exec() == QMessageBox::Yes)
{ {
QString name = _blurChoices->itemText(_blurChoices->currentIndex()); QString name = _blurChoices->itemText(_blurChoices->currentIndex());
if(_blurChoices->currentIndex()==0){ _blurChoices->removeItem(_blurChoices->currentIndex());
_blurChoices->setCurrentIndex(_blurChoices->currentIndex()); _blurChoices->setCurrentIndex(0);
_blurChoices->removeItem(_blurChoices->currentIndex()); QFile file(_path.toUtf8());
}else{
_blurChoices->setCurrentIndex(_blurChoices->currentIndex()-1);
_blurChoices->removeItem(_blurChoices->currentIndex()+1);
}
QFile file("filters.xml");
if(file.exists()) if(file.exists())
{ {
QDomDocument doc(""); QDomDocument doc("");
...@@ -472,6 +471,7 @@ void FilterChoice::deleteFilter() ...@@ -472,6 +471,7 @@ void FilterChoice::deleteFilter()
} }
} }
} }
this->updateBlur(true);
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment