From 16ea929e026d029a9d69b3aa977bc0ddd9ad0a4c Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 6 Mar 2017 14:53:04 +0300 Subject: [PATCH] Patch modules/med.git for Doxygen typos/grammar + misc. typos http://www.salome-platform.org/forum/forum_10/228148167 --- .../config_files/med_check_sizeof_medint.m4 | 2 +- doc/dev/sphinx/medcalc-userguide-api.rst | 8 ++++---- doc/tut/medcoupling/pyfunctions/functions.py | 2 +- doc/tut/medcoupling/testpil.py | 4 ++-- doc/tut/medloader/manage.py | 2 +- idl/MEDDataManager.idl | 4 ++-- src/MEDCalc/cmp/MEDDataManager_i.cxx | 2 +- src/MEDCalc/cmp/MEDPresentation.cxx | 2 +- src/MEDCalc/cmp/test_medcalc_components.py | 4 ++-- .../dialogs/WidgetPresentationParameters.cxx | 2 +- src/MEDCalc/tui/medconsole.py | 4 ++-- src/MEDCalc/tui/medevents.py | 2 +- src/MEDCalc/tui/medimages.py | 4 ++-- src/MEDCalc/tui/medpresentation.py | 14 ++++++------- src/MEDCalc/tui/medprocessing.py | 4 ++-- .../MEDCalculatorBrowserMesh.cxx | 2 +- .../MEDCalculatorBrowserStep.cxx | 2 +- src/MEDCalculator/MEDCalculatorDBField.cxx | 20 +++++++++---------- src/MEDCalculator/Swig/SPythonParser.cxx | 4 ++-- .../Client/MEDCouplingMeshClient.cxx | 2 +- src/MEDGUI/MEDGUIFileContentDial.h | 2 +- 21 files changed, 46 insertions(+), 46 deletions(-) diff --git a/adm_local/unix/config_files/med_check_sizeof_medint.m4 b/adm_local/unix/config_files/med_check_sizeof_medint.m4 index d49d3f804..24d3dd6ff 100644 --- a/adm_local/unix/config_files/med_check_sizeof_medint.m4 +++ b/adm_local/unix/config_files/med_check_sizeof_medint.m4 @@ -30,7 +30,7 @@ AC_DEFUN([MED_CHECK_SIZEOF_MEDINT], [ test "x$ac_cv_sizeof_int" = "x4" || AC_MSG_ERROR([Size of C type int expected to be four bytes]) DEFINED_F77INT64="" else - AC_MSG_ERROR([Size of Fortran type integer is neither four nor eigth bytes]) + AC_MSG_ERROR([Size of Fortran type integer is neither four nor eight bytes]) fi AC_SUBST(DEFINED_F77INT64) ]) \ No newline at end of file diff --git a/doc/dev/sphinx/medcalc-userguide-api.rst b/doc/dev/sphinx/medcalc-userguide-api.rst index 96df82504..9914f26b9 100644 --- a/doc/dev/sphinx/medcalc-userguide-api.rst +++ b/doc/dev/sphinx/medcalc-userguide-api.rst @@ -44,7 +44,7 @@ install only the MEDMEM library from the source files embedded in the SALOME MED module. Keep in mind that the MEDMEM library is designed to be a self-consistent library with very few third party softwares (only med-file, glibc and mpi typically). In particular, it is strictly -independant from the SALOME framework even if it distributed with +independent from the SALOME framework even if it distributed with SALOME for convenience reasons. Components of the MEDMEM library @@ -292,7 +292,7 @@ does not provide such data structures. We suggest to work with a simple list concept to store the metadata for each mesh entry and each field entry. Note that a mesh entry is characterized by the mesh name only, while a field entry is -charaterized by the following attributes: +characterized by the following attributes: * :tt:`fieldName`: the name of the field * :tt:`meshName`: the name of the mesh that supports the field @@ -300,7 +300,7 @@ charaterized by the following attributes: * :tt:`iteration`: a couple of integers :tt:`(iter,order)` that characterizes the step in a serie (timeseries or spectrum). -By default, we suggest to work with a simple map concept (dictionnary in a +By default, we suggest to work with a simple map concept (dictionary in a python context, map in a C++ context) to register the meshes and fields loaded from the med file for each metadata entry. @@ -309,7 +309,7 @@ you may dispatch the data in a tree structure that fit your specific case, for performance reasons. For example, the following code illustrates how to dispatch the metadata in a tree data structure where leaves are the physical data (field objects). We first have to -define a tree structure (basic definition in htis simple case, but it +define a tree structure (basic definition in this simple case, but it works fine): .. include:: ../../tut/medloader/manage.py diff --git a/doc/tut/medcoupling/pyfunctions/functions.py b/doc/tut/medcoupling/pyfunctions/functions.py index 2dec17d09..2ecb5c95a 100755 --- a/doc/tut/medcoupling/pyfunctions/functions.py +++ b/doc/tut/medcoupling/pyfunctions/functions.py @@ -104,7 +104,7 @@ class FuncStiffExp(Function): class FuncCosinus(Function): def __init__(self,nbPeriods): - # The pulsation w must be choosen so that w*xmax=n*2pi where + # The pulsation w must be chosen so that w*xmax=n*2pi where # xmax=1 and n is an integer that corresponds to the number of # oscilations on the xrange [0,xmax]. w=nbPeriods*2*pi diff --git a/doc/tut/medcoupling/testpil.py b/doc/tut/medcoupling/testpil.py index 9a34bed77..0f8ef702e 100755 --- a/doc/tut/medcoupling/testpil.py +++ b/doc/tut/medcoupling/testpil.py @@ -63,7 +63,7 @@ import MEDLoader as ML def createMesh(meshname, sizeX, sizeY): """ Creating a cartesian mesh with a grid of the size of the image. - sizeX and sizeY should be respectively the width and heigth of the + sizeX and sizeY should be respectively the width and height of the image. """ # >>> @@ -131,7 +131,7 @@ def image2med(): img=Image.open("images/avatar.png") #img=Image.open("images/irm.png") imgbw=ImageOps.grayscale(img) - # We keep only the grayscale. Maybe, it could be usefull to get + # We keep only the grayscale. Maybe, it could be useful to get # the RGB scales each on one component of the field. width,height=imgbw.size diff --git a/doc/tut/medloader/manage.py b/doc/tut/medloader/manage.py index 168d6b9fb..cabbb820c 100644 --- a/doc/tut/medloader/manage.py +++ b/doc/tut/medloader/manage.py @@ -72,7 +72,7 @@ for meshName in meshNames: # MEDCoupling field? Or a tree that you cross using attribute and # whose leaves are the MEDCoupling fields? # R: I think that the default structure should be a simple list that -# store objects whith properties that corresponds to the metadata (and +# store objects with properties that corresponds to the metadata (and # if loaded the MEDCouplingField or Mesh). Then for specific request, # a BTree could be create to organize the search (for example if we # request all the fields for a given iteration step, then we should diff --git a/idl/MEDDataManager.idl b/idl/MEDDataManager.idl index b1e80d3db..8d8892848 100644 --- a/idl/MEDDataManager.idl +++ b/idl/MEDDataManager.idl @@ -84,7 +84,7 @@ module MEDCALC }; typedef sequence FieldseriesHandlerList; - // The FieldHandler structure is a lightweigth data structure that + // The FieldHandler structure is a lightweight data structure that // represents a single field (as understood in MEDCoupling model). struct FieldHandler { long id; @@ -135,7 +135,7 @@ module MEDCALC FieldHandler getFieldHandler(in long fieldHandlerId); FieldHandlerList getFieldHandlerList(); - // __GBO__ Maybe it could be usefull to define a getFieldHandlerList with a datasourceId in argument + // __GBO__ Maybe it could be useful to define a getFieldHandlerList with a datasourceId in argument string getFieldRepresentation(in long fieldHandlerId); // Persistency management diff --git a/src/MEDCalc/cmp/MEDDataManager_i.cxx b/src/MEDCalc/cmp/MEDDataManager_i.cxx index 6a703eabb..a3f937175 100644 --- a/src/MEDCalc/cmp/MEDDataManager_i.cxx +++ b/src/MEDCalc/cmp/MEDDataManager_i.cxx @@ -452,7 +452,7 @@ void MEDDataManager_i::saveFields(const char * filepath, * function savePersistentFields is called. */ void MEDDataManager_i::markAsPersistent(CORBA::Long fieldHandlerId, bool persistent) { - LOG("mark as persistant : id="<>> diff --git a/src/MEDCalc/tui/medpresentation.py b/src/MEDCalc/tui/medpresentation.py index 3ef5c42a8..7c1d5f9b2 100644 --- a/src/MEDCalc/tui/medpresentation.py +++ b/src/MEDCalc/tui/medpresentation.py @@ -34,7 +34,7 @@ def MakeMeshView(meshID, notifyGui_addPresentation(meshID, presentation_id) return presentation_id except SALOME.SALOME_Exception as e: - notifyGui_error("An error occured while creating the mesh view:\n" + e.details.text) + notifyGui_error("An error occurred while creating the mesh view:\n" + e.details.text) raise Exception(e.details.text) @@ -52,7 +52,7 @@ def MakeScalarMap(proxy, notifyGui_addPresentation(proxy.id, presentation_id) return presentation_id except SALOME.SALOME_Exception as e: - notifyGui_error("An error occured while creating the scalar map:\n" + e.details.text) + notifyGui_error("An error occurred while creating the scalar map:\n" + e.details.text) raise Exception(e.details.text) def MakeContour(proxy, @@ -67,7 +67,7 @@ def MakeContour(proxy, notifyGui_addPresentation(proxy.id, presentation_id) return presentation_id except SALOME.SALOME_Exception as e: - notifyGui_error("An error occured while creating the contour:\n" + e.details.text) + notifyGui_error("An error occurred while creating the contour:\n" + e.details.text) raise Exception(e.details.text) # @@ -85,7 +85,7 @@ def MakeVectorField(proxy, notifyGui_addPresentation(proxy.id, presentation_id) return presentation_id except SALOME.SALOME_Exception as e: - notifyGui_error("An error occured while creating the vector field:\n" + e.details.text) + notifyGui_error("An error occurred while creating the vector field:\n" + e.details.text) raise Exception(e.details.text) def MakeSlices(proxy, @@ -104,7 +104,7 @@ def MakeSlices(proxy, notifyGui_addPresentation(proxy.id, presentation_id) return presentation_id except SALOME.SALOME_Exception as e: - notifyGui_error("An error occured while creating the slices:\n" + e.details.text) + notifyGui_error("An error occurred while creating the slices:\n" + e.details.text) raise Exception(e.details.text) @@ -121,7 +121,7 @@ def MakeDeflectionShape(proxy, notifyGui_addPresentation(proxy.id, presentation_id) return presentation_id except SALOME.SALOME_Exception as e: - notifyGui_error("An error occured while creating the deflection shape:\n" + e.details.text) + notifyGui_error("An error occurred while creating the deflection shape:\n" + e.details.text) raise Exception(e.details.text) @@ -139,7 +139,7 @@ def MakePointSprite(proxy, notifyGui_addPresentation(proxy.id, presentation_id) return presentation_id except SALOME.SALOME_Exception as e: - notifyGui_error("An error occured while creating the point sprite:\n" + e.details.text) + notifyGui_error("An error occurred while creating the point sprite:\n" + e.details.text) raise Exception(e.details.text) def RemovePresentation(presentation_id): diff --git a/src/MEDCalc/tui/medprocessing.py b/src/MEDCalc/tui/medprocessing.py index 3501e6084..c95f14055 100644 --- a/src/MEDCalc/tui/medprocessing.py +++ b/src/MEDCalc/tui/medprocessing.py @@ -36,7 +36,7 @@ def ChangeUnderlyingMesh(fieldId, meshId): notifyGui_changeUnderlyingMesh(duplicate.id) return duplicate.id except SALOME.SALOME_Exception as e: - notifyGui_error("An error occured while changing underlying mesh:\n" + e.details.text) + notifyGui_error("An error occurred while changing underlying mesh:\n" + e.details.text) raise Exception(e.details.text) # @@ -57,6 +57,6 @@ def InterpolateField(fieldId, notifyGui_interpolateField(fieldHandler.id) return fieldHandler.id except SALOME.SALOME_Exception as e: - notifyGui_error("An error occured while interpolating field:\n" + e.details.text) + notifyGui_error("An error occurred while interpolating field:\n" + e.details.text) raise Exception(e.details.text) # diff --git a/src/MEDCalculator/MEDCalculatorBrowserMesh.cxx b/src/MEDCalculator/MEDCalculatorBrowserMesh.cxx index 620526650..fed187cbd 100644 --- a/src/MEDCalculator/MEDCalculatorBrowserMesh.cxx +++ b/src/MEDCalculator/MEDCalculatorBrowserMesh.cxx @@ -75,7 +75,7 @@ const std::string& MEDCalculatorBrowserMesh::getName() const return _name; } -// Return if the mesh name is equal to input or not, usefull for std::find for example +// Return if the mesh name is equal to input or not, useful for std::find for example bool MEDCalculatorBrowserMesh::operator==(const std::string& nm) { return _name==nm; diff --git a/src/MEDCalculator/MEDCalculatorBrowserStep.cxx b/src/MEDCalculator/MEDCalculatorBrowserStep.cxx index a7ade24ed..83288e56a 100644 --- a/src/MEDCalculator/MEDCalculatorBrowserStep.cxx +++ b/src/MEDCalculator/MEDCalculatorBrowserStep.cxx @@ -55,7 +55,7 @@ bool MEDCalculatorBrowserStep::operator==(bool sel) // str method // Construct a std::string to print this time step, using std::cout for example // Put x or o for selected or not -// Add time step id value ( tiem value ) +// Add time step id value ( time value ) // Return a std::string std::string MEDCalculatorBrowserStep::str() { diff --git a/src/MEDCalculator/MEDCalculatorDBField.cxx b/src/MEDCalculator/MEDCalculatorDBField.cxx index 4c838b61c..5c9a3aa25 100644 --- a/src/MEDCalculator/MEDCalculatorDBField.cxx +++ b/src/MEDCalculator/MEDCalculatorDBField.cxx @@ -249,7 +249,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator+(const MEDCalculatorDBF return ret; } else - throw INTERP_KERNEL::Exception("FieldReal::operator+ : unrecognized type of parameter recieved !"); + throw INTERP_KERNEL::Exception("FieldReal::operator+ : unrecognized type of parameter received !"); } } @@ -299,7 +299,7 @@ bool MEDCalculatorDBFieldReal::isEqual(const MEDCalculatorDBField& other, double return ret; } else - throw INTERP_KERNEL::Exception("FieldReal::isEqual : unrecognized type of parameter recieved !"); + throw INTERP_KERNEL::Exception("FieldReal::isEqual : unrecognized type of parameter received !"); } } @@ -346,7 +346,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator-(const MEDCalculatorDBF return ret; } else - throw INTERP_KERNEL::Exception("FieldReal::operator- : unrecognized type of parameter recieved !"); + throw INTERP_KERNEL::Exception("FieldReal::operator- : unrecognized type of parameter received !"); } } @@ -396,7 +396,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator*(const MEDCalculatorDBF return ret; } else - throw INTERP_KERNEL::Exception("FieldReal::operator* : unrecognized type of parameter recieved !"); + throw INTERP_KERNEL::Exception("FieldReal::operator* : unrecognized type of parameter received !"); } } @@ -446,7 +446,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldReal::operator/(const MEDCalculatorDBF return ret; } else - throw INTERP_KERNEL::Exception("FieldReal::operator/ : unrecognized type of parameter recieved !"); + throw INTERP_KERNEL::Exception("FieldReal::operator/ : unrecognized type of parameter received !"); } } @@ -806,7 +806,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldCst::operator+(const MEDCalculatorDBFi return ret; } else - throw INTERP_KERNEL::Exception("FieldCst::operator+ : unrecognized type of parameter recieved !"); + throw INTERP_KERNEL::Exception("FieldCst::operator+ : unrecognized type of parameter received !"); } } @@ -831,7 +831,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldCst::operator-(const MEDCalculatorDBFi return ret; } else - throw INTERP_KERNEL::Exception("FieldCst::operator- : unrecognized type of parameter recieved !"); + throw INTERP_KERNEL::Exception("FieldCst::operator- : unrecognized type of parameter received !"); } } @@ -856,7 +856,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldCst::operator*(const MEDCalculatorDBFi return ret; } else - throw INTERP_KERNEL::Exception("FieldCst::operator* : unrecognized type of parameter recieved !"); + throw INTERP_KERNEL::Exception("FieldCst::operator* : unrecognized type of parameter received !"); } } @@ -881,7 +881,7 @@ MEDCalculatorDBField *MEDCalculatorDBFieldCst::operator/(const MEDCalculatorDBFi return ret; } else - throw INTERP_KERNEL::Exception("FieldCst::operator/ : unrecognized type of parameter recieved !"); + throw INTERP_KERNEL::Exception("FieldCst::operator/ : unrecognized type of parameter received !"); } } @@ -901,6 +901,6 @@ bool MEDCalculatorDBFieldCst::isEqual(const MEDCalculatorDBField& other, double return ret; } else - throw INTERP_KERNEL::Exception("FieldCst::isEqual : unrecognized type of parameter recieved !"); + throw INTERP_KERNEL::Exception("FieldCst::isEqual : unrecognized type of parameter received !"); } } diff --git a/src/MEDCalculator/Swig/SPythonParser.cxx b/src/MEDCalculator/Swig/SPythonParser.cxx index f686f1b10..39858b1fc 100644 --- a/src/MEDCalculator/Swig/SPythonParser.cxx +++ b/src/MEDCalculator/Swig/SPythonParser.cxx @@ -295,7 +295,7 @@ bool SPythonParser::isElementInParenthesisMatching(const std::string& s, std::st return true; } std::size_t pos5=s.find_first_not_of(NUMBERS,pos4,10); - if(pos5==pos4)//an another caracter found after : ! + if(pos5==pos4)//an another character found after : ! return false; std::string elt2; if(pos5==std::string::npos) @@ -309,7 +309,7 @@ bool SPythonParser::isElementInParenthesisMatching(const std::string& s, std::st ret << elt2; result=ret.str(); std::size_t pos6=s.find_first_not_of(' ',pos5); - if(pos6==pos5)//an another caracter found after 2nd elt ! + if(pos6==pos5)//an another character found after 2nd elt ! return false; return pos6==std::string::npos; } diff --git a/src/MEDCouplingCorba/Client/MEDCouplingMeshClient.cxx b/src/MEDCouplingCorba/Client/MEDCouplingMeshClient.cxx index 2f14bda1b..23c3ac61a 100644 --- a/src/MEDCouplingCorba/Client/MEDCouplingMeshClient.cxx +++ b/src/MEDCouplingCorba/Client/MEDCouplingMeshClient.cxx @@ -95,7 +95,7 @@ void MEDCouplingMeshClient::fillMeshFromCorbaData(MEDCouplingMesh *meshCpp, SALO { meshPtr->Register(); //1st call to getTinyInfo to get tiny array of key integers value - //to corectly resize local copy of distant instance adressed by 'meshPtr' + //to corectly resize local copy of distant instance addressed by 'meshPtr' //1st value of returned array is the type of instance. Thanks to //CORBA and its type-check no use of this value is necessary. SALOME_TYPES::ListOfDouble *tinyD; diff --git a/src/MEDGUI/MEDGUIFileContentDial.h b/src/MEDGUI/MEDGUIFileContentDial.h index 500fa63f5..8ec0efbe4 100644 --- a/src/MEDGUI/MEDGUIFileContentDial.h +++ b/src/MEDGUI/MEDGUIFileContentDial.h @@ -55,7 +55,7 @@ class MEDGUIFileContentDial : public QDialog public slots: void openFile();// Create a new MedGUI_LiteStruct from a file and add content to QTreeWidgets void meshesStateChange(QTreeWidgetItem*, int);// Change the select statement of one or more meshes, the item represents a mesh or a file - void fieldsStateChange(QTreeWidgetItem*, int);// Change tje select statement of one or more fields, the item represents a mesh or a field or a step + void fieldsStateChange(QTreeWidgetItem*, int);// Change the select statement of one or more fields, the item represents a mesh or a field or a step void fieldsStateChanges(); void sendSelectionToDB(); void unselectAll();// Unselec all fields and meshes -- 2.39.2