From 755f3d5f3bb2879245d7cd49a2b17f9a8e6e677c Mon Sep 17 00:00:00 2001
From: BertrandP <bertrand.provot@insa-rennes.fr>
Date: Tue, 24 Jul 2018 10:54:28 +0200
Subject: [PATCH] Fixed bugs filter deletion + custom filter correctly applied
---
app/Widgets/FilterChoice.cpp | 42 ++++++++++++++++++------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/app/Widgets/FilterChoice.cpp b/app/Widgets/FilterChoice.cpp
index 8f7ad52..ca42fa9 100644
--- a/app/Widgets/FilterChoice.cpp
+++ b/app/Widgets/FilterChoice.cpp
@@ -376,20 +376,24 @@ void FilterChoice::validate()
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.exec();
}else{
- switch(_blurChoices->currentIndex())
- {
- case 0:
- _filtering = new Filtering(Filtering::uniformBlur(num));
- break;
- case 1:
- _filtering = new Filtering(Filtering::gaussianBlur(num, _stdDevBox->value()));
- break;
- case 2:
- _filtering = new Filtering(Filtering::prewitt(num));
- break;
- default:
- _filtering = new Filtering(_filters[_blurChoices->currentIndex()]);
+ if(!_customButton->isChecked()){
+ switch(_blurChoices->currentIndex())
+ {
+ case 0:
+ _filtering = new Filtering(Filtering::uniformBlur(num));
+ break;
+ case 1:
+ _filtering = new Filtering(Filtering::gaussianBlur(num, _stdDevBox->value()));
+ break;
+ case 2:
+ _filtering = new Filtering(Filtering::prewitt(num));
+ break;
+ default:
+ _filtering = new Filtering(_filters[_blurChoices->currentIndex()]);
+ }
}
+ else
+ _filtering = new Filtering(_filters[_blurChoices->currentIndex()]);
switch(_policyChoices->currentIndex())
{
@@ -435,14 +439,9 @@ void FilterChoice::deleteFilter()
if(msgBox.exec() == QMessageBox::Yes)
{
QString name = _blurChoices->itemText(_blurChoices->currentIndex());
- if(_blurChoices->currentIndex()==0){
- _blurChoices->setCurrentIndex(_blurChoices->currentIndex());
- _blurChoices->removeItem(_blurChoices->currentIndex());
- }else{
- _blurChoices->setCurrentIndex(_blurChoices->currentIndex()-1);
- _blurChoices->removeItem(_blurChoices->currentIndex()+1);
- }
- QFile file("filters.xml");
+ _blurChoices->removeItem(_blurChoices->currentIndex());
+ _blurChoices->setCurrentIndex(0);
+ QFile file(_path.toUtf8());
if(file.exists())
{
QDomDocument doc("");
@@ -472,6 +471,7 @@ void FilterChoice::deleteFilter()
}
}
}
+ this->updateBlur(true);
}
/**
--
GitLab