From: asl Date: Wed, 18 Nov 2015 09:29:18 +0000 (+0300) Subject: global misprinting in the word "splitted" is replaced by "split" X-Git-Tag: v1.5~19^2^2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2f02a5b7680c10ed7fcd63f4ffb75af0932f5bb9;p=modules%2Fhydro.git global misprinting in the word "splitted" is replaced by "split" --- diff --git a/CMake/UsePyQt4EXT.cmake b/CMake/UsePyQt4EXT.cmake index bd1875f6..b6b0f5a5 100644 --- a/CMake/UsePyQt4EXT.cmake +++ b/CMake/UsePyQt4EXT.cmake @@ -145,8 +145,8 @@ MACRO(PYQT4_WRAP_SIP_EXT outfiles) LIST(APPEND _output ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_ShapesGroup.cc) SET(${outfiles} ${${outfiles}} ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_ShapesGroup.cc) - LIST(APPEND _output ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_SplittedShapesGroup.cc) - SET(${outfiles} ${${outfiles}} ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_SplittedShapesGroup.cc) + LIST(APPEND _output ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_SplitShapesGroup.cc) + SET(${outfiles} ${${outfiles}} ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyHYDROData_SplitShapesGroup.cc) LIST(APPEND _output ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyTCollection_AsciiString.cc) SET(${outfiles} ${${outfiles}} ${CMAKE_CURRENT_BINARY_DIR}/sipHYDROPyTCollection_AsciiString.cc) diff --git a/src/HYDROData/CMakeLists.txt b/src/HYDROData/CMakeLists.txt index f1868fb7..707e6694 100644 --- a/src/HYDROData/CMakeLists.txt +++ b/src/HYDROData/CMakeLists.txt @@ -37,7 +37,7 @@ set(PROJECT_HEADERS HYDROData_River.h HYDROData_ShapesGroup.h HYDROData_ShapesTool.h - HYDROData_SplittedShapesGroup.h + HYDROData_SplitShapesGroup.h HYDROData_SplitToZonesTool.h HYDROData_Stream.h HYDROData_StreamAltitude.h @@ -93,7 +93,7 @@ set(PROJECT_SOURCES HYDROData_River.cxx HYDROData_ShapesGroup.cxx HYDROData_ShapesTool.cxx - HYDROData_SplittedShapesGroup.cxx + HYDROData_SplitShapesGroup.cxx HYDROData_SplitToZonesTool.cxx HYDROData_Stream.cxx HYDROData_StreamAltitude.cxx diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx index d0927c2b..3919019f 100644 --- a/src/HYDROData/HYDROData_CalculationCase.cxx +++ b/src/HYDROData/HYDROData_CalculationCase.cxx @@ -26,7 +26,7 @@ #include "HYDROData_PolylineXY.h" #include "HYDROData_StricklerTable.h" #include "HYDROData_LandCoverMap.h" -#include "HYDROData_SplittedShapesGroup.h" +#include "HYDROData_SplitShapesGroup.h" #include "HYDROData_Region.h" #include "HYDROData_Tool.h" #include "HYDROData_GeomTool.h" @@ -97,14 +97,14 @@ void HYDROData_CalculationCase::SetName( const QString& theName ) // Update names of regions and its zones UpdateRegionsNames( GetRegions(), anOldCaseName, theName ); - HYDROData_SequenceOfObjects aGroups = GetSplittedGroups(); + HYDROData_SequenceOfObjects aGroups = GetSplitGroups(); HYDROData_SequenceOfObjects::Iterator anIter; anIter.Init( aGroups ); for ( ; anIter.More(); anIter.Next() ) { - Handle(HYDROData_SplittedShapesGroup) aGroup = - Handle(HYDROData_SplittedShapesGroup)::DownCast( anIter.Value() ); + Handle(HYDROData_SplitShapesGroup) aGroup = + Handle(HYDROData_SplitShapesGroup)::DownCast( anIter.Value() ); if ( aGroup.IsNull() ) continue; @@ -263,7 +263,7 @@ void HYDROData_CalculationCase::Update() // At first we remove previously created objects RemoveRegions(); - RemoveSplittedGroups(); + RemoveSplitGroups(); Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); if ( aDocument.IsNull() ) @@ -409,7 +409,7 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume void HYDROData_CalculationCase::CreateEdgeGroupsDef( const Handle(HYDROData_Document)& theDoc, const HYDROData_SplitToZonesTool::SplitDataList& theEdges ) { - QMap aSplittedEdgesGroupsMap; + QMap aSplitEdgesGroupsMap; HYDROData_SplitToZonesTool::SplitDataListIterator anIter( theEdges ); while( anIter.hasNext() ) @@ -426,20 +426,20 @@ void HYDROData_CalculationCase::CreateEdgeGroupsDef( const Handle(HYDROData_Docu QString aStr = aSplitData.ObjectNames.join(" "); cout << " CCase: Names = "< -static const Standard_GUID GUID_SELF_SPLITTED("997995aa-5c19-40bf-9a60-ab4b70ad04d8"); +static const Standard_GUID GUID_SELF_SPLIT("997995aa-5c19-40bf-9a60-ab4b70ad04d8"); static const Standard_GUID GUID_HAS_LOCAL_POINTS("FD8841AA-FC44-42fa-B6A7-0F682CCC6F27"); static const Standard_GUID GUID_HAS_GLOBAL_POINTS("330D0E81-742D-4ea3-92D4-484877CFA7C1"); @@ -508,7 +508,7 @@ void HYDROData_Image::RemoveAllReferences() ClearReferences(); SetOperatorName( "" ); SetArgs( "" ); - SetIsSelfSplitted( false ); + SetIsSelfSplit( false ); } bool anIsByTwoPoints = IsByTwoPoints(); @@ -875,19 +875,19 @@ QByteArray HYDROData_Image::Args() const return QByteArray(aData, aLen); } -void HYDROData_Image::SetIsSelfSplitted(bool theFlag) +void HYDROData_Image::SetIsSelfSplit(bool theFlag) { if (theFlag) { - TDataStd_UAttribute::Set(myLab, GUID_SELF_SPLITTED); + TDataStd_UAttribute::Set(myLab, GUID_SELF_SPLIT); } else { - myLab.ForgetAttribute(GUID_SELF_SPLITTED); + myLab.ForgetAttribute(GUID_SELF_SPLIT); } Changed( Geom_2d ); } -bool HYDROData_Image::IsSelfSplitted() const +bool HYDROData_Image::IsSelfSplit() const { - return myLab.IsAttribute(GUID_SELF_SPLITTED); + return myLab.IsAttribute(GUID_SELF_SPLIT); } QPointF HYDROData_Image::generateThirdPoint( const QPointF& thePointA, diff --git a/src/HYDROData/HYDROData_Image.h b/src/HYDROData/HYDROData_Image.h index 255e0575..5a25af9e 100644 --- a/src/HYDROData/HYDROData_Image.h +++ b/src/HYDROData/HYDROData_Image.h @@ -363,16 +363,16 @@ public: /** - * Marks the image as self-splitted. - * \param theFlag is true for self-splitted image + * Marks the image as self-split. + * \param theFlag is true for self-plit image */ - HYDRODATA_EXPORT void SetIsSelfSplitted(bool theFlag); + HYDRODATA_EXPORT void SetIsSelfSplit(bool theFlag); /** - * Checks that the image is self-splitted. - * \returns true if image is self-splitted + * Checks that the image is self-split. + * \returns true if image is self-split */ - HYDRODATA_EXPORT bool IsSelfSplitted() const; + HYDRODATA_EXPORT bool IsSelfSplit() const; private: diff --git a/src/HYDROData/HYDROData_Iterator.cxx b/src/HYDROData/HYDROData_Iterator.cxx index 8b4caf92..615454a9 100644 --- a/src/HYDROData/HYDROData_Iterator.cxx +++ b/src/HYDROData/HYDROData_Iterator.cxx @@ -37,7 +37,7 @@ #include "HYDROData_Region.h" #include "HYDROData_River.h" #include "HYDROData_ShapesGroup.h" -#include "HYDROData_SplittedShapesGroup.h" +#include "HYDROData_SplitShapesGroup.h" #include "HYDROData_Stream.h" #include "HYDROData_StreamAltitude.h" #include "HYDROData_VisualState.h" @@ -148,7 +148,7 @@ Handle(HYDROData_Entity) HYDROData_Iterator::Object( const TDF_Label& theLabel ) case KIND_VISUAL_STATE: aResult = new HYDROData_VisualState(); break; case KIND_DUMMY_3D: aResult = new HYDROData_DummyObject3D(); break; case KIND_SHAPES_GROUP: aResult = new HYDROData_ShapesGroup(); break; - case KIND_SPLITTED_GROUP: aResult = new HYDROData_SplittedShapesGroup(); break; + case KIND_SPLIT_GROUP: aResult = new HYDROData_SplitShapesGroup(); break; case KIND_STREAM_ALTITUDE: aResult = new HYDROData_StreamAltitude(); break; case KIND_OBSTACLE_ALTITUDE: aResult = new HYDROData_ObstacleAltitude(); break; case KIND_STRICKLER_TABLE: aResult = new HYDROData_StricklerTable(); break; diff --git a/src/HYDROData/HYDROData_PolylineOperator.cxx b/src/HYDROData/HYDROData_PolylineOperator.cxx index 03e6d600..6dbbd745 100644 --- a/src/HYDROData/HYDROData_PolylineOperator.cxx +++ b/src/HYDROData/HYDROData_PolylineOperator.cxx @@ -222,12 +222,12 @@ bool HYDROData_PolylineOperator::split( const Handle( HYDROData_Document )& theD aCurve.Intersect(aToolCurves[aTSI], aParams); } - std::deque aSplittedCurves; - theIsIntersected |= aCurve.Cut(aParams, aSplittedCurves); + std::deque aSplitCurves; + theIsIntersected |= aCurve.Cut(aParams, aSplitCurves); std::deque::const_iterator aCIt = - aSplittedCurves.begin(); + aSplitCurves.begin(); std::deque::const_iterator aLastCIt = - aSplittedCurves.end(); + aSplitCurves.end(); for (; aCIt != aLastCIt; ++aCIt) { aResult.push_back(aCIt->Wire()); diff --git a/src/HYDROData/HYDROData_SplitShapesGroup.cxx b/src/HYDROData/HYDROData_SplitShapesGroup.cxx new file mode 100644 index 00000000..dd50bc4e --- /dev/null +++ b/src/HYDROData/HYDROData_SplitShapesGroup.cxx @@ -0,0 +1,33 @@ +// Copyright (C) 2014-2015 EDF-R&D +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +#include "HYDROData_SplitShapesGroup.h" + +IMPLEMENT_STANDARD_HANDLE(HYDROData_SplitShapesGroup,HYDROData_ShapesGroup) +IMPLEMENT_STANDARD_RTTIEXT(HYDROData_SplitShapesGroup,HYDROData_ShapesGroup) + +HYDROData_SplitShapesGroup::HYDROData_SplitShapesGroup() +: HYDROData_ShapesGroup() +{ +} + +HYDROData_SplitShapesGroup::~HYDROData_SplitShapesGroup() +{ +} + + diff --git a/src/HYDROData/HYDROData_SplitShapesGroup.h b/src/HYDROData/HYDROData_SplitShapesGroup.h new file mode 100644 index 00000000..81e04ded --- /dev/null +++ b/src/HYDROData/HYDROData_SplitShapesGroup.h @@ -0,0 +1,65 @@ +// Copyright (C) 2014-2015 EDF-R&D +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +#ifndef HYDROData_SplitShapesGroup_HeaderFile +#define HYDROData_SplitShapesGroup_HeaderFile + +#include + +DEFINE_STANDARD_HANDLE(HYDROData_SplitShapesGroup, HYDROData_ShapesGroup) + + +/**\class HYDROData_SplitShapesGroup + * \brief Class that stores/retreives the sequence of split shapes. + */ +class HYDROData_SplitShapesGroup : public HYDROData_ShapesGroup +{ +protected: + /** + * Enumeration of tags corresponding to the persistent object parameters. + */ + enum DataTag + { + DataTag_First = HYDROData_ShapesGroup::DataTag_First + 100 ///< first tag, to reserve + }; + +public: + DEFINE_STANDARD_RTTI(HYDROData_SplitShapesGroup); + + /** + * Returns the kind of this object. Must be redefined in all objects of known type. + */ + HYDRODATA_EXPORT virtual const ObjectKind GetKind() const { return KIND_SPLIT_GROUP; } + +protected: + + friend class HYDROData_Iterator; + + /** + * Creates new object in the internal data structure. Use higher level objects + * to create objects with real content. + */ + HYDRODATA_EXPORT HYDROData_SplitShapesGroup(); + + /** + * Destructs properties of the object and object itself, removes it from the document. + */ + virtual HYDRODATA_EXPORT ~HYDROData_SplitShapesGroup(); +}; + +#endif diff --git a/src/HYDROData/HYDROData_SplittedShapesGroup.cxx b/src/HYDROData/HYDROData_SplittedShapesGroup.cxx deleted file mode 100644 index 4c183003..00000000 --- a/src/HYDROData/HYDROData_SplittedShapesGroup.cxx +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (C) 2014-2015 EDF-R&D -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#include "HYDROData_SplittedShapesGroup.h" - -IMPLEMENT_STANDARD_HANDLE(HYDROData_SplittedShapesGroup,HYDROData_ShapesGroup) -IMPLEMENT_STANDARD_RTTIEXT(HYDROData_SplittedShapesGroup,HYDROData_ShapesGroup) - -HYDROData_SplittedShapesGroup::HYDROData_SplittedShapesGroup() -: HYDROData_ShapesGroup() -{ -} - -HYDROData_SplittedShapesGroup::~HYDROData_SplittedShapesGroup() -{ -} - - diff --git a/src/HYDROData/HYDROData_SplittedShapesGroup.h b/src/HYDROData/HYDROData_SplittedShapesGroup.h deleted file mode 100644 index 2aa64ae5..00000000 --- a/src/HYDROData/HYDROData_SplittedShapesGroup.h +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (C) 2014-2015 EDF-R&D -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#ifndef HYDROData_SplittedShapesGroup_HeaderFile -#define HYDROData_SplittedShapesGroup_HeaderFile - -#include - -DEFINE_STANDARD_HANDLE(HYDROData_SplittedShapesGroup, HYDROData_ShapesGroup) - - -/**\class HYDROData_SplittedShapesGroup - * \brief Class that stores/retreives the sequence of splitted shapes. - */ -class HYDROData_SplittedShapesGroup : public HYDROData_ShapesGroup -{ -protected: - /** - * Enumeration of tags corresponding to the persistent object parameters. - */ - enum DataTag - { - DataTag_First = HYDROData_ShapesGroup::DataTag_First + 100 ///< first tag, to reserve - }; - -public: - DEFINE_STANDARD_RTTI(HYDROData_SplittedShapesGroup); - - /** - * Returns the kind of this object. Must be redefined in all objects of known type. - */ - HYDRODATA_EXPORT virtual const ObjectKind GetKind() const { return KIND_SPLITTED_GROUP; } - -protected: - - friend class HYDROData_Iterator; - - /** - * Creates new object in the internal data structure. Use higher level objects - * to create objects with real content. - */ - HYDRODATA_EXPORT HYDROData_SplittedShapesGroup(); - - /** - * Destructs properties of the object and object itself, removes it from the document. - */ - virtual HYDRODATA_EXPORT ~HYDROData_SplittedShapesGroup(); -}; - -#endif diff --git a/src/HYDROData/HYDROData_TopoCurve.h b/src/HYDROData/HYDROData_TopoCurve.h index 484e2021..1f1025d9 100644 --- a/src/HYDROData/HYDROData_TopoCurve.h +++ b/src/HYDROData/HYDROData_TopoCurve.h @@ -68,7 +68,7 @@ public: //! Cuts the curve in the given parameter of the given edge and //! fills the cut part. //! Returns 'true' if: - //! - the curve is open and was splitted into two parts or + //! - the curve is open and was split into two parts or //! - the curve is closed and was cut into an open curve. HYDRODATA_EXPORT bool Cut( const std::list::iterator& theEdgePosition, diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h index a74d7b06..42599f59 100644 --- a/src/HYDROGUI/HYDROGUI_CalculationOp.h +++ b/src/HYDROGUI/HYDROGUI_CalculationOp.h @@ -94,7 +94,7 @@ protected slots: */ void onCreateRegion( const QList& theZonesList ); /** - * Case objects must be splitted to zones if the case has been modified or new. + * Case objects must be split to zones if the case has been modified or new. */ void onNext( const int ); void onLastViewClosed( SUIT_ViewManager* ); diff --git a/src/HYDROGUI/HYDROGUI_DataModel.cxx b/src/HYDROGUI/HYDROGUI_DataModel.cxx index 7f4db438..12938432 100644 --- a/src/HYDROGUI/HYDROGUI_DataModel.cxx +++ b/src/HYDROGUI/HYDROGUI_DataModel.cxx @@ -639,7 +639,7 @@ bool HYDROGUI_DataModel::canCopy() bool isChildObject = aKind == KIND_DUMMY_3D || aKind == KIND_ZONE || aKind == KIND_SHAPES_GROUP || - aKind == KIND_SPLITTED_GROUP; + aKind == KIND_SPLIT_GROUP; if ( isUnrecognized || isChildObject ) { isCanCopy = false; break; @@ -732,7 +732,7 @@ LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject* const ObjectKind aKind = theModelObject->GetKind(); bool visibility = aKind == KIND_IMAGE || aKind == KIND_POLYLINEXY || aKind == KIND_POLYLINE || - aKind == KIND_SHAPES_GROUP || aKind == KIND_SPLITTED_GROUP || aKind == KIND_ZONE || + aKind == KIND_SHAPES_GROUP || aKind == KIND_SPLIT_GROUP || aKind == KIND_ZONE || aKind == KIND_IMMERSIBLE_ZONE || aKind == KIND_REGION || aKind == KIND_BATHYMETRY || aKind == KIND_OBSTACLE || aKind == KIND_STREAM || aKind == KIND_CHANNEL || aKind == KIND_DIGUE || aKind == KIND_DUMMY_3D || aKind == KIND_LAND_COVER_MAP; @@ -1015,8 +1015,8 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, HYDROData_SequenceOfObjects aCalcGroups = aCaseObj->GetGeometryGroups(); buildObjectPartition( aGuiObj, aCalcGroups, tr( "OBJECT_GROUPS" ), false ); - HYDROData_SequenceOfObjects aCalcSplitGroups = aCaseObj->GetSplittedGroups(); - buildObjectPartition( aGuiObj, aCalcSplitGroups, tr( "CASE_SPLITTED_GROUPS" ), false ); + HYDROData_SequenceOfObjects aCalcSplitGroups = aCaseObj->GetSplitGroups(); + buildObjectPartition( aGuiObj, aCalcSplitGroups, tr( "CASE_SPLIT_GROUPS" ), false ); #endif } diff --git a/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx b/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx index 5db4f16b..1c83e787 100644 --- a/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx +++ b/src/HYDROGUI/HYDROGUI_LandCoverMapOp.cxx @@ -285,9 +285,9 @@ bool HYDROGUI_LandCoverMapOp::processApply( int& theUpdateFlags, // Split land cover(s) inside edited land cover map if ( myOperationId == SplitLandCoverId ) { - bool aLandCoverSplitted = false; + bool aLandCoverSplit = false; if ( !aPolyline.IsNull() ) - aLandCoverSplitted = aLandCoverMapObj->Split( aPolyline ); + aLandCoverSplit = aLandCoverMapObj->Split( aPolyline ); else if ( !aFace.IsNull() ) { // Get the complete boundary of the object face as the splitting polyline @@ -302,12 +302,12 @@ bool HYDROGUI_LandCoverMapOp::processApply( int& theUpdateFlags, continue; bool aSplitResult = aLandCoverMapObj->Split( aShape ); - aLandCoverSplitted = ( i==0 ? aSplitResult : aLandCoverSplitted && aSplitResult ); + aLandCoverSplit = ( i==0 ? aSplitResult : aLandCoverSplit && aSplitResult ); } } - if ( !aLandCoverSplitted ) + if ( !aLandCoverSplit ) { - theErrorMsg = tr( "LAND_COVER_NOT_SPLITTED" ); + theErrorMsg = tr( "LAND_COVER_NOT_SPLIT" ); return false; } } diff --git a/src/HYDROGUI/HYDROGUI_Module.cxx b/src/HYDROGUI/HYDROGUI_Module.cxx index e46d12a9..9b1d8f3d 100644 --- a/src/HYDROGUI/HYDROGUI_Module.cxx +++ b/src/HYDROGUI/HYDROGUI_Module.cxx @@ -324,7 +324,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient, bool anIsImageHasRefs = false; bool anIsFusedImage = false; bool anIsCutImage = false; - bool anIsSplittedImage = false; + bool anIsSplitImage = false; bool anIsMustObjectBeUpdated = false; bool anIsPolyline = false; bool anIsPolyline3D = false; @@ -424,7 +424,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient, else if( anOperatorName == ImageComposer_CutOperator::Type() ) anIsCutImage = true; else if( anOperatorName == ImageComposer_CropOperator::Type() ) - anIsSplittedImage = true; + anIsSplitImage = true; } } } @@ -476,7 +476,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient, anIsDigue = true; else if( anObjectKind == KIND_DUMMY_3D ) anIsDummyObject3D = true; - else if( anObjectKind == KIND_SHAPES_GROUP || anObjectKind == KIND_SPLITTED_GROUP ) + else if( anObjectKind == KIND_SHAPES_GROUP || anObjectKind == KIND_SPLIT_GROUP ) anIsGroup = true; } @@ -571,8 +571,8 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient, theMenu->addAction( action( EditFusedImageId ) ); else if( anIsCutImage ) theMenu->addAction( action( EditCutImageId ) ); - else if( anIsSplittedImage ) - theMenu->addAction( action( EditSplittedImageId ) ); + else if( anIsSplitImage ) + theMenu->addAction( action( EditSplitImageId ) ); } //RKV: BUG#98: theMenu->addAction( action( ObserveImageId ) ); diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx index 04aa55f7..8371e64d 100644 --- a/src/HYDROGUI/HYDROGUI_Operations.cxx +++ b/src/HYDROGUI/HYDROGUI_Operations.cxx @@ -197,7 +197,7 @@ void HYDROGUI_Module::createActions() createAction( EditCutImageId, "EDIT_CUT_IMAGE", "EDIT_CUT_IMAGE_ICO" ); createAction( SplitImageId, "SPLIT_IMAGE", "SPLIT_IMAGE_ICO" ); - createAction( EditSplittedImageId, "EDIT_SPLITTED_IMAGE", "EDIT_SPLITTED_IMAGE_ICO" ); + createAction( EditSplitImageId, "EDIT_SPLIT_IMAGE", "EDIT_SPLIT_IMAGE_ICO" ); createAction( RecognizeContoursId, "RECOGNIZE_CONTOURS", "RECOGNIZE_CONTOURS_ICO" ); @@ -613,8 +613,8 @@ LightApp_Operation* HYDROGUI_Module::createOperation( const int theId ) const anOp = new HYDROGUI_TwoImagesOp( aModule, HYDROGUI_TwoImagesOp::Cut, theId == EditCutImageId ); break; case SplitImageId: - case EditSplittedImageId: - anOp = new HYDROGUI_TwoImagesOp( aModule, HYDROGUI_TwoImagesOp::Split, theId == EditSplittedImageId ); + case EditSplitImageId: + anOp = new HYDROGUI_TwoImagesOp( aModule, HYDROGUI_TwoImagesOp::Split, theId == EditSplitImageId ); break; case ImportObstacleFromFileId: anOp = new HYDROGUI_ImportObstacleFromFileOp( aModule ); diff --git a/src/HYDROGUI/HYDROGUI_Operations.h b/src/HYDROGUI/HYDROGUI_Operations.h index 22ce77dc..45f95161 100644 --- a/src/HYDROGUI/HYDROGUI_Operations.h +++ b/src/HYDROGUI/HYDROGUI_Operations.h @@ -80,7 +80,7 @@ enum OperationId EditCutImageId, SplitImageId, - EditSplittedImageId, + EditSplitImageId, ImportObstacleFromFileId, ImportGeomObjectAsObstacleId, diff --git a/src/HYDROGUI/HYDROGUI_Tool2.cxx b/src/HYDROGUI/HYDROGUI_Tool2.cxx index edcfd868..c87743e0 100644 --- a/src/HYDROGUI/HYDROGUI_Tool2.cxx +++ b/src/HYDROGUI/HYDROGUI_Tool2.cxx @@ -92,7 +92,7 @@ bool HYDROGUI_Tool::IsObjectHasPresentation( const Handle(HYDROData_Entity)& the anObjectKind == KIND_LAND_COVER_MAP #ifdef DEB_GROUPS || anObjectKind == KIND_SHAPES_GROUP || - anObjectKind == KIND_SPLITTED_GROUP + anObjectKind == KIND_SPLIT_GROUP #endif ) { diff --git a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx index 7376c5b3..8ebdf025 100644 --- a/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx +++ b/src/HYDROGUI/HYDROGUI_TwoImagesOp.cxx @@ -50,7 +50,7 @@ HYDROGUI_TwoImagesOp::HYDROGUI_TwoImagesOp( HYDROGUI_Module* theModule, { case Fuse: aName = theIsEdit ? tr( "EDIT_FUSED_IMAGE" ) : tr( "FUSE_IMAGES" ); break; case Cut: aName = theIsEdit ? tr( "EDIT_CUT_IMAGE" ) : tr( "CUT_IMAGES" ); break; - case Split: aName = theIsEdit ? tr( "EDIT_SPLITTED_IMAGE" ) : tr( "SPLIT_IMAGE" ); break; + case Split: aName = theIsEdit ? tr( "EDIT_SPLIT_IMAGE" ) : tr( "SPLIT_IMAGE" ); break; default: break; } setName( aName ); @@ -229,7 +229,7 @@ bool HYDROGUI_TwoImagesOp::processApply( int& theUpdateFlags, Handle(HYDROData_Image) aSelectedImage = Handle(HYDROData_Image)::DownCast( anObject1 ); if( !aSelectedImage.IsNull() ) { - aSelectedImage->SetIsSelfSplitted( true ); + aSelectedImage->SetIsSelfSplit( true ); aSelectedImage->SetImage( aResult->Image() ); aSelectedImage->SetTrsf( aResult->Trsf() ); aResult->Remove(); diff --git a/src/HYDROGUI/resources/HYDROGUI_images.ts b/src/HYDROGUI/resources/HYDROGUI_images.ts index 207f7779..f0b4b7dd 100644 --- a/src/HYDROGUI/resources/HYDROGUI_images.ts +++ b/src/HYDROGUI/resources/HYDROGUI_images.ts @@ -471,8 +471,8 @@ icon_split_image.png - EDIT_SPLITTED_IMAGE_ICO - icon_edit_splitted_image.png + EDIT_SPLIT_IMAGE_ICO + icon_edit_split_image.png diff --git a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts index 616c8d6b..31619c9c 100644 --- a/src/HYDROGUI/resources/HYDROGUI_msg_en.ts +++ b/src/HYDROGUI/resources/HYDROGUI_msg_en.ts @@ -120,7 +120,7 @@ LAND COVER MAP - CASE_SPLITTED_GROUPS + CASE_SPLIT_GROUPS Split groups @@ -913,7 +913,7 @@ Would you like to remove all references from the image? Edit polyline 3D - DSK_EDIT_SPLITTED_IMAGE + DSK_EDIT_SPLIT_IMAGE Edit split image @@ -1258,7 +1258,7 @@ Would you like to remove all references from the image? Edit profile - MEN_EDIT_SPLITTED_IMAGE + MEN_EDIT_SPLIT_IMAGE Edit split image @@ -1567,7 +1567,7 @@ Would you like to remove all references from the image? Edit polyline 3D - STB_EDIT_SPLITTED_IMAGE + STB_EDIT_SPLIT_IMAGE Edit split image @@ -2042,7 +2042,7 @@ Would you like to remove all references from the image? Edit fused image - EDIT_SPLITTED_IMAGE + EDIT_SPLIT_IMAGE Edit split image @@ -2966,8 +2966,8 @@ Polyline should consist from one not closed curve. Land cover can not be removed. - LAND_COVER_NOT_SPLITTED - Land cover can not be splitted. + LAND_COVER_NOT_SPLIT + Land cover can not be split. LAND_COVER_NOT_MERGED @@ -3252,7 +3252,7 @@ Polyline should consist from one not closed curve. SPLIT_POLYLINE_BY_TOOL_WARNING_MSG - The splitted polyline is not intersected by the tool. + The split polyline is not intersected by the tool. diff --git a/src/HYDROGUI/resources/icon_edit_split_image.png b/src/HYDROGUI/resources/icon_edit_split_image.png new file mode 100644 index 00000000..e8b8d51c Binary files /dev/null and b/src/HYDROGUI/resources/icon_edit_split_image.png differ diff --git a/src/HYDROGUI/resources/icon_edit_splitted_image.png b/src/HYDROGUI/resources/icon_edit_splitted_image.png deleted file mode 100644 index e8b8d51c..00000000 Binary files a/src/HYDROGUI/resources/icon_edit_splitted_image.png and /dev/null differ diff --git a/src/HYDROPy/CMakeLists.txt b/src/HYDROPy/CMakeLists.txt index 013a4a9e..4d00303e 100644 --- a/src/HYDROPy/CMakeLists.txt +++ b/src/HYDROPy/CMakeLists.txt @@ -63,7 +63,7 @@ SET(_sip_files2 HYDROData_IInterpolator.sip HYDROData_Entity.sip HYDROData_ShapesGroup.sip - HYDROData_SplittedShapesGroup.sip + HYDROData_SplitShapesGroup.sip HYDROData_IPolyline.sip HYDROData_IAltitudeObject.sip HYDROData_AltitudeObject.sip diff --git a/src/HYDROPy/HYDROData.sip b/src/HYDROPy/HYDROData.sip index 84f94621..3b52af7b 100644 --- a/src/HYDROPy/HYDROData.sip +++ b/src/HYDROPy/HYDROData.sip @@ -77,7 +77,7 @@ %Include HYDROData_River.sip %Include HYDROData_SequenceOfObjects.sip %Include HYDROData_ShapesGroup.sip -%Include HYDROData_SplittedShapesGroup.sip +%Include HYDROData_SplitShapesGroup.sip %Include HYDROData_Stream.sip %Include HYDROData_StreamAltitude.sip %Include HYDROData_StricklerTable.sip diff --git a/src/HYDROPy/HYDROData_CalculationCase.sip b/src/HYDROPy/HYDROData_CalculationCase.sip index 9ed40198..d7cd1593 100644 --- a/src/HYDROPy/HYDROData_CalculationCase.sip +++ b/src/HYDROPy/HYDROData_CalculationCase.sip @@ -72,7 +72,7 @@ public: DataTag_Region, ///< reference regions DataTag_Polyline, ///< reference boundary polyline DataTag_GeometryGroup, ///< reference geometry groups - DataTag_SplittedGroups, ///< reference splitted groups + DataTag_SplitGroups, ///< reference split groups DataTag_CustomRules, ///< custom rules DataTag_AssignmentMode, ///< assignment mode DataTag_StricklerTable, ///< reference Strickler table @@ -295,12 +295,12 @@ public: /** * Returns all reference geometry groups of calculation case. */ - HYDROData_SequenceOfObjects GetSplittedGroups() const; + HYDROData_SequenceOfObjects GetSplitGroups() const; /** * Removes all reference geometry groups from calculation case. */ - void RemoveSplittedGroups(); + void RemoveSplitGroups(); /** diff --git a/src/HYDROPy/HYDROData_Document.sip b/src/HYDROPy/HYDROData_Document.sip index 2ff3c604..4ebd3353 100644 --- a/src/HYDROPy/HYDROData_Document.sip +++ b/src/HYDROPy/HYDROData_Document.sip @@ -148,9 +148,9 @@ class HYDROData_Document aRes = new HYDROData_ShapesGroup( *dynamic_cast( theObject ) ); break; } - case KIND_SPLITTED_GROUP: + case KIND_SPLIT_GROUP: { - aRes = new HYDROData_SplittedShapesGroup( *dynamic_cast( theObject ) ); + aRes = new HYDROData_SplitShapesGroup( *dynamic_cast( theObject ) ); break; } case KIND_OBSTACLE_ALTITUDE: diff --git a/src/HYDROPy/HYDROData_Entity.sip b/src/HYDROPy/HYDROData_Entity.sip index 52a84635..fda3ec35 100644 --- a/src/HYDROPy/HYDROData_Entity.sip +++ b/src/HYDROPy/HYDROData_Entity.sip @@ -41,7 +41,7 @@ const ObjectKind KIND_CALCULATION; const ObjectKind KIND_ZONE; const ObjectKind KIND_REGION; const ObjectKind KIND_SHAPES_GROUP; -const ObjectKind KIND_SPLITTED_GROUP; +const ObjectKind KIND_SPLIT_GROUP; const ObjectKind KIND_OBSTACLE_ALTITUDE; const ObjectKind KIND_STRICKLER_TABLE; const ObjectKind KIND_LAND_COVER_MAP; @@ -128,8 +128,8 @@ class HYDROData_Entity sipClass = sipClass_HYDROData_ShapesGroup; break; - case KIND_SPLITTED_GROUP: - sipClass = sipClass_HYDROData_SplittedShapesGroup; + case KIND_SPLIT_GROUP: + sipClass = sipClass_HYDROData_SplitShapesGroup; break; case KIND_STREAM_ALTITUDE: diff --git a/src/HYDROPy/HYDROData_Image.sip b/src/HYDROPy/HYDROData_Image.sip index 1ad52b97..00e70250 100644 --- a/src/HYDROPy/HYDROData_Image.sip +++ b/src/HYDROPy/HYDROData_Image.sip @@ -385,16 +385,16 @@ public: /** - * Marks the image as self-splitted. - * \param theFlag is true for self-splitted image + * Marks the image as self-split. + * \param theFlag is true for self-split image */ - void SetIsSelfSplitted(bool theFlag); + void SetIsSelfSplit(bool theFlag); /** - * Checks that the image is self-splitted. - * \returns true if image is self-splitted + * Checks that the image is self-split. + * \returns true if image is self-split */ - bool IsSelfSplitted() const; + bool IsSelfSplit() const; protected: diff --git a/src/HYDROPy/HYDROData_ShapesGroup.sip b/src/HYDROPy/HYDROData_ShapesGroup.sip index 66710629..51bcf69c 100644 --- a/src/HYDROPy/HYDROData_ShapesGroup.sip +++ b/src/HYDROPy/HYDROData_ShapesGroup.sip @@ -31,8 +31,8 @@ class HYDROData_ShapesGroup : public HYDROData_Entity // HYDROData_Entity sub-classes provide a unique kind ID. switch ( sipCpp->GetKind() ) { - case KIND_SPLITTED_GROUP: - sipClass = sipClass_HYDROData_SplittedShapesGroup; + case KIND_SPLIT_GROUP: + sipClass = sipClass_HYDROData_SplitShapesGroup; break; case KIND_UNKNOWN: diff --git a/src/HYDROPy/HYDROData_SplitShapesGroup.sip b/src/HYDROPy/HYDROData_SplitShapesGroup.sip new file mode 100644 index 00000000..cdb93096 --- /dev/null +++ b/src/HYDROPy/HYDROData_SplitShapesGroup.sip @@ -0,0 +1,42 @@ +// Copyright (C) 2014-2015 EDF-R&D +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +%ExportedHeaderCode +#include +%End + +class HYDROData_SplitShapesGroup : public HYDROData_ShapesGroup +{ + +%TypeHeaderCode +#include +%End + +protected: + + /** + * Creates new object in the internal data structure. Use higher level objects + * to create objects with real content. + */ + HYDROData_SplitShapesGroup(); + + /** + * Destructs properties of the object and object itself, removes it from the document. + */ + virtual ~HYDROData_SplitShapesGroup(); +}; diff --git a/src/HYDROPy/HYDROData_SplittedShapesGroup.sip b/src/HYDROPy/HYDROData_SplittedShapesGroup.sip deleted file mode 100644 index c686d1e1..00000000 --- a/src/HYDROPy/HYDROData_SplittedShapesGroup.sip +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (C) 2014-2015 EDF-R&D -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -%ExportedHeaderCode -#include -%End - -class HYDROData_SplittedShapesGroup : public HYDROData_ShapesGroup -{ - -%TypeHeaderCode -#include -%End - -protected: - - /** - * Creates new object in the internal data structure. Use higher level objects - * to create objects with real content. - */ - HYDROData_SplittedShapesGroup(); - - /** - * Destructs properties of the object and object itself, removes it from the document. - */ - virtual ~HYDROData_SplittedShapesGroup(); -}; diff --git a/src/HYDRO_tests/ExternalFiles.cmake b/src/HYDRO_tests/ExternalFiles.cmake index da960034..df610ea5 100644 --- a/src/HYDRO_tests/ExternalFiles.cmake +++ b/src/HYDRO_tests/ExternalFiles.cmake @@ -37,7 +37,7 @@ set( EXTERNAL_FILES ../HYDROData/HYDROData_River.cxx ../HYDROData/HYDROData_ShapesGroup.cxx ../HYDROData/HYDROData_ShapesTool.cxx - ../HYDROData/HYDROData_SplittedShapesGroup.cxx + ../HYDROData/HYDROData_SplitShapesGroup.cxx ../HYDROData/HYDROData_SplitToZonesTool.cxx ../HYDROData/HYDROData_Stream.cxx ../HYDROData/HYDROData_StreamAltitude.cxx diff --git a/src/HYDRO_tests/test_HYDROGUI_LandCoverMapDlg.cxx b/src/HYDRO_tests/test_HYDROGUI_LandCoverMapDlg.cxx index 20ef1481..a9ac1dc0 100644 --- a/src/HYDRO_tests/test_HYDROGUI_LandCoverMapDlg.cxx +++ b/src/HYDRO_tests/test_HYDROGUI_LandCoverMapDlg.cxx @@ -60,7 +60,7 @@ void test_HYDROGUI_LandCoverMapDlg::test_objects_filtering_refs_707() CPPUNIT_ASSERT_EQUAL( false, isOK( f, aDoc, KIND_NATURAL_OBJECT ) ); CPPUNIT_ASSERT_EQUAL( false, isOK( f, aDoc, KIND_DUMMY_3D ) ); CPPUNIT_ASSERT_EQUAL( false, isOK( f, aDoc, KIND_SHAPES_GROUP ) ); - CPPUNIT_ASSERT_EQUAL( false, isOK( f, aDoc, KIND_SPLITTED_GROUP ) ); + CPPUNIT_ASSERT_EQUAL( false, isOK( f, aDoc, KIND_SPLIT_GROUP ) ); CPPUNIT_ASSERT_EQUAL( false, isOK( f, aDoc, KIND_STREAM_ALTITUDE ) ); CPPUNIT_ASSERT_EQUAL( false, isOK( f, aDoc, KIND_OBSTACLE_ALTITUDE ) ); CPPUNIT_ASSERT_EQUAL( false, isOK( f, aDoc, KIND_STRICKLER_TABLE ) );