From: rnv <rnv@opencascade.com>
Date: Tue, 26 Dec 2017 11:38:55 +0000 (+0300)
Subject: Merge master branch into V9_dev.
X-Git-Tag: V9_0_0~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=66a70e025d31e6b8d124510db0bcf9bea9493b46;p=modules%2Fmed.git

Merge master branch into V9_dev.
---

66a70e025d31e6b8d124510db0bcf9bea9493b46
diff --cc src/MEDCalc/gui/ProcessingController.cxx
index ca111db6c,599d97739..bb7321ce2
--- a/src/MEDCalc/gui/ProcessingController.cxx
+++ b/src/MEDCalc/gui/ProcessingController.cxx
@@@ -82,7 -82,10 +82,7 @@@ ProcessingController::createActions(
  void
  ProcessingController::OnChangeUnderlyingMesh()
  {
-   // Get the selected objects in the study (SObject). In cas of a
 -  // We need a studyEditor updated on the active study
 -  _studyEditor->updateActiveStudy();
 -
+   // Get the selected objects in the study (SObject). In case of a
    // multiple selection, we consider only the first item. At least one
    // item must be selected.
    SALOME_StudyEditor::SObjectList* listOfSObject = _studyEditor->getSelectedObjects();
diff --cc src/MEDCalc/tui/medcorba.py
index 1c05b4de4,8fdae6982..fa828c6ac
--- a/src/MEDCalc/tui/medcorba.py
+++ b/src/MEDCalc/tui/medcorba.py
@@@ -45,8 -45,8 +45,8 @@@ import MEDCALC   # corbaModul
  med_engine = salome.lcc.FindOrLoadComponent(containerType,medComponentName)
  factory = salome.lcc.FindOrLoadComponent(containerType,factoryComponentName)
  # The factory is not the main CORBA component of the SALOME module MED
 -# (i.e. the engine associated to the active study), but the CORBA
 +# (i.e. the engine associated to the study), but the CORBA
  # entry point for MED fields operations (i.e. a CORBA component
- # reachable throught the LifeCycleCORBA). This entry point is used to
+ # reachable through the LifeCycleCORBA). This entry point is used to
  # get the other SALOME CORBA components required for MED field
  # operations, in particular the dataManager and the calculator
diff --cc src/MEDCalc/tui/medevents.py
index 1d41ff7cf,276c65a37..c9a644557
--- a/src/MEDCalc/tui/medevents.py
+++ b/src/MEDCalc/tui/medevents.py
@@@ -36,10 -36,10 +36,10 @@@ def connectEventListener()
    try:
      eventListenerIOR = dataManager.getEventListenerIOR()
      __eventListener = salome.orb.string_to_object(eventListenerIOR)
 -  except SALOME.SALOME_Exception, e:
 +  except SALOME.SALOME_Exception as e:
      medcalc.wrn("The event listener is not running yet")
      msg ="When you'll have loaded the MED GUI, "
-     msg+="call explicitely \"medcalc.medevents.connectEventListener()\" "
+     msg+="call explicitly \"medcalc.medevents.connectEventListener()\" "
      msg+="to connect the GUI event listener"
      medcalc.inf(msg)
      __eventListener = None