From 41b3e4433388f439856c3b0bb3725e9c81179c24 Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 13 Jan 2017 13:39:13 +0300 Subject: [PATCH] Remove useless MESSAGEs --- src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx | 1 - src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx | 8 -- src/SMDS/SMDS_MeshElementIDFactory.cxx | 1 - src/SMESH/SMESH_Gen.cxx | 1 - src/SMESH/SMESH_MeshEditor.cxx | 99 +++++++++---------- src/SMESH/SMESH_Pattern.cxx | 29 ++---- src/SMESH_I/SMESH_Hypothesis_i.cxx | 2 +- src/SMESH_I/SMESH_MeshEditor_i.cxx | 3 - src/SMESH_I/SMESH_subMesh_i.cxx | 1 - src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx | 5 - src/StdMeshers/StdMeshers_AutomaticLength.cxx | 2 +- .../StdMeshers_CompositeSegment_1D.cxx | 1 - src/StdMeshers/StdMeshers_HexaFromSkin_3D.cxx | 2 - src/StdMeshers/StdMeshers_Import_1D.cxx | 1 - src/StdMeshers/StdMeshers_Import_1D2D.cxx | 1 - .../StdMeshers_LayerDistribution.cxx | 1 - .../StdMeshers_LayerDistribution2D.cxx | 1 - .../StdMeshers_MaxElementVolume.cxx | 1 - src/StdMeshers/StdMeshers_NumberOfLayers.cxx | 1 - .../StdMeshers_NumberOfLayers2D.cxx | 1 - src/StdMeshers/StdMeshers_Penta_3D.cxx | 18 ++-- .../StdMeshers_ProjectionSource1D.cxx | 7 +- .../StdMeshers_ProjectionSource2D.cxx | 7 +- .../StdMeshers_ProjectionSource3D.cxx | 7 +- src/StdMeshers/StdMeshers_ProjectionUtils.cxx | 32 +++--- src/StdMeshers_I/StdMeshers_Adaptive1D_i.cxx | 1 - .../StdMeshers_Arithmetic1D_i.cxx | 7 -- .../StdMeshers_CartesianParameters3D_i.cxx | 3 - .../StdMeshers_Cartesian_3D_i.cxx | 3 - .../StdMeshers_CompositeSegment_1D_i.cxx | 3 - .../StdMeshers_Deflection1D_i.cxx | 5 - .../StdMeshers_FixedPoints1D_i.cxx | 9 -- .../StdMeshers_ImportSource1D_i.cxx | 5 - .../StdMeshers_ImportSource2D_i.cxx | 5 - src/StdMeshers_I/StdMeshers_Import_1D2D_i.cxx | 3 - src/StdMeshers_I/StdMeshers_Import_1D_i.cxx | 3 - .../StdMeshers_LayerDistribution2D_i.cxx | 2 - .../StdMeshers_LayerDistribution_i.cxx | 2 - .../StdMeshers_LengthFromEdges_i.cxx | 5 - src/StdMeshers_I/StdMeshers_LocalLength_i.cxx | 7 -- src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx | 3 - .../StdMeshers_MaxElementArea_i.cxx | 5 - .../StdMeshers_MaxElementVolume_i.cxx | 5 - .../StdMeshers_NotConformAllowed_i.cxx | 1 - .../StdMeshers_NumberOfLayers2D_i.cxx | 2 - .../StdMeshers_NumberOfLayers_i.cxx | 2 - .../StdMeshers_PolygonPerFace_2D_i.cxx | 2 - src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx | 6 -- .../StdMeshers_ProjectionSource1D_i.cxx | 2 - .../StdMeshers_ProjectionSource3D_i.cxx | 2 - src/StdMeshers_I/StdMeshers_Propagation_i.cxx | 1 - .../StdMeshers_QuadrangleParams_i.cxx | 9 -- .../StdMeshers_RadialQuadrangle_1D2D_i.cxx | 3 - .../StdMeshers_SegmentAroundVertex_0D_i.cxx | 3 - .../StdMeshers_StartEndLength_i.cxx | 5 - .../StdMeshers_UseExisting_1D2D_i.cxx | 6 -- .../StdMeshers_ViscousLayers2D_i.cxx | 3 - 57 files changed, 88 insertions(+), 268 deletions(-) diff --git a/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx index e047bc711..5d2956c57 100644 --- a/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx +++ b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx @@ -47,7 +47,6 @@ Driver_Mesh::Status DriverDAT_R_SMDS_Mesh::Perform() int NoeudsMaille[20]; int NoeudMaille; - MESSAGE("in DriverDAT_R_SMDS_Mesh::Read()"); /**************************************************************************** * OUVERTURE DU FICHIER EN LECTURE * ****************************************************************************/ diff --git a/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx index d94571ab6..d8bca84a0 100644 --- a/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx +++ b/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx @@ -59,7 +59,6 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform() TDataSet aDataSet2411; // Storing SMDS nodes to the UNV file //----------------------------------- - MESSAGE("Perform - myMesh->NbNodes() = "<NbNodes()); SMDS_NodeIteratorPtr aNodesIter = myMesh->nodesIterator(); TRecord aRec; while ( aNodesIter->more() ) @@ -71,7 +70,6 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform() aRec.coord[2] = aNode->Z(); aDataSet2411.push_back( aRec ); } - MESSAGE("Perform - aDataSet2411.size() = "<NbEdges() = "<NbEdges()); if(myMesh->NbEdges()){ SMDS_EdgeIteratorPtr anIter = myMesh->edgesIterator(); while( anIter->more() ) @@ -102,10 +99,8 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform() } aDataSet2412.push_back(aRec); } - MESSAGE("Perform - aDataSet2412.size() = "<NbFaces() = "<NbFaces()); if ( myMesh->NbFaces() ) { SMDS_FaceIteratorPtr anIter = myMesh->facesIterator(); @@ -134,10 +129,8 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform() } aDataSet2412.push_back(aRec); } - MESSAGE("Perform - aDataSet2412.size() = "<NbVolumes() = "<NbVolumes()); if ( myMesh->NbVolumes() ) { SMDS_VolumeIteratorPtr anIter = myMesh->volumesIterator(); @@ -174,7 +167,6 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform() aDataSet2412.push_back(aRec); } } - MESSAGE("Perform - aDataSet2412.size() = "<registerElement(ID, elem); } diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx index 7ca0a59fa..7388a0095 100644 --- a/src/SMESH/SMESH_Gen.cxx +++ b/src/SMESH/SMESH_Gen.cxx @@ -586,7 +586,6 @@ bool SMESH_Gen::Evaluate(SMESH_Mesh & aMesh, ret = Evaluate( aMesh, aShape, aResMap, /*anUpward=*/true, aShapesId ); } - MESSAGE( "VSR - SMESH_Gen::Evaluate() finished, OK = " << ret); return ret; } diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx index 056da7050..716780318 100644 --- a/src/SMESH/SMESH_MeshEditor.cxx +++ b/src/SMESH/SMESH_MeshEditor.cxx @@ -4342,18 +4342,18 @@ void SMESH_MeshEditor::Smooth (TIDSortedElemSet & theElems, } } if ( maxRatio <= theTgtAspectRatio ) { - MESSAGE("-- quality achived --"); + //MESSAGE("-- quality achived --"); break; } if (it+1 == theNbIterations) { - MESSAGE("-- Iteration limit exceeded --"); + //MESSAGE("-- Iteration limit exceeded --"); } } // smoothing iterations - MESSAGE(" Face id: " << *fId << - " Nb iterstions: " << it << - " Displacement: " << maxDisplacement << - " Aspect Ratio " << maxRatio); + // MESSAGE(" Face id: " << *fId << + // " Nb iterstions: " << it << + // " Displacement: " << maxDisplacement << + // " Aspect Ratio " << maxRatio); // --------------------------------------- // new nodes positions are computed, @@ -11075,9 +11075,9 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vectormyMesh->GetMeshDS(); meshDS->BuildDownWardConnectivity(true); @@ -11100,7 +11100,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector emptySet; emptyMap.clear(); - MESSAGE(".. Number of domains :"< > mutipleNodes; // nodes multi domains with domain order std::map > mutipleNodesToFace; // nodes multi domains with domain order to transform in Face (junction between 3 or more 2D domains) - MESSAGE(".. Duplication of the nodes"); + //MESSAGE(".. Duplication of the nodes"); for (int idomain = idom0; idomain < nbDomains; idomain++) { itface = faceDomains.begin(); @@ -11312,7 +11312,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector > nodeQuadDomains; std::map mapOfJunctionGroups; - MESSAGE(".. Creation of elements: simple junction"); + //MESSAGE(".. Creation of elements: simple junction"); if (createJointElems) { int idg; @@ -11494,7 +11494,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector >::const_iterator itnod = nodeDomains.begin(); @@ -11669,9 +11669,9 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector& theElems) { - MESSAGE("-------------------------------------------------"); - MESSAGE("SMESH_MeshEditor::CreateFlatElementsOnFacesGroups"); - MESSAGE("-------------------------------------------------"); + // MESSAGE("-------------------------------------------------"); + // MESSAGE("SMESH_MeshEditor::CreateFlatElementsOnFacesGroups"); + // MESSAGE("-------------------------------------------------"); SMESHDS_Mesh *meshDS = this->myMesh->GetMeshDS(); @@ -11833,9 +11833,9 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, std::vector& nodesCoords, std::vector >& listOfListOfNodes) { - MESSAGE("--------------------------------"); - MESSAGE("SMESH_MeshEditor::CreateHoleSkin"); - MESSAGE("--------------------------------"); + // MESSAGE("--------------------------------"); + // MESSAGE("SMESH_MeshEditor::CreateHoleSkin"); + // MESSAGE("--------------------------------"); // --- zone of volumes to remove is given : // 1 either by a geom shape (one or more vertices) and a radius, @@ -11937,7 +11937,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, if (isNodeGroup) // --- a group of nodes is provided : find all the volumes using one or more of this nodes { - MESSAGE("group of nodes provided"); + //MESSAGE("group of nodes provided"); SMDS_ElemIteratorPtr elemIt = groupDS->GetElements(); while ( elemIt->more() ) { @@ -11959,7 +11959,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, } else if (isNodeCoords) { - MESSAGE("list of nodes coordinates provided"); + //MESSAGE("list of nodes coordinates provided"); size_t i = 0; int k = 0; while ( i < nodesCoords.size()-2 ) @@ -11969,13 +11969,13 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, double z = nodesCoords[i++]; gp_Pnt p = gp_Pnt(x, y ,z); gpnts.push_back(p); - MESSAGE("TopoDS_Vertex " << k << " " << p.X() << " " << p.Y() << " " << p.Z()); + //MESSAGE("TopoDS_Vertex " << k << " " << p.X() << " " << p.Y() << " " << p.Z()); k++; } } else // --- no group, no coordinates : use the vertices of the geom shape provided, and radius { - MESSAGE("no group of nodes provided, using vertices from geom shape, and radius"); + //MESSAGE("no group of nodes provided, using vertices from geom shape, and radius"); TopTools_IndexedMapOfShape vertexMap; TopExp::MapShapes( theShape, TopAbs_VERTEX, vertexMap ); gp_Pnt p = gp_Pnt(0,0,0); @@ -11987,20 +11987,17 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, const TopoDS_Vertex& vertex = TopoDS::Vertex( vertexMap( i )); p = BRep_Tool::Pnt(vertex); gpnts.push_back(p); - MESSAGE("TopoDS_Vertex " << i << " " << p.X() << " " << p.Y() << " " << p.Z()); + //MESSAGE("TopoDS_Vertex " << i << " " << p.X() << " " << p.Y() << " " << p.Z()); } } if (gpnts.size() > 0) { - int nodeId = 0; const SMDS_MeshNode* startNode = theNodeSearcher->FindClosestTo(gpnts[0]); - if (startNode) - nodeId = startNode->GetID(); - MESSAGE("nodeId " << nodeId); + //MESSAGE("startNode->nodeId " << nodeId); double radius2 = radius*radius; - MESSAGE("radius2 " << radius2); + //MESSAGE("radius2 " << radius2); // --- volumes on start node @@ -12029,7 +12026,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, { std::set::iterator it = setOfVolToCheck.begin(); int vtkId = *it; - MESSAGE("volume to check, vtkId " << vtkId << " smdsId " << meshDS->fromVtkToSmds(vtkId)); + //MESSAGE("volume to check, vtkId " << vtkId << " smdsId " << meshDS->fromVtkToSmds(vtkId)); bool volInside = false; vtkIdType npts = 0; vtkIdType* pts = 0; @@ -12040,7 +12037,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, if (mapOfNodeDistance2.count(pts[i])) { distance2 = mapOfNodeDistance2[pts[i]]; - MESSAGE("point " << pts[i] << " distance2 " << distance2); + //MESSAGE("point " << pts[i] << " distance2 " << distance2); } else { @@ -12058,7 +12055,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, } } mapOfNodeDistance2[pts[i]] = distance2; - MESSAGE(" point " << pts[i] << " distance2 " << distance2 << " coords " << coords[0] << " " << coords[1] << " " << coords[2]); + //MESSAGE(" point " << pts[i] << " distance2 " << distance2 << " coords " << coords[0] << " " << coords[1] << " " << coords[2]); } if (distance2 < radius2) { @@ -12070,7 +12067,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, if (volInside) { setOfInsideVol.insert(vtkId); - MESSAGE(" volume inside, vtkId " << vtkId << " smdsId " << meshDS->fromVtkToSmds(vtkId)); + //MESSAGE(" volume inside, vtkId " << vtkId << " smdsId " << meshDS->fromVtkToSmds(vtkId)); int neighborsVtkIds[NBMAXNEIGHBORS]; int downIds[NBMAXNEIGHBORS]; unsigned char downTypes[NBMAXNEIGHBORS]; @@ -12082,7 +12079,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, else { setOfOutsideVol.insert(vtkId); - MESSAGE(" volume outside, vtkId " << vtkId << " smdsId " << meshDS->fromVtkToSmds(vtkId)); + //MESSAGE(" volume outside, vtkId " << vtkId << " smdsId " << meshDS->fromVtkToSmds(vtkId)); } setOfVolToCheck.erase(vtkId); } @@ -12095,7 +12092,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, std::set setOfVolToReCheck; while (addedInside) { - MESSAGE(" --------------------------- re check"); + //MESSAGE(" --------------------------- re check"); addedInside = false; std::set::iterator itv = setOfInsideVol.begin(); for (; itv != setOfInsideVol.end(); ++itv) @@ -12117,7 +12114,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, int vtkId = *it; if (grid->GetCellType(vtkId) == VTK_HEXAHEDRON) { - MESSAGE("volume to recheck, vtkId " << vtkId << " smdsId " << meshDS->fromVtkToSmds(vtkId)); + //MESSAGE("volume to recheck, vtkId " << vtkId << " smdsId " << meshDS->fromVtkToSmds(vtkId)); int countInside = 0; int neighborsVtkIds[NBMAXNEIGHBORS]; int downIds[NBMAXNEIGHBORS]; @@ -12126,10 +12123,10 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, for (int n = 0; n < nbNeighbors; n++) if (setOfInsideVol.count(neighborsVtkIds[n])) countInside++; - MESSAGE("countInside " << countInside); + //MESSAGE("countInside " << countInside); if (countInside > 1) { - MESSAGE(" volume inside, vtkId " << vtkId << " smdsId " << meshDS->fromVtkToSmds(vtkId)); + //MESSAGE(" volume inside, vtkId " << vtkId << " smdsId " << meshDS->fromVtkToSmds(vtkId)); setOfInsideVol.insert(vtkId); sgrp->Add(meshDS->fromVtkToSmds(vtkId)); addedInside = true; @@ -12226,7 +12223,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, for (; itShape != shapeIdToVtkIdSet.end(); ++itShape) { int shapeId = itShape->first; - MESSAGE(" --- Shape ID --- "<< shapeId); + //MESSAGE(" --- Shape ID --- "<< shapeId); shapeIdToEdges[shapeId] = emptyEdges; std::vector nodesEdges; @@ -12235,7 +12232,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, for (; its != itShape->second.end(); ++its) { int vtkId = *its; - MESSAGE(" " << vtkId); + //MESSAGE(" " << vtkId); int neighborsVtkIds[NBMAXNEIGHBORS]; int downIds[NBMAXNEIGHBORS]; unsigned char downTypes[NBMAXNEIGHBORS]; @@ -12256,7 +12253,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, int nbNodes = grid->getDownArray(downTypes[n])->getNodes(downIds[n],vtkNodeId); nodesEdges.push_back(vtkNodeId[0]); nodesEdges.push_back(vtkNodeId[nbNodes-1]); - MESSAGE(" --- nodes " << vtkNodeId[0]+1 << " " << vtkNodeId[nbNodes-1]+1); + //MESSAGE(" --- nodes " << vtkNodeId[0]+1 << " " << vtkNodeId[nbNodes-1]+1); } } } @@ -12266,9 +12263,9 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, order.clear(); if (nodesEdges.size() > 0) { - order.push_back(nodesEdges[0]); MESSAGE(" --- back " << order.back()+1); // SMDS id = VTK id + 1; + order.push_back(nodesEdges[0]); //MESSAGE(" --- back " << order.back()+1); // SMDS id = VTK id + 1; nodesEdges[0] = -1; - order.push_back(nodesEdges[1]); MESSAGE(" --- back " << order.back()+1); + order.push_back(nodesEdges[1]); //MESSAGE(" --- back " << order.back()+1); nodesEdges[1] = -1; // do not reuse this edge bool found = true; while (found) @@ -12287,7 +12284,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, found = false; else { - order.push_back(nodesEdges[i-1]); MESSAGE(" --- back " << order.back()+1); + order.push_back(nodesEdges[i-1]); //MESSAGE(" --- back " << order.back()+1); nodesEdges[i-1] = -1; } else // even ==> use the next one @@ -12295,7 +12292,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, found = false; else { - order.push_back(nodesEdges[i+1]); MESSAGE(" --- back " << order.back()+1); + order.push_back(nodesEdges[i+1]); //MESSAGE(" --- back " << order.back()+1); nodesEdges[i+1] = -1; } } @@ -12317,7 +12314,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, found = false; else { - order.push_front(nodesEdges[i-1]); MESSAGE(" --- front " << order.front()+1); + order.push_front(nodesEdges[i-1]); //MESSAGE(" --- front " << order.front()+1); nodesEdges[i-1] = -1; } else // even ==> use the next one @@ -12325,7 +12322,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, found = false; else { - order.push_front(nodesEdges[i+1]); MESSAGE(" --- front " << order.front()+1); + order.push_front(nodesEdges[i+1]); //MESSAGE(" --- front " << order.front()+1); nodesEdges[i+1] = -1; } } @@ -12338,7 +12335,7 @@ void SMESH_MeshEditor::CreateHoleSkin(double radius, for (; itl != order.end(); itl++) { nodes.push_back((*itl) + 1); // SMDS id = VTK id + 1; - MESSAGE(" ordered node " << nodes[nodes.size()-1]); + //MESSAGE(" ordered node " << nodes[nodes.size()-1]); } listOfListOfNodes.push_back(nodes); } diff --git a/src/SMESH/SMESH_Pattern.cxx b/src/SMESH/SMESH_Pattern.cxx index 6f3c1b076..f08831acd 100644 --- a/src/SMESH/SMESH_Pattern.cxx +++ b/src/SMESH/SMESH_Pattern.cxx @@ -267,8 +267,6 @@ SMESH_Pattern::SMESH_Pattern (): myToKeepNodes(false) bool SMESH_Pattern::Load (const char* theFileContents) { - MESSAGE("Load( file ) "); - Kernel_Utils::Localizer loc; // file structure: @@ -413,8 +411,6 @@ bool SMESH_Pattern::Load (const char* theFileContents) bool SMESH_Pattern::Save (ostream& theFile) { - MESSAGE(" ::Save(file) " ); - Kernel_Utils::Localizer loc; if ( !IsLoaded() ) { @@ -568,7 +564,6 @@ bool SMESH_Pattern::Load (SMESH_Mesh* theMesh, TopoDS_Vertex the1stVertex, bool theKeepNodes) { - MESSAGE(" ::Load(face) " ); Clear(); myIs2D = true; myToKeepNodes = theKeepNodes; @@ -616,7 +611,6 @@ bool SMESH_Pattern::Load (SMESH_Mesh* theMesh, if ( needProject ) { - MESSAGE("Project the submesh"); // --------------------------------------------------------------- // The case where the submesh is projected to theFace // --------------------------------------------------------------- @@ -1104,10 +1098,10 @@ static bool intersectIsolines(const gp_XY& uv11, const gp_XY& uv12, const double // resUV /= 2.; // } - if ( isDeformed ) { - MESSAGE("intersectIsolines(), d1 = " << d1 << ", d2 = " << d2 << ", delta = " << delta << - ", " << (loc1 - loc2).SquareModulus() << " > " << delta * delta); - } + // if ( isDeformed ) { + // MESSAGE("intersectIsolines(), d1 = " << d1 << ", d2 = " << d2 << ", delta = " << delta << + // ", " << (loc1 - loc2).SquareModulus() << " > " << delta * delta); + // } return true; } @@ -1902,7 +1896,7 @@ bool SMESH_Pattern:: list < TIsoNode* > internNodes; bool needIteration = true; if ( startNodes.empty() ) { - MESSAGE( " Starting UV by compUVByIsoIntersection()"); + //MESSAGE( " Starting UV by compUVByIsoIntersection()"); needIteration = false; map < double, TIsoLine >& isos = isoMap[ 0 ]; map < double, TIsoLine >::iterator isoIt = isos.begin(); @@ -2122,7 +2116,7 @@ bool SMESH_Pattern:: #endif } while ( maxMove > 1e-8 && nbIter++ < maxNbIter ); - MESSAGE( "compUVByElasticIsolines(): Nb iterations " << nbIter << " dist: " << sqrt( maxMove )); + //MESSAGE( "compUVByElasticIsolines(): Nb iterations " << nbIter << " dist: " << sqrt( maxMove )); if ( nbIter >= maxNbIter && sqrt(maxMove) > minUvSize * 0.05 ) { MESSAGE( "compUVByElasticIsolines() failed: "<"< & theVolumes, const int theNode000Index, const int theNode001Index) { - MESSAGE(" ::Apply(set) " ); - if ( !IsLoaded() ) { MESSAGE( "Pattern not loaded" ); return setErrorCode( ERR_APPL_NOT_LOADED ); @@ -3199,7 +3190,6 @@ bool SMESH_Pattern::Load (SMESH_Mesh* theMesh, const TopoDS_Shell& theBlock, bool theKeepNodes) { - MESSAGE(" ::Load(volume) " ); Clear(); myIs2D = false; myToKeepNodes = theKeepNodes; @@ -3363,8 +3353,6 @@ bool SMESH_Pattern::Apply (const TopoDS_Shell& theBlock, const TopoDS_Vertex& theVertex000, const TopoDS_Vertex& theVertex001) { - MESSAGE(" ::Apply(volume) " ); - if (!findBoundaryPoints() || // bind ID to points !setShapeToMesh( theBlock )) // check theBlock is a suitable shape return false; @@ -3424,8 +3412,6 @@ bool SMESH_Pattern::Apply (const SMDS_MeshVolume* theVolume, const int theNode000Index, const int theNode001Index) { - //MESSAGE(" ::Apply(MeshVolume) " ); - if (!findBoundaryPoints()) // bind ID to points return false; @@ -4016,7 +4002,6 @@ bool SMESH_Pattern::MakeMesh(SMESH_Mesh* theMesh, const bool toCreatePolygons, const bool toCreatePolyedrs) { - MESSAGE(" ::MakeMesh() " ); if ( !myIsComputed ) return setErrorCode( ERR_MAKEM_NOT_COMPUTED ); @@ -4552,8 +4537,6 @@ bool SMESH_Pattern::findBoundaryPoints() { if ( myIsBoundaryPointsFound ) return true; - MESSAGE(" findBoundaryPoints() "); - myNbKeyPntInBoundary.clear(); if ( myIs2D ) diff --git a/src/SMESH_I/SMESH_Hypothesis_i.cxx b/src/SMESH_I/SMESH_Hypothesis_i.cxx index cbce54f50..b3e4e4832 100644 --- a/src/SMESH_I/SMESH_Hypothesis_i.cxx +++ b/src/SMESH_I/SMESH_Hypothesis_i.cxx @@ -60,7 +60,7 @@ SMESH_Hypothesis_i::SMESH_Hypothesis_i( PortableServer::POA_ptr thePOA ) SMESH_Hypothesis_i::~SMESH_Hypothesis_i() { - MESSAGE( "SMESH_Hypothesis_i::~SMESH_Hypothesis_i" ); + //MESSAGE( "SMESH_Hypothesis_i::~SMESH_Hypothesis_i" ); if ( myBaseImpl ) delete myBaseImpl; }; diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx index a0c252bd3..b55f78631 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.cxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx @@ -5117,7 +5117,6 @@ CORBA::Boolean SMESH_MeshEditor_i::ChangeElemNodes(CORBA::Long ide, TPythonDump() << "isDone = " << this << ".ChangeElemNodes( " << ide << ", " << newIDs << " )"; - MESSAGE("ChangeElementNodes"); bool res = getMeshDS()->ChangeElementNodes( elem, & aNodes[0], nbn1+1 ); declareMeshModified( /*isReComputeSafe=*/ !res ); @@ -6280,7 +6279,6 @@ SMESH_MeshEditor_i::AffectedElemGroupsInRegion( const SMESH::ListOfGroups& theEl throw (SALOME::SALOME_Exception) { SMESH_TRY; - MESSAGE("AffectedElemGroupsInRegion"); SMESH::ListOfGroups_var aListOfGroups = new SMESH::ListOfGroups(); bool isEdgeGroup = false; bool isFaceGroup = false; @@ -6309,7 +6307,6 @@ SMESH_MeshEditor_i::AffectedElemGroupsInRegion( const SMESH::ListOfGroups& theEl if (aResult) { int lg = anAffected.size(); - MESSAGE("lg="<< lg); SMESH::long_array_var volumeIds = new SMESH::long_array; volumeIds->length(lg); SMESH::long_array_var faceIds = new SMESH::long_array; diff --git a/src/SMESH_I/SMESH_subMesh_i.cxx b/src/SMESH_I/SMESH_subMesh_i.cxx index 9328f4b77..48ed4a134 100644 --- a/src/SMESH_I/SMESH_subMesh_i.cxx +++ b/src/SMESH_I/SMESH_subMesh_i.cxx @@ -80,7 +80,6 @@ SMESH_subMesh_i::SMESH_subMesh_i( PortableServer::POA_ptr thePOA, SMESH_subMesh_i::~SMESH_subMesh_i() { - MESSAGE("SMESH_subMesh_i::~SMESH_subMesh_i"); if ( _preMeshInfo ) delete _preMeshInfo; _preMeshInfo = NULL; } diff --git a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx index cb9e5ae6f..f356bd9ba 100644 --- a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx +++ b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx @@ -421,7 +421,6 @@ SMESH_Swig::~SMESH_Swig() //=============================================================== const char* SMESH_Swig::AddNewMesh(const char* theIOR) { - MESSAGE("AddNewMesh"); // VSR: added temporarily - to be removed - objects are published automatically by engine SALOMEDS::SObject_var aSObject = myStudy->FindObjectIOR(theIOR); @@ -456,8 +455,6 @@ const char* SMESH_Swig::AddNewMesh(const char* theIOR) //=============================================================== const char* SMESH_Swig::AddNewHypothesis(const char* theIOR) { - MESSAGE("AddNewHypothesis"); - SALOMEDS::SObject_var aSObject = ::AddHypothesis(theIOR, mySComponentMesh, myStudyBuilder); @@ -471,8 +468,6 @@ const char* SMESH_Swig::AddNewHypothesis(const char* theIOR) //=============================================================== const char* SMESH_Swig::AddNewAlgorithms(const char* theIOR) { - MESSAGE("AddNewAlgorithms"); - SALOMEDS::SObject_var aSObject = ::AddAlgorithms(theIOR, mySComponentMesh, myStudyBuilder); diff --git a/src/StdMeshers/StdMeshers_AutomaticLength.cxx b/src/StdMeshers/StdMeshers_AutomaticLength.cxx index a22a33415..ad5f5263f 100644 --- a/src/StdMeshers/StdMeshers_AutomaticLength.cxx +++ b/src/StdMeshers/StdMeshers_AutomaticLength.cxx @@ -216,7 +216,7 @@ namespace { NbSeg += ( Lrat2 - Lratio ) / ( Lrat2 - Lrat1 ) * ( NbSegMax - NbSegMin ); double S0 = Lmin / (int) NbSeg; - MESSAGE( "S0 = " << S0 << ", Lmin = " << Lmin << ", Nbseg = " << (int) NbSeg); + //MESSAGE( "S0 = " << S0 << ", Lmin = " << Lmin << ", Nbseg = " << (int) NbSeg); // Compute segments length for all edges diff --git a/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx b/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx index 3d04f7aac..3373dd402 100644 --- a/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx +++ b/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx @@ -247,7 +247,6 @@ StdMeshers_CompositeSegment_1D::StdMeshers_CompositeSegment_1D(int hypId SMESH_Gen * gen) :StdMeshers_Regular_1D(hypId, studyId, gen) { - MESSAGE("StdMeshers_CompositeSegment_1D::StdMeshers_CompositeSegment_1D"); _name = AlgoName(); } diff --git a/src/StdMeshers/StdMeshers_HexaFromSkin_3D.cxx b/src/StdMeshers/StdMeshers_HexaFromSkin_3D.cxx index 52ed47d01..12ae7326f 100644 --- a/src/StdMeshers/StdMeshers_HexaFromSkin_3D.cxx +++ b/src/StdMeshers/StdMeshers_HexaFromSkin_3D.cxx @@ -1025,13 +1025,11 @@ namespace StdMeshers_HexaFromSkin_3D::StdMeshers_HexaFromSkin_3D(int hypId, int studyId, SMESH_Gen* gen) :SMESH_3D_Algo(hypId, studyId, gen) { - MESSAGE("StdMeshers_HexaFromSkin_3D::StdMeshers_HexaFromSkin_3D"); _name = "HexaFromSkin_3D"; } StdMeshers_HexaFromSkin_3D::~StdMeshers_HexaFromSkin_3D() { - MESSAGE("StdMeshers_HexaFromSkin_3D::~StdMeshers_HexaFromSkin_3D"); } //================================================================================ diff --git a/src/StdMeshers/StdMeshers_Import_1D.cxx b/src/StdMeshers/StdMeshers_Import_1D.cxx index 94770855a..6be0fe15e 100644 --- a/src/StdMeshers/StdMeshers_Import_1D.cxx +++ b/src/StdMeshers/StdMeshers_Import_1D.cxx @@ -63,7 +63,6 @@ using namespace std; StdMeshers_Import_1D::StdMeshers_Import_1D(int hypId, int studyId, SMESH_Gen * gen) :SMESH_1D_Algo(hypId, studyId, gen), _sourceHyp(0) { - MESSAGE("StdMeshers_Import_1D::StdMeshers_Import_1D"); _name = "Import_1D"; _shapeType = (1 << TopAbs_EDGE); diff --git a/src/StdMeshers/StdMeshers_Import_1D2D.cxx b/src/StdMeshers/StdMeshers_Import_1D2D.cxx index e54a2bf7e..0d4a369e8 100644 --- a/src/StdMeshers/StdMeshers_Import_1D2D.cxx +++ b/src/StdMeshers/StdMeshers_Import_1D2D.cxx @@ -98,7 +98,6 @@ namespace StdMeshers_Import_1D2D::StdMeshers_Import_1D2D(int hypId, int studyId, SMESH_Gen * gen) :SMESH_2D_Algo(hypId, studyId, gen), _sourceHyp(0) { - MESSAGE("StdMeshers_Import_1D2D::StdMeshers_Import_1D2D"); _name = "Import_1D2D"; _shapeType = (1 << TopAbs_FACE); diff --git a/src/StdMeshers/StdMeshers_LayerDistribution.cxx b/src/StdMeshers/StdMeshers_LayerDistribution.cxx index cac7ccf86..05f0b2fd6 100644 --- a/src/StdMeshers/StdMeshers_LayerDistribution.cxx +++ b/src/StdMeshers/StdMeshers_LayerDistribution.cxx @@ -59,7 +59,6 @@ StdMeshers_LayerDistribution::StdMeshers_LayerDistribution(int hypId, int studyI StdMeshers_LayerDistribution::~StdMeshers_LayerDistribution() { - MESSAGE( "StdMeshers_LayerDistribution::~StdMeshers_LayerDistribution" ); } //============================================================================= diff --git a/src/StdMeshers/StdMeshers_LayerDistribution2D.cxx b/src/StdMeshers/StdMeshers_LayerDistribution2D.cxx index 3d77fdabd..664995684 100644 --- a/src/StdMeshers/StdMeshers_LayerDistribution2D.cxx +++ b/src/StdMeshers/StdMeshers_LayerDistribution2D.cxx @@ -55,5 +55,4 @@ StdMeshers_LayerDistribution2D::StdMeshers_LayerDistribution2D(int hypId, StdMeshers_LayerDistribution2D::~StdMeshers_LayerDistribution2D() { - MESSAGE( "StdMeshers_LayerDistribution2D::~StdMeshers_LayerDistribution2D" ); } diff --git a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx index 4839f9b21..7cdb3e488 100644 --- a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx +++ b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx @@ -64,7 +64,6 @@ StdMeshers_MaxElementVolume::StdMeshers_MaxElementVolume(int hypId, int studyId, StdMeshers_MaxElementVolume::~StdMeshers_MaxElementVolume() { - MESSAGE("StdMeshers_MaxElementVolume::~StdMeshers_MaxElementVolume"); } //============================================================================= diff --git a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx index 95a764d56..55967940c 100644 --- a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx +++ b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx @@ -61,7 +61,6 @@ StdMeshers_NumberOfLayers::StdMeshers_NumberOfLayers(int hypId, int studyId, StdMeshers_NumberOfLayers::~StdMeshers_NumberOfLayers() { - MESSAGE( "StdMeshers_NumberOfLayers::~StdMeshers_NumberOfLayers" ); } //============================================================================= diff --git a/src/StdMeshers/StdMeshers_NumberOfLayers2D.cxx b/src/StdMeshers/StdMeshers_NumberOfLayers2D.cxx index f1f6e9b03..74d6b0c9a 100644 --- a/src/StdMeshers/StdMeshers_NumberOfLayers2D.cxx +++ b/src/StdMeshers/StdMeshers_NumberOfLayers2D.cxx @@ -55,6 +55,5 @@ StdMeshers_NumberOfLayers2D::StdMeshers_NumberOfLayers2D(int hypId, StdMeshers_NumberOfLayers2D::~StdMeshers_NumberOfLayers2D() { - MESSAGE( "StdMeshers_NumberOfLayers2D::~StdMeshers_NumberOfLayers2D" ); } diff --git a/src/StdMeshers/StdMeshers_Penta_3D.cxx b/src/StdMeshers/StdMeshers_Penta_3D.cxx index 413ec1f7e..e566580b9 100644 --- a/src/StdMeshers/StdMeshers_Penta_3D.cxx +++ b/src/StdMeshers/StdMeshers_Penta_3D.cxx @@ -96,8 +96,6 @@ StdMeshers_Penta_3D::~StdMeshers_Penta_3D() bool StdMeshers_Penta_3D::Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape) { - MESSAGE("StdMeshers_Penta_3D::Compute()"); - // bool bOK=false; // myShape=aShape; @@ -426,7 +424,7 @@ void StdMeshers_Penta_3D::MakeNodes() // suporting shape ID ShapeSupportID(bIsUpperLayer, aBNSSID, aSSID); if (!myErrorStatus->IsOK()) { - MESSAGE("StdMeshers_Penta_3D::MakeNodes() "); + MESSAGE("StdMeshers_Penta_3D::MakeNodes() pb"); return; } // @@ -473,7 +471,7 @@ void StdMeshers_Penta_3D::MakeNodes() } } if (!myErrorStatus->IsOK()) { - MESSAGE("StdMeshers_Penta_3D::MakeNodes() "); + MESSAGE("StdMeshers_Penta_3D::MakeNodes() err"); return; } // @@ -685,7 +683,7 @@ void StdMeshers_Penta_3D::MakeVolumeMesh() aID0 = pNode->GetID(); aJ[k] = GetIndexOnLayer(aID0); if (!myErrorStatus->IsOK()) { - MESSAGE("StdMeshers_Penta_3D::MakeVolumeMesh"); + MESSAGE("StdMeshers_Penta_3D::MakeVolumeMesh pb"); return; } } @@ -820,7 +818,7 @@ void StdMeshers_Penta_3D::MakeMeshOnFxy1() aID0 = pNode->GetID(); aJ = GetIndexOnLayer(aID0); if (!myErrorStatus->IsOK()) { - MESSAGE("StdMeshers_Penta_3D::MakeMeshOnFxy1() "); + MESSAGE("StdMeshers_Penta_3D::MakeMeshOnFxy1() pb"); return; } // @@ -1224,7 +1222,7 @@ void StdMeshers_Penta_3D::MakeBlock() // 1.1 Base vertex V000 iNbE = aME.Extent(); if (iNbE!= NB_WALL_FACES ){ - MESSAGE("StdMeshers_Penta_3D::MakeBlock() "); + MESSAGE("StdMeshers_Penta_3D::MakeBlock() err"); myErrorStatus->myName=7; // too few edges are in base face aFTr myErrorStatus->myComment=SMESH_Comment("Not a quadrilateral face #") <GetMeshDS()->ShapeToIndex( aFTr )<<": "<myName=7; // too few edges meet in base vertex myErrorStatus->myComment=SMESH_Comment("3 edges must share vertex #") <GetMeshDS()->ShapeToIndex( aV000 )<<" but there are "<myName=8; // can not find reper V001 myErrorStatus->myComment=SMESH_Comment("Can't find opposite vertex for vertex #") <GetMeshDS()->ShapeToIndex( aV000 ); @@ -1863,8 +1861,6 @@ bool StdMeshers_Penta_3D::Evaluate(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape, MapShapeNbElems& aResMap) { - MESSAGE("StdMeshers_Penta_3D::Evaluate()"); - // find face contains only triangles vector < SMESH_subMesh * >meshFaces; TopTools_SequenceOfShape aFaces; diff --git a/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx index 06550eb6b..c3dd4ec00 100644 --- a/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx +++ b/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx @@ -63,13 +63,12 @@ StdMeshers_ProjectionSource1D::StdMeshers_ProjectionSource1D(int hypId, int stud StdMeshers_ProjectionSource1D::~StdMeshers_ProjectionSource1D() { - MESSAGE( "StdMeshers_ProjectionSource1D::~StdMeshers_ProjectionSource1D" ); } //============================================================================= - /*! - * Sets source to take a mesh pattern from - */ +/*! + * Sets source to take a mesh pattern from + */ //============================================================================= void StdMeshers_ProjectionSource1D::SetSourceEdge(const TopoDS_Shape& edge) diff --git a/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx index d56fe4dea..0a0f3a81a 100644 --- a/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx +++ b/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx @@ -64,13 +64,12 @@ StdMeshers_ProjectionSource2D::StdMeshers_ProjectionSource2D(int hypId, int stud StdMeshers_ProjectionSource2D::~StdMeshers_ProjectionSource2D() { - MESSAGE( "StdMeshers_ProjectionSource2D::~StdMeshers_ProjectionSource2D" ); } //============================================================================= - /*! - * Sets a source to take a mesh pattern from - */ +/*! + * Sets a source to take a mesh pattern from + */ //============================================================================= void StdMeshers_ProjectionSource2D::SetSourceFace(const TopoDS_Shape& Face) diff --git a/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx index 0fdfad774..868553480 100644 --- a/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx +++ b/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx @@ -62,13 +62,12 @@ StdMeshers_ProjectionSource3D::StdMeshers_ProjectionSource3D(int hypId, int stud StdMeshers_ProjectionSource3D::~StdMeshers_ProjectionSource3D() { - MESSAGE( "StdMeshers_ProjectionSource3D::~StdMeshers_ProjectionSource3D" ); } //============================================================================= - /*! - * Sets a source to take a mesh pattern from - */ +/*! + * Sets a source shape to take a mesh pattern from + */ //============================================================================= void StdMeshers_ProjectionSource3D::SetSource3DShape(const TopoDS_Shape& Shape) diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx index c13ea9fcb..c1c77b12e 100644 --- a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx +++ b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx @@ -742,8 +742,8 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the int nbE = FindFaceAssociation( face1, VV1, face2, VV2, edges1, edges2, isVCloseness ); if ( !nbE ) RETURN_BAD_RESULT("FindFaceAssociation() failed"); InsertAssociation( face1, face2, theMap ); // assoc faces - MESSAGE("Assoc FACE " << theMesh1->GetMeshDS()->ShapeToIndex( face1 )<< - " to " << theMesh2->GetMeshDS()->ShapeToIndex( face2 )); + // MESSAGE("Assoc FACE " << theMesh1->GetMeshDS()->ShapeToIndex( face1 )<< + // " to " << theMesh2->GetMeshDS()->ShapeToIndex( face2 )); if ( nbE == 2 && (edge1.IsSame( edges1.front())) != (edge2.IsSame( edges2.front()))) { reverseEdges( edges2, nbE ); @@ -954,14 +954,14 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the v2e[0].UnBind( V[0] ); v2e[1].UnBind( V[1] ); InsertAssociation( e0, e1, theMap ); - MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0 )<< - " to " << theMesh2->GetMeshDS()->ShapeToIndex( e1 )); + // MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0 )<< + // " to " << theMesh2->GetMeshDS()->ShapeToIndex( e1 )); V[0] = GetNextVertex( e0, V[0] ); V[1] = GetNextVertex( e1, V[1] ); if ( !V[0].IsNull() ) { InsertAssociation( V[0], V[1], theMap ); - MESSAGE("Assoc vertex " << theMesh1->GetMeshDS()->ShapeToIndex( V[0] )<< - " to " << theMesh2->GetMeshDS()->ShapeToIndex( V[1] )); + // MESSAGE("Assoc vertex " << theMesh1->GetMeshDS()->ShapeToIndex( V[0] )<< + // " to " << theMesh2->GetMeshDS()->ShapeToIndex( V[1] )); } } else if ( nbE0 == 2 ) @@ -988,12 +988,12 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the InsertAssociation( e0b, e1b, theMap ); InsertAssociation( e0n, e1n, theMap ); InsertAssociation( v0n, v1n, theMap ); - MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0b )<< - " to " << theMesh2->GetMeshDS()->ShapeToIndex( e1b )); - MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0n )<< - " to " << theMesh2->GetMeshDS()->ShapeToIndex( e1n )); - MESSAGE("Assoc vertex " << theMesh1->GetMeshDS()->ShapeToIndex( v0n )<< - " to " << theMesh2->GetMeshDS()->ShapeToIndex( v1n )); + // MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0b )<< + // " to " << theMesh2->GetMeshDS()->ShapeToIndex( e1b )); + // MESSAGE("Assoc edge " << theMesh1->GetMeshDS()->ShapeToIndex( e0n )<< + // " to " << theMesh2->GetMeshDS()->ShapeToIndex( e1n )); + // MESSAGE("Assoc vertex " << theMesh1->GetMeshDS()->ShapeToIndex( v0n )<< + // " to " << theMesh2->GetMeshDS()->ShapeToIndex( v1n )); v2e[0].UnBind( V[0] ); v2e[1].UnBind( V[1] ); V[0] = v0n; @@ -1342,10 +1342,10 @@ bool StdMeshers_ProjectionUtils::FindSubShapeAssociation(const TopoDS_Shape& the InsertAssociation( VV1[ 0 ], VV2[ 0 ], theMap ); InsertAssociation( VV1[ 1 ], VV2[ 1 ], theMap ); - MESSAGE("Initial assoc VERT " << theMesh1->GetMeshDS()->ShapeToIndex( VV1[ 0 ] )<< - " to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[ 0 ] )<< - "\nand VERT " << theMesh1->GetMeshDS()->ShapeToIndex( VV1[ 1 ] )<< - " to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[ 1 ] )); + // MESSAGE("Initial assoc VERT " << theMesh1->GetMeshDS()->ShapeToIndex( VV1[ 0 ] )<< + // " to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[ 0 ] )<< + // "\nand VERT " << theMesh1->GetMeshDS()->ShapeToIndex( VV1[ 1 ] )<< + // " to " << theMesh2->GetMeshDS()->ShapeToIndex( VV2[ 1 ] )); if ( theShape1.ShapeType() == TopAbs_EDGE ) { InsertAssociation( theShape1, theShape2, theMap ); return true; diff --git a/src/StdMeshers_I/StdMeshers_Adaptive1D_i.cxx b/src/StdMeshers_I/StdMeshers_Adaptive1D_i.cxx index 4b2214cfc..d0439c955 100644 --- a/src/StdMeshers_I/StdMeshers_Adaptive1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Adaptive1D_i.cxx @@ -56,7 +56,6 @@ StdMeshers_Adaptive1D_i::StdMeshers_Adaptive1D_i( PortableServer::POA_ptr thePOA StdMeshers_Adaptive1D_i::~StdMeshers_Adaptive1D_i() { - MESSAGE( "StdMeshers_Adaptive1D_i::~StdMeshers_Adaptive1D_i" ); } //======================================================================= diff --git a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx index 01ebbfa7b..824530ec2 100644 --- a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx @@ -51,7 +51,6 @@ StdMeshers_Arithmetic1D_i::StdMeshers_Arithmetic1D_i( PortableServer::POA_ptr th : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_Arithmetic1D_i::StdMeshers_Arithmetic1D_i" ); myBaseImpl = new ::StdMeshers_Arithmetic1D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -67,7 +66,6 @@ StdMeshers_Arithmetic1D_i::StdMeshers_Arithmetic1D_i( PortableServer::POA_ptr th StdMeshers_Arithmetic1D_i::~StdMeshers_Arithmetic1D_i() { - MESSAGE( "StdMeshers_Arithmetic1D_i::~StdMeshers_Arithmetic1D_i" ); } //============================================================================= @@ -82,7 +80,6 @@ void StdMeshers_Arithmetic1D_i::SetLength(CORBA::Double theLength, CORBA::Boolean theIsStart ) throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_StartEndLength_i::SetLength" ); ASSERT( myBaseImpl ); try { this->GetImpl()->SetLength( theLength, theIsStart ); @@ -132,7 +129,6 @@ void StdMeshers_Arithmetic1D_i::SetEndLength( CORBA::Double length) CORBA::Double StdMeshers_Arithmetic1D_i::GetLength( CORBA::Boolean theIsStart) { - MESSAGE( "StdMeshers_Arithmetic1D_i::GetLength" ); ASSERT( myBaseImpl ); return this->GetImpl()->GetLength( theIsStart ); } @@ -197,7 +193,6 @@ void StdMeshers_Arithmetic1D_i::SetObjectEntry( const char* theEntry ) char* StdMeshers_Arithmetic1D_i::GetObjectEntry() { - MESSAGE( "StdMeshers_Arithmetic1D_i::SetObjectEntry" ); ASSERT( myBaseImpl ); const char* entry; try { @@ -220,7 +215,6 @@ char* StdMeshers_Arithmetic1D_i::GetObjectEntry() SMESH::long_array* StdMeshers_Arithmetic1D_i::GetReversedEdges() { - MESSAGE( "StdMeshers_StartEndLength_i::GetReversedEdges" ); ASSERT( myBaseImpl ); SMESH::long_array_var anArray = new SMESH::long_array; std::vector ids = this->GetImpl()->GetReversedEdges(); @@ -241,7 +235,6 @@ SMESH::long_array* StdMeshers_Arithmetic1D_i::GetReversedEdges() ::StdMeshers_Arithmetic1D* StdMeshers_Arithmetic1D_i::GetImpl() { - MESSAGE( "StdMeshers_Arithmetic1D_i::GetImpl" ); return ( ::StdMeshers_Arithmetic1D* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx b/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx index b8b54ddbc..9e1fb02f9 100644 --- a/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_CartesianParameters3D_i.cxx @@ -64,7 +64,6 @@ StdMeshers_CartesianParameters3D_i( PortableServer::POA_ptr thePOA, : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_CartesianParameters3D_i::StdMeshers_CartesianParameters3D_i" ); myBaseImpl = new ::StdMeshers_CartesianParameters3D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -80,7 +79,6 @@ StdMeshers_CartesianParameters3D_i( PortableServer::POA_ptr thePOA, StdMeshers_CartesianParameters3D_i::~StdMeshers_CartesianParameters3D_i() { - MESSAGE( "StdMeshers_CartesianParameters3D_i::~StdMeshers_CartesianParameters3D_i" ); } //============================================================================= @@ -419,7 +417,6 @@ StdMeshers_CartesianParameters3D_i::ComputeCoordinates(CORBA::Double ::StdMeshers_CartesianParameters3D* StdMeshers_CartesianParameters3D_i::GetImpl() { - MESSAGE( "StdMeshers_CartesianParameters3D_i::GetImpl" ); return ( ::StdMeshers_CartesianParameters3D* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_Cartesian_3D_i.cxx b/src/StdMeshers_I/StdMeshers_Cartesian_3D_i.cxx index cc11d2205..2eeaff8d1 100644 --- a/src/StdMeshers_I/StdMeshers_Cartesian_3D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Cartesian_3D_i.cxx @@ -45,7 +45,6 @@ StdMeshers_Cartesian_3D_i::StdMeshers_Cartesian_3D_i( PortableServer::POA_ptr th SMESH_Algo_i( thePOA ), SMESH_3D_Algo_i( thePOA ) { - MESSAGE( "StdMeshers_Cartesian_3D_i::StdMeshers_Cartesian_3D_i" ); myBaseImpl = new ::StdMeshers_Cartesian_3D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -61,7 +60,6 @@ StdMeshers_Cartesian_3D_i::StdMeshers_Cartesian_3D_i( PortableServer::POA_ptr th StdMeshers_Cartesian_3D_i::~StdMeshers_Cartesian_3D_i() { - MESSAGE( "StdMeshers_Cartesian_3D_i::~StdMeshers_Cartesian_3D_i" ); } //============================================================================= @@ -74,6 +72,5 @@ StdMeshers_Cartesian_3D_i::~StdMeshers_Cartesian_3D_i() ::StdMeshers_Cartesian_3D* StdMeshers_Cartesian_3D_i::GetImpl() { - MESSAGE( "StdMeshers_Cartesian_3D_i::GetImpl" ); return ( ::StdMeshers_Cartesian_3D* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx b/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx index 48c6f4bac..01a579b56 100644 --- a/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx @@ -50,7 +50,6 @@ StdMeshers_CompositeSegment_1D_i::StdMeshers_CompositeSegment_1D_i SMESH_Algo_i( thePOA ), SMESH_1D_Algo_i( thePOA ) { - MESSAGE( "StdMeshers_CompositeSegment_1D_i::StdMeshers_CompositeSegment_1D_i" ); myBaseImpl = new ::StdMeshers_CompositeSegment_1D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -66,7 +65,6 @@ StdMeshers_CompositeSegment_1D_i::StdMeshers_CompositeSegment_1D_i StdMeshers_CompositeSegment_1D_i::~StdMeshers_CompositeSegment_1D_i() { - MESSAGE( "StdMeshers_CompositeSegment_1D_i::~StdMeshers_CompositeSegment_1D_i" ); } //============================================================================= @@ -79,7 +77,6 @@ StdMeshers_CompositeSegment_1D_i::~StdMeshers_CompositeSegment_1D_i() ::StdMeshers_CompositeSegment_1D* StdMeshers_CompositeSegment_1D_i::GetImpl() { - MESSAGE( "StdMeshers_CompositeSegment_1D_i::GetImpl" ); return ( ::StdMeshers_CompositeSegment_1D* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx b/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx index d97829623..add0ede6d 100644 --- a/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx @@ -52,7 +52,6 @@ StdMeshers_Deflection1D_i::StdMeshers_Deflection1D_i( PortableServer::POA_ptr th : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_Deflection1D_i::StdMeshers_Deflection1D_i" ); myBaseImpl = new ::StdMeshers_Deflection1D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -68,7 +67,6 @@ StdMeshers_Deflection1D_i::StdMeshers_Deflection1D_i( PortableServer::POA_ptr th StdMeshers_Deflection1D_i::~StdMeshers_Deflection1D_i() { - MESSAGE( "StdMeshers_Deflection1D_i::~StdMeshers_Deflection1D_i" ); } //============================================================================= @@ -82,7 +80,6 @@ StdMeshers_Deflection1D_i::~StdMeshers_Deflection1D_i() void StdMeshers_Deflection1D_i::SetDeflection( CORBA::Double theValue ) throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_Deflection1D_i::SetDeflection" ); ASSERT( myBaseImpl ); try { this->GetImpl()->SetDeflection( theValue ); @@ -106,7 +103,6 @@ void StdMeshers_Deflection1D_i::SetDeflection( CORBA::Double theValue ) CORBA::Double StdMeshers_Deflection1D_i::GetDeflection() { - MESSAGE( "StdMeshers_Deflection1D_i::GetDeflection" ); ASSERT( myBaseImpl ); return this->GetImpl()->GetDeflection(); } @@ -121,7 +117,6 @@ CORBA::Double StdMeshers_Deflection1D_i::GetDeflection() ::StdMeshers_Deflection1D* StdMeshers_Deflection1D_i::GetImpl() { - MESSAGE( "StdMeshers_Deflection1D_i::GetImpl" ); return ( ::StdMeshers_Deflection1D* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx b/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx index e11ceb987..fbaa715c6 100644 --- a/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx @@ -49,7 +49,6 @@ StdMeshers_FixedPoints1D_i::StdMeshers_FixedPoints1D_i( PortableServer::POA_ptr : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_FixedPoints1D_i::StdMeshers_FixedPoints1D_i" ); myBaseImpl = new ::StdMeshers_FixedPoints1D(theGenImpl->GetANewId(), theStudyId, theGenImpl); @@ -65,7 +64,6 @@ StdMeshers_FixedPoints1D_i::StdMeshers_FixedPoints1D_i( PortableServer::POA_ptr StdMeshers_FixedPoints1D_i::~StdMeshers_FixedPoints1D_i() { - MESSAGE( "StdMeshers_FixedPoints1D_i::~StdMeshers_FixedPoints1D_i" ); } //============================================================================= @@ -77,7 +75,6 @@ StdMeshers_FixedPoints1D_i::~StdMeshers_FixedPoints1D_i() void StdMeshers_FixedPoints1D_i::SetNbSegments(const SMESH::long_array& listNbSeg) throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_FixedPoints1D_i::SetNbSegments" ); ASSERT( myBaseImpl ); try { std::vector nbsegs( listNbSeg.length() ); @@ -104,7 +101,6 @@ void StdMeshers_FixedPoints1D_i::SetNbSegments(const SMESH::long_array& listNbSe void StdMeshers_FixedPoints1D_i::SetPoints(const SMESH::double_array& listParams) throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_FixedPoints1D_i::SetPoints" ); ASSERT( myBaseImpl ); try { std::vector params( listParams.length() ); @@ -132,7 +128,6 @@ void StdMeshers_FixedPoints1D_i::SetPoints(const SMESH::double_array& listParams SMESH::double_array* StdMeshers_FixedPoints1D_i::GetPoints() { - MESSAGE( "StdMeshers_FixedPoints1D_i::GetPoints" ); ASSERT( myBaseImpl ); SMESH::double_array_var anArray = new SMESH::double_array; std::vector params = this->GetImpl()->GetPoints(); @@ -153,7 +148,6 @@ SMESH::double_array* StdMeshers_FixedPoints1D_i::GetPoints() SMESH::long_array* StdMeshers_FixedPoints1D_i::GetNbSegments() { - MESSAGE( "StdMeshers_FixedPoints1D_i::GetNbSegments" ); ASSERT( myBaseImpl ); SMESH::long_array_var anArray = new SMESH::long_array; std::vector nbsegs = this->GetImpl()->GetNbSegments(); @@ -224,7 +218,6 @@ void StdMeshers_FixedPoints1D_i::SetObjectEntry( const char* theEntry ) char* StdMeshers_FixedPoints1D_i::GetObjectEntry() { - MESSAGE( "StdMeshers_FixedPoints1D_i::SetObjectEntry" ); ASSERT( myBaseImpl ); const char* entry; try { @@ -247,7 +240,6 @@ char* StdMeshers_FixedPoints1D_i::GetObjectEntry() SMESH::long_array* StdMeshers_FixedPoints1D_i::GetReversedEdges() { - MESSAGE( "StdMeshers_FixedPoints1D_i::GetReversedEdges" ); ASSERT( myBaseImpl ); SMESH::long_array_var anArray = new SMESH::long_array; std::vector ids = this->GetImpl()->GetReversedEdges(); @@ -268,7 +260,6 @@ SMESH::long_array* StdMeshers_FixedPoints1D_i::GetReversedEdges() ::StdMeshers_FixedPoints1D* StdMeshers_FixedPoints1D_i::GetImpl() { - MESSAGE( "StdMeshers_FixedPoints1D_i::GetImpl" ); return ( ::StdMeshers_FixedPoints1D* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_ImportSource1D_i.cxx b/src/StdMeshers_I/StdMeshers_ImportSource1D_i.cxx index 7b6a2b80e..61ec24bd4 100644 --- a/src/StdMeshers_I/StdMeshers_ImportSource1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ImportSource1D_i.cxx @@ -56,7 +56,6 @@ StdMeshers_ImportSource1D_i::StdMeshers_ImportSource1D_i( PortableServer::POA_pt : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_ImportSource1D_i::StdMeshers_ImportSource1D_i" ); myBaseImpl = new ::StdMeshers_ImportSource1D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -73,7 +72,6 @@ StdMeshers_ImportSource1D_i::StdMeshers_ImportSource1D_i( PortableServer::POA_pt StdMeshers_ImportSource1D_i::~StdMeshers_ImportSource1D_i() { - MESSAGE( "StdMeshers_ImportSource1D_i::~StdMeshers_ImportSource1D_i" ); } //============================================================================= @@ -84,7 +82,6 @@ StdMeshers_ImportSource1D_i::~StdMeshers_ImportSource1D_i() void StdMeshers_ImportSource1D_i::SetSourceEdges(const SMESH::ListOfGroups& groups) { - MESSAGE( "StdMeshers_ImportSource1D_i::SetSourceEdges" ); ASSERT( myBaseImpl ); try { @@ -129,7 +126,6 @@ void StdMeshers_ImportSource1D_i::SetSourceEdges(const SMESH::ListOfGroups& grou SMESH::string_array* StdMeshers_ImportSource1D_i::GetSourceEdges() { - MESSAGE( "StdMeshers_ImportSource1D_i::GetImportSource" ); SMESH::string_array_var res = new SMESH::string_array( _groupEntries ); return res._retn(); } @@ -261,7 +257,6 @@ void StdMeshers_ImportSource1D_i::UpdateAsMeshesRestored() ::StdMeshers_ImportSource1D* StdMeshers_ImportSource1D_i::GetImpl() { - MESSAGE( "StdMeshers_ImportSource1D_i::GetImpl" ); return ( ::StdMeshers_ImportSource1D* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_ImportSource2D_i.cxx b/src/StdMeshers_I/StdMeshers_ImportSource2D_i.cxx index f8d31a414..dc61b9cdd 100644 --- a/src/StdMeshers_I/StdMeshers_ImportSource2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ImportSource2D_i.cxx @@ -55,7 +55,6 @@ StdMeshers_ImportSource2D_i::StdMeshers_ImportSource2D_i( PortableServer::POA_pt : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_ImportSource2D_i::StdMeshers_ImportSource2D_i" ); myBaseImpl = new ::StdMeshers_ImportSource2D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -72,7 +71,6 @@ StdMeshers_ImportSource2D_i::StdMeshers_ImportSource2D_i( PortableServer::POA_pt StdMeshers_ImportSource2D_i::~StdMeshers_ImportSource2D_i() { - MESSAGE( "StdMeshers_ImportSource2D_i::~StdMeshers_ImportSource2D_i" ); } //============================================================================= @@ -83,7 +81,6 @@ StdMeshers_ImportSource2D_i::~StdMeshers_ImportSource2D_i() void StdMeshers_ImportSource2D_i::SetSourceFaces(const SMESH::ListOfGroups& groups) { - MESSAGE( "StdMeshers_ImportSource2D_i::SetSourceFaces" ); ASSERT( myBaseImpl ); try { @@ -129,7 +126,6 @@ void StdMeshers_ImportSource2D_i::SetSourceFaces(const SMESH::ListOfGroups& grou SMESH::string_array* StdMeshers_ImportSource2D_i::GetSourceFaces() { - MESSAGE( "StdMeshers_ImportSource2D_i::GetImportSource" ); SMESH::string_array_var res = new SMESH::string_array( _groupEntries ); return res._retn(); } @@ -263,7 +259,6 @@ void StdMeshers_ImportSource2D_i::UpdateAsMeshesRestored() ::StdMeshers_ImportSource2D* StdMeshers_ImportSource2D_i::GetImpl() { - MESSAGE( "StdMeshers_ImportSource2D_i::GetImpl" ); return ( ::StdMeshers_ImportSource2D* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_Import_1D2D_i.cxx b/src/StdMeshers_I/StdMeshers_Import_1D2D_i.cxx index ed2f3cefe..061257e9f 100644 --- a/src/StdMeshers_I/StdMeshers_Import_1D2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Import_1D2D_i.cxx @@ -44,7 +44,6 @@ StdMeshers_Import_1D2D_i::StdMeshers_Import_1D2D_i (PortableServer::POA_ptr theP SMESH_Algo_i( thePOA ), SMESH_2D_Algo_i( thePOA ) { - MESSAGE( "StdMeshers_Import_1D2D_i::StdMeshers_Import_1D2D_i" ); myBaseImpl = new ::StdMeshers_Import_1D2D(theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -54,14 +53,12 @@ StdMeshers_Import_1D2D_i::StdMeshers_Import_1D2D_i (PortableServer::POA_ptr theP StdMeshers_Import_1D2D_i::~StdMeshers_Import_1D2D_i() { - MESSAGE( "StdMeshers_Import_1D2D_i::~StdMeshers_Import_1D2D_i" ); } //----------------------------------------------------------------------------- ::StdMeshers_Import_1D2D* StdMeshers_Import_1D2D_i::GetImpl() { - MESSAGE( "StdMeshers_Import_1D2D_i::GetImpl" ); return ( ::StdMeshers_Import_1D2D* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_Import_1D_i.cxx b/src/StdMeshers_I/StdMeshers_Import_1D_i.cxx index 260516a3d..dfbda1eb9 100644 --- a/src/StdMeshers_I/StdMeshers_Import_1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Import_1D_i.cxx @@ -50,7 +50,6 @@ StdMeshers_Import_1D_i::StdMeshers_Import_1D_i( PortableServer::POA_ptr thePOA, SMESH_Algo_i( thePOA ), SMESH_1D_Algo_i( thePOA ) { - MESSAGE( "StdMeshers_Import_1D_i::StdMeshers_Import_1D_i" ); myBaseImpl = new ::StdMeshers_Import_1D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -66,7 +65,6 @@ StdMeshers_Import_1D_i::StdMeshers_Import_1D_i( PortableServer::POA_ptr thePOA, StdMeshers_Import_1D_i::~StdMeshers_Import_1D_i() { - MESSAGE( "StdMeshers_Import_1D_i::~StdMeshers_Import_1D_i" ); } //============================================================================= @@ -79,7 +77,6 @@ StdMeshers_Import_1D_i::~StdMeshers_Import_1D_i() ::StdMeshers_Import_1D* StdMeshers_Import_1D_i::GetImpl() { - MESSAGE( "StdMeshers_Import_1D_i::GetImpl" ); return ( ::StdMeshers_Import_1D* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.cxx b/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.cxx index 37e780ec2..013db3995 100644 --- a/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.cxx @@ -41,7 +41,6 @@ StdMeshers_LayerDistribution2D_i::StdMeshers_LayerDistribution2D_i :SMESH_Hypothesis_i( thePOA ), StdMeshers_LayerDistribution_i(thePOA,theStudyId,theGenImpl) { - MESSAGE( "StdMeshers_LayerDistribution2D_i::StdMeshers_LayerDistribution2D_i" ); myBaseImpl = new ::StdMeshers_LayerDistribution2D(theGenImpl->GetANewId(), theStudyId, theGenImpl); @@ -57,7 +56,6 @@ StdMeshers_LayerDistribution2D_i::StdMeshers_LayerDistribution2D_i StdMeshers_LayerDistribution2D_i::~StdMeshers_LayerDistribution2D_i() { - MESSAGE("StdMeshers_LayerDistribution2D_i::~StdMeshers_LayerDistribution2D_i"); } //============================================================================= diff --git a/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx b/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx index d958478e7..d8bb02180 100644 --- a/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx +++ b/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx @@ -50,7 +50,6 @@ StdMeshers_LayerDistribution_i::StdMeshers_LayerDistribution_i( PortableServer:: : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_LayerDistribution_i::StdMeshers_LayerDistribution_i" ); myBaseImpl = new ::StdMeshers_LayerDistribution( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -66,7 +65,6 @@ StdMeshers_LayerDistribution_i::StdMeshers_LayerDistribution_i( PortableServer:: StdMeshers_LayerDistribution_i::~StdMeshers_LayerDistribution_i() { - MESSAGE( "StdMeshers_LayerDistribution_i::~StdMeshers_LayerDistribution_i" ); if ( !myHyp->_is_nil() ) myHyp->UnRegister(); } diff --git a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx index 599b3d861..7404b9e13 100644 --- a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx +++ b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx @@ -49,7 +49,6 @@ StdMeshers_LengthFromEdges_i::StdMeshers_LengthFromEdges_i( PortableServer::POA_ : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_LengthFromEdges_i::StdMeshers_LengthFromEdges_i" ); myBaseImpl = new ::StdMeshers_LengthFromEdges( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -65,7 +64,6 @@ StdMeshers_LengthFromEdges_i::StdMeshers_LengthFromEdges_i( PortableServer::POA_ StdMeshers_LengthFromEdges_i::~StdMeshers_LengthFromEdges_i() { - MESSAGE( "StdMeshers_LengthFromEdges_i::~StdMeshers_LengthFromEdges_i" ); } //============================================================================= @@ -79,7 +77,6 @@ StdMeshers_LengthFromEdges_i::~StdMeshers_LengthFromEdges_i() void StdMeshers_LengthFromEdges_i::SetMode( CORBA::Long theMode ) throw (SALOME::SALOME_Exception) { - MESSAGE( "StdMeshers_LengthFromEdges_i::SetMode" ); ASSERT( myBaseImpl ); try { this->GetImpl()->SetMode( theMode ); @@ -100,7 +97,6 @@ void StdMeshers_LengthFromEdges_i::SetMode( CORBA::Long theMode ) CORBA::Long StdMeshers_LengthFromEdges_i::GetMode() { - MESSAGE( "StdMeshers_LengthFromEdges_i::GetMode" ); ASSERT( myBaseImpl ); return this->GetImpl()->GetMode(); } @@ -126,7 +122,6 @@ CORBA::Boolean StdMeshers_LengthFromEdges_i::HasParameters() ::StdMeshers_LengthFromEdges* StdMeshers_LengthFromEdges_i::GetImpl() { - MESSAGE( "StdMeshers_LengthFromEdges_i::GetImpl" ); return ( ::StdMeshers_LengthFromEdges* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx b/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx index 75a74e181..af0e63a48 100644 --- a/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx +++ b/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx @@ -52,7 +52,6 @@ StdMeshers_LocalLength_i::StdMeshers_LocalLength_i( PortableServer::POA_ptr theP : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_LocalLength_i::StdMeshers_LocalLength_i" ); myBaseImpl = new ::StdMeshers_LocalLength( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -68,7 +67,6 @@ StdMeshers_LocalLength_i::StdMeshers_LocalLength_i( PortableServer::POA_ptr theP StdMeshers_LocalLength_i::~StdMeshers_LocalLength_i() { - MESSAGE( "StdMeshers_LocalLength_i::~StdMeshers_LocalLength_i" ); } //============================================================================= @@ -81,7 +79,6 @@ StdMeshers_LocalLength_i::~StdMeshers_LocalLength_i() void StdMeshers_LocalLength_i::SetLength( CORBA::Double theLength ) throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_LocalLength_i::SetLength" ); ASSERT( myBaseImpl ); try { this->GetImpl()->SetLength( theLength ); @@ -105,7 +102,6 @@ void StdMeshers_LocalLength_i::SetLength( CORBA::Double theLength ) void StdMeshers_LocalLength_i::SetPrecision( CORBA::Double thePrecision ) throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_LocalLength_i::SetPrecision" ); ASSERT( myBaseImpl ); try { this->GetImpl()->SetPrecision( thePrecision ); @@ -128,7 +124,6 @@ void StdMeshers_LocalLength_i::SetPrecision( CORBA::Double thePrecision ) //============================================================================= CORBA::Double StdMeshers_LocalLength_i::GetLength() { - MESSAGE( "StdMeshers_LocalLength_i::GetLength" ); ASSERT( myBaseImpl ); return this->GetImpl()->GetLength(); } @@ -142,7 +137,6 @@ CORBA::Double StdMeshers_LocalLength_i::GetLength() //============================================================================= CORBA::Double StdMeshers_LocalLength_i::GetPrecision() { - MESSAGE( "StdMeshers_LocalLength_i::GetPrecision" ); ASSERT( myBaseImpl ); return this->GetImpl()->GetPrecision(); } @@ -156,7 +150,6 @@ CORBA::Double StdMeshers_LocalLength_i::GetPrecision() //============================================================================= ::StdMeshers_LocalLength* StdMeshers_LocalLength_i::GetImpl() { - MESSAGE( "StdMeshers_LocalLength_i::GetImpl" ); return ( ::StdMeshers_LocalLength* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx b/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx index 00417f747..d463a4ebe 100644 --- a/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx @@ -51,7 +51,6 @@ StdMeshers_MEFISTO_2D_i::StdMeshers_MEFISTO_2D_i( PortableServer::POA_ptr thePOA SMESH_Algo_i( thePOA ), SMESH_2D_Algo_i( thePOA ) { - MESSAGE( "StdMeshers_MEFISTO_2D_i::StdMeshers_MEFISTO_2D_i" ); myBaseImpl = new ::StdMeshers_MEFISTO_2D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -67,7 +66,6 @@ StdMeshers_MEFISTO_2D_i::StdMeshers_MEFISTO_2D_i( PortableServer::POA_ptr thePOA StdMeshers_MEFISTO_2D_i::~StdMeshers_MEFISTO_2D_i() { - MESSAGE( "StdMeshers_MEFISTO_2D_i::~StdMeshers_MEFISTO_2D_i" ); } //============================================================================= @@ -80,7 +78,6 @@ StdMeshers_MEFISTO_2D_i::~StdMeshers_MEFISTO_2D_i() ::StdMeshers_MEFISTO_2D* StdMeshers_MEFISTO_2D_i::GetImpl() { - MESSAGE( "StdMeshers_MEFISTO_2D_i::GetImpl" ); return ( ::StdMeshers_MEFISTO_2D* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx index 12d983820..017c33bb0 100644 --- a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx +++ b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx @@ -52,7 +52,6 @@ StdMeshers_MaxElementArea_i::StdMeshers_MaxElementArea_i( PortableServer::POA_pt : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_MaxElementArea_i::StdMeshers_MaxElementArea_i" ); myBaseImpl = new ::StdMeshers_MaxElementArea( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -68,7 +67,6 @@ StdMeshers_MaxElementArea_i::StdMeshers_MaxElementArea_i( PortableServer::POA_pt StdMeshers_MaxElementArea_i::~StdMeshers_MaxElementArea_i() { - MESSAGE( "StdMeshers_MaxElementArea_i::~StdMeshers_MaxElementArea_i" ); } //============================================================================= @@ -82,7 +80,6 @@ StdMeshers_MaxElementArea_i::~StdMeshers_MaxElementArea_i() void StdMeshers_MaxElementArea_i::SetMaxElementArea( CORBA::Double theArea ) throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_MaxElementArea_i::SetMaxElementArea" ); ASSERT( myBaseImpl ); try { this->GetImpl()->SetMaxArea( theArea ); @@ -106,7 +103,6 @@ void StdMeshers_MaxElementArea_i::SetMaxElementArea( CORBA::Double theArea ) CORBA::Double StdMeshers_MaxElementArea_i::GetMaxElementArea() { - MESSAGE( "StdMeshers_MaxElementArea_i::GetMaxElementArea" ); ASSERT( myBaseImpl ); return this->GetImpl()->GetMaxArea(); } @@ -121,7 +117,6 @@ CORBA::Double StdMeshers_MaxElementArea_i::GetMaxElementArea() ::StdMeshers_MaxElementArea* StdMeshers_MaxElementArea_i::GetImpl() { - MESSAGE( "StdMeshers_MaxElementArea_i::GetImpl" ); return ( ::StdMeshers_MaxElementArea* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx index af7f0a948..c9861c1f6 100644 --- a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx +++ b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx @@ -52,7 +52,6 @@ StdMeshers_MaxElementVolume_i::StdMeshers_MaxElementVolume_i( PortableServer::PO : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_MaxElementVolume_i::StdMeshers_MaxElementVolume_i" ); myBaseImpl = new ::StdMeshers_MaxElementVolume( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -68,7 +67,6 @@ StdMeshers_MaxElementVolume_i::StdMeshers_MaxElementVolume_i( PortableServer::PO StdMeshers_MaxElementVolume_i::~StdMeshers_MaxElementVolume_i() { - MESSAGE( "StdMeshers_MaxElementVolume_i::~StdMeshers_MaxElementVolume_i()" ); } //============================================================================= @@ -82,7 +80,6 @@ StdMeshers_MaxElementVolume_i::~StdMeshers_MaxElementVolume_i() void StdMeshers_MaxElementVolume_i::SetMaxElementVolume( CORBA::Double theVolume ) throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_MaxElementVolume_i::SetMaxElementVolume" ); ASSERT( myBaseImpl ); try { this->GetImpl()->SetMaxVolume( theVolume ); @@ -106,7 +103,6 @@ void StdMeshers_MaxElementVolume_i::SetMaxElementVolume( CORBA::Double theVolume CORBA::Double StdMeshers_MaxElementVolume_i::GetMaxElementVolume() { - MESSAGE( "StdMeshers_MaxElementVolume_i::GetMaxElementVolume" ); ASSERT( myBaseImpl ); return this->GetImpl()->GetMaxVolume(); } @@ -121,7 +117,6 @@ CORBA::Double StdMeshers_MaxElementVolume_i::GetMaxElementVolume() ::StdMeshers_MaxElementVolume* StdMeshers_MaxElementVolume_i::GetImpl() { - MESSAGE( "StdMeshers_MaxElementVolume_i::GetImpl" ); return ( ::StdMeshers_MaxElementVolume* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx index 7e2185327..ba1f768c2 100644 --- a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx +++ b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx @@ -47,7 +47,6 @@ StdMeshers_NotConformAllowed_i::StdMeshers_NotConformAllowed_i : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE("StdMeshers_NotConformAllowed_i::StdMeshers_NotConformAllowed_i"); myBaseImpl = new ::StdMeshers_NotConformAllowed(genImpl->GetANewId(), studyId, genImpl); diff --git a/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.cxx index d7e085dfa..263e4d5c3 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.cxx @@ -41,7 +41,6 @@ StdMeshers_NumberOfLayers2D_i::StdMeshers_NumberOfLayers2D_i :SMESH_Hypothesis_i( thePOA ), StdMeshers_NumberOfLayers_i(thePOA,theStudyId,theGenImpl) { - MESSAGE("StdMeshers_NumberOfLayers2D_i::StdMeshers_NumberOfLayers2D_i"); myBaseImpl = new ::StdMeshers_NumberOfLayers2D(theGenImpl->GetANewId(), theStudyId, theGenImpl); @@ -57,7 +56,6 @@ StdMeshers_NumberOfLayers2D_i::StdMeshers_NumberOfLayers2D_i StdMeshers_NumberOfLayers2D_i::~StdMeshers_NumberOfLayers2D_i() { - MESSAGE( "StdMeshers_NumberOfLayers2D_i::~StdMeshers_NumberOfLayers2D_i" ); } //============================================================================= diff --git a/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx index 59bab3103..40905a672 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx @@ -51,7 +51,6 @@ StdMeshers_NumberOfLayers_i::StdMeshers_NumberOfLayers_i( PortableServer::POA_pt : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_NumberOfLayers_i::StdMeshers_NumberOfLayers_i" ); myBaseImpl = new ::StdMeshers_NumberOfLayers( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -67,7 +66,6 @@ StdMeshers_NumberOfLayers_i::StdMeshers_NumberOfLayers_i( PortableServer::POA_pt StdMeshers_NumberOfLayers_i::~StdMeshers_NumberOfLayers_i() { - MESSAGE( "StdMeshers_NumberOfLayers_i::~StdMeshers_NumberOfLayers_i" ); } //============================================================================= diff --git a/src/StdMeshers_I/StdMeshers_PolygonPerFace_2D_i.cxx b/src/StdMeshers_I/StdMeshers_PolygonPerFace_2D_i.cxx index 660ab6c68..4659ab42b 100644 --- a/src/StdMeshers_I/StdMeshers_PolygonPerFace_2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_PolygonPerFace_2D_i.cxx @@ -43,7 +43,6 @@ StdMeshers_PolygonPerFace_2D_i::StdMeshers_PolygonPerFace_2D_i( PortableServer:: SMESH_Algo_i( thePOA ), SMESH_2D_Algo_i( thePOA ) { - //MESSAGE( "StdMeshers_PolygonPerFace_2D_i::StdMeshers_PolygonPerFace_2D_i" ); myBaseImpl = new ::StdMeshers_PolygonPerFace_2D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -57,5 +56,4 @@ StdMeshers_PolygonPerFace_2D_i::StdMeshers_PolygonPerFace_2D_i( PortableServer:: StdMeshers_PolygonPerFace_2D_i::~StdMeshers_PolygonPerFace_2D_i() { - //MESSAGE( "StdMeshers_PolygonPerFace_2D_i::~StdMeshers_PolygonPerFace_2D_i" ); } diff --git a/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx b/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx index 4ce0380e5..8f5999d65 100644 --- a/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx @@ -48,7 +48,6 @@ StdMeshers_Prism_3D_i::StdMeshers_Prism_3D_i( PortableServer::POA_ptr thePOA, SMESH_Algo_i( thePOA ), SMESH_3D_Algo_i( thePOA ) { - MESSAGE( "StdMeshers_Prism_3D_i::StdMeshers_Prism_3D_i" ); myBaseImpl = new ::StdMeshers_Prism_3D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -57,13 +56,11 @@ StdMeshers_Prism_3D_i::StdMeshers_Prism_3D_i( PortableServer::POA_ptr thePOA, StdMeshers_Prism_3D_i::~StdMeshers_Prism_3D_i() { - MESSAGE( "StdMeshers_Prism_3D_i::~StdMeshers_Prism_3D_i" ); } //----------------------------------------------------------------------------- ::StdMeshers_Prism_3D* StdMeshers_Prism_3D_i::GetImpl() { - MESSAGE( "StdMeshers_Prism_3D_i::GetImpl" ); return ( ::StdMeshers_Prism_3D* )myBaseImpl; } //----------------------------------------------------------------------------- @@ -89,7 +86,6 @@ StdMeshers_RadialPrism_3D_i::StdMeshers_RadialPrism_3D_i( PortableServer::POA_pt SMESH_Algo_i( thePOA ), SMESH_3D_Algo_i( thePOA ) { - MESSAGE( "StdMeshers_RadialPrism_3D_i::StdMeshers_RadialPrism_3D_i" ); myBaseImpl = new ::StdMeshers_RadialPrism_3D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -98,13 +94,11 @@ StdMeshers_RadialPrism_3D_i::StdMeshers_RadialPrism_3D_i( PortableServer::POA_pt StdMeshers_RadialPrism_3D_i::~StdMeshers_RadialPrism_3D_i() { - MESSAGE( "StdMeshers_RadialPrism_3D_i::~StdMeshers_RadialPrism_3D_i" ); } //----------------------------------------------------------------------------- ::StdMeshers_RadialPrism_3D* StdMeshers_RadialPrism_3D_i::GetImpl() { - MESSAGE( "StdMeshers_RadialPrism_3D_i::GetImpl" ); return ( ::StdMeshers_RadialPrism_3D* )myBaseImpl; } //----------------------------------------------------------------------------- diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx index 8c0d9778b..6067de55b 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx @@ -52,7 +52,6 @@ StdMeshers_ProjectionSource1D_i::StdMeshers_ProjectionSource1D_i ::SMESH_Gen* theGenImpl ) : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_ProjectionSource1D_i::StdMeshers_ProjectionSource1D_i" ); myBaseImpl = new ::StdMeshers_ProjectionSource1D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -68,7 +67,6 @@ StdMeshers_ProjectionSource1D_i::StdMeshers_ProjectionSource1D_i StdMeshers_ProjectionSource1D_i::~StdMeshers_ProjectionSource1D_i() { - MESSAGE( "StdMeshers_ProjectionSource1D_i::~StdMeshers_ProjectionSource1D_i" ); } //============================================================================= diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx index 84ad6ca62..195fafc65 100644 --- a/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx @@ -52,7 +52,6 @@ StdMeshers_ProjectionSource3D_i::StdMeshers_ProjectionSource3D_i ::SMESH_Gen* theGenImpl ) : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_ProjectionSource3D_i::StdMeshers_ProjectionSource3D_i" ); myBaseImpl = new ::StdMeshers_ProjectionSource3D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -68,7 +67,6 @@ StdMeshers_ProjectionSource3D_i::StdMeshers_ProjectionSource3D_i StdMeshers_ProjectionSource3D_i::~StdMeshers_ProjectionSource3D_i() { - MESSAGE( "StdMeshers_ProjectionSource3D_i::~StdMeshers_ProjectionSource3D_i" ); } //============================================================================= diff --git a/src/StdMeshers_I/StdMeshers_Propagation_i.cxx b/src/StdMeshers_I/StdMeshers_Propagation_i.cxx index d5c2d2c82..6d086c514 100644 --- a/src/StdMeshers_I/StdMeshers_Propagation_i.cxx +++ b/src/StdMeshers_I/StdMeshers_Propagation_i.cxx @@ -45,7 +45,6 @@ StdMeshers_Propagation_i::StdMeshers_Propagation_i (PortableServer::POA_ptr theP : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_Propagation_i::StdMeshers_Propagation_i" ); myBaseImpl = new ::StdMeshers_Propagation(theGenImpl->GetANewId(), theStudyId, theGenImpl); diff --git a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx index 7f17b00f6..1681544fa 100644 --- a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx +++ b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx @@ -50,7 +50,6 @@ StdMeshers_QuadrangleParams_i::StdMeshers_QuadrangleParams_i : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_QuadrangleParams_i::StdMeshers_QuadrangleParams_i" ); myBaseImpl = new ::StdMeshers_QuadrangleParams(theGenImpl->GetANewId(), theStudyId, theGenImpl); @@ -66,7 +65,6 @@ StdMeshers_QuadrangleParams_i::StdMeshers_QuadrangleParams_i StdMeshers_QuadrangleParams_i::~StdMeshers_QuadrangleParams_i() { - MESSAGE( "StdMeshers_QuadrangleParams_i::~StdMeshers_QuadrangleParams_i" ); } //============================================================================= @@ -79,7 +77,6 @@ StdMeshers_QuadrangleParams_i::~StdMeshers_QuadrangleParams_i() void StdMeshers_QuadrangleParams_i::SetTriaVertex(CORBA::Long vertID) { - MESSAGE( "StdMeshers_QuadrangleParams_i::SetTriaVertex" ); ASSERT( myBaseImpl ); try { this->GetImpl()->SetTriaVertex( vertID ); @@ -102,7 +99,6 @@ void StdMeshers_QuadrangleParams_i::SetTriaVertex(CORBA::Long vertID) CORBA::Long StdMeshers_QuadrangleParams_i::GetTriaVertex() { - MESSAGE( "StdMeshers_QuadrangleParams_i::GetTriaVertex" ); ASSERT( myBaseImpl ); return this->GetImpl()->GetTriaVertex(); } @@ -117,7 +113,6 @@ CORBA::Long StdMeshers_QuadrangleParams_i::GetTriaVertex() void StdMeshers_QuadrangleParams_i::SetObjectEntry( const char* entry ) { - MESSAGE( "StdMeshers_QuadrangleParams_i::SetObjectEntry" ); ASSERT( myBaseImpl ); try { @@ -141,7 +136,6 @@ void StdMeshers_QuadrangleParams_i::SetObjectEntry( const char* entry ) char* StdMeshers_QuadrangleParams_i::GetObjectEntry() { - MESSAGE( "StdMeshers_QuadrangleParams_i::SetObjectEntry" ); ASSERT( myBaseImpl ); const char* entry; try { @@ -162,7 +156,6 @@ char* StdMeshers_QuadrangleParams_i::GetObjectEntry() //============================================================================= void StdMeshers_QuadrangleParams_i::SetQuadType(StdMeshers::QuadType type) { - MESSAGE("StdMeshers_QuadrangleParams_i::SetQuadType"); ASSERT(myBaseImpl); if (int(type) >= int(StdMeshers::QUAD_NB_TYPES)) { @@ -204,7 +197,6 @@ void StdMeshers_QuadrangleParams_i::SetQuadType(StdMeshers::QuadType type) //============================================================================= StdMeshers::QuadType StdMeshers_QuadrangleParams_i::GetQuadType() { - MESSAGE("StdMeshers_QuadrangleParams_i::GetQuadType"); ASSERT(myBaseImpl); return StdMeshers::QuadType(int(this->GetImpl()->GetQuadType())); } @@ -313,7 +305,6 @@ SMESH::string_array* StdMeshers_QuadrangleParams_i::GetEnfVertices() ::StdMeshers_QuadrangleParams* StdMeshers_QuadrangleParams_i::GetImpl() { - MESSAGE( "StdMeshers_QuadrangleParams_i::GetImpl" ); return ( ::StdMeshers_QuadrangleParams* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx b/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx index ff019673a..1bb991a8b 100644 --- a/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx @@ -45,7 +45,6 @@ StdMeshers_RadialQuadrangle_1D2D_i::StdMeshers_RadialQuadrangle_1D2D_i SMESH_Algo_i( thePOA ), SMESH_2D_Algo_i( thePOA ) { - MESSAGE( "StdMeshers_RadialQuadrangle_1D2D_i::StdMeshers_RadialQuadrangle_1D2D_i" ); myBaseImpl = new ::StdMeshers_RadialQuadrangle_1D2D(theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -55,14 +54,12 @@ StdMeshers_RadialQuadrangle_1D2D_i::StdMeshers_RadialQuadrangle_1D2D_i StdMeshers_RadialQuadrangle_1D2D_i::~StdMeshers_RadialQuadrangle_1D2D_i() { - MESSAGE( "StdMeshers_RadialQuadrangle_1D2D_i::~StdMeshers_RadialQuadrangle_1D2D_i" ); } //----------------------------------------------------------------------------- ::StdMeshers_RadialQuadrangle_1D2D* StdMeshers_RadialQuadrangle_1D2D_i::GetImpl() { - MESSAGE( "StdMeshers_RadialQuadrangle_1D2D_i::GetImpl" ); return ( ::StdMeshers_RadialQuadrangle_1D2D* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_SegmentAroundVertex_0D_i.cxx b/src/StdMeshers_I/StdMeshers_SegmentAroundVertex_0D_i.cxx index 578deff57..57cbb7071 100644 --- a/src/StdMeshers_I/StdMeshers_SegmentAroundVertex_0D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_SegmentAroundVertex_0D_i.cxx @@ -51,7 +51,6 @@ StdMeshers_SegmentAroundVertex_0D_i::StdMeshers_SegmentAroundVertex_0D_i SMESH_Algo_i( thePOA ), SMESH_0D_Algo_i( thePOA ) { - MESSAGE( "StdMeshers_SegmentAroundVertex_0D_i::StdMeshers_SegmentAroundVertex_0D_i" ); myBaseImpl = new ::StdMeshers_SegmentAroundVertex_0D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -60,12 +59,10 @@ StdMeshers_SegmentAroundVertex_0D_i::StdMeshers_SegmentAroundVertex_0D_i StdMeshers_SegmentAroundVertex_0D_i::~StdMeshers_SegmentAroundVertex_0D_i() { - MESSAGE( "StdMeshers_SegmentAroundVertex_0D_i::~StdMeshers_SegmentAroundVertex_0D_i" ); } //----------------------------------------------------------------------------- ::StdMeshers_SegmentAroundVertex_0D* StdMeshers_SegmentAroundVertex_0D_i::GetImpl() { - MESSAGE( "StdMeshers_SegmentAroundVertex_0D_i::GetImpl" ); return ( ::StdMeshers_SegmentAroundVertex_0D* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx b/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx index 1748ef6fb..8d1edd67f 100644 --- a/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx +++ b/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx @@ -52,7 +52,6 @@ StdMeshers_StartEndLength_i::StdMeshers_StartEndLength_i( PortableServer::POA_pt : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_StartEndLength_i::StdMeshers_StartEndLength_i" ); myBaseImpl = new ::StdMeshers_StartEndLength( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -68,7 +67,6 @@ StdMeshers_StartEndLength_i::StdMeshers_StartEndLength_i( PortableServer::POA_pt StdMeshers_StartEndLength_i::~StdMeshers_StartEndLength_i() { - MESSAGE( "StdMeshers_StartEndLength_i::~StdMeshers_StartEndLength_i" ); } //============================================================================= @@ -83,7 +81,6 @@ void StdMeshers_StartEndLength_i::SetLength(CORBA::Double theLength, CORBA::Boolean theIsStart ) throw ( SALOME::SALOME_Exception ) { - MESSAGE( "StdMeshers_StartEndLength_i::SetLength" ); ASSERT( myBaseImpl ); try { this->GetImpl()->SetLength( theLength, theIsStart ); @@ -133,7 +130,6 @@ void StdMeshers_StartEndLength_i::SetEndLength( CORBA::Double length) CORBA::Double StdMeshers_StartEndLength_i::GetLength( CORBA::Boolean theIsStart) { - MESSAGE( "StdMeshers_StartEndLength_i::GetLength" ); ASSERT( myBaseImpl ); return this->GetImpl()->GetLength( theIsStart ); } @@ -239,7 +235,6 @@ SMESH::long_array* StdMeshers_StartEndLength_i::GetReversedEdges() ::StdMeshers_StartEndLength* StdMeshers_StartEndLength_i::GetImpl() { - MESSAGE( "StdMeshers_StartEndLength_i::GetImpl" ); return ( ::StdMeshers_StartEndLength* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_UseExisting_1D2D_i.cxx b/src/StdMeshers_I/StdMeshers_UseExisting_1D2D_i.cxx index be95101b1..ce339913d 100644 --- a/src/StdMeshers_I/StdMeshers_UseExisting_1D2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_UseExisting_1D2D_i.cxx @@ -45,7 +45,6 @@ StdMeshers_UseExisting_1D_i::StdMeshers_UseExisting_1D_i SMESH_Algo_i( thePOA ), SMESH_1D_Algo_i( thePOA ) { - MESSAGE( "StdMeshers_UseExisting_1D_i::StdMeshers_UseExisting_1D_i" ); myBaseImpl = new ::StdMeshers_UseExisting_1D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -54,13 +53,11 @@ StdMeshers_UseExisting_1D_i::StdMeshers_UseExisting_1D_i StdMeshers_UseExisting_1D_i::~StdMeshers_UseExisting_1D_i() { - MESSAGE( "StdMeshers_UseExisting_1D_i::~StdMeshers_UseExisting_1D_i" ); } //----------------------------------------------------------------------------- ::StdMeshers_UseExisting_1D* StdMeshers_UseExisting_1D_i::GetImpl() { - MESSAGE( "StdMeshers_UseExisting_1D_i::GetImpl" ); return ( ::StdMeshers_UseExisting_1D* )myBaseImpl; } @@ -80,7 +77,6 @@ StdMeshers_UseExisting_2D_i::StdMeshers_UseExisting_2D_i SMESH_Algo_i( thePOA ), SMESH_2D_Algo_i( thePOA ) { - MESSAGE( "StdMeshers_UseExisting_2D_i::StdMeshers_UseExisting_2D_i" ); myBaseImpl = new ::StdMeshers_UseExisting_2D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -89,12 +85,10 @@ StdMeshers_UseExisting_2D_i::StdMeshers_UseExisting_2D_i StdMeshers_UseExisting_2D_i::~StdMeshers_UseExisting_2D_i() { - MESSAGE( "StdMeshers_UseExisting_2D_i::~StdMeshers_UseExisting_2D_i" ); } //----------------------------------------------------------------------------- ::StdMeshers_UseExisting_2D* StdMeshers_UseExisting_2D_i::GetImpl() { - MESSAGE( "StdMeshers_UseExisting_2D_i::GetImpl" ); return ( ::StdMeshers_UseExisting_2D* )myBaseImpl; } diff --git a/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.cxx b/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.cxx index 3f828a372..fb0bbbcfd 100644 --- a/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_ViscousLayers2D_i.cxx @@ -52,7 +52,6 @@ StdMeshers_ViscousLayers2D_i::StdMeshers_ViscousLayers2D_i( PortableServer::POA_ : SALOME::GenericObj_i( thePOA ), SMESH_Hypothesis_i( thePOA ) { - MESSAGE( "StdMeshers_ViscousLayers2D_i::StdMeshers_ViscousLayers2D_i" ); myBaseImpl = new ::StdMeshers_ViscousLayers2D( theGenImpl->GetANewId(), theStudyId, theGenImpl ); @@ -68,7 +67,6 @@ StdMeshers_ViscousLayers2D_i::StdMeshers_ViscousLayers2D_i( PortableServer::POA_ StdMeshers_ViscousLayers2D_i::~StdMeshers_ViscousLayers2D_i() { - MESSAGE( "StdMeshers_ViscousLayers2D_i::~StdMeshers_ViscousLayers2D_i" ); } //================================================================================ @@ -234,7 +232,6 @@ throw ( SALOME::SALOME_Exception ) ::StdMeshers_ViscousLayers2D* StdMeshers_ViscousLayers2D_i::GetImpl() { - MESSAGE( "StdMeshers_ViscousLayers2D_i::GetImpl" ); return ( ::StdMeshers_ViscousLayers2D* )myBaseImpl; }