Skip to content

Commit

Permalink
refs #5167. Disable features.
Browse files Browse the repository at this point in the history
  • Loading branch information
OwenArnold committed Oct 28, 2012
1 parent ab8711a commit 5af025d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Code/Mantid/Framework/Algorithms/src/SmoothNeighbours.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -627,12 +627,12 @@ bool SmoothNeighbours::isRectangularDetectorInstrument() const
{
if(detector->type() == "RectangularDetectorPixel")
{
g_log.information("Assuming Rectangular Detectors for SmoothNeighbours on this data.");
g_log.debug("Assuming Rectangular Detectors for SmoothNeighbours on this data.");
isRectangularDetectorInstrument = true;
}
else
{
g_log.information("Assuming Non-Rectangular Detectors for SmoothNeighbours on this data.");
g_log.debug("Assuming Non-Rectangular Detectors for SmoothNeighbours on this data.");
isRectangularDetectorInstrument = false;
}
}
Expand Down
12 changes: 7 additions & 5 deletions Code/Mantid/MantidQt/SliceViewer/src/SliceViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ SliceViewer::SliceViewer(QWidget *parent)
m_overlayWSOutline->setShowHandles(false);
m_overlayWSOutline->setShowLine(false);
m_overlayWSOutline->setShown(false);

ui.btnPeakOverlay->hide();
// -------- Peak Overlay ----------------
//PeakOverlay* m_peakOverlay = new PeakOverlay(m_plot, m_plot->canvas(), QPointF(0.5,0.5), QPointF(0.1, 0.2)); //TODO use the peak overlay
//m_peakOverlay->setPlaneDistance(0);
Expand Down Expand Up @@ -308,12 +310,12 @@ void SliceViewer::initMenus()

m_menuView->addSeparator();

action = new QAction(QPixmap(), "Peak Overlay", this);
m_syncPeakOverlay = new SyncedCheckboxes(action, ui.btnPeakOverlay, false);
connect(action, SIGNAL(toggled(bool)), this, SLOT(peakOverlay_toggled(bool)));
m_menuView->addAction(action);
//action = new QAction(QPixmap(), "Peak Overlay", this);
//m_syncPeakOverlay = new SyncedCheckboxes(action, ui.btnPeakOverlay, false);
//connect(action, SIGNAL(toggled(bool)), this, SLOT(peakOverlay_toggled(bool)));
//m_menuView->addAction(action);

m_menuView->addSeparator();
//m_menuView->addSeparator();

QActionGroup* group = new QActionGroup( this );

Expand Down

0 comments on commit 5af025d

Please sign in to comment.