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

Fixed combine planes noImg + window name multifilter

parent 912a50d6
No related branches found
No related tags found
No related merge requests found
......@@ -73,7 +73,10 @@ void CombineColorOp::operator()(const imagein::Image*, const std::map<const imag
}
else{
QDialog::DialogCode code = static_cast<QDialog::DialogCode>(dialog->exec());
if(code!=QDialog::Accepted) return;
for(int i = 0; i<3; i++){
if(imageBoxes[i]->currentIndex()==-1) return;
}
if(code!=QDialog::Accepted ) return;
}
......
......@@ -73,9 +73,11 @@ void CombineHSVOp::operator()(const imagein::Image_t<double>*, const map<const i
QDialog::DialogCode code = static_cast<QDialog::DialogCode>(dialog->exec());
if(code!=QDialog::Accepted) {
return;
for(int i=0; i<3; i++){
if(imageBoxes[i]->currentIndex()==-1) return;
}
if(code!=QDialog::Accepted) return;
QColor color;
int width = imageBoxes[0]->currentImage()->getWidth();
......
......@@ -101,7 +101,7 @@ void FilteringService::applyAlgorithm(Filtering* algo)
}
Image_t<double>* dblResImg = (*algo)(image);
unsigned char i = 0;
unsigned int i = 0;
ImageWindow* riw;
if(_siw->isStandard()) {
delete image;
......@@ -139,8 +139,8 @@ void FilteringService::applyAlgorithm(Filtering* algo)
_ws->addText("-------------------------------------------");
}
if(i == 0) riw->setWindowTitle(_siw->windowTitle() + " - " + _filterChoice->getFilterName() + " Result ");
else riw->setWindowTitle(_siw->windowTitle() + " - " + _filterChoice->getFilterName() + " " + i);
if(i == 0) riw->setWindowTitle(_siw->windowTitle() + " - " + _filterChoice->getFilterName() + qApp->translate("FilteringService"," Result ").toUtf8());
else riw->setWindowTitle(_siw->windowTitle() + " - " + _filterChoice->getFilterName() + " - " + QString::number(i).toUtf8() );
emit newImageWindowCreated(_ws->getNodeId(_siw), riw);
i++;
......
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