X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHOMARDGUI%2FMonCreateZone.cxx;h=2c823168273926cc944a846e4086c777b15770e6;hb=499468132a2c35186f4f1f44ea9004b4f7c13589;hp=7a01d9c7558e27531b5498c9329057ae966fb58b;hpb=de3963adc6da4f33b81a3990d07fb6c64f4e2d35;p=modules%2Fhomard.git diff --git a/src/HOMARDGUI/MonCreateZone.cxx b/src/HOMARDGUI/MonCreateZone.cxx index 7a01d9c7..2c823168 100644 --- a/src/HOMARDGUI/MonCreateZone.cxx +++ b/src/HOMARDGUI/MonCreateZone.cxx @@ -1,9 +1,9 @@ -// Copyright (C) 2011-2013 CEA/DEN, EDF R&D +// Copyright (C) 2011-2016 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 @@ -17,8 +17,6 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -using namespace std; - #include "MonCreateZone.h" #include "MonCreateHypothesis.h" @@ -36,6 +34,8 @@ using namespace std; #include #include +using namespace std; + // ---------------------------------------------------------------------- MonCreateZone::MonCreateZone(MonCreateHypothesis* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen0, @@ -199,19 +199,19 @@ void MonCreateZone::InitValZone() if ( _Orient == 0 ) { pix = resMgr->loadPixmap( "HOMARD", "cylinderpointvector.png" ) ; } else { pix = resMgr->loadPixmap( "HOMARD", "disk.png" ) ; - RBCylinder->setText(QApplication::translate("CreateZone", "Disk", 0, QApplication::UnicodeUTF8)); - TLXbase->setText(QApplication::translate("CreateZone", "X centre", 0, QApplication::UnicodeUTF8)); - TLYbase->setText(QApplication::translate("CreateZone", "Y centre", 0, QApplication::UnicodeUTF8)); - TLZbase->setText(QApplication::translate("CreateZone", "Z centre", 0, QApplication::UnicodeUTF8)); } + RBCylinder->setText(QApplication::translate("CreateZone", "Disk", 0)); + TLXbase->setText(QApplication::translate("CreateZone", "X centre", 0)); + TLYbase->setText(QApplication::translate("CreateZone", "Y centre", 0)); + TLZbase->setText(QApplication::translate("CreateZone", "Z centre", 0)); } IS=QIcon(pix) ; RBCylinder->setIcon(IS) ; if ( _Orient == 0 ) { pix = resMgr->loadPixmap( "HOMARD", "pipe.png" ) ; } else { pix = resMgr->loadPixmap( "HOMARD", "diskwithhole.png" ) ; - RBPipe->setText(QApplication::translate("CreateZone", "Disk with hole", 0, QApplication::UnicodeUTF8)); - TLXbase_p->setText(QApplication::translate("CreateZone", "X centre", 0, QApplication::UnicodeUTF8)); - TLYbase_p->setText(QApplication::translate("CreateZone", "Y centre", 0, QApplication::UnicodeUTF8)); - TLZbase_p->setText(QApplication::translate("CreateZone", "Z centre", 0, QApplication::UnicodeUTF8)); } + RBPipe->setText(QApplication::translate("CreateZone", "Disk with hole", 0)); + TLXbase_p->setText(QApplication::translate("CreateZone", "X centre", 0)); + TLYbase_p->setText(QApplication::translate("CreateZone", "Y centre", 0)); + TLZbase_p->setText(QApplication::translate("CreateZone", "Z centre", 0)); } IS=QIcon(pix) ; RBPipe->setIcon(IS) ; @@ -287,13 +287,9 @@ void MonCreateZone::InitMinMax() } // Rayons SpinBox_Rayon->setSingleStep(_Rayon/10.) ; - SpinBox_Rayon->setMinimum(0.) ; SpinBox_Radius->setSingleStep(_Rayon/10.) ; - SpinBox_Radius->setMinimum(0.) ; SpinBox_Radius_int->setSingleStep(_Rayon/20.) ; - SpinBox_Radius_int->setMinimum(0.) ; SpinBox_Radius_ext->setSingleStep(_Rayon/10.) ; - SpinBox_Radius_ext->setMinimum(0.) ; // Axe et hauteur // Si une coordonnee est constante, inutile de demander l'axe et la hauteur if ( _Orient > 0) { @@ -315,9 +311,7 @@ void MonCreateZone::InitMinMax() TLHaut_p->setVisible(0) ; } else { - SpinBox_Haut->setMinimum(0.) ; SpinBox_Haut->setSingleStep(_Rayon/10.) ; - SpinBox_Haut_p->setMinimum(0.) ; SpinBox_Haut_p->setSingleStep(_Rayon/10.) ; } } @@ -344,11 +338,11 @@ bool MonCreateZone::PushOnApply() { } case 2 : // il s agit d un parallelipipede rectangle { - if ( (_ZoneXmin != SpinBox_Xmini->value()) or - (_ZoneXmax != SpinBox_Xmaxi->value()) or - (_ZoneYmin != SpinBox_Ymini->value()) or - (_ZoneYmax != SpinBox_Ymaxi->value()) or - (_ZoneZmin != SpinBox_Zmini->value()) or + if ( (_ZoneXmin != SpinBox_Xmini->value()) || + (_ZoneXmax != SpinBox_Xmaxi->value()) || + (_ZoneYmin != SpinBox_Ymini->value()) || + (_ZoneYmax != SpinBox_Ymaxi->value()) || + (_ZoneZmin != SpinBox_Zmini->value()) || (_ZoneZmax != SpinBox_Zmaxi->value()) ) { Chgt = true; @@ -360,9 +354,9 @@ bool MonCreateZone::PushOnApply() } case 4 : // il s agit d une sphere { - if ( (_ZoneXcentre != SpinBox_Xcentre->value()) or - (_ZoneYcentre != SpinBox_Ycentre->value()) or - (_ZoneZcentre != SpinBox_Zbase->value()) or + if ( (_ZoneXcentre != SpinBox_Xcentre->value()) || + (_ZoneYcentre != SpinBox_Ycentre->value()) || + (_ZoneZcentre != SpinBox_Zbase->value()) || (_ZoneRayon != SpinBox_Rayon->value()) ) { Chgt = true; @@ -381,13 +375,13 @@ bool MonCreateZone::PushOnApply() { } case 5 : // il s agit d un cylindre { - if ( (_ZoneXcentre != SpinBox_Xbase->value()) or - (_ZoneYcentre != SpinBox_Ybase->value()) or - (_ZoneZcentre != SpinBox_Zbase->value()) or - (_ZoneRayon != SpinBox_Radius->value()) or - (_ZoneHaut != SpinBox_Haut->value()) or - (_ZoneXaxis != SpinBox_Xaxis->value()) or - (_ZoneYaxis != SpinBox_Yaxis->value()) or + if ( (_ZoneXcentre != SpinBox_Xbase->value()) || + (_ZoneYcentre != SpinBox_Ybase->value()) || + (_ZoneZcentre != SpinBox_Zbase->value()) || + (_ZoneRayon != SpinBox_Radius->value()) || + (_ZoneHaut != SpinBox_Haut->value()) || + (_ZoneXaxis != SpinBox_Xaxis->value()) || + (_ZoneYaxis != SpinBox_Yaxis->value()) || (_ZoneZaxis != SpinBox_Zaxis->value()) ) { Chgt = true; @@ -410,14 +404,14 @@ bool MonCreateZone::PushOnApply() { } case 7 : // il s agit d un tuyau { - if ( (_ZoneXcentre != SpinBox_Xbase_p->value()) or - (_ZoneYcentre != SpinBox_Ybase_p->value()) or - (_ZoneZcentre != SpinBox_Zbase_p->value()) or - (_ZoneRayonInt != SpinBox_Radius_int->value()) or - (_ZoneRayon != SpinBox_Radius_ext->value()) or - (_ZoneHaut != SpinBox_Haut_p->value()) or - (_ZoneXaxis != SpinBox_Xaxis_p->value()) or - (_ZoneYaxis != SpinBox_Yaxis_p->value()) or + if ( (_ZoneXcentre != SpinBox_Xbase_p->value()) || + (_ZoneYcentre != SpinBox_Ybase_p->value()) || + (_ZoneZcentre != SpinBox_Zbase_p->value()) || + (_ZoneRayonInt != SpinBox_Radius_int->value()) || + (_ZoneRayon != SpinBox_Radius_ext->value()) || + (_ZoneHaut != SpinBox_Haut_p->value()) || + (_ZoneXaxis != SpinBox_Xaxis_p->value()) || + (_ZoneYaxis != SpinBox_Yaxis_p->value()) || (_ZoneZaxis != SpinBox_Zaxis_p->value()) ) { Chgt = true; @@ -437,25 +431,25 @@ bool MonCreateZone::PushOnApply() // Controles // Pour un rectangle ou un parallelepipede : - if ( ( _Type >= 11 and _Type <= 13 ) or _Type == 2 ) + if ( ( _Type >= 11 && _Type <= 13 ) || _Type == 2 ) { - if ((_ZoneXmin >= _ZoneXmax) and (_Xincr > 0)) { + if ((_ZoneXmin >= _ZoneXmax) && (_Xincr > 0)) { QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), QObject::tr("HOM_ZONE_LIMIT").arg("X") ) ; return false; } - if ((_ZoneYmin >= _ZoneYmax) and (_Yincr > 0)) { + if ((_ZoneYmin >= _ZoneYmax) && (_Yincr > 0)) { QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), QObject::tr("HOM_ZONE_LIMIT").arg("Y") ) ; return false; } - if ((_ZoneZmin >= _ZoneZmax) and (_Zincr > 0)) { + if ((_ZoneZmin >= _ZoneZmax) && (_Zincr > 0)) { QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), QObject::tr("HOM_ZONE_LIMIT").arg("Z") ) ; return false; } } // L'axe pour un cylindre ou un tuyau : - if ( _Type == 5 or _Type == 7 ) + if ( _Type == 5 || _Type == 7 ) { double daux = _ZoneXaxis*_ZoneXaxis + _ZoneYaxis*_ZoneYaxis + _ZoneZaxis*_ZoneZaxis ; if ( daux < 0.0000001 ) @@ -466,7 +460,7 @@ bool MonCreateZone::PushOnApply() } } // Rayons pour disque avec trou ou un tuyau : - if ( ( _Type >= 61 and _Type <= 63 ) or _Type == 7 ) + if ( ( _Type >= 61 && _Type <= 63 ) || _Type == 7 ) { if ( _ZoneRayonInt >= _ZoneRayon ) { @@ -586,7 +580,8 @@ void MonCreateZone::PushOnOK() void MonCreateZone::PushOnHelp() // ------------------------------------------------------------------------ { - HOMARD_UTILS::PushOnHelp(QString("gui_create_zone.html"), QString("") ) ; + std::string LanguageShort = myHomardGen->GetLanguageShort(); + HOMARD_UTILS::PushOnHelp(QString("gui_create_zone.html"), QString(""), QString(LanguageShort.c_str())); } // ----------------------------------- @@ -605,9 +600,9 @@ void MonCreateZone::SetNewName() { if ( aName == QString(MyObjects[i])) { - num=num+1; - aName=""; - break; + num ++ ; + aName = "" ; + break ; } } }