Skip to content

Commit

Permalink
refs #5693. Prevent change of custom colormap when btn not selected.
Browse files Browse the repository at this point in the history
  • Loading branch information
jawrainey committed Jul 9, 2013
1 parent e3979f0 commit 7411a56
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

from mantid.api import PythonAlgorithm, AlgorithmFactory
import mantid.simpleapi as api
from mantid.simpleapi import *

class SimpleAPIPythonAlgorithm1(PythonAlgorithm):

def PyInit(self):
pass
def PyExec(self):
SimpleAPIPythonAlgorithm2()
api.SimpleAPIPythonAlgorithm2()

AlgorithmFactory.subscribe(SimpleAPIPythonAlgorithm1)
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

from mantid.api import PythonAlgorithm, AlgorithmFactory
import mantid.simpleapi as api
from mantid.simpleapi import *

class SimpleAPIPythonAlgorithm2(PythonAlgorithm):

def PyInit(self):
pass
def PyExec(self):
pass
pass

AlgorithmFactory.subscribe(SimpleAPIPythonAlgorithm2)
9 changes: 8 additions & 1 deletion Code/Mantid/MantidPlot/src/PlotDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1177,6 +1177,14 @@ void PlotDialog::showColorMapEditor(bool)
}
}


void PlotDialog::showSelectColorMapButton(bool )
{
mSelectColormap->show();
connect(mSelectColormap,SIGNAL(clicked()),this,SLOT(changeColormap()));

}

void PlotDialog::initSpectrogramPage()
{
spectrogramPage = new QWidget();
Expand All @@ -1193,7 +1201,6 @@ void PlotDialog::initSpectrogramPage()
vl->addWidget(defaultScaleBox);
customScaleBox = new QRadioButton(tr("&Custom Color Map"));
connect(customScaleBox, SIGNAL(toggled(bool)), this, SLOT(showColorMapEditor(bool)));
// connect(customScaleBox, SIGNAL(toggled(bool)), this, SLOT(showSelectColorMapButton(bool)));
vl->addWidget(customScaleBox);

QHBoxLayout *hl = new QHBoxLayout(imageGroupBox);
Expand Down
1 change: 1 addition & 0 deletions Code/Testing/Temporary/CTestCostData.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
---

0 comments on commit 7411a56

Please sign in to comment.