Skip to content

Commit

Permalink
Refs #4316: cleaning up squish tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Janik Zikovsky committed Dec 12, 2011
1 parent 06f9a81 commit 275608e
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 51 deletions.
2 changes: 1 addition & 1 deletion Code/Mantid/Build/CMake/CommonSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ if ( SQUISH_FOUND )
enable_testing()
message ( STATUS "Found Squish for GUI testing" )
else()
message ( STATUS "Could not find Squish - GUI testing not available" )
message ( STATUS "Could not find Squish - GUI testing not available. Try specifying your SQUISH_INSTALL_DIR cmake variable." )
endif()

###########################################################################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ using namespace MantidQt::SliceViewer;
int main( int argc, char ** argv )
{
double min=0;
double max=1e4;
double max=100;

QApplication app(argc, argv);
app.setOrganizationName("MantidProject");
Expand All @@ -40,6 +40,7 @@ int main( int argc, char ** argv )
ColorBarWidget * widget = new ColorBarWidget(frame);

widget->setDataRange(min, max);
widget->setViewRange(min, max);
widget->setLog(false);

layout->addWidget(widget);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AUT=ColorBarWidgetDemo
LANGUAGE=Python
TEST_CASES=tst_min_makes_max_increase tst_startup tst_log_resets_min tst_signals
TEST_CASES=tst_min_makes_max_increase tst_startup tst_log_resets_min
VERSION=2
WRAPPERS=Qt

This file was deleted.

27 changes: 27 additions & 0 deletions Code/Mantid/MantidQt/SliceViewer/test/test_python_interface.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import sys
import os
from PyQt4 import Qt

# We instantiate a QApplication passing the arguments of the script to it:
a = Qt.QApplication(sys.argv)

sys.path.append( os.getcwd() )
import MantidFramework
from mantidsimple import *

# Create a test data set
CreateMDWorkspace(Dimensions='3',Extents='0,10,0,10,0,10',Names='x,y,z',
Units='m,m,m',SplitInto='5',MaxRecursionDepth='20',OutputWorkspace='mdw')
FakeMDEventData("mdw", UniformParams="1e6")
BinMD("mdw", "uniform", AxisAligned=1, AlignedDimX="x,0,10,30", AlignedDimY="y,0,10,30", AlignedDimZ="z,0,10,30", IterateEvents="1", Parallel="0")

print "CREATED!"

# Create the widget
import libmantidqtpython
sv = libmantidqtpython.MantidQt.SliceViewer.SliceViewer()
sv.setWorkspace('uniform')
sv.show()

# Run the app.
a.exec_()

0 comments on commit 275608e

Please sign in to comment.