refs #6601. solve name conflict.

mantidproject · Feb 22, 2013 · 93aae25 · 93aae25
1 parent 4459f5e
commit 93aae25
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Code/Mantid/MantidPlot/mantidplot.py b/Code/Mantid/MantidPlot/mantidplot.py
@@ -844,8 +844,8 @@ def screenshot(widget, filename, description, png_exists=False):
 
         _replace_report_text(report, filename, section_text)
 
-def screenshot(widget, filename, screenshot_dir):
-    """Take a screenshot of a widget
+def screenshot_to_dir(widget, filename, screenshot_dir):
+    """Take a screenshot_to_dir of a widget
     
     @param widget :: QWidget to take an image of
     @param filename :: Destination filename for that image

diff --git a/Code/Mantid/MantidPlot/test/MantidPlotAlgorithmDialogTest.py b/Code/Mantid/MantidPlot/test/MantidPlotAlgorithmDialogTest.py
@@ -24,7 +24,7 @@ def test_ScreenShotDialog(self):
         dialog = threadsafe_call( interface_manager.createDialogFromName, self.__target_algorithm__, self.__clean_properties__)
         screenshotdir = tempfile.gettempdir();
         file = "CreateMDWorkspace_screenshot"
-        screenshot(widget=dialog, filename=file, screenshot_dir=screenshotdir)
+        screenshot_to_dir(widget=dialog, filename=file, screenshot_dir=screenshotdir)
         threadsafe_call(dialog.close)
         file_abs = os.path.join(screenshotdir, file + ".png")
         file_exists = os.path.isfile(file_abs)

diff --git a/Code/Mantid/scripts/WikiMaker/ScreenshotAlgDialogs.py b/Code/Mantid/scripts/WikiMaker/ScreenshotAlgDialogs.py
@@ -15,7 +15,7 @@ def screenShotAlgorithm(alg_name):
 	interface_manager = mantidqtpython.MantidQt.API.InterfaceManager()
 	dlg = threadsafe_call( interface_manager.createDialogFromName, alg_name, True)
 	file = alg_name + "_dlg"
-	screenshot(widget=dlg, filename=file, screenshot_dir=screenshotdir)
+	screenshot_to_dir(widget=dlg, filename=file, screenshot_dir=screenshotdir)
 	threadsafe_call(dlg.close)
 	file_abs = os.path.join(screenshotdir, file + ".png")