Supporting PySide2 and addressing Grid defect (#1008)

* new verbage

* Closes #1007

* andrea

* Closes #1003. Closes #973

* fixed ascii character problem

* cleaned csv loader

* skiped ui

* modified plugin test

* initial porting to PySide2

* oka

* removed folder accidentally added

* Scene needs to have the path item added.

* Switching to Qt5 because that is the default with Pyside2.

* Fixing problems with UI and python 3 compatibility.

* Qt5 does not have a rotate for simple text.

* Updating for python 3 and qt5/Pyside2

* Use Agg backend in windows, and nothing uses self.ddata so don't save

Even the docstring said it wasn't returned.

* addressed Paul comment

* reverted input param for global grid

doc/user_manual/Installation/clone.tex

@@ -148,6 +148,6 @@ \subsubsection{Updating RAVEN}
 \end{itemize}
 
 \subsubsection{In-use Testing}
-
-At any time, tests can be checked by re-running the installation tests as
-described in Section \ref{sec:testing raven}.
+Whenever RAVEN is installed on a new computer or whenever there is a significant change to the operating system, 
+in-use tests shall be conducted.
+Acceptable performance of RAVEN shall be confirmed by running the installation tests as described in  \ref{sec:testing raven}.

framework/Application.py

@@ -35,7 +35,12 @@
   import PySide.QtCore as qtc
   __QtAvailable = True
 except ImportError as e:
-  __QtAvailable = False
+  try:
+    import PySide2.QtWidgets as qtw
+    import PySide2.QtCore as qtc
+    __QtAvailable = True
+  except ImportError as e:
+    __QtAvailable = False
 
 if __QtAvailable:
   class InteractiveApplication(qtw.QApplication, MessageHandler.MessageUser):

framework/CodeInterfaces/RAVEN/RAVENInterface.py

@@ -75,8 +75,9 @@ def _readMoreXML(self,xmlNode):
       @ In, xmlNode, xml.etree.ElementTree.Element, Xml element node
       @ Out, None.
     """
-    if os.path.basename(xmlNode.find("executable").text) != 'raven_framework':
-      raise IOError(self.printTag+' ERROR: executable must be "raven_framework" (in whatever location)!')
+    baseName = os.path.basename(xmlNode.find("executable").text)
+    if baseName not in ['raven_framework','Driver.py']:
+      raise IOError(self.printTag+' ERROR: executable must be "raven_framework" (in whatever location)! Got "'+baseName+'"!')
 
     linkedDataObjects = xmlNode.find("outputExportOutStreams")
     if linkedDataObjects is None:
@@ -162,7 +163,7 @@ def generateCommand(self,inputFiles,executable,clargs=None,fargs=None, preExec=N
     outputfile = self.outputPrefix+inputFiles[index].getBase()
     # we set the command type to serial since the SLAVE RAVEN handles the parallel on its own
     pre = ""
-    if "python" not in executable.lower() or executable.endswith(".py"):
+    if "python" not in executable.lower() or not executable.endswith(".py"):
       pre = self.preCommand.strip() + " "
     executeCommand = [('serial',pre + executable+ ' '+inputFiles[index].getFilename())]
     returnCommand = executeCommand, outputfile

framework/GridEntities.py

@@ -32,7 +32,7 @@
 #External Modules End--------------------------------------------------------------------------------
 
 #Internal Modules------------------------------------------------------------------------------------
-from utils.utils import UreturnPrintTag,partialEval,compare, metaclass_insert
+from utils.utils import UreturnPrintTag,partialEval,floatConversion,compare, metaclass_insert
 from BaseClasses import BaseType
 import utils.TreeStructure as ETS
 from utils.RAVENiterators import ravenArrayIterator
@@ -351,7 +351,7 @@ def _fillGrid(self,child):
       self.raiseAnError(IOError,"Each <grid> XML node needs to have the attribute type!!!!")
     nameGrid = None
     if constrType in ['custom','equal']:
-      bounds = [partialEval(element) for element in child.text.split()]
+      bounds = [floatConversion(element) for element in child.text.split()]
       bounds.sort()
       lower, upper = min(bounds), max(bounds)
       if 'name' in child.attrib.keys():

framework/PostProcessors/DataMining.py

@@ -890,7 +890,15 @@ def __runTemporalSciKitLearn(self, Input):
 
 try:
   import PySide.QtCore as qtc
+  __QtAvailable = True
+except ImportError as e:
+  try:
+    import PySide2.QtCore as qtc
+    __QtAvailable = True
+  except ImportError as e:
+    __QtAvailable = False
 
+if __QtAvailable:
   class QDataMining(DataMining,qtc.QObject):
     """
       DataMining class - Computes a hierarchical clustering from an input point
@@ -966,7 +974,7 @@ def userInteraction(self):
 
         ## Give this UI a unique id in case other threads are requesting UI
         ##  elements
-        uiID = unicode(id(self))
+        uiID = str(id(self))
 
         ## Send the request for a UI thread to the main application
         self.requestUI.emit('HierarchyWindow', uiID,
@@ -993,7 +1001,5 @@ def signalDone(self,uiID):
             until the correct one has signaled it is done.
         @Out, None
       """
-      if uiID == unicode(id(self)):
+      if uiID == str(id(self)):
         self.uiDone = True
-except ImportError as e:
-  pass

framework/PostProcessors/TopologicalDecomposition.py

@@ -361,6 +361,15 @@ def run(self, inputIn):
 
 try:
   import PySide.QtCore as qtc
+  __QtAvailable = True
+except ImportError as e:
+  try:
+    import PySide2.QtCore as qtc
+    __QtAvailable = True
+  except ImportError as e:
+    __QtAvailable = False
+
+if __QtAvailable:
   class QTopologicalDecomposition(TopologicalDecomposition,qtc.QObject):
     """
       TopologicalDecomposition class - Computes an approximated hierarchical
@@ -431,7 +440,7 @@ def userInteraction(self):
 
         ## Give this UI a unique id in case other threads are requesting UI
         ##  elements
-        uiID = unicode(id(self))
+        uiID = str(id(self))
 
         ## Send the request for a UI thread to the main application
         self.requestUI.emit('TopologyWindow', uiID,
@@ -467,7 +476,5 @@ def signalDone(self,uiID):
             until the correct one has signaled it is done.
         @Out, None
       """
-      if uiID == unicode(id(self)):
+      if uiID == str(id(self)):
         self.uiDone = True
-except ImportError as e:
-  pass

framework/Samplers/Grid.py

@@ -100,6 +100,7 @@ def localInputAndChecks(self,xmlNode, paramInput):
     if 'limit' in paramInput.parameterValues:
       self.raiseAnError(IOError,'limit is not used in Grid sampler')
     self.limit = 1
+    ##FIXME: THIS READ MORE XML MUST BE CONVERTED IN THE INPUTPARAMETER COLLECTOR!!!!!!!
     self.gridEntity._readMoreXml(xmlNode,dimensionTags=["variable","Distribution"],messageHandler=self.messageHandler, dimTagsPrefix={"Distribution":"<distribution>"})
     grdInfo = self.gridEntity.returnParameter("gridInfo")
     for axis, value in grdInfo.items():