From 3655bff6415a8cf7e2635934751ffbb1c9dd214a Mon Sep 17 00:00:00 2001 From: jfa Date: Wed, 21 Nov 2007 07:40:43 +0000 Subject: [PATCH] Update Help references (bug 17577) --- src/VISUGUI/VisuGUI_BuildProgressDlg.cxx | 2 +- src/VISUGUI/VisuGUI_CacheDlg.cxx | 2 +- src/VISUGUI/VisuGUI_ClippingDlg.cxx | 8 +- src/VISUGUI/VisuGUI_CursorDlg.cxx | 10 +-- src/VISUGUI/VisuGUI_CutLinesDlg.cxx | 16 ++-- src/VISUGUI/VisuGUI_CutPlanesDlg.cxx | 14 ++-- src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx | 18 ++-- src/VISUGUI/VisuGUI_EditContainerDlg.cxx | 10 +-- src/VISUGUI/VisuGUI_GaussPointsDlg.cxx | 2 +- src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx | 6 +- src/VISUGUI/VisuGUI_NameDlg.cxx | 32 ++++---- src/VISUGUI/VisuGUI_Plot3DDlg.cxx | 14 ++-- src/VISUGUI/VisuGUI_Prs3dDlg.cxx | 10 +-- src/VISUGUI/VisuGUI_ScalarBarDlg.cxx | 14 ++-- .../VisuGUI_ScalarMapOnDeformedShapeDlg.cxx | 6 +- src/VISUGUI/VisuGUI_Selection.cxx | 18 ++-- src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx | 82 +++++++++---------- src/VISUGUI/VisuGUI_StreamLinesDlg.cxx | 8 +- src/VISUGUI/VisuGUI_TimeAnimation.cxx | 2 +- src/VISUGUI/VisuGUI_TransparencyDlg.cxx | 30 +++---- src/VISUGUI/VisuGUI_VectorsDlg.cxx | 22 ++--- 21 files changed, 163 insertions(+), 163 deletions(-) diff --git a/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx b/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx index e1dace81..822caab7 100644 --- a/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx +++ b/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx @@ -261,7 +261,7 @@ void VisuGUI_BuildProgressDlg::onClose() void VisuGUI_BuildProgressDlg::onHelp() { - QString aHelpFileName = "/files/importing_med_objects.htm"; // ? + QString aHelpFileName = "importing_med_objects_page.html"; // ? LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); if (app) { VisuGUI* aVisuGUI = dynamic_cast( app->activeModule() ); diff --git a/src/VISUGUI/VisuGUI_CacheDlg.cxx b/src/VISUGUI/VisuGUI_CacheDlg.cxx index 08b19295..9e8a9bd5 100644 --- a/src/VISUGUI/VisuGUI_CacheDlg.cxx +++ b/src/VISUGUI/VisuGUI_CacheDlg.cxx @@ -182,7 +182,7 @@ void VisuGUI_CacheDlg::accept() void VisuGUI_CacheDlg::onHelp() { - QString aHelpFileName;// = "types_of_gauss_points_presentations.htm"; + QString aHelpFileName;// = "types_of_gauss_points_presentations_page.html"; LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); if (app) app->onHelpContextModule(app->activeModule() ? diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.cxx b/src/VISUGUI/VisuGUI_ClippingDlg.cxx index 35f2c776..29adb4c8 100644 --- a/src/VISUGUI/VisuGUI_ClippingDlg.cxx +++ b/src/VISUGUI/VisuGUI_ClippingDlg.cxx @@ -574,16 +574,16 @@ void VisuGUI_ClippingDlg::ClickOnCancel() //================================================================================= void VisuGUI_ClippingDlg::ClickOnHelp() { - QString aHelpFileName = "clipping.htm"; + QString aHelpFileName = "clipping_page.html"; LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); if (app) app->onHelpContextModule(myVisuGUI ? app->moduleName(myVisuGUI->moduleName()) : QString(""), aHelpFileName); else { - QString platform; + QString platform; #ifdef WIN32 - platform = "winapplication"; + platform = "winapplication"; #else - platform = "application"; + platform = "application"; #endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). diff --git a/src/VISUGUI/VisuGUI_CursorDlg.cxx b/src/VISUGUI/VisuGUI_CursorDlg.cxx index 45de30f6..f0ba9786 100644 --- a/src/VISUGUI/VisuGUI_CursorDlg.cxx +++ b/src/VISUGUI/VisuGUI_CursorDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -129,18 +129,18 @@ VisuGUI_CursorDlg::~VisuGUI_CursorDlg() */ void VisuGUI_CursorDlg::onHelp() { - QString aHelpFileName = "/files/changing_visualization_parameters_of_the_presenetation.htm#Width"; + QString aHelpFileName = "viewing_3d_presentations_intro_page.html"; LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); if (app) { VisuGUI* aVisuGUI = dynamic_cast( app->activeModule() ); app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName); } else { - QString platform; + QString platform; #ifdef WIN32 - platform = "winapplication"; + platform = "winapplication"; #else - platform = "application"; + platform = "application"; #endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx index 8570ebd8..9f44b482 100644 --- a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx +++ b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx @@ -305,7 +305,7 @@ void VisuGUI_CutLinesDlg::initFromPrsObject ( VISU::ColoredPrs3d_i* thePrs, hasInit = true; myCutLines = VISU::TSameAsFactory().Create(myPrsCopy, VISU::ColoredPrs3d_i::EDoNotPublish); myCutLines->CopyCurvesInverted(myPrsCopy->GetCurvesInverted()); - if (myCutLines->IsAllCurvesInverted()) + if (myCutLines->IsAllCurvesInverted()) myAllCurvesInvertedCheck->setChecked(true); myBasePlanePos->setText( QString::number(myCutLines->GetBasePlanePosition()) ); myCBSetDef->setChecked(myPrsCopy->IsDefault()); @@ -328,7 +328,7 @@ int VisuGUI_CutLinesDlg::storeToPrsObject (VISU::ColoredPrs3d_i* thePrs) { if(!myInputPane->check() || !GetScalarPane()->check()) return 0; - + int anIsOk = myInputPane->storeToPrsObject( myPrsCopy ); anIsOk &= GetScalarPane()->storeToPrsObject( myPrsCopy ); @@ -374,11 +374,11 @@ void VisuGUI_CutLinesDlg::createPlanes() vtkDataSetMapper* aPlaneMapper = vtkDataSetMapper::New(); aPlaneMapper->SetInput(aPolyData->GetOutput()); aPlaneMapper->ScalarVisibilityOff(); - + myPreviewActorGlyphs = SALOME_Actor::New(); myPreviewActorGlyphs->PickableOff(); updateGlyphs(false); - + myPreviewActor = SALOME_Actor::New(); myPreviewActor->PickableOff(); myPreviewActor->SetMapper(aPlaneMapper); @@ -395,7 +395,7 @@ void VisuGUI_CutLinesDlg::deletePlanes() if (myPreviewActor == 0) return; vtkRenderer* aRend = myPreviewActor->GetRenderer(); vtkRenderer* aRendGlyphs = myPreviewActorGlyphs->GetRenderer(); - + vtkRenderWindow* aWnd1 = aRend->GetRenderWindow(); vtkRenderWindow* aWnd2 = aRendGlyphs->GetRenderWindow(); if(aRend && aWnd1) @@ -564,13 +564,13 @@ void VisuGUI_CutLinesDlg::updateGlyphs(bool update){ aPlaneMapper->GetBounds(bounds); for(int i=0; i<3; i++) aBoundCenter[i] = (bounds[i*2] + bounds[i*2+1])/2.0; - for(int i=0; i<3; i++){ + for(int i=0; i<3; i++){ if (!myAllCurvesInvertedCheck->isChecked()) aSecondPnt[i] = aDirLn[i]; else aSecondPnt[i] = - aDirLn[i]; } - + vtkFloatingPointType max_bound = 0; max_bound < bounds[1]-bounds[0] ? max_bound = bounds[1] - bounds[0] : max_bound = max_bound; max_bound < bounds[3]-bounds[2] ? max_bound = bounds[3] - bounds[2] : max_bound = max_bound; @@ -793,5 +793,5 @@ void VisuGUI_CutLinesDlg::onPlanePos (const QString& theValue) QString VisuGUI_CutLinesDlg::GetContextHelpFilePath() { - return "/files/cut_lines_presentation.htm"; + return "cut_lines_page.html"; } diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx index 9a0033c8..52f8a065 100644 --- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx +++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -76,9 +76,9 @@ using namespace std; VisuGUI_CutPlanesPane::VisuGUI_CutPlanesPane (QWidget* theParent) : QFrame(theParent), myPreviewActor(0) { - QGridLayout* TopLayout = new QGridLayout( this ); - TopLayout->setSpacing( 6 ); - TopLayout->setMargin( 10 ); + QGridLayout* TopLayout = new QGridLayout(this); + TopLayout->setSpacing(6); + TopLayout->setMargin(10); QButtonGroup* SelPlane = new QButtonGroup (tr("TXT_ORIENTATION"), this, "SelPlane"); //SelPlane->setTitle(tr("TXT_ORIENTATION")); @@ -322,7 +322,7 @@ void VisuGUI_CutPlanesPane::DrawTable() QCheckTableItem* aItem = (QCheckTableItem*)myPosTable->item( i, 1 ); if (aItem == 0) break; if (!aItem->isChecked()) - myCutPlanes->SetPlanePosition(i, myPosTable->text(i, 0).toDouble()); + myCutPlanes->SetPlanePosition(i, myPosTable->text(i, 0).toDouble()); } if (aNbPlanes > aNbRows) @@ -562,14 +562,14 @@ void VisuGUI_CutPlanesDlg::accept() VisuGUI_ScalarBarBaseDlg::accept(); } -void VisuGUI_CutPlanesDlg::reject() +void VisuGUI_CutPlanesDlg::reject() { VisuGUI_ScalarBarBaseDlg::reject(); } QString VisuGUI_CutPlanesDlg::GetContextHelpFilePath() { - return "/files/cut_lines_resentation.htm"; + return "cut_planes_page.html"; } //################################################################### diff --git a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx index 503fbabd..0a42dc4c 100644 --- a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx +++ b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -136,8 +136,8 @@ VisuGUI_DeformedShapeDlg::VisuGUI_DeformedShapeDlg (SalomeApp_Module* theModule) VisuGUI_DeformedShapeDlg::~VisuGUI_DeformedShapeDlg() {} -void VisuGUI_DeformedShapeDlg::initFromPrsObject ( VISU::ColoredPrs3d_i* thePrs, - bool theInit ) +void VisuGUI_DeformedShapeDlg::initFromPrsObject (VISU::ColoredPrs3d_i* thePrs, + bool theInit) { if( theInit ) myPrsCopy = VISU::TSameAsFactory().Create(thePrs, VISU::ColoredPrs3d_i::EDoNotPublish); @@ -147,14 +147,14 @@ void VisuGUI_DeformedShapeDlg::initFromPrsObject ( VISU::ColoredPrs3d_i* thePrs, setFactor(myPrsCopy->GetScale()); UseMagn->setChecked(myPrsCopy->IsColored()); - if( !theInit ) + if (!theInit) return; - myInputPane->initFromPrsObject( myPrsCopy ); - myTabBox->setCurrentPage( 0 ); + myInputPane->initFromPrsObject(myPrsCopy); + myTabBox->setCurrentPage(0); } -int VisuGUI_DeformedShapeDlg::storeToPrsObject(VISU::ColoredPrs3d_i* thePrs) +int VisuGUI_DeformedShapeDlg::storeToPrsObject(VISU::ColoredPrs3d_i* thePrs) { if(!myInputPane->check() || !GetScalarPane()->check()) return 0; @@ -170,7 +170,7 @@ int VisuGUI_DeformedShapeDlg::storeToPrsObject(VISU::ColoredPrs3d_i* thePrs) return anIsOk; } -void VisuGUI_DeformedShapeDlg::accept() +void VisuGUI_DeformedShapeDlg::accept() { VisuGUI_ScalarBarBaseDlg::accept(); } @@ -182,5 +182,5 @@ void VisuGUI_DeformedShapeDlg::reject() QString VisuGUI_DeformedShapeDlg::GetContextHelpFilePath() { - return "/files/deformed_shape_presentation.htm"; + return "deformed_shape_page.html"; } diff --git a/src/VISUGUI/VisuGUI_EditContainerDlg.cxx b/src/VISUGUI/VisuGUI_EditContainerDlg.cxx index 9850d1f4..6eecdcc0 100644 --- a/src/VISUGUI/VisuGUI_EditContainerDlg.cxx +++ b/src/VISUGUI/VisuGUI_EditContainerDlg.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : VisuGUI_EditContainerDlg.cxx // Author : VSV @@ -451,16 +451,16 @@ void VisuGUI_EditContainerDlg::onRightSelected() void VisuGUI_EditContainerDlg::onHelp() { - QString aHelpFileName = "/files/creating_xy_plot.htm"; + QString aHelpFileName = "creating_xy_plot_page.html"; SalomeApp_Application* app = (SalomeApp_Application*)(SUIT_Session::session()->activeApplication()); if (app) app->onHelpContextModule(myVisuGUI ? app->moduleName(myVisuGUI->moduleName()) : QString(""), aHelpFileName); else { - QString platform; + QString platform; #ifdef WIN32 - platform = "winapplication"; + platform = "winapplication"; #else - platform = "application"; + platform = "application"; #endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). diff --git a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx index 2e5c6363..d1728070 100644 --- a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx +++ b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx @@ -935,5 +935,5 @@ void VisuGUI_GaussPointsDlg::accept() QString VisuGUI_GaussPointsDlg::GetContextHelpFilePath() { - return "types_of_gauss_points_presentations.htm"; + return "types_of_gauss_points_presentations_page.html"; } diff --git a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx index b74d15f3..17a5e383 100644 --- a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx +++ b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx @@ -122,7 +122,7 @@ bool VisuGUI_IsoSurfPane::check() tr("MSG_MINMAX_VALUES"), tr("BUT_OK")); return false; - } + } return true; } @@ -213,7 +213,7 @@ int VisuGUI_IsoSurfacesDlg::storeToPrsObject(VISU::ColoredPrs3d_i* thePrs) { if(!myInputPane->check() || !GetScalarPane()->check()) return 0; - + int anIsOk = myInputPane->storeToPrsObject( myPrsCopy ); anIsOk &= GetScalarPane()->storeToPrsObject( myPrsCopy ); anIsOk &= myIsoPane->storeToPrsObject( myPrsCopy ); @@ -225,5 +225,5 @@ int VisuGUI_IsoSurfacesDlg::storeToPrsObject(VISU::ColoredPrs3d_i* thePrs) QString VisuGUI_IsoSurfacesDlg::GetContextHelpFilePath() { - return "/files/iso_surfaces_presentation.htm"; + return "iso_surfaces_page.html"; } diff --git a/src/VISUGUI/VisuGUI_NameDlg.cxx b/src/VISUGUI/VisuGUI_NameDlg.cxx index 60b252af..67e3f3ee 100644 --- a/src/VISUGUI/VisuGUI_NameDlg.cxx +++ b/src/VISUGUI/VisuGUI_NameDlg.cxx @@ -45,14 +45,14 @@ using namespace std; Constructor */ VisuGUI_NameDlg::VisuGUI_NameDlg( QWidget* parent ) - : QDialog( parent ? parent : SUIT_Session::session()->activeApplication()->desktop(), - "VisuGUI_NameDlg", - true, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) + : QDialog(parent ? parent : SUIT_Session::session()->activeApplication()->desktop(), + "VisuGUI_NameDlg", + true, + WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { setCaption( tr("TLT_RENAME") ); setSizeGripEnabled( TRUE ); - + QVBoxLayout* topLayout = new QVBoxLayout( this ); topLayout->setMargin( 11 ); topLayout->setSpacing( 6 ); @@ -63,23 +63,23 @@ VisuGUI_NameDlg::VisuGUI_NameDlg( QWidget* parent ) QHBoxLayout* GroupC1Layout = new QHBoxLayout( GroupC1->layout() ); GroupC1Layout->setAlignment( Qt::AlignTop ); GroupC1Layout->setMargin( 11 ); GroupC1Layout->setSpacing( 6 ); - + QLabel* TextLabel = new QLabel( GroupC1, "TextLabel1" ); TextLabel->setText( tr( "NAME_LBL" ) ); GroupC1Layout->addWidget( TextLabel ); - + myLineEdit = new QLineEdit( GroupC1, "LineEdit1" ); myLineEdit->setMinimumSize( 250, 0 ); GroupC1Layout->addWidget( myLineEdit ); - + /***************************************************************/ QGroupBox* GroupButtons = new QGroupBox( this, "GroupButtons" ); GroupButtons->setColumnLayout(0, Qt::Vertical ); - GroupButtons->layout()->setMargin( 0 ); GroupButtons->layout()->setSpacing( 0 ); + GroupButtons->layout()->setMargin( 0 ); GroupButtons->layout()->setSpacing( 0 ); QHBoxLayout* GroupButtonsLayout = new QHBoxLayout( GroupButtons->layout() ); GroupButtonsLayout->setAlignment( Qt::AlignTop ); GroupButtonsLayout->setMargin( 11 ); GroupButtonsLayout->setSpacing( 6 ); - + myButtonOk = new QPushButton( GroupButtons, "buttonOk" ); myButtonOk->setText( tr( "BUT_OK" ) ); myButtonOk->setAutoDefault( TRUE ); myButtonOk->setDefault( TRUE ); @@ -144,21 +144,21 @@ void VisuGUI_NameDlg::accept() void VisuGUI_NameDlg::onHelp() { - QString aHelpFileName = "/files/renaming_presentations.htm"; + QString aHelpFileName = "viewing_3d_presentations_intro_page.html"; LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); if (app) { VisuGUI* aVisuGUI = dynamic_cast( app->activeModule() ); app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName); } else { - QString platform; + QString platform; #ifdef WIN32 - platform = "winapplication"; + platform = "winapplication"; #else - platform = "application"; + platform = "application"; #endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), - QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). + QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } @@ -173,7 +173,7 @@ QString VisuGUI_NameDlg::getName( QWidget* parent, const QString& oldName ) VisuGUI_NameDlg* dlg = new VisuGUI_NameDlg( parent ); if ( !oldName.isNull() ) dlg->setName( oldName ); - if ( dlg->exec() == QDialog::Accepted ) + if ( dlg->exec() == QDialog::Accepted ) n = dlg->name(); delete dlg; return n; diff --git a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx index 1ca0edca..7f66cd39 100644 --- a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx +++ b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx @@ -503,7 +503,7 @@ int VisuGUI_Plot3DPane::storeToPrsObject(VISU::Plot3D_i* thePrs) bool VisuGUI_Plot3DPane::check() { if(!myPreviewActor) return true; - + vtkRenderer* aRend = myPreviewActor->GetRenderer(); vtkRenderWindow* aWnd = aRend->GetRenderWindow(); if(aRend && aWnd){ @@ -512,7 +512,7 @@ bool VisuGUI_Plot3DPane::check() myPreviewActor->Delete(); myPreviewActor = 0; } - + return true; } @@ -625,8 +625,8 @@ void VisuGUI_Plot3DDlg::reject() //function : initFromPrsObject //purpose : //======================================================================= -void VisuGUI_Plot3DDlg::initFromPrsObject( VISU::ColoredPrs3d_i* thePrs, - bool theInit ) +void VisuGUI_Plot3DDlg::initFromPrsObject (VISU::ColoredPrs3d_i* thePrs, + bool theInit) { if( theInit ) myPrsCopy = VISU::TSameAsFactory().Create(thePrs, VISU::ColoredPrs3d_i::EDoNotPublish); @@ -647,10 +647,10 @@ void VisuGUI_Plot3DDlg::initFromPrsObject( VISU::ColoredPrs3d_i* thePrs, //purpose : //======================================================================= int VisuGUI_Plot3DDlg::storeToPrsObject (VISU::ColoredPrs3d_i* thePrs) -{ +{ if(!myInputPane->check() || !GetScalarPane()->check()) return 0; - + int anIsOk = myInputPane->storeToPrsObject( myPrsCopy ); anIsOk &= GetScalarPane()->storeToPrsObject( myPrsCopy ); anIsOk &= myIsoPane->storeToPrsObject( myPrsCopy ); @@ -666,7 +666,7 @@ int VisuGUI_Plot3DDlg::storeToPrsObject (VISU::ColoredPrs3d_i* thePrs) //======================================================================= QString VisuGUI_Plot3DDlg::GetContextHelpFilePath() { - return "plot_3d_presentation.htm"; + return "plot_3d_page.html"; } //======================================================================= diff --git a/src/VISUGUI/VisuGUI_Prs3dDlg.cxx b/src/VISUGUI/VisuGUI_Prs3dDlg.cxx index f45f02dd..ead00b29 100644 --- a/src/VISUGUI/VisuGUI_Prs3dDlg.cxx +++ b/src/VISUGUI/VisuGUI_Prs3dDlg.cxx @@ -171,7 +171,7 @@ void VisuGUI_TextPrefDlg::setTitleVisible(bool isVisible) //---------------------------------------------------------------------------- void VisuGUI_TextPrefDlg::onHelp() { - QString aHelpFileName = "/files/scalar_map_presentation.htm"; + QString aHelpFileName = "scalar_map_page.html"; LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); if (app) { VisuGUI* aVisuGUI = dynamic_cast( app->activeModule() ); @@ -245,7 +245,7 @@ void VisuGUI_TextPrefDlg::keyPressEvent( QKeyEvent* e ) Constructor */ VisuGUI_ScalarBarPane::VisuGUI_ScalarBarPane (QWidget * parent): - QVBox(parent), + QVBox(parent), myPreviewActor(0), myScalarMap(NULL), myScalarMapPL(NULL) @@ -257,13 +257,13 @@ VisuGUI_ScalarBarPane::VisuGUI_ScalarBarPane (QWidget * parent): myVerY = aResourceMgr->doubleValue("VISU", propertyName + "y", 0.); myVerW = aResourceMgr->doubleValue("VISU", propertyName + "width", 0.); myVerH = aResourceMgr->doubleValue("VISU", propertyName + "height",0.); - + propertyName = QString("scalar_bar_horizontal_"); myHorX = aResourceMgr->doubleValue("VISU", propertyName + "x", 0.); myHorY = aResourceMgr->doubleValue("VISU", propertyName + "y", 0.); myHorW = aResourceMgr->doubleValue("VISU", propertyName + "width", 0.); myHorH = aResourceMgr->doubleValue("VISU", propertyName + "height",0.); - + setSpacing(6); //setMargin(11); @@ -432,7 +432,7 @@ VisuGUI_ScalarBarPane::VisuGUI_ScalarBarPane (QWidget * parent): CheckGroup->layout()->setSpacing( 0 ); CheckGroup->layout()->setMargin( 0 ); QGridLayout* CheckGroupLayout = new QGridLayout( CheckGroup->layout() ); - + myPreviewCheck = new QCheckBox(tr("LBL_SHOW_PREVIEW"), CheckGroup); myPreviewCheck->setChecked(false); CheckGroupLayout->addWidget(myPreviewCheck , 0, 0 ); diff --git a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx index aa44489d..32a57488 100644 --- a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx +++ b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx @@ -121,7 +121,7 @@ VisuGUI_ScalarBarDlg::~VisuGUI_ScalarBarDlg() */ QString VisuGUI_ScalarBarDlg::GetContextHelpFilePath() { - return "/files/scalar_map_presentation.htm"; + return "scalar_map_page.html"; } /*! @@ -134,11 +134,11 @@ void VisuGUI_ScalarBarDlg::initFromPrsObject( VISU::ColoredPrs3d_i* thePrs, myPrsCopy = VISU::TSameAsFactory().Create(thePrs, VISU::ColoredPrs3d_i::EDoNotPublish); VisuGUI_ScalarBarBaseDlg::initFromPrsObject(myPrsCopy, theInit); - + if( !theInit ) return; - myInputPane->initFromPrsObject( myPrsCopy ); + myInputPane->initFromPrsObject(myPrsCopy); myTabBox->setCurrentPage( 0 ); } @@ -147,13 +147,13 @@ void VisuGUI_ScalarBarDlg::initFromPrsObject( VISU::ColoredPrs3d_i* thePrs, */ int VisuGUI_ScalarBarDlg::storeToPrsObject(VISU::ColoredPrs3d_i* thePrs) { - if(!myInputPane->check() || !GetScalarPane()->check()) + if (!myInputPane->check() || !GetScalarPane()->check()) return 0; - + int anIsOk = myInputPane->storeToPrsObject( myPrsCopy ); anIsOk &= GetScalarPane()->storeToPrsObject( myPrsCopy ); - + VISU::TSameAsFactory().Copy(myPrsCopy, thePrs); - + return anIsOk; } diff --git a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx b/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx index 84f9737d..5b2e881e 100644 --- a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx +++ b/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx @@ -170,7 +170,7 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::initFromPrsObject( VISU::ColoredPrs3d_ myPrsCopy = VISU::TSameAsFactory().Create(thePrs, VISU::ColoredPrs3d_i::EDoNotPublish); setFactor(myPrsCopy->GetScale()); myTimeStampsCombo->setDisabled(myIsAnimation); - + CORBA::String_var aFieldName(myPrsCopy->GetScalarFieldName()); QString aIteration = GetFloatValueOfTimeStamp(myPrsCopy->GetScalarEntity(), aFieldName.in(), @@ -235,7 +235,7 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::initFromPrsObject( VISU::ColoredPrs3d_ if (aType == VISU::TTIMESTAMP) { QString aMeshName = aRestoringMap["myMeshName"]; CORBA::String_var aName = myPrsCopy->GetMeshName(); - if (aMeshName != aName.in()) + if (aMeshName != aName.in()) continue; QString aFieldName = aRestoringMap["myFieldName"]; QString aTimeIter = aRestoringMap["myTimeStampId"]; @@ -371,7 +371,7 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::reject() QString VisuGUI_ScalarMapOnDeformedShapeDlg::GetContextHelpFilePath() { - return "scalar_map_on_deformed_shape_presentation.htm"; + return "scalar_map_on_deformed_shape_page.html"; } void VisuGUI_ScalarMapOnDeformedShapeDlg::AddAllFieldNames(){ diff --git a/src/VISUGUI/VisuGUI_Selection.cxx b/src/VISUGUI/VisuGUI_Selection.cxx index e5608936..a7326897 100644 --- a/src/VISUGUI/VisuGUI_Selection.cxx +++ b/src/VISUGUI/VisuGUI_Selection.cxx @@ -92,9 +92,9 @@ using namespace std; static VisuGUI_SelectionDlg* mySelectionDlg = NULL; VisuGUI_SelectionDlg::VisuGUI_SelectionDlg (const SalomeApp_Module* theModule): - QDialog(VISU::GetDesktop(theModule), - 0, - false, + QDialog(VISU::GetDesktop(theModule), + 0, + false, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose), mySelectionMgr(NULL), myModule(theModule) @@ -360,7 +360,7 @@ template QString getVector(TData* theData, int theId){ void VisuGUI_SelectionDlg::onSelectionEvent() { SVTK_ViewWindow* aViewWindow = VISU::GetActiveViewWindow(myModule); - if (!aViewWindow) + if (!aViewWindow) return; switch (aViewWindow->SelectionMode()) { @@ -373,7 +373,7 @@ void VisuGUI_SelectionDlg::onSelectionEvent() { return; } - if (myFl) + if (myFl) return; myFl = true; @@ -659,16 +659,16 @@ void VisuGUI_SelectionDlg::onCellIdEdit (const QString& theText) void VisuGUI_SelectionDlg::onHelp() { - QString aHelpFileName = "/files/getting_elements_attributes.htm"; + QString aHelpFileName = "selection_info_page.html"; LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); if (app) app->onHelpContextModule(myModule ? app->moduleName(myModule->moduleName()) : QString(""), aHelpFileName); else { - QString platform; + QString platform; #ifdef WIN32 - platform = "winapplication"; + platform = "winapplication"; #else - platform = "application"; + platform = "application"; #endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). diff --git a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx index 5c46ede4..495a45f8 100644 --- a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx +++ b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : VisuGUI_SetupPlot2dDlg.cxx // Author : Vadim SANDLER @@ -53,7 +53,7 @@ using namespace std; -#define DLG_SIZE_WIDTH 500 +#define DLG_SIZE_WIDTH 500 #define DLG_SIZE_HEIGHT 400 #define MAX_LINE_WIDTH 100 #define MARGIN_SIZE 11 @@ -63,14 +63,14 @@ using namespace std; Constructor */ VisuGUI_SetupPlot2dDlg::VisuGUI_SetupPlot2dDlg( _PTR(SObject) object, QWidget* parent ) - : QDialog( parent, - "VisuGUI_SetupPlot2dDlg", - true, + : QDialog( parent, + "VisuGUI_SetupPlot2dDlg", + true, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) { setCaption( tr("TLT_SETUP_PLOT2D") ); setSizeGripEnabled( TRUE ); - QGridLayout* topLayout = new QGridLayout( this ); + QGridLayout* topLayout = new QGridLayout( this ); topLayout->setSpacing( SPACING_SIZE ); topLayout->setMargin( MARGIN_SIZE ); @@ -84,7 +84,7 @@ VisuGUI_SetupPlot2dDlg::VisuGUI_SetupPlot2dDlg( _PTR(SObject) object, QWidget* p frame->setFrameStyle( QFrame::Plain | QFrame::NoFrame ); QGridLayout* frameLayout = new QGridLayout( frame, 1, 12 ); frameLayout->setMargin( MARGIN_SIZE ); frameLayout->setSpacing( SPACING_SIZE ); - + QFrame* lin; QLabel* labAxis = new QLabel( tr( "AXIS_LBL" ), frame ); @@ -127,13 +127,13 @@ VisuGUI_SetupPlot2dDlg::VisuGUI_SetupPlot2dDlg( _PTR(SObject) object, QWidget* p _PTR(GenericAttribute) anAttr; _PTR(AttributeTableOfInteger) tblIntAttr; _PTR(AttributeTableOfReal) tblRealAttr; - + /* Try table of integer */ if ( myObject->FindAttribute( anAttr, "AttributeTableOfInteger" ) ) { tblIntAttr = anAttr; if ( tblIntAttr ) { try { - int nbRows = tblIntAttr->GetNbRows() ; + int nbRows = tblIntAttr->GetNbRows() ; vector rowTitles = tblIntAttr->GetRowTitles(); vector rowUnits = tblIntAttr->GetRowUnits(); QStringList rows; @@ -174,7 +174,7 @@ VisuGUI_SetupPlot2dDlg::VisuGUI_SetupPlot2dDlg( _PTR(SObject) object, QWidget* p tblRealAttr = anAttr; if ( tblRealAttr ) { try { - int nbRows = tblRealAttr->GetNbRows() ; + int nbRows = tblRealAttr->GetNbRows(); vector rowTitles = tblRealAttr->GetRowTitles(); vector rowUnits = tblRealAttr->GetRowUnits(); QStringList rows; @@ -220,7 +220,7 @@ VisuGUI_SetupPlot2dDlg::VisuGUI_SetupPlot2dDlg( _PTR(SObject) object, QWidget* p myView->addChild( frame, 0, 0 ); myView->setResizePolicy( QScrollView::AutoOneFit ); - + myView->setMinimumWidth( frame->sizeHint().width() + MARGIN_SIZE * 2 ); /* OK/Cancel/Help buttons */ @@ -271,18 +271,18 @@ void VisuGUI_SetupPlot2dDlg::getCurvesSource( int& horIndex, QValueList& ve verIndexes.append( i ); zIndices.append( myItems.at( i )->assigned() ); } - + } } /*! Gets curve attributes */ -bool VisuGUI_SetupPlot2dDlg::getCurveAttributes( const int vIndex, - bool& isAuto, - int& marker, - int& line, - int& lineWidth, - QColor& color) +bool VisuGUI_SetupPlot2dDlg::getCurveAttributes (const int vIndex, + bool& isAuto, + int& marker, + int& line, + int& lineWidth, + QColor& color) { if ( vIndex >= 0 && vIndex < myItems.count() ) { isAuto = myItems.at( vIndex )->isAutoAssign(); @@ -302,7 +302,7 @@ void VisuGUI_SetupPlot2dDlg::getCurves( QPtrList& container ) _PTR(GenericAttribute) anAttr; _PTR(AttributeTableOfInteger) tblIntAttr; _PTR(AttributeTableOfReal) tblRealAttr; - + /* clearing container contents */ container.clear(); @@ -313,13 +313,13 @@ void VisuGUI_SetupPlot2dDlg::getCurves( QPtrList& container ) getCurvesSource( horIndex, verIndex, zIndices ); if ( horIndex < 0 || verIndex.isEmpty() ) /* no curves can be created */ return; - + /* Try table of integer */ if ( myObject->FindAttribute( anAttr, "AttributeTableOfInteger" ) ) { tblIntAttr = anAttr; if ( tblIntAttr ) { try { - int nbCols = tblIntAttr->GetNbColumns() ; + int nbCols = tblIntAttr->GetNbColumns(); vector rowTitles = tblIntAttr->GetRowTitles(); vector rowUnits = tblIntAttr->GetRowUnits(); @@ -373,7 +373,7 @@ void VisuGUI_SetupPlot2dDlg::getCurves( QPtrList& container ) tblRealAttr = anAttr; if ( tblRealAttr ) { try { - int nbCols = tblRealAttr->GetNbColumns() ; + int nbCols = tblRealAttr->GetNbColumns(); vector rowTitles = tblRealAttr->GetRowTitles(); vector rowUnits = tblRealAttr->GetRowUnits(); @@ -462,12 +462,12 @@ void VisuGUI_SetupPlot2dDlg::onVBtnToggled( bool on ) } } } - if ( totalOn == 0 && !itemList.isEmpty() && - SUIT_MessageBox::info2( this, - this->caption(), + if ( totalOn == 0 && !itemList.isEmpty() && + SUIT_MessageBox::info2( this, + this->caption(), tr( "QUE_WANT_SAME_UNITS" ), - tr( "BUT_YES" ), - tr( "BUT_NO" ), + tr( "BUT_YES" ), + tr( "BUT_NO" ), 0, 1, 1 ) == 0 ) { for ( i = 0; i < itemList.count(); i++ ) { itemList.at( i )->blockSignals( true ); @@ -483,18 +483,18 @@ void VisuGUI_SetupPlot2dDlg::onVBtnToggled( bool on ) */ void VisuGUI_SetupPlot2dDlg::onHelp() { - QString aHelpFileName = "/files/creating_curves.htm"; + QString aHelpFileName = "plot2d_viewer_page.html"; LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); if (app) { VisuGUI* aVisuGUI = dynamic_cast( app->activeModule() ); app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName); } else { - QString platform; + QString platform; #ifdef WIN32 - platform = "winapplication"; + platform = "winapplication"; #else - platform = "application"; + platform = "application"; #endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). @@ -503,7 +503,7 @@ void VisuGUI_SetupPlot2dDlg::onHelp() } } /*! - Enables/disables buttons + Enables/disables buttons */ void VisuGUI_SetupPlot2dDlg::enableControls() { @@ -548,7 +548,7 @@ void VisuGUI_SetupPlot2dDlg::keyPressEvent( QKeyEvent* e ) Constructor */ VisuGUI_ItemContainer::VisuGUI_ItemContainer( QObject* parent, const char* name ) - : QObject( parent, name ), + : QObject( parent, name ), myEnabled( true ) { } @@ -566,11 +566,11 @@ void VisuGUI_ItemContainer::createWidgets( QWidget* parentWidget, const QStringL myVBtn->setText( tr( "V" ) ); myVBtn->setToggleButton( true ); myVBtn->setOn( false ); - + myTitleLab = new QLabel( parentWidget ); myUnitLab = new QLabel( parentWidget ); myUnitLab->setAlignment( AlignCenter); - + myAutoCheck = new QCheckBox( tr( "AUTO_CHECK_LBL" ), parentWidget ); myAutoCheck->setChecked( true ); @@ -608,7 +608,7 @@ void VisuGUI_ItemContainer::createWidgets( QWidget* parentWidget, const QStringL for( ; anIt!=aLast; anIt++ ) myAssigned->insertItem( *anIt ); myAssigned->setEnabled( false ); - + connect( myAutoCheck, SIGNAL( clicked() ), this, SLOT( onAutoChanged() ) ); connect( myColorBtn, SIGNAL( clicked() ), this, SLOT( onColorChanged() ) ); connect( myHBtn, SIGNAL( toggled( bool ) ), this, SLOT( onHVToggled( bool ) ) ); @@ -729,10 +729,10 @@ QColor VisuGUI_ItemContainer::getColor() const void VisuGUI_ItemContainer::updateState() { myAutoCheck->setEnabled( myEnabled ); - myLineCombo->setEnabled( myEnabled && !myAutoCheck->isChecked() ); - myLineSpin->setEnabled( myEnabled && !myAutoCheck->isChecked() ); - myMarkerCombo->setEnabled( myEnabled && !myAutoCheck->isChecked() ); - myColorBtn->setEnabled( myEnabled && !myAutoCheck->isChecked() ); + myLineCombo->setEnabled( myEnabled && !myAutoCheck->isChecked() ); + myLineSpin->setEnabled( myEnabled && !myAutoCheck->isChecked() ); + myMarkerCombo->setEnabled( myEnabled && !myAutoCheck->isChecked() ); + myColorBtn->setEnabled( myEnabled && !myAutoCheck->isChecked() ); } /*! Slot, called when user clickes check box @@ -785,7 +785,7 @@ void VisuGUI_ItemContainer::onHVToggled( bool on ) */ int VisuGUI_ItemContainer::assigned() const { - if( isVerticalOn() ) + if ( isVerticalOn() ) return myAssigned->currentItem()-1; else return -1; diff --git a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx index d3ecb875..c94ed9dd 100644 --- a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx +++ b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : VisuGUI_StreamLinesDlg.cxx // Author : Vitaly SMETANNIKOV @@ -370,7 +370,7 @@ int VisuGUI_StreamLinesDlg::storeToPrsObject (VISU::ColoredPrs3d_i* thePrs) { if(!myInputPane->check() || !GetScalarPane()->check()) return 0; - + int anIsOk = myInputPane->storeToPrsObject( myPrsCopy ); anIsOk &= GetScalarPane()->storeToPrsObject( myPrsCopy ); @@ -517,7 +517,7 @@ VISU::Mesh_ptr VisuGUI_StreamLinesDlg::createMesh (VISU::VISUType theType, QStri return VISU::Mesh::_nil(); } -void VisuGUI_StreamLinesDlg::accept() +void VisuGUI_StreamLinesDlg::accept() { VisuGUI_ScalarBarBaseDlg::accept(); } @@ -529,5 +529,5 @@ void VisuGUI_StreamLinesDlg::reject() QString VisuGUI_StreamLinesDlg::GetContextHelpFilePath() { - return "/files/stream_lines_presentation.htm"; + return "stream_lines_page.html"; } diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.cxx b/src/VISUGUI/VisuGUI_TimeAnimation.cxx index b47b0eae..508d27ee 100644 --- a/src/VISUGUI/VisuGUI_TimeAnimation.cxx +++ b/src/VISUGUI/VisuGUI_TimeAnimation.cxx @@ -1742,7 +1742,7 @@ void VisuGUI_TimeAnimationDlg::onStop() //------------------------------------------------------------------------ void VisuGUI_TimeAnimationDlg::onHelp() { - QString aHelpFileName = "/files/animating_presentations.htm"; + QString aHelpFileName = "animating_page.html"; LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); if (app) app->onHelpContextModule(myModule ? app->moduleName(myModule->moduleName()) : QString(""), aHelpFileName); diff --git a/src/VISUGUI/VisuGUI_TransparencyDlg.cxx b/src/VISUGUI/VisuGUI_TransparencyDlg.cxx index 4685b597..61da7c31 100644 --- a/src/VISUGUI/VisuGUI_TransparencyDlg.cxx +++ b/src/VISUGUI/VisuGUI_TransparencyDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -63,15 +63,15 @@ using namespace std; // purpose : // //================================================================================= -VisuGUI_TransparencyDlg::VisuGUI_TransparencyDlg( VisuGUI* theModule, - const char* name, - bool modal, - WFlags fl) - : QDialog( VISU::GetDesktop( theModule ), name, modal, WStyle_Customize | WStyle_NormalBorder | - WStyle_Title | WStyle_SysMenu | WDestructiveClose ), - myModule(theModule), - mySelectionMgr( VISU::GetSelectionMgr( theModule ) ), - myViewWindow( VISU::GetActiveViewWindow(theModule) ) +VisuGUI_TransparencyDlg::VisuGUI_TransparencyDlg (VisuGUI* theModule, + const char* name, + bool modal, + WFlags fl) + : QDialog(VISU::GetDesktop(theModule), name, modal, WStyle_Customize | WStyle_NormalBorder | + WStyle_Title | WStyle_SysMenu | WDestructiveClose), + myModule(theModule), + mySelectionMgr(VISU::GetSelectionMgr(theModule)), + myViewWindow(VISU::GetActiveViewWindow(theModule)) { if (!name) setName("VisuGUI_TransparencyDlg"); @@ -180,18 +180,18 @@ void VisuGUI_TransparencyDlg::ClickOnOk() //======================================================================= void VisuGUI_TransparencyDlg::ClickOnHelp() { - QString aHelpFileName = "/files/changing_visualization_parameters_of_the_presenetation.htm#Changing3"; + QString aHelpFileName = "viewing_3d_presentations_intro_page.html"; LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); if (app) { VisuGUI* aVisuGUI = dynamic_cast( app->activeModule() ); app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName); } else { - QString platform; + QString platform; #ifdef WIN32 - platform = "winapplication"; + platform = "winapplication"; #else - platform = "application"; + platform = "application"; #endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). @@ -219,7 +219,7 @@ void VisuGUI_TransparencyDlg::SetTransparency() Handle(SALOME_InteractiveObject) anIO = anIter.Value(); VISU_Actor* anActor = VISU::FindActor(VISU::GetAppStudy(myModule), myViewWindow, anIO->getEntry()); if (anActor) - anActor->SetOpacity(opacity); + anActor->SetOpacity(opacity); } myViewWindow->Repaint(); } diff --git a/src/VISUGUI/VisuGUI_VectorsDlg.cxx b/src/VISUGUI/VisuGUI_VectorsDlg.cxx index f4fbd569..9a92656d 100644 --- a/src/VISUGUI/VisuGUI_VectorsDlg.cxx +++ b/src/VISUGUI/VisuGUI_VectorsDlg.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -57,7 +57,7 @@ VisuGUI_VectorsDlg::VisuGUI_VectorsDlg (SalomeApp_Module* theModule) setCaption(tr("DLG_TITLE")); setSizeGripEnabled(TRUE); - QVBoxLayout* TopLayout = new QVBoxLayout( this ); + QVBoxLayout* TopLayout = new QVBoxLayout( this ); TopLayout->setSpacing( 6 ); TopLayout->setMargin( 11 ); @@ -173,7 +173,7 @@ VisuGUI_VectorsDlg::VisuGUI_VectorsDlg (SalomeApp_Module* theModule) // top layout myTabBox->addTab(aBox, "Vectors"); myInputPane = new VisuGUI_InputPane(VISU::TVECTORS, theModule, this); - myTabBox->addTab(GetScalarPane(), "Scalar Bar"); + myTabBox->addTab(GetScalarPane(), "Scalar Bar"); myTabBox->addTab(myInputPane, "Input"); TopLayout->addWidget( myTabBox ); @@ -203,7 +203,7 @@ VisuGUI_VectorsDlg::~VisuGUI_VectorsDlg() void VisuGUI_VectorsDlg::initFromPrsObject( VISU::ColoredPrs3d_i* thePrs, bool theInit ) { - if( theInit ) + if ( theInit ) myPrsCopy = VISU::TSameAsFactory().Create(thePrs, VISU::ColoredPrs3d_i::EDoNotPublish); VisuGUI_ScalarBarBaseDlg::initFromPrsObject(myPrsCopy, theInit); @@ -219,7 +219,7 @@ void VisuGUI_VectorsDlg::initFromPrsObject( VISU::ColoredPrs3d_i* thePrs, setUseGlyphs(true); setGlyphType(myPrsCopy->GetGlyphType()); setGlyphPos(myPrsCopy->GetGlyphPos()); - } else + } else setUseGlyphs(false); enableSetColor(); @@ -253,7 +253,7 @@ int VisuGUI_VectorsDlg::storeToPrsObject(VISU::ColoredPrs3d_i* thePrs) if (getUseGlyphs()) { myPrsCopy->SetGlyphPos(getGlyphPos()); myPrsCopy->SetGlyphType(getGlyphType()); - } else + } else myPrsCopy->SetGlyphType(VISU::Vectors::NONE); VISU::TSameAsFactory().Copy(myPrsCopy, thePrs); @@ -318,7 +318,7 @@ void VisuGUI_VectorsDlg::setLineWidth( int lw ) /*! Gets Line width */ -int VisuGUI_VectorsDlg::getLineWidth() +int VisuGUI_VectorsDlg::getLineWidth() { return LinWid->value(); } @@ -343,7 +343,7 @@ bool VisuGUI_VectorsDlg::getUseMagnColor() /*! Sets "Use Glyphs" flag */ -void VisuGUI_VectorsDlg::setUseGlyphs( bool on ) +void VisuGUI_VectorsDlg::setUseGlyphs( bool on ) { UseGlyph->setChecked( on ); enableGlyphType(); @@ -376,7 +376,7 @@ void VisuGUI_VectorsDlg::setColor( QColor color ) */ void VisuGUI_VectorsDlg::setGlyphType(VISU::Vectors::GlyphType type ) { - if ( type == VISU::Vectors::CONE2) + if ( type == VISU::Vectors::CONE2) RBCones2->setChecked( true ); else if ( type == VISU::Vectors::CONE6) RBCones6->setChecked( true ); @@ -404,7 +404,7 @@ VISU::Vectors::GlyphType VisuGUI_VectorsDlg::getGlyphType() */ void VisuGUI_VectorsDlg::setGlyphPos(VISU::Vectors::GlyphPos pos) { - if ( pos == VISU::Vectors::TAIL) + if ( pos == VISU::Vectors::TAIL) RBTail->setChecked(true); else if ( pos == VISU::Vectors::HEAD) RBHead->setChecked(true); @@ -439,5 +439,5 @@ void VisuGUI_VectorsDlg::enableMagnColor( bool enable ) QString VisuGUI_VectorsDlg::GetContextHelpFilePath() { - return "/files/vectors_presentation.htm"; + return "vectors_page.html"; } -- 2.39.2