From: eap Date: Mon, 20 Jan 2014 10:45:36 +0000 (+0000) Subject: fix indentation X-Git-Tag: V7_4_0a1~102 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f55c997d2e89aa82c20662515fabde8d0a2b9513;p=modules%2Fsmesh.git fix indentation --- diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx index 4a00711b7..242c7cb3a 100644 --- a/src/SMESH/SMESH_Mesh.cxx +++ b/src/SMESH/SMESH_Mesh.cxx @@ -143,7 +143,7 @@ SMESH_Mesh::SMESH_Mesh(): namespace { #ifndef WIN32 - void deleteMeshDS(SMESHDS_Mesh* meshDS) + void deleteMeshDS(SMESHDS_Mesh* meshDS) { //cout << "deleteMeshDS( " << meshDS << endl; delete meshDS; @@ -152,18 +152,18 @@ namespace static void* deleteMeshDS(void* meshDS) { //cout << "deleteMeshDS( " << meshDS << endl; - SMESHDS_Mesh* m = (SMESHDS_Mesh*)meshDS; - if(m) { - delete m; - } - return 0; + SMESHDS_Mesh* m = (SMESHDS_Mesh*)meshDS; + if(m) { + delete m; + } + return 0; } #endif } //============================================================================= /*! - * + * */ //============================================================================= @@ -207,7 +207,7 @@ SMESH_Mesh::~SMESH_Mesh() _myDocument = 0; if ( _myMeshDS ) { - // delete _myMeshDS, in a thread in order not to block closing a study with large meshes + // delete _myMeshDS, in a thread in order not to block closing a study with large meshes #ifndef WIN32 boost::thread aThread(boost::bind( & deleteMeshDS, _myMeshDS )); #else diff --git a/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx b/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx index 836087663..75e83d5f2 100644 --- a/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx @@ -762,22 +762,22 @@ void rotationToNormal ( double theRotation[2], switch ( theOrientation ) { case 0: case 1: - theDir[0][1] = anU[0]; - theDir[0][2] = aV[0]; - theDir[1][0] = anU[1]; - theDir[1][2] = aV[1]; + theDir[0][1] = anU[0]; + theDir[0][2] = aV[0]; + theDir[1][0] = anU[1]; + theDir[1][2] = aV[1]; break; case 2: - theDir[0][2] = anU[0]; - theDir[0][0] = aV[0]; - theDir[1][1] = anU[1]; - theDir[1][0] = aV[1]; + theDir[0][2] = anU[0]; + theDir[0][0] = aV[0]; + theDir[1][1] = anU[1]; + theDir[1][0] = aV[1]; break; case 3: - theDir[0][0] = anU[0]; - theDir[0][1] = aV[0]; - theDir[1][2] = anU[1]; - theDir[1][1] = aV[1]; + theDir[0][0] = anU[0]; + theDir[0][1] = aV[0]; + theDir[1][2] = anU[1]; + theDir[1][1] = aV[1]; break; } @@ -799,12 +799,12 @@ bool SMESHGUI_ClippingDlg::AddPlane ( SMESH::TActorList theActorList, int anOrientation; if ( thePlane->PlaneMode == SMESH::Absolute ) - anOrientation = thePlane->myAbsoluteOrientation; + anOrientation = thePlane->myAbsoluteOrientation; else if ( thePlane->PlaneMode == SMESH::Relative ) - anOrientation = thePlane->myRelativeOrientation + 1; + anOrientation = thePlane->myRelativeOrientation + 1; if ( anOrientation == 0 ) { - // compute a direction for plane in absolute mode + // compute a direction for plane in absolute mode double znam = sqrt( thePlane->Dx*thePlane->Dx + thePlane->Dy*thePlane->Dy + thePlane->Dz*thePlane->Dz ); double aRotation = acos( thePlane->Dy/znam )/aCoeff; if ( thePlane->Dy >= 0.0 && thePlane->Dz >= 0.0 ) thePlane->myAngle[0] = 90.0 + aRotation; @@ -905,10 +905,10 @@ bool SMESHGUI_ClippingDlg::AddPlane ( SMESH::TActorList theActorList, for ( ; anIter != theActorList.end(); anIter++ ) if( vtkActor* aVTKActor = *anIter ) if( SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( aVTKActor ) ) { - if( thePlane->IsOpenGLClipping ) + if( thePlane->IsOpenGLClipping ) anActor->AddOpenGLClippingPlane( thePlane->InvertPlane() ); - else - anActor->AddClippingPlane( thePlane ); + else + anActor->AddClippingPlane( thePlane ); } return true; @@ -1169,7 +1169,7 @@ void SMESHGUI_ClippingDlg::updateActorItem( QListWidgetItem* theItem, SMESH::ComputeBounds( anActorList, myBounds ); myPreviewWidget->PlaceWidget( myBounds[0], myBounds[1], myBounds[2], - myBounds[3], myBounds[4], myBounds[5] ); + myBounds[3], myBounds[4], myBounds[5] ); } } } @@ -1367,7 +1367,7 @@ void SMESHGUI_ClippingDlg::onSelectPlane ( int theIndex ) myIsSelectPlane = false; SMESH::ComputeBounds( aPlaneData.ActorList, myBounds ); myPreviewWidget->PlaceWidget( myBounds[0], myBounds[1], myBounds[2], - myBounds[3], myBounds[4], myBounds[5] ); + myBounds[3], myBounds[4], myBounds[5] ); SetCurrentPlaneParam(); // Actors @@ -1454,9 +1454,9 @@ void SMESHGUI_ClippingDlg::SetCurrentPlaneParam() double aRot[2] = { getRotation1(), getRotation2() }; int anOrient; if ( aPlane->PlaneMode == SMESH::Absolute ) - anOrient = CBAbsoluteOrientation->currentIndex(); + anOrient = CBAbsoluteOrientation->currentIndex(); else if ( aPlane->PlaneMode == SMESH::Relative ) - anOrient = CBRelativeOrientation->currentIndex() + 1; + anOrient = CBRelativeOrientation->currentIndex() + 1; if ( aPlane->PlaneMode == SMESH::Relative ) { aPlane->myAngle[0] = aRot[0]; @@ -1466,7 +1466,7 @@ void SMESHGUI_ClippingDlg::SetCurrentPlaneParam() } if ( anOrient == 0 ) { - // compute a direction for plane in absolute mode + // compute a direction for plane in absolute mode double znam = sqrt( aPlane->Dx*aPlane->Dx + aPlane->Dy*aPlane->Dy + aPlane->Dz*aPlane->Dz ); double aRotation = acos( aPlane->Dy/znam )/aCoeff; if ( aPlane->Dy >= 0.0 && aPlane->Dz >= 0.0 ) aRot[0] = 90.0 + aRotation; @@ -1508,7 +1508,7 @@ void SMESHGUI_ClippingDlg::SetCurrentPlaneParam() anOrigin[1] = aPlane->Y; anOrigin[2] = aPlane->Z; } - + if( anIsOk ) { aPlane->SetNormal( aNormal ); aPlane->SetOrigin( anOrigin ); @@ -1614,7 +1614,7 @@ void SMESHGUI_ClippingDlg::setBoundsForPreviewWidget() if( anOrigin[2] < aBounds[4] ) { myBounds[4] = anOrigin[2]; isBoundsChanged = true; } if( anOrigin[2] > aBounds[5] ) { - myBounds[5] = anOrigin[2]; isBoundsChanged = true; } + myBounds[5] = anOrigin[2]; isBoundsChanged = true; } } if( isBoundsChanged ) @@ -1803,10 +1803,10 @@ void SMESHGUI_ClippingDlg::ClickOnApply() for( ; anIter3 != anActorList.end(); anIter3++ ) if( vtkActor* aVTKActor = *anIter3 ) if( SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( aVTKActor ) ) { - if( anOrientedPlane->IsOpenGLClipping ) + if( anOrientedPlane->IsOpenGLClipping ) anActor->AddOpenGLClippingPlane( anOrientedPlane->InvertPlane() ); - else - anActor->AddClippingPlane( anOrientedPlane ); + else + anActor->AddClippingPlane( anOrientedPlane ); } SMESH::ClippingPlaneInfo aClippingPlaneInfo; @@ -1820,7 +1820,7 @@ void SMESHGUI_ClippingDlg::ClickOnApply() anAllActors->InitTraversal(); while( vtkActor* aVTKActor = anAllActors->GetNextActor() ) if( SMESH_Actor* anActor = SMESH_Actor::SafeDownCast( aVTKActor ) ) { - anSMESHActor = anActor; + anSMESHActor = anActor; anActor->SetOpenGLClippingPlane(); } diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx index eb0a30ed7..4fe3a6580 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx @@ -1392,13 +1392,13 @@ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex, } // check that tab enable, if algorithm building needed algo is one less than dimension if ( algoData && myIsOnGeometry && !algoData->InputTypes.isEmpty() && - ( aDim > SMESH::DIM_0D ) && !isAccessibleDim( aDim - 1 ) ){ + ( aDim > SMESH::DIM_0D ) && !isAccessibleDim( aDim - 1 ) ){ myDlg->enableTab( aDim - 1 ); } if ( (myDlg->currentMeshType() != MT_ANY) && - (( !algoData && ( aDim > SMESH::DIM_0D ) && isAccessibleDim( aDim - 1 )) || - ( algoData && myIsOnGeometry && algoData->InputTypes.isEmpty() && - ( aDim > SMESH::DIM_0D ) && isAccessibleDim( aDim - 1 ) ) ) ){ + (( !algoData && ( aDim > SMESH::DIM_0D ) && isAccessibleDim( aDim - 1 )) || + ( algoData && myIsOnGeometry && algoData->InputTypes.isEmpty() && + ( aDim > SMESH::DIM_0D ) && isAccessibleDim( aDim - 1 ) ) ) ){ for (int i = aDim - 1; i >= SMESH::DIM_0D; i--){ if ( isAccessibleDim( i ) ) myDlg->disableTab( i ); } @@ -1406,7 +1406,7 @@ void SMESHGUI_MeshOp::onAlgoSelected( const int theIndex, // check that algorithms of other dimentions are compatible with // the selected one - // 2 loops: backward and forward from algo dimension + // 2 loops: backward and forward from algo dimension for ( int forward = false; forward <= true; ++forward ) { int dim = aDim + 1, lastDim = SMESH::DIM_3D, dir = 1; diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx index d2c18706b..0ca286bc9 100644 --- a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx +++ b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx @@ -69,8 +69,8 @@ bool SMESHGUI_XmlHandler::startDocument() Reimplemented from QXmlDefaultHandler. */ -bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&, - const QString& qName, +bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&, + const QString& qName, const QXmlAttributes& atts) { if (qName == "meshers") @@ -80,22 +80,22 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&, } else if (qName == "meshers-group") // group of hypotheses and algorithms { -// if (atts.value("server-lib") != "") + // if (atts.value("server-lib") != "") { myPluginName = atts.value("name"); myServerLib = atts.value("server-lib"); myClientLib = atts.value("gui-lib"); -/* It's Need to tranlate lib name for WIN32 or X platform - * (only client lib, because server lib translates in SMESH_Gen_i::createHypothesis - * for normal work of *.py files ) - */ + /* It's Need to tranlate lib name for WIN32 or X platform + * (only client lib, because server lib translates in SMESH_Gen_i::createHypothesis + * for normal work of *.py files ) + */ if( !myClientLib.isEmpty() ) { #ifdef WIN32 - //myServerLib += ".dll"; + //myServerLib += ".dll"; myClientLib += ".dll"; #else - //myServerLib = "lib" + myServerLib + ".so"; + //myServerLib = "lib" + myServerLib + ".so"; myClientLib = "lib" + myClientLib + ".so"; #endif } @@ -158,7 +158,7 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&, attr[ i ] = aStr.split( ',', QString::SkipEmptyParts ); } } - + if ( !aHypAlType.contains( BAD_HYP_FLAG ) ) { HypothesisData* aHypData = new HypothesisData (aHypAlType, myPluginName, myServerLib, myClientLib, @@ -189,9 +189,9 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&, bool badSet = hypos.contains( BAD_HYP_FLAG ) || algos.contains( BAD_HYP_FLAG ); if ( !badSet ) - myListOfHypothesesSets.append( new HypothesesSet ( atts.value("name"), - hypos.split( ',', QString::SkipEmptyParts ), - algos.split( ',', QString::SkipEmptyParts ) ) ); + myListOfHypothesesSets.append( new HypothesesSet ( atts.value("name"), + hypos.split( ',', QString::SkipEmptyParts ), + algos.split( ',', QString::SkipEmptyParts ) ) ); } } else if ( qName == "python-wrap" ||