Skip to content

Commit

Permalink
Re #6151 Reduction UI framework now entirely free of old API
Browse files Browse the repository at this point in the history
  • Loading branch information
mdoucet committed Dec 20, 2012
1 parent 4851f74 commit 493e722
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions Code/Mantid/scripts/Interface/reduction_application.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@
from PyQt4 import QtGui, QtCore, uic

# Check whether Mantid is available
try:
from MantidFramework import *
mtd.initialise(False)
from mantidsimple import *
HAS_MANTID = True
except:
HAS_MANTID = False

IS_IN_MANTIDPLOT = False
try:
import mantidplot
Expand All @@ -21,7 +13,7 @@
REDUCTION_WARNING = False
WARNING_MESSAGE = ""

if HAS_MANTID:
if IS_IN_MANTIDPLOT:
try:
import reduction
if os.path.splitext(os.path.basename(reduction.__file__))[0] == "reduction":
Expand Down Expand Up @@ -88,7 +80,7 @@ def __init__(self, instrument=None, instrument_list=None):
self.setupUi(self)

# Event connections
if not HAS_MANTID:
if not IS_IN_MANTIDPLOT:
self.reduce_button.hide()
self.connect(self.export_button, QtCore.SIGNAL("clicked()"), self._export)
self.connect(self.reduce_button, QtCore.SIGNAL("clicked()"), self.reduce_clicked)
Expand Down

0 comments on commit 493e722

Please sign in to comment.