diff --git a/app/Services/FilteringService.cpp b/app/Services/FilteringService.cpp index 5cd768c3b7a67bebf492e16175444abb009a3508..61fbb3b1d2e3714a5de0c31c40940c8cf58e3597 100644 --- a/app/Services/FilteringService.cpp +++ b/app/Services/FilteringService.cpp @@ -33,9 +33,6 @@ using namespace imagein::algorithm; void FilteringService::display(GenericInterface* gi) { AlgorithmService::display(gi); - -// _filtering = _toolBar->addAction("&Filtering"); -// _filterEdition = _toolBar->addAction("&FilterEditor"); QMenu* menu = gi->menu(qApp->translate("", "Filtering")); _filtering = menu->addAction(tr("&Apply filter")); _filtering->setEnabled(false); @@ -50,7 +47,6 @@ void FilteringService::checkActionsValid(const QWidget* activeWidget) { void FilteringService::connect(GenericInterface* gi) { AlgorithmService::connect(gi); - QObject::connect(_filtering, SIGNAL(triggered()), this, SLOT(applyFiltering())); QObject::connect(_filterEdition, SIGNAL(triggered()), this, SLOT(edition())); QObject::connect(gi->windowService(), SIGNAL(activeWidgetChanged(const QWidget*)), this, SLOT(checkActionsValid(const QWidget*))); @@ -65,8 +61,6 @@ void FilteringService::applyFiltering() _filterChoice = new FilterChoice(_gi); _filterChoice->setDoubleResult(siw->isDouble()); -// QMdiArea* area = (QMdiArea*)_gi->centralWidget(); -// area->addSubWindow(_filterChoice); QDialog::DialogCode code = static_cast<QDialog::DialogCode>(_filterChoice->exec()); if(code!=QDialog::Accepted) { @@ -84,17 +78,10 @@ void FilteringService::edition() { _filterEditor = new FilterEditor(); _filterEditor->exec(); - //QMdiArea* area = (QMdiArea*)_gi->centralWidget(); - //area->addSubWindow(_filterEditor); -// StandardImageWindow* siw = dynamic_cast<StandardImageWindow*>(_ws->getCurrentImageWindow()); -// _ws->addWidget(_ws->getNodeId(siw), _filterEditor); - //_filterEditor->show(); - } void FilteringService::applyAlgorithm(Filtering* algo) { - //StandardImageWindow* siw = dynamic_cast<StandardImageWindow*>(_ws->getCurrentImageWindow()); if (_siw != NULL) { const Image_t<double>* image; @@ -129,7 +116,7 @@ void FilteringService::applyAlgorithm(Filtering* algo) delete intResImg; riw = new StandardImageWindow(resImg, _siw->getPath()); } - riw->setWindowTitle(_siw->windowTitle()); + riw->setWindowTitle(_siw->windowTitle() + " - " + _filterChoice->getFilterName()); emit newImageWindowCreated(_ws->getNodeId(_siw), riw); } } diff --git a/app/Widgets/FilterChoice.cpp b/app/Widgets/FilterChoice.cpp index 7027a270992654423e6ff9cc5d15763bf5e2ca2c..8f7ad527c2d2036bb3cf61815af12588274343d7 100644 --- a/app/Widgets/FilterChoice.cpp +++ b/app/Widgets/FilterChoice.cpp @@ -609,6 +609,10 @@ void FilterChoice::updatePath(){ updateBlur(true); } +/** + * @brief FilterChoice::updateOptions + * @param a + */ void FilterChoice::updateOptions(bool a){ if(a){ _offsetButton->setChecked(true); diff --git a/app/Widgets/FilterChoice.h b/app/Widgets/FilterChoice.h index 84c775a44cb7cb7eabe994c23dc945b592372520..4fa5ce097355b85579aa7adda595159a19500d84 100644 --- a/app/Widgets/FilterChoice.h +++ b/app/Widgets/FilterChoice.h @@ -53,6 +53,7 @@ namespace filtrme public: FilterChoice(QWidget *parent); inline imagein::algorithm::Filtering* getFiltering() { return _filtering; } + inline QString getFilterName(){ return _blurChoices->currentText();} inline bool doubleResult() { return _dblResButton->isChecked(); } inline bool scalingResult() { return _scalingButton->isChecked(); } inline bool offsetResult() { return _offsetButton->isChecked(); } diff --git a/app/Widgets/FilterEditorItem.cpp b/app/Widgets/FilterEditorItem.cpp index c57c569389def3018e779775db21c928f7864d9f..71d823605631543a747dbeb45aa2390747f0304e 100644 --- a/app/Widgets/FilterEditorItem.cpp +++ b/app/Widgets/FilterEditorItem.cpp @@ -105,16 +105,15 @@ void FilterEditorItem::initUI() */ void FilterEditorItem::widthChanged(const int width) { - cout << "diff de width: " << width << " | " << _width << "\n"; if(_width < width){ while(_width!=width){ - emit(insertColumn(width-_width)); + emit(insertColumn(_width-1)); _width++; } } else{ while(_width!=width){ - emit(removeColumn(_width-width)); + emit(removeColumn(_width-1)); _width--; } } @@ -125,13 +124,13 @@ void FilterEditorItem::heightChanged(const int height) { if(_height < height){ while(_height!=height){ - emit(insertRow(height-_height)); + emit(insertRow(_height - 1)); _height++; } } else{ while(_height!=height){ - emit(removeRow(_height-height)); + emit(removeRow(_height- 1)); _height--; } }