X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHOMARD%2FHOMARD_Zone.cxx;h=92b7b5e61b4e5edc96e2fbc08c146d39b3ea4f6a;hb=43b157e57cd76036825fa6cce8db5d9f7eed93c2;hp=0b23732d77f4764eea37f3de9c1f4ca9f589541e;hpb=a9189d870ff98f06dc5577c5fc37102ee5337aea;p=modules%2Fhomard.git diff --git a/src/HOMARD/HOMARD_Zone.cxx b/src/HOMARD/HOMARD_Zone.cxx index 0b23732d..92b7b5e6 100644 --- a/src/HOMARD/HOMARD_Zone.cxx +++ b/src/HOMARD/HOMARD_Zone.cxx @@ -1,11 +1,11 @@ -// HOMARD HOMARD : implementaion of HOMARD idl descriptions +// HOMARD HOMARD : implementation of HOMARD idl descriptions // -// Copyright (C) 2011-2012 CEA/DEN, EDF R&D +// Copyright (C) 2011-2019 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,10 +19,20 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : HOMARD_Zone.cxx -// Author : Paul RASCLE, EDF +// Author : Gerald NICOLAS, EDF // Module : HOMARD +// +// Remarques : +// L'ordre de description des fonctions est le meme dans tous les fichiers +// HOMARD_aaaa.idl, HOMARD_aaaa.hxx, HOMARD_aaaa.cxx, HOMARD_aaaa_i.hxx, HOMARD_aaaa_i.cxx : +// 1. Les generalites : Name, Delete, DumpPython, Dump, Restore +// 2. Les caracteristiques +// 3. Le lien avec les autres structures +// +// Quand les 2 fonctions Setxxx et Getxxx sont presentes, Setxxx est decrit en premier #include "HOMARD_Zone.hxx" +#include "HOMARD.hxx" #include "utilities.h" //============================================================================= @@ -31,7 +41,7 @@ */ //============================================================================= HOMARD_Zone::HOMARD_Zone(): - _NomZone( "" ),_ZoneType( 2 ), + _Name( "" ),_Type( 2 ), _Xmin( 0 ), _Xmax( 0 ), _Ymin( 0 ), _Ymax( 0 ), _Zmin( 0 ), _Zmax( 0 ), _Xcentre( 0 ), _Ycentre( 0 ), _Zcentre( 0 ), _Rayon( 0 ), _Xaxe( 0 ), _Yaxe( 0 ), _Zaxe( 0 ), _Haut( 0 ), @@ -45,115 +55,112 @@ HOMARD_Zone::~HOMARD_Zone() { MESSAGE("~HOMARD_Zone") ; } - //============================================================================= -void HOMARD_Zone::SetName( const char* NomZone ) +//============================================================================= +// Generalites +//============================================================================= +//============================================================================= +void HOMARD_Zone::SetName( const char* Name ) { - _NomZone = std::string( NomZone ) ; + _Name = std::string( Name ); } - //============================================================================= std::string HOMARD_Zone::GetName() const { - return _NomZone; + return _Name; } - //============================================================================= std::string HOMARD_Zone::GetDumpPython() const { -// MESSAGE("GetDumpPython avec _ZoneType " << _ZoneType) ; -// MESSAGE("GetDumpPython avec _NomZone " << _NomZone) ; +// MESSAGE("GetDumpPython avec _Type " << _Type) ; +// MESSAGE("GetDumpPython avec _Name " << _Name) ; std::ostringstream aScript; aScript << "\n# Creation of the "; - if ( _ZoneType >= 11 and _ZoneType <= 13 ) { aScript << "rectangle " ; } - else if ( _ZoneType == 2 ) { aScript << "box " ;} - else if ( _ZoneType >= 31 and _ZoneType <= 33 ) { aScript << "disk " ;} - else if ( _ZoneType == 4 ) { aScript << "sphere " ; } - else if ( _ZoneType == 5 ) { aScript << "cylinder " ; } - else if ( _ZoneType >= 61 and _ZoneType <= 63 ) { aScript << "disk with hole " ;} - else if ( _ZoneType == 7 ) { aScript << "pipe " ; } - aScript << _NomZone << "\n" ; + if ( _Type >= 11 && _Type <= 13 ) { aScript << "rectangle " ; } + else if ( _Type == 2 ) { aScript << "box " ;} + else if ( _Type >= 31 && _Type <= 33 ) { aScript << "disk " ;} + else if ( _Type == 4 ) { aScript << "sphere " ; } + else if ( _Type == 5 ) { aScript << "cylinder " ; } + else if ( _Type >= 61 && _Type <= 63 ) { aScript << "disk with hole " ;} + else if ( _Type == 7 ) { aScript << "pipe " ; } + aScript << _Name << "\n" ; // - aScript << "\t" << _NomZone << " = homard.CreateZone" ; + aScript << "\t" << _Name << " = homard.CreateZone" ; // - switch (_ZoneType) + switch (_Type) { case 11: - { aScript << "Box2D( \"" << _NomZone << "\", " << _Xmin << ", " << _Xmax << ", " << _Ymin << ", " << _Ymax << ", 1 )\n"; + { aScript << "Box2D( \"" << _Name << "\", " << _Xmin << ", " << _Xmax << ", " << _Ymin << ", " << _Ymax << ", 1 )\n"; break ; } case 12: - { aScript << "Box2D( \"" << _NomZone << "\", " << _Ymin << ", " << _Ymax << ", " << _Zmin << ", " << _Zmax << ", 2 )\n"; + { aScript << "Box2D( \"" << _Name << "\", " << _Ymin << ", " << _Ymax << ", " << _Zmin << ", " << _Zmax << ", 2 )\n"; break ; } case 13: - { aScript << "Box2D( \"" << _NomZone << "\", " << _Zmin << ", " << _Zmax << ", " << _Xmin << ", " << _Xmax << ", 3 )\n"; + { aScript << "Box2D( \"" << _Name << "\", " << _Zmin << ", " << _Zmax << ", " << _Xmin << ", " << _Xmax << ", 3 )\n"; break ; } case 2: - { aScript << "Box( \"" << _NomZone << "\", " << _Xmin << ", " << _Xmax << ", " << _Ymin << ", " << _Ymax << ", " << _Zmin << ", " << _Zmax << ")\n"; + { aScript << "Box( \"" << _Name << "\", " << _Xmin << ", " << _Xmax << ", " << _Ymin << ", " << _Ymax << ", " << _Zmin << ", " << _Zmax << ")\n"; break ; } case 4: - { aScript << "Sphere( \"" << _NomZone << "\", " << _Xcentre << ", " << _Ycentre << ", " << _Zcentre << ", " << _Rayon << ")\n"; + { aScript << "Sphere( \"" << _Name << "\", " << _Xcentre << ", " << _Ycentre << ", " << _Zcentre << ", " << _Rayon << ")\n"; break ; } case 31: - { aScript << "Disk( \"" << _NomZone << "\", " << _Xcentre << ", " << _Ycentre << ", " << _Rayon << ", 1 )\n"; + { aScript << "Disk( \"" << _Name << "\", " << _Xcentre << ", " << _Ycentre << ", " << _Rayon << ", 1 )\n"; break ; } case 32: - { aScript << "Disk( \"" << _NomZone << "\", " << _Ycentre << ", " << _Zcentre << ", " << _Rayon << ", 2 )\n"; + { aScript << "Disk( \"" << _Name << "\", " << _Ycentre << ", " << _Zcentre << ", " << _Rayon << ", 2 )\n"; break ; } case 33: - { aScript << "Disk( \"" << _NomZone << "\", " << _Zcentre << ", " << _Xcentre << ", " << _Rayon << ", 3 )\n"; + { aScript << "Disk( \"" << _Name << "\", " << _Zcentre << ", " << _Xcentre << ", " << _Rayon << ", 3 )\n"; break ; } case 5: - { aScript << "Cylinder( \"" << _NomZone << "\", " << _Xcentre << ", " << _Ycentre << ", " << _Zcentre << ", " << _Xaxe << ", " << _Yaxe << ", " << _Zaxe << ", " << _Rayon << ", " << _Haut << ")\n"; + { aScript << "Cylinder( \"" << _Name << "\", " << _Xcentre << ", " << _Ycentre << ", " << _Zcentre << ", " << _Xaxe << ", " << _Yaxe << ", " << _Zaxe << ", " << _Rayon << ", " << _Haut << ")\n"; break ; } case 61: - { aScript << "DiskWithHole( \"" << _NomZone << "\", " << _Xcentre << ", " << _Ycentre << ", " << _Rayon << ", " << _Rayonint << ", 1 )\n"; + { aScript << "DiskWithHole( \"" << _Name << "\", " << _Xcentre << ", " << _Ycentre << ", " << _Rayon << ", " << _Rayonint << ", 1 )\n"; break ; } case 62: - { aScript << "DiskWithHole( \"" << _NomZone << "\", " << _Ycentre << ", " << _Zcentre << ", " << _Rayon << ", " << _Rayonint << ", 2 )\n"; + { aScript << "DiskWithHole( \"" << _Name << "\", " << _Ycentre << ", " << _Zcentre << ", " << _Rayon << ", " << _Rayonint << ", 2 )\n"; break ; } case 63: - { aScript << "DiskWithHole( \"" << _NomZone << "\", " << _Zcentre << ", " << _Xcentre << ", " << _Rayon << ", " << _Rayonint << ", 3 )\n"; + { aScript << "DiskWithHole( \"" << _Name << "\", " << _Zcentre << ", " << _Xcentre << ", " << _Rayon << ", " << _Rayonint << ", 3 )\n"; break ; } case 7: - { aScript << "Pipe( \"" << _NomZone << "\", " << _Xcentre << ", " << _Ycentre << ", " << _Zcentre << ", " << _Xaxe << ", " << _Yaxe << ", " << _Zaxe << ", " << _Rayon << ", " << _Haut << ", " << _Rayonint << ")\n"; + { aScript << "Pipe( \"" << _Name << "\", " << _Xcentre << ", " << _Ycentre << ", " << _Zcentre << ", " << _Xaxe << ", " << _Yaxe << ", " << _Zaxe << ", " << _Rayon << ", " << _Haut << ", " << _Rayonint << ")\n"; break ; } } return aScript.str() ; } - //============================================================================= -void HOMARD_Zone::SetZoneType( int ZoneType ) -{ - _ZoneType = ZoneType; -} - //============================================================================= -int HOMARD_Zone::GetZoneType() const +// Caracteristiques +//============================================================================= +//============================================================================= +void HOMARD_Zone::SetType( int Type ) { - return _ZoneType; + _Type = Type; } - -//====================================================================== -void HOMARD_Zone::SetLimit( double X0, double X1, double X2 ) +//============================================================================= +int HOMARD_Zone::GetType() const { - _Xincr = X0; _Yincr = X1; _Zincr = X2; + return _Type; } //======================================================================================= void HOMARD_Zone::SetBox( double X0, double X1, double X2, double X3, double X4, double X5 ) @@ -162,16 +169,6 @@ void HOMARD_Zone::SetBox( double X0, double X1, double X2, double X3, double X4, _Ymin = X2; _Ymax = X3; _Zmin = X4; _Zmax = X5; } - -//====================================================================== -void HOMARD_Zone::SetSphere( double X0, double X1, double X2, double X3 ) -{ - _Xcentre = X0; - _Ycentre = X1; - _Zcentre = X2; - _Rayon = X3; -} - //======================================================================================= void HOMARD_Zone::SetCylinder( double X0, double X1, double X2, double X3, double X4, double X5, double X6, double X7 ) @@ -199,23 +196,20 @@ void HOMARD_Zone::SetPipe( double X0, double X1, double X2, _Haut = X7; _Rayonint = X8; } - -//======================================================================================= -std::vector HOMARD_Zone::GetLimit() const +//====================================================================== +void HOMARD_Zone::SetSphere( double X0, double X1, double X2, double X3 ) { - std::vector mesLimit; - mesLimit.push_back( _Xincr ) ; - mesLimit.push_back( _Yincr ) ; - mesLimit.push_back( _Zincr ) ; - return mesLimit; + _Xcentre = X0; + _Ycentre = X1; + _Zcentre = X2; + _Rayon = X3; } - //======================================================================================= std::vector HOMARD_Zone::GetCoords() const { std::vector mesCoor; // - switch (_ZoneType) + switch (_Type) { // Rectangle ou parallelepipede case 11: @@ -282,17 +276,38 @@ std::vector HOMARD_Zone::GetCoords() const mesCoor.push_back( _Rayonint ) ; break ; } - ASSERT ( _ZoneType == -1 ) ; + VERIFICATION ( ( (_Type>10) && (_Type<14) ) || (_Type==2) || ( (_Type>30) && (_Type<34) ) || (_Type==4) || (_Type==5) || ( (_Type>60) && (_Type<64) ) || (_Type==7) ) ; } return mesCoor; } - +//====================================================================== +void HOMARD_Zone::SetLimit( double X0, double X1, double X2 ) +{ + _Xincr = X0; _Yincr = X1; _Zincr = X2; +} +//======================================================================================= +std::vector HOMARD_Zone::GetLimit() const +{ + std::vector mesLimit; + mesLimit.push_back( _Xincr ) ; + mesLimit.push_back( _Yincr ) ; + mesLimit.push_back( _Zincr ) ; + return mesLimit; +} +//============================================================================= +//============================================================================= +// Liens avec les autres structures +//============================================================================= //============================================================================= void HOMARD_Zone::AddHypo( const char* NomHypo ) { _ListHypo.push_back( std::string( NomHypo ) ) ; } - +//============================================================================= +const std::list& HOMARD_Zone::GetHypo() const +{ + return _ListHypo; +} //============================================================================= void HOMARD_Zone::SupprHypo( const char* NomHypo ) { @@ -300,16 +315,9 @@ void HOMARD_Zone::SupprHypo( const char* NomHypo ) if ( it != _ListHypo.end() ) { MESSAGE ("Dans SupprHypo pour " << NomHypo) ; - _ListHypo.erase( it ) ; + it = _ListHypo.erase( it ) ; } } - -//============================================================================= -const std::list& HOMARD_Zone::GetHypo() const -{ - return _ListHypo; -} - //============================================================================= void HOMARD_Zone::SupprHypos() {