Skip to content

Commit 672698d

Browse files
committed
Made the blending to use a default colourmap map
Instead of just warning of unexpected results. Fixed overlay on images not working due to integer image changes.
1 parent 74bd664 commit 672698d

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

src/Qt/milxQtImage.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,6 +1249,7 @@ void milxQtImage::overlay(QString filename)
12491249
emit done(-1);
12501250

12511251
eightbit = false;
1252+
integer = false;
12521253
rgb = true;
12531254
generateImage();
12541255
}
@@ -1310,6 +1311,7 @@ void milxQtImage::overlayContour(QString filename)
13101311
emit done(-1);
13111312

13121313
eightbit = false;
1314+
integer = false;
13131315
rgb = true;
13141316
generateImage();
13151317
}

src/Qt/milxQtMain.cpp

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2348,10 +2348,16 @@ void milxQtMain::imagesMix()
23482348
{
23492349
QMessageBox msgBox;
23502350
msgBox.setText("Colormap not set?");
2351-
msgBox.setInformativeText("Image " + firstImg->strippedBaseName() + " has no colormap set. Result could be unexpected.");
2351+
msgBox.setInformativeText("Image " + firstImg->strippedBaseName() + " has no colormap set. Setting to a default map.");
23522352
msgBox.setStandardButtons(QMessageBox::Ok);
23532353
msgBox.setDefaultButton(QMessageBox::Ok);
23542354
msgBox.exec();
2355+
2356+
//Use default cmap
2357+
if (firstImg->is8BitImage())
2358+
firstImg->colourMapToHSV();
2359+
else
2360+
firstImg->colourMapToGray();
23552361
}
23562362

23572363
for(int j = 1; j < n; j ++) //!< For all windows, do operation
@@ -2362,10 +2368,16 @@ void milxQtMain::imagesMix()
23622368
{
23632369
QMessageBox msgBox;
23642370
msgBox.setText("Colormap not set?");
2365-
msgBox.setInformativeText("Image " + secondImg->strippedBaseName() + " has no colormap set. Result could be unexpected.");
2371+
msgBox.setInformativeText("Image " + secondImg->strippedBaseName() + " has no colormap set. Setting to a default map.");
23662372
msgBox.setStandardButtons(QMessageBox::Ok);
23672373
msgBox.setDefaultButton(QMessageBox::Ok);
23682374
msgBox.exec();
2375+
2376+
//Use default cmap
2377+
if (secondImg->is8BitImage() || secondImg->is32BitImage()) //follow up images expected to be a label
2378+
secondImg->colourMapToHSV();
2379+
else
2380+
secondImg->colourMapToGray();
23692381
}
23702382

23712383
QVBoxLayout *layout = new QVBoxLayout(this);

0 commit comments

Comments
 (0)