From: adam Date: Fri, 26 Feb 2010 15:20:27 +0000 (+0000) Subject: Windows port X-Git-Tag: V5_1_4a1~50 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e058a9902378d056e0b947cfd2ca6b4d68bf5724;p=modules%2Fgeom.git Windows port --- diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index 34b1f0835..543c07270 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -556,13 +556,13 @@ void GEOMToolsGUI::OnDeflection() GEOMToolsGUI_DeflectionDlg * DeflectionDlg = new GEOMToolsGUI_DeflectionDlg (SUIT_Session::session()->activeApplication()->desktop()); - DeflectionDlg->setDC(aDC); + DeflectionDlg->setTheDC(aDC); double aNewDC = 0.0; bool ok = false; while (!ok) { if (DeflectionDlg->exec()) { SUIT_OverrideCursor(); - aNewDC = DeflectionDlg->getDC(); + aNewDC = DeflectionDlg->getTheDC(); ok = (1e-07 <= aNewDC && aNewDC <= 1.0); // spinbox can return zero if (ok) { for (; ic->MoreCurrent(); ic->NextCurrent()) { @@ -628,10 +628,10 @@ void GEOMToolsGUI::OnDeflection() GEOMToolsGUI_DeflectionDlg* DeflectionDlg = new GEOMToolsGUI_DeflectionDlg (SUIT_Session::session()->activeApplication()->desktop()); - DeflectionDlg->setDC(aDC); + DeflectionDlg->setTheDC(aDC); if (DeflectionDlg->exec()) { SUIT_OverrideCursor(); - aDC = DeflectionDlg->getDC(); + aDC = DeflectionDlg->getTheDC(); while (anAct != NULL) { if (GEOM_Actor* anActor = GEOM_Actor::SafeDownCast(anAct)) { // There are no casting to needed actor. diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx index 715c22dee..d36b4f0c5 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx @@ -137,12 +137,12 @@ GEOMToolsGUI_DeflectionDlg::~GEOMToolsGUI_DeflectionDlg() // no need to delete child widgets, Qt does it all for us } -double GEOMToolsGUI_DeflectionDlg::getDC() const +double GEOMToolsGUI_DeflectionDlg::getTheDC() const { return SpinBox->text().toDouble(); } -void GEOMToolsGUI_DeflectionDlg::setDC (const double v) +void GEOMToolsGUI_DeflectionDlg::setTheDC (const double v) { SpinBox->setValue(v); } diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h index 39bb8cc7e..e5b3fe9e6 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h @@ -44,8 +44,8 @@ public: GEOMToolsGUI_DeflectionDlg( QWidget* ); ~GEOMToolsGUI_DeflectionDlg(); - double getDC() const; - void setDC( const double ); + double getTheDC() const; + void setTheDC( const double ); private slots: void ClickOnHelp();