From 2e13824c952ed9fccfc420822f983bc88f8a5b2d Mon Sep 17 00:00:00 2001 From: prascle Date: Tue, 22 Mar 2011 16:35:11 +0000 Subject: [PATCH] PR: synchro from cvs base EDF tag V6_main_20110322 --- doc/images/create_hypothese_3.png | Bin 22963 -> 0 bytes doc/images/create_hypothese_4.png | Bin 6466 -> 0 bytes doc/images/create_hypothese_5.png | Bin 9227 -> 0 bytes doc/images/create_hypothese_6.png | Bin 12443 -> 0 bytes doc/images/create_hypothese_7.png | Bin 14510 -> 0 bytes doc/images/create_hypothese_8.png | Bin 17686 -> 0 bytes doc/tutorial_3.py | 50 -- src/HOMARD/HomardDriver.cxx | 55 +-- src/HOMARDGUI/CreateBoundaryAn.h | 12 +- src/HOMARDGUI/CreateBoundaryAn.ui | 10 +- src/HOMARDGUI/CreateBoundaryDi.h | 49 +- src/HOMARDGUI/CreateBoundaryDi.ui | 32 +- src/HOMARDGUI/CreateCase.h | 26 +- src/HOMARDGUI/CreateCase.ui | 24 +- src/HOMARDGUI/CreateHypothesis.h | 411 +++++++++------- src/HOMARDGUI/CreateHypothesis.ui | 204 ++++++-- src/HOMARDGUI/CreateIteration.h | 195 ++++---- src/HOMARDGUI/CreateIteration.ui | 106 ++-- src/HOMARDGUI/CreateListGroup.h | 142 +++--- src/HOMARDGUI/CreateListGroup.ui | 40 +- src/HOMARDGUI/CreateZone.h | 625 ++++++++++++----------- src/HOMARDGUI/CreateZone.ui | 469 ++++++++++-------- src/HOMARDGUI/EditFile.h | 10 +- src/HOMARDGUI/EditFile.ui | 8 +- src/HOMARDGUI/HOMARDGUI.cxx | 52 +- src/HOMARDGUI/HOMARD_icons.po | 11 - src/HOMARDGUI/HOMARD_msg_en.po | 111 ----- src/HOMARDGUI/HOMARD_msg_en.ts | 384 ++++++++++++--- src/HOMARDGUI/HOMARD_msg_fr.po | 31 -- src/HOMARDGUI/HOMARD_msg_fr.ts | 680 +++++++++++++++++++++++--- src/HOMARDGUI/HomardQtCommun.cxx | 408 +++++++--------- src/HOMARDGUI/HomardQtCommun.h | 3 - src/HOMARDGUI/Makefile.am | 11 +- src/HOMARDGUI/MonCreateBoundaryAn.cxx | 20 +- src/HOMARDGUI/MonCreateBoundaryDi.cxx | 37 +- src/HOMARDGUI/MonCreateCase.cxx | 54 +- src/HOMARDGUI/MonCreateHypothesis.cxx | 93 ++-- src/HOMARDGUI/MonCreateIteration.cxx | 88 ++-- src/HOMARDGUI/MonCreateListGroup.cxx | 12 +- src/HOMARDGUI/MonCreateZone.cxx | 83 ++-- src/HOMARDGUI/MonEditBoundaryAn.cxx | 2 +- src/HOMARDGUI/MonEditBoundaryDi.cxx | 34 +- src/HOMARDGUI/MonEditCase.cxx | 6 +- src/HOMARDGUI/MonEditFile.cxx | 5 +- src/HOMARDGUI/MonEditHypothesis.cxx | 10 +- src/HOMARDGUI/MonEditIteration.cxx | 8 +- src/HOMARDGUI/MonEditListGroup.cxx | 12 +- src/HOMARDGUI/MonEditZone.cxx | 6 +- src/HOMARDGUI/MonHomardDlg.cxx | 331 ------------- src/HOMARDGUI/MonHomardDlg.h | 55 --- 50 files changed, 2722 insertions(+), 2293 deletions(-) delete mode 100644 doc/images/create_hypothese_3.png delete mode 100644 doc/images/create_hypothese_4.png delete mode 100644 doc/images/create_hypothese_5.png delete mode 100644 doc/images/create_hypothese_6.png delete mode 100644 doc/images/create_hypothese_7.png delete mode 100644 doc/images/create_hypothese_8.png delete mode 100644 doc/tutorial_3.py delete mode 100644 src/HOMARDGUI/HOMARD_icons.po delete mode 100644 src/HOMARDGUI/HOMARD_msg_en.po delete mode 100644 src/HOMARDGUI/HOMARD_msg_fr.po delete mode 100644 src/HOMARDGUI/MonHomardDlg.cxx delete mode 100644 src/HOMARDGUI/MonHomardDlg.h diff --git a/doc/images/create_hypothese_3.png b/doc/images/create_hypothese_3.png deleted file mode 100644 index d8b6ecd672b9f3233158fbd266027509d27dbd71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22963 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 WgheSB7EnYG^h{1gwpjY*yZ-_zvx6T1 diff --git a/doc/images/create_hypothese_5.png b/doc/images/create_hypothese_5.png deleted file mode 100644 index 76879ad91e9c7c7e8a732530a52e2d205df16ea6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9227 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 diff --git a/doc/images/create_hypothese_6.png b/doc/images/create_hypothese_6.png deleted file mode 100644 index bed6fce798a740ec320a434f3cc41d4a6202435e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12443 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 ehw#mT-~R_LRk9`k diff --git a/doc/images/create_hypothese_7.png b/doc/images/create_hypothese_7.png deleted file mode 100644 index cdcb199e5637ef05266968c57a92e6efe61ffea9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14510 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 diff --git a/doc/images/create_hypothese_8.png b/doc/images/create_hypothese_8.png deleted file mode 100644 index c1ef185ea57cad0828d0759a26b6baa33ffd8b17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17686 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 diff --git a/doc/tutorial_3.py b/doc/tutorial_3.py deleted file mode 100644 index 264d5905..00000000 --- a/doc/tutorial_3.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env python -# -*- coding: iso-8859-1 -*- -""" -Exemple de couplage HOMARD-Salome -Copyright EDF-R&D 1996, 2010 -""" -__revision__ = "V1.0" -# -import salome -salome.salome_init() -import HOMARD -# -homard = salome.lcc.FindOrLoadComponent("FactoryServer", "HOMARD") -study_main = salome.myStudyManager.NewStudy("HOMARD") -homard.SetCurrentStudy(salome.myStudy) -# -repcas = "/tmp" -# -# Creation of the zones -# ===================== -# Box "Zone_0" -Zone_0 = homard.CreateZone('Zone_0', 2) -Zone_0.SetBox(-0.1, 1.1, -0.1, 1.1, 0.9, 1.1) - -# Sphere "Zone_1" -Zone_1 = homard.CreateZone('Zone_1', 4) -Zone_1.SetSphere(0., 0., 0., 1.05) -# -# Hypothesis "Hypo_0" -# =================== -Hypo_0 = homard.CreateHypothesis('Hypo_0') -Hypo_0.SetAdapRefinUnRef(0, 1, 0) -homard.AssociateHypoZone('Zone_1', 'Hypo_0') -homard.AssociateHypoZone('Zone_0', 'Hypo_0') -# -# Case "Case_0" -# ============= -Case_0 = homard.CreateCase('Case_0', 'MZERO', repcas+'/tutorial_2.00.med') -Case_0.SetDirName(repcas) -# -# Iteration "Iter_0" -# ================== -Iter_0 = homard.CreateIteration('Iter_0', Case_0.GetIter0Name()) -Iter_0.SetMeshName('MUN') -Iter_0.SetMeshFile(repcas+'/maill.01.med') -homard.AssociateIterHypo('Iter_0', 'Hypo_0') -codret = homard.Compute('Iter_0', 1) - -if salome.sg.hasDesktop(): - salome.sg.updateObjBrowser(1) diff --git a/src/HOMARD/HomardDriver.cxx b/src/HOMARD/HomardDriver.cxx index d1e1ed3b..da930133 100644 --- a/src/HOMARD/HomardDriver.cxx +++ b/src/HOMARD/HomardDriver.cxx @@ -26,6 +26,7 @@ HomardDriver::HomardDriver(const std::string siter, const std::string siterp1): else executable = std::string(execchar); _HOMARD_Exec = dir + "/" + executable ; + MESSAGE("Dans HomardDriver::HomardDriver, _HOMARD_Exec ="<<_HOMARD_Exec); // _siter = siter ; _siterp1 = siterp1 ; @@ -40,7 +41,8 @@ HomardDriver::~HomardDriver() ////============================================================================= void HomardDriver::TexteInit( const std::string DirCompute, const std::string DirComputePa, const std::string MessFile ) { - + MESSAGE("Dans HomardDriver::TexteInit, MessFile ="< 0 ) _Texte += "CCGroFro " + GroupName + "\n" ; // -// std::cerr << "A la fin de TexteBoundaryOption _Texte ="<<_Texte << std::endl; } ////============================================================================= void HomardDriver::TexteBoundaryAn( int NumeBoundary, int BoundaryType, const std::string Group, double x0, double x1, double x2, double x3, double x4, double x5, double x6 ) { - MESSAGE("Dans TexteBoundaryAn de HomardDriver NumeBoundary = "<setWindowTitle(QApplication::translate("CreateBoundaryAn", "Create an analytical boundary", 0, QApplication::UnicodeUTF8)); gBCylindre->setTitle(QApplication::translate("CreateBoundaryAn", "Coordinates of the cylindre", 0, QApplication::UnicodeUTF8)); TLXcent->setText(QApplication::translate("CreateBoundaryAn", "X centre", 0, QApplication::UnicodeUTF8)); TLradius->setText(QApplication::translate("CreateBoundaryAn", "Radius", 0, QApplication::UnicodeUTF8)); @@ -419,10 +419,10 @@ public: TLYaxis->setText(QApplication::translate("CreateBoundaryAn", "Y axis", 0, QApplication::UnicodeUTF8)); TLZaxis->setText(QApplication::translate("CreateBoundaryAn", "Z axis", 0, QApplication::UnicodeUTF8)); GBButtons->setTitle(QString()); - buttonOk->setText(QApplication::translate("CreateBoundaryAn", "&Ok", 0, QApplication::UnicodeUTF8)); - buttonApply->setText(QApplication::translate("CreateBoundaryAn", "&Apply", 0, QApplication::UnicodeUTF8)); - buttonCancel->setText(QApplication::translate("CreateBoundaryAn", "&Cancel", 0, QApplication::UnicodeUTF8)); - buttonHelp->setText(QApplication::translate("CreateBoundaryAn", "&Help", 0, QApplication::UnicodeUTF8)); + buttonOk->setText(QApplication::translate("CreateBoundaryAn", "OK", 0, QApplication::UnicodeUTF8)); + buttonApply->setText(QApplication::translate("CreateBoundaryAn", "Apply", 0, QApplication::UnicodeUTF8)); + buttonCancel->setText(QApplication::translate("CreateBoundaryAn", "Cancel", 0, QApplication::UnicodeUTF8)); + buttonHelp->setText(QApplication::translate("CreateBoundaryAn", "Help", 0, QApplication::UnicodeUTF8)); gBSphere->setTitle(QApplication::translate("CreateBoundaryAn", "Coordinates of the sphere", 0, QApplication::UnicodeUTF8)); TLRayon->setText(QApplication::translate("CreateBoundaryAn", "Radius", 0, QApplication::UnicodeUTF8)); TLZcentre->setText(QApplication::translate("CreateBoundaryAn", "Z centre", 0, QApplication::UnicodeUTF8)); diff --git a/src/HOMARDGUI/CreateBoundaryAn.ui b/src/HOMARDGUI/CreateBoundaryAn.ui index e5a1cc80..e7e67a70 100644 --- a/src/HOMARDGUI/CreateBoundaryAn.ui +++ b/src/HOMARDGUI/CreateBoundaryAn.ui @@ -10,7 +10,7 @@ - Create Analytical Boundary + Create an analytical boundary true @@ -303,28 +303,28 @@ - &Ok + OK - &Apply + Apply - &Cancel + Cancel - &Help + Help diff --git a/src/HOMARDGUI/CreateBoundaryDi.h b/src/HOMARDGUI/CreateBoundaryDi.h index 816d59fc..2b99f0f7 100644 --- a/src/HOMARDGUI/CreateBoundaryDi.h +++ b/src/HOMARDGUI/CreateBoundaryDi.h @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'CreateBoundaryDi.ui' ** -** Created: Thu Nov 18 15:18:52 2010 -** by: Qt User Interface Compiler version 4.4.3 +** Created: Thu Feb 24 09:10:36 2011 +** by: Qt User Interface Compiler version 4.2.1 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -22,8 +22,6 @@ #include #include -QT_BEGIN_NAMESPACE - class Ui_CreateBoundaryDi { public: @@ -35,7 +33,7 @@ public: QLineEdit *LEFileName; QCheckBox *CBGroupe; QGroupBox *GBButtons; - QGridLayout *gridLayout_5; + QGridLayout *gridLayout1; QPushButton *buttonOk; QPushButton *buttonApply; QPushButton *buttonCancel; @@ -43,17 +41,17 @@ public: void setupUi(QDialog *CreateBoundaryDi) { - if (CreateBoundaryDi->objectName().isEmpty()) - CreateBoundaryDi->setObjectName(QString::fromUtf8("CreateBoundaryDi")); - CreateBoundaryDi->resize(566, 169); - QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + CreateBoundaryDi->setObjectName(QString::fromUtf8("CreateBoundaryDi")); + QSizePolicy sizePolicy(static_cast(0), static_cast(0)); sizePolicy.setHorizontalStretch(0); sizePolicy.setVerticalStretch(0); sizePolicy.setHeightForWidth(CreateBoundaryDi->sizePolicy().hasHeightForWidth()); CreateBoundaryDi->setSizePolicy(sizePolicy); - CreateBoundaryDi->setAutoFillBackground(false); + CreateBoundaryDi->setAutoFillBackground(true); CreateBoundaryDi->setSizeGripEnabled(true); gridLayout = new QGridLayout(CreateBoundaryDi); + gridLayout->setSpacing(6); + gridLayout->setMargin(9); gridLayout->setObjectName(QString::fromUtf8("gridLayout")); Name = new QLabel(CreateBoundaryDi); Name->setObjectName(QString::fromUtf8("Name")); @@ -90,27 +88,29 @@ public: GBButtons = new QGroupBox(CreateBoundaryDi); GBButtons->setObjectName(QString::fromUtf8("GBButtons")); - gridLayout_5 = new QGridLayout(GBButtons); - gridLayout_5->setObjectName(QString::fromUtf8("gridLayout_5")); + gridLayout1 = new QGridLayout(GBButtons); + gridLayout1->setSpacing(6); + gridLayout1->setMargin(9); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); buttonOk = new QPushButton(GBButtons); buttonOk->setObjectName(QString::fromUtf8("buttonOk")); - gridLayout_5->addWidget(buttonOk, 0, 0, 1, 1); + gridLayout1->addWidget(buttonOk, 0, 0, 1, 1); buttonApply = new QPushButton(GBButtons); buttonApply->setObjectName(QString::fromUtf8("buttonApply")); - gridLayout_5->addWidget(buttonApply, 0, 1, 1, 1); + gridLayout1->addWidget(buttonApply, 0, 1, 1, 1); buttonCancel = new QPushButton(GBButtons); buttonCancel->setObjectName(QString::fromUtf8("buttonCancel")); - gridLayout_5->addWidget(buttonCancel, 0, 2, 1, 1); + gridLayout1->addWidget(buttonCancel, 0, 2, 1, 1); buttonHelp = new QPushButton(GBButtons); buttonHelp->setObjectName(QString::fromUtf8("buttonHelp")); - gridLayout_5->addWidget(buttonHelp, 0, 3, 1, 1); + gridLayout1->addWidget(buttonHelp, 0, 3, 1, 1); gridLayout->addWidget(GBButtons, 3, 0, 1, 3); @@ -118,21 +118,26 @@ public: retranslateUi(CreateBoundaryDi); + QSize size(566, 169); + size = size.expandedTo(CreateBoundaryDi->minimumSizeHint()); + CreateBoundaryDi->resize(size); + + QMetaObject::connectSlotsByName(CreateBoundaryDi); } // setupUi void retranslateUi(QDialog *CreateBoundaryDi) { - CreateBoundaryDi->setWindowTitle(QApplication::translate("CreateBoundaryDi", "Create Discrete Boundary", 0, QApplication::UnicodeUTF8)); + CreateBoundaryDi->setWindowTitle(QApplication::translate("CreateBoundaryDi", "Create a discrete boundary", 0, QApplication::UnicodeUTF8)); Name->setText(QApplication::translate("CreateBoundaryDi", "Name", 0, QApplication::UnicodeUTF8)); Mesh->setText(QApplication::translate("CreateBoundaryDi", "Mesh", 0, QApplication::UnicodeUTF8)); PushFichier->setText(QString()); CBGroupe->setText(QApplication::translate("CreateBoundaryDi", "Filtering with groups", 0, QApplication::UnicodeUTF8)); GBButtons->setTitle(QString()); - buttonOk->setText(QApplication::translate("CreateBoundaryDi", "&Ok", 0, QApplication::UnicodeUTF8)); - buttonApply->setText(QApplication::translate("CreateBoundaryDi", "&Apply", 0, QApplication::UnicodeUTF8)); - buttonCancel->setText(QApplication::translate("CreateBoundaryDi", "&Cancel", 0, QApplication::UnicodeUTF8)); - buttonHelp->setText(QApplication::translate("CreateBoundaryDi", "&Help", 0, QApplication::UnicodeUTF8)); + buttonOk->setText(QApplication::translate("CreateBoundaryDi", "OK", 0, QApplication::UnicodeUTF8)); + buttonApply->setText(QApplication::translate("CreateBoundaryDi", "Apply", 0, QApplication::UnicodeUTF8)); + buttonCancel->setText(QApplication::translate("CreateBoundaryDi", "Cancel", 0, QApplication::UnicodeUTF8)); + buttonHelp->setText(QApplication::translate("CreateBoundaryDi", "Help", 0, QApplication::UnicodeUTF8)); Q_UNUSED(CreateBoundaryDi); } // retranslateUi @@ -142,6 +147,4 @@ namespace Ui { class CreateBoundaryDi: public Ui_CreateBoundaryDi {}; } // namespace Ui -QT_END_NAMESPACE - #endif // CREATEBOUNDARYDI_H diff --git a/src/HOMARDGUI/CreateBoundaryDi.ui b/src/HOMARDGUI/CreateBoundaryDi.ui index b97931d9..5df5cb02 100644 --- a/src/HOMARDGUI/CreateBoundaryDi.ui +++ b/src/HOMARDGUI/CreateBoundaryDi.ui @@ -10,21 +10,29 @@ - + + 0 + 0 0 0 - Create Discrete Boundary + Create a discrete boundary - false + true true - + + + 9 + + + 6 + @@ -81,32 +89,38 @@ - + + + 9 + + + 6 + - &Ok + OK - &Apply + Apply - &Cancel + Cancel - &Help + Help diff --git a/src/HOMARDGUI/CreateCase.h b/src/HOMARDGUI/CreateCase.h index 88f472cd..44a27c33 100644 --- a/src/HOMARDGUI/CreateCase.h +++ b/src/HOMARDGUI/CreateCase.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading ui file 'CreateCase.ui' ** -** Created: Mon Jan 31 13:48:20 2011 +** Created: Tue Mar 15 09:25:40 2011 ** by: Qt User Interface Compiler version 4.2.1 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! @@ -364,13 +364,13 @@ public: void retranslateUi(QDialog *CreateCase) { - CreateCase->setWindowTitle(QApplication::translate("CreateCase", "Create Case", 0, QApplication::UnicodeUTF8)); + CreateCase->setWindowTitle(QApplication::translate("CreateCase", "Create a case", 0, QApplication::UnicodeUTF8)); GroupButtons->setTitle(QString()); - buttonOk->setText(QApplication::translate("CreateCase", "&Ok", 0, QApplication::UnicodeUTF8)); - buttonApply->setText(QApplication::translate("CreateCase", "&Apply", 0, QApplication::UnicodeUTF8)); - buttonCancel->setText(QApplication::translate("CreateCase", "&Cancel", 0, QApplication::UnicodeUTF8)); - buttonHelp->setText(QApplication::translate("CreateCase", "&Help", 0, QApplication::UnicodeUTF8)); - GBBoundaryA->setTitle(QApplication::translate("CreateCase", "Analytic Boundary", 0, QApplication::UnicodeUTF8)); + buttonOk->setText(QApplication::translate("CreateCase", "OK", 0, QApplication::UnicodeUTF8)); + buttonApply->setText(QApplication::translate("CreateCase", "Apply", 0, QApplication::UnicodeUTF8)); + buttonCancel->setText(QApplication::translate("CreateCase", "Cancel", 0, QApplication::UnicodeUTF8)); + buttonHelp->setText(QApplication::translate("CreateCase", "Help", 0, QApplication::UnicodeUTF8)); + GBBoundaryA->setTitle(QApplication::translate("CreateCase", "Analytical boundary", 0, QApplication::UnicodeUTF8)); PBBoundaryAnNew->setText(QApplication::translate("CreateCase", "New", 0, QApplication::UnicodeUTF8)); PBBoundaryAnHelp->setText(QApplication::translate("CreateCase", "Help", 0, QApplication::UnicodeUTF8)); if (TWBoundary->columnCount() < 1) @@ -384,16 +384,16 @@ public: PushDir->setText(QString()); Mesh_2->setText(QApplication::translate("CreateCase", "Mesh", 0, QApplication::UnicodeUTF8)); PushFichier->setText(QString()); - GBTypeConf->setTitle(QApplication::translate("CreateCase", "Conformity Type", 0, QApplication::UnicodeUTF8)); + GBTypeConf->setTitle(QApplication::translate("CreateCase", "Conformity type", 0, QApplication::UnicodeUTF8)); RBConforme->setText(QApplication::translate("CreateCase", "Conformal", 0, QApplication::UnicodeUTF8)); RBNonConforme->setText(QApplication::translate("CreateCase", "Non conformal", 0, QApplication::UnicodeUTF8)); - GBTypeNoConf->setTitle(QApplication::translate("CreateCase", "Non Conformal option", 0, QApplication::UnicodeUTF8)); + GBTypeNoConf->setTitle(QApplication::translate("CreateCase", "Non conformal option", 0, QApplication::UnicodeUTF8)); RB1NpM->setText(QApplication::translate("CreateCase", "1 hanging node per mesh", 0, QApplication::UnicodeUTF8)); RB1NpA->setText(QApplication::translate("CreateCase", "1 node per edge", 0, QApplication::UnicodeUTF8)); - RBQuelconque->setText(QApplication::translate("CreateCase", "free", 0, QApplication::UnicodeUTF8)); - CBBoundaryD->setText(QApplication::translate("CreateCase", "Discrete Boundary ", 0, QApplication::UnicodeUTF8)); - CBBoundaryA->setText(QApplication::translate("CreateCase", "Analytic Boundary ", 0, QApplication::UnicodeUTF8)); - GBBoundaryD->setTitle(QApplication::translate("CreateCase", "Discrete Boundary", 0, QApplication::UnicodeUTF8)); + RBQuelconque->setText(QApplication::translate("CreateCase", "Free", 0, QApplication::UnicodeUTF8)); + CBBoundaryD->setText(QApplication::translate("CreateCase", "Discrete boundary", 0, QApplication::UnicodeUTF8)); + CBBoundaryA->setText(QApplication::translate("CreateCase", "Analytical boundary", 0, QApplication::UnicodeUTF8)); + GBBoundaryD->setTitle(QApplication::translate("CreateCase", "Discrete boundary", 0, QApplication::UnicodeUTF8)); PBBoundaryDiHelp->setText(QApplication::translate("CreateCase", "Help", 0, QApplication::UnicodeUTF8)); PBBoundaryDiNew->setText(QApplication::translate("CreateCase", "New", 0, QApplication::UnicodeUTF8)); PBBoundaryDiEdit->setText(QApplication::translate("CreateCase", "Edit", 0, QApplication::UnicodeUTF8)); diff --git a/src/HOMARDGUI/CreateCase.ui b/src/HOMARDGUI/CreateCase.ui index 4bc2dd16..64884b5c 100644 --- a/src/HOMARDGUI/CreateCase.ui +++ b/src/HOMARDGUI/CreateCase.ui @@ -18,7 +18,7 @@ - Create Case + Create a case true @@ -45,7 +45,7 @@ - &Ok + OK false @@ -55,7 +55,7 @@ - &Apply + Apply false @@ -65,7 +65,7 @@ - &Cancel + Cancel false @@ -75,7 +75,7 @@ - &Help + Help false @@ -94,7 +94,7 @@ - Analytic Boundary + Analytical boundary @@ -280,7 +280,7 @@ - Conformity Type + Conformity type @@ -325,7 +325,7 @@ - Non Conformal option + Non conformal option @@ -351,7 +351,7 @@ - free + Free @@ -382,14 +382,14 @@ - Discrete Boundary + Discrete boundary - Analytic Boundary + Analytical boundary @@ -432,7 +432,7 @@ - Discrete Boundary + Discrete boundary diff --git a/src/HOMARDGUI/CreateHypothesis.h b/src/HOMARDGUI/CreateHypothesis.h index dc3fa573..edac2890 100644 --- a/src/HOMARDGUI/CreateHypothesis.h +++ b/src/HOMARDGUI/CreateHypothesis.h @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'CreateHypothesis.ui' ** -** Created: Thu Nov 18 15:21:42 2010 -** by: Qt User Interface Compiler version 4.4.3 +** Created: Tue Mar 15 11:33:40 2011 +** by: Qt User Interface Compiler version 4.2.1 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -29,43 +29,41 @@ #include #include -QT_BEGIN_NAMESPACE - class Ui_CreateHypothesis { public: - QGridLayout *gridLayout_10; + QGridLayout *gridLayout; QLabel *Name; QLineEdit *LEHypothesisName; QGroupBox *GBTypeAdaptation; - QHBoxLayout *horizontalLayout; + QHBoxLayout *hboxLayout; QRadioButton *RBUniforme; QRadioButton *RBChamp; QRadioButton *RBZone; QGroupBox *GBUniform; - QGridLayout *gridLayout_2; + QGridLayout *gridLayout1; QRadioButton *RBUniDera; QRadioButton *RBUniRaff; QGroupBox *GBFieldFile; - QGridLayout *gridLayout_9; + QGridLayout *gridLayout2; QLabel *FieldFile; QLineEdit *LEFieldFile; QGroupBox *GBFieldManagement; - QGridLayout *gridLayout_6; - QHBoxLayout *horizontalLayout_6; + QGridLayout *gridLayout3; + QHBoxLayout *hboxLayout1; QLabel *FieldName; QComboBox *CBFieldName; - QSpacerItem *horizontalSpacer_3; - QHBoxLayout *horizontalLayout_7; + QSpacerItem *spacerItem; + QHBoxLayout *hboxLayout2; QTableWidget *TWCMP; - QSpacerItem *horizontalSpacer_4; - QVBoxLayout *verticalLayout_3; - QHBoxLayout *horizontalLayout_3; + QSpacerItem *spacerItem1; + QVBoxLayout *vboxLayout; + QHBoxLayout *hboxLayout3; QRadioButton *RBL2; QRadioButton *RBInf; - QHBoxLayout *horizontalLayout_2; + QHBoxLayout *hboxLayout4; QGroupBox *GBRefinementThresholds; - QGridLayout *gridLayout; + QGridLayout *gridLayout4; QRadioButton *RBRPE; QDoubleSpinBox *SpinBox_RPE; QRadioButton *RBRRel; @@ -74,7 +72,7 @@ public: QDoubleSpinBox *SpinBox_RAbs; QRadioButton *RBRNo; QGroupBox *GBCoarseningThresholds; - QGridLayout *gridLayout_4; + QGridLayout *gridLayout5; QRadioButton *RBCPE; QDoubleSpinBox *SpinBox_CPE; QRadioButton *RBCRel; @@ -83,24 +81,24 @@ public: QDoubleSpinBox *SpinBox_CAbs; QRadioButton *RBCNo; QGroupBox *GBAreaManagement; - QGridLayout *gridLayout_3; + QGridLayout *gridLayout6; QTableWidget *TWZone; - QVBoxLayout *verticalLayout_2; - QVBoxLayout *verticalLayout; + QVBoxLayout *vboxLayout1; + QVBoxLayout *vboxLayout2; QPushButton *PBZoneNew; QPushButton *PBZoneEdit; QPushButton *PBZoneDelete; - QSpacerItem *verticalSpacer; + QSpacerItem *spacerItem2; QGroupBox *GBField; - QGridLayout *gridLayout_8; - QGridLayout *gridLayout_7; + QGridLayout *gridLayout7; + QGridLayout *gridLayout8; QRadioButton *RBFieldNo; QRadioButton *RBFieldAll; QRadioButton *RBFieldChosen; QTableWidget *TWField; QCheckBox *CBGroupe; QGroupBox *GBButtons; - QGridLayout *gridLayout_5; + QGridLayout *gridLayout9; QPushButton *buttonOk; QPushButton *buttonApply; QPushButton *buttonCancel; @@ -108,181 +106,201 @@ public: void setupUi(QDialog *CreateHypothesis) { - if (CreateHypothesis->objectName().isEmpty()) - CreateHypothesis->setObjectName(QString::fromUtf8("CreateHypothesis")); - CreateHypothesis->resize(717, 1005); - QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + CreateHypothesis->setObjectName(QString::fromUtf8("CreateHypothesis")); + QSizePolicy sizePolicy(static_cast(0), static_cast(0)); sizePolicy.setHorizontalStretch(0); sizePolicy.setVerticalStretch(0); sizePolicy.setHeightForWidth(CreateHypothesis->sizePolicy().hasHeightForWidth()); CreateHypothesis->setSizePolicy(sizePolicy); - CreateHypothesis->setAutoFillBackground(false); + CreateHypothesis->setAutoFillBackground(true); CreateHypothesis->setSizeGripEnabled(true); - gridLayout_10 = new QGridLayout(CreateHypothesis); - gridLayout_10->setObjectName(QString::fromUtf8("gridLayout_10")); + gridLayout = new QGridLayout(CreateHypothesis); + gridLayout->setSpacing(6); + gridLayout->setMargin(9); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); Name = new QLabel(CreateHypothesis); Name->setObjectName(QString::fromUtf8("Name")); - gridLayout_10->addWidget(Name, 0, 0, 1, 1); + gridLayout->addWidget(Name, 0, 0, 1, 1); LEHypothesisName = new QLineEdit(CreateHypothesis); LEHypothesisName->setObjectName(QString::fromUtf8("LEHypothesisName")); LEHypothesisName->setMinimumSize(QSize(382, 31)); LEHypothesisName->setMaxLength(32); - gridLayout_10->addWidget(LEHypothesisName, 0, 1, 1, 1); + gridLayout->addWidget(LEHypothesisName, 0, 1, 1, 1); GBTypeAdaptation = new QGroupBox(CreateHypothesis); GBTypeAdaptation->setObjectName(QString::fromUtf8("GBTypeAdaptation")); - horizontalLayout = new QHBoxLayout(GBTypeAdaptation); - horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); + hboxLayout = new QHBoxLayout(GBTypeAdaptation); + hboxLayout->setSpacing(6); + hboxLayout->setMargin(9); + hboxLayout->setObjectName(QString::fromUtf8("hboxLayout")); RBUniforme = new QRadioButton(GBTypeAdaptation); RBUniforme->setObjectName(QString::fromUtf8("RBUniforme")); RBUniforme->setCheckable(true); - horizontalLayout->addWidget(RBUniforme); + hboxLayout->addWidget(RBUniforme); RBChamp = new QRadioButton(GBTypeAdaptation); RBChamp->setObjectName(QString::fromUtf8("RBChamp")); - horizontalLayout->addWidget(RBChamp); + hboxLayout->addWidget(RBChamp); RBZone = new QRadioButton(GBTypeAdaptation); RBZone->setObjectName(QString::fromUtf8("RBZone")); - horizontalLayout->addWidget(RBZone); + hboxLayout->addWidget(RBZone); - gridLayout_10->addWidget(GBTypeAdaptation, 1, 0, 1, 2); + gridLayout->addWidget(GBTypeAdaptation, 1, 0, 1, 2); GBUniform = new QGroupBox(CreateHypothesis); GBUniform->setObjectName(QString::fromUtf8("GBUniform")); - gridLayout_2 = new QGridLayout(GBUniform); - gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2")); + gridLayout1 = new QGridLayout(GBUniform); + gridLayout1->setSpacing(6); + gridLayout1->setMargin(9); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); RBUniDera = new QRadioButton(GBUniform); RBUniDera->setObjectName(QString::fromUtf8("RBUniDera")); - gridLayout_2->addWidget(RBUniDera, 0, 1, 1, 1); + gridLayout1->addWidget(RBUniDera, 0, 1, 1, 1); RBUniRaff = new QRadioButton(GBUniform); RBUniRaff->setObjectName(QString::fromUtf8("RBUniRaff")); RBUniRaff->setChecked(true); - gridLayout_2->addWidget(RBUniRaff, 0, 0, 1, 1); + gridLayout1->addWidget(RBUniRaff, 0, 0, 1, 1); - gridLayout_10->addWidget(GBUniform, 2, 0, 1, 2); + gridLayout->addWidget(GBUniform, 2, 0, 1, 2); GBFieldFile = new QGroupBox(CreateHypothesis); GBFieldFile->setObjectName(QString::fromUtf8("GBFieldFile")); - gridLayout_9 = new QGridLayout(GBFieldFile); - gridLayout_9->setObjectName(QString::fromUtf8("gridLayout_9")); + gridLayout2 = new QGridLayout(GBFieldFile); + gridLayout2->setSpacing(6); + gridLayout2->setMargin(9); + gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); FieldFile = new QLabel(GBFieldFile); FieldFile->setObjectName(QString::fromUtf8("FieldFile")); - gridLayout_9->addWidget(FieldFile, 0, 0, 1, 1); + gridLayout2->addWidget(FieldFile, 0, 0, 1, 1); LEFieldFile = new QLineEdit(GBFieldFile); LEFieldFile->setObjectName(QString::fromUtf8("LEFieldFile")); LEFieldFile->setMinimumSize(QSize(282, 31)); - gridLayout_9->addWidget(LEFieldFile, 0, 1, 1, 1); + gridLayout2->addWidget(LEFieldFile, 0, 1, 1, 1); - gridLayout_10->addWidget(GBFieldFile, 3, 0, 1, 2); + gridLayout->addWidget(GBFieldFile, 3, 0, 1, 2); GBFieldManagement = new QGroupBox(CreateHypothesis); GBFieldManagement->setObjectName(QString::fromUtf8("GBFieldManagement")); - sizePolicy.setHeightForWidth(GBFieldManagement->sizePolicy().hasHeightForWidth()); - GBFieldManagement->setSizePolicy(sizePolicy); - gridLayout_6 = new QGridLayout(GBFieldManagement); - gridLayout_6->setObjectName(QString::fromUtf8("gridLayout_6")); - horizontalLayout_6 = new QHBoxLayout(); - horizontalLayout_6->setObjectName(QString::fromUtf8("horizontalLayout_6")); + QSizePolicy sizePolicy1(static_cast(0), static_cast(0)); + sizePolicy1.setHorizontalStretch(0); + sizePolicy1.setVerticalStretch(0); + sizePolicy1.setHeightForWidth(GBFieldManagement->sizePolicy().hasHeightForWidth()); + GBFieldManagement->setSizePolicy(sizePolicy1); + gridLayout3 = new QGridLayout(GBFieldManagement); + gridLayout3->setSpacing(6); + gridLayout3->setMargin(9); + gridLayout3->setObjectName(QString::fromUtf8("gridLayout3")); + hboxLayout1 = new QHBoxLayout(); + hboxLayout1->setSpacing(6); + hboxLayout1->setMargin(0); + hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1")); FieldName = new QLabel(GBFieldManagement); FieldName->setObjectName(QString::fromUtf8("FieldName")); - horizontalLayout_6->addWidget(FieldName); + hboxLayout1->addWidget(FieldName); CBFieldName = new QComboBox(GBFieldManagement); CBFieldName->setObjectName(QString::fromUtf8("CBFieldName")); - QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Fixed); - sizePolicy1.setHorizontalStretch(0); - sizePolicy1.setVerticalStretch(0); - sizePolicy1.setHeightForWidth(CBFieldName->sizePolicy().hasHeightForWidth()); - CBFieldName->setSizePolicy(sizePolicy1); + QSizePolicy sizePolicy2(static_cast(0), static_cast(0)); + sizePolicy2.setHorizontalStretch(0); + sizePolicy2.setVerticalStretch(0); + sizePolicy2.setHeightForWidth(CBFieldName->sizePolicy().hasHeightForWidth()); + CBFieldName->setSizePolicy(sizePolicy2); CBFieldName->setEditable(false); CBFieldName->setSizeAdjustPolicy(QComboBox::AdjustToContents); - horizontalLayout_6->addWidget(CBFieldName); + hboxLayout1->addWidget(CBFieldName); - horizontalSpacer_3 = new QSpacerItem(48, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + spacerItem = new QSpacerItem(48, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - horizontalLayout_6->addItem(horizontalSpacer_3); + hboxLayout1->addItem(spacerItem); - gridLayout_6->addLayout(horizontalLayout_6, 0, 0, 1, 1); + gridLayout3->addLayout(hboxLayout1, 0, 0, 1, 1); - horizontalLayout_7 = new QHBoxLayout(); - horizontalLayout_7->setObjectName(QString::fromUtf8("horizontalLayout_7")); + hboxLayout2 = new QHBoxLayout(); + hboxLayout2->setSpacing(6); + hboxLayout2->setMargin(0); + hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2")); TWCMP = new QTableWidget(GBFieldManagement); - if (TWCMP->columnCount() < 2) - TWCMP->setColumnCount(2); - QTableWidgetItem *__colItem = new QTableWidgetItem(); - TWCMP->setHorizontalHeaderItem(0, __colItem); - QTableWidgetItem *__colItem1 = new QTableWidgetItem(); - TWCMP->setHorizontalHeaderItem(1, __colItem1); TWCMP->setObjectName(QString::fromUtf8("TWCMP")); - TWCMP->setEditTriggers(QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked); + TWCMP->setEditTriggers(QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::NoEditTriggers|QAbstractItemView::SelectedClicked); TWCMP->setShowGrid(true); TWCMP->setRowCount(0); TWCMP->setColumnCount(2); - horizontalLayout_7->addWidget(TWCMP); + hboxLayout2->addWidget(TWCMP); - horizontalSpacer_4 = new QSpacerItem(60, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); + spacerItem1 = new QSpacerItem(60, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - horizontalLayout_7->addItem(horizontalSpacer_4); + hboxLayout2->addItem(spacerItem1); - verticalLayout_3 = new QVBoxLayout(); - verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3")); - horizontalLayout_3 = new QHBoxLayout(); - horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3")); + vboxLayout = new QVBoxLayout(); + vboxLayout->setSpacing(6); + vboxLayout->setMargin(0); + vboxLayout->setObjectName(QString::fromUtf8("vboxLayout")); + hboxLayout3 = new QHBoxLayout(); + hboxLayout3->setSpacing(6); + hboxLayout3->setMargin(0); + hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3")); RBL2 = new QRadioButton(GBFieldManagement); RBL2->setObjectName(QString::fromUtf8("RBL2")); RBL2->setChecked(true); - horizontalLayout_3->addWidget(RBL2); + hboxLayout3->addWidget(RBL2); RBInf = new QRadioButton(GBFieldManagement); RBInf->setObjectName(QString::fromUtf8("RBInf")); RBInf->setChecked(false); - horizontalLayout_3->addWidget(RBInf); + hboxLayout3->addWidget(RBInf); - verticalLayout_3->addLayout(horizontalLayout_3); + vboxLayout->addLayout(hboxLayout3); - horizontalLayout_7->addLayout(verticalLayout_3); + hboxLayout2->addLayout(vboxLayout); - gridLayout_6->addLayout(horizontalLayout_7, 1, 0, 1, 1); + gridLayout3->addLayout(hboxLayout2, 1, 0, 1, 1); - horizontalLayout_2 = new QHBoxLayout(); - horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2")); + hboxLayout4 = new QHBoxLayout(); + hboxLayout4->setSpacing(6); + hboxLayout4->setMargin(0); + hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4")); GBRefinementThresholds = new QGroupBox(GBFieldManagement); GBRefinementThresholds->setObjectName(QString::fromUtf8("GBRefinementThresholds")); - sizePolicy.setHeightForWidth(GBRefinementThresholds->sizePolicy().hasHeightForWidth()); - GBRefinementThresholds->setSizePolicy(sizePolicy); - gridLayout = new QGridLayout(GBRefinementThresholds); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + QSizePolicy sizePolicy3(static_cast(0), static_cast(0)); + sizePolicy3.setHorizontalStretch(0); + sizePolicy3.setVerticalStretch(0); + sizePolicy3.setHeightForWidth(GBRefinementThresholds->sizePolicy().hasHeightForWidth()); + GBRefinementThresholds->setSizePolicy(sizePolicy3); + gridLayout4 = new QGridLayout(GBRefinementThresholds); + gridLayout4->setSpacing(6); + gridLayout4->setMargin(9); + gridLayout4->setObjectName(QString::fromUtf8("gridLayout4")); RBRPE = new QRadioButton(GBRefinementThresholds); RBRPE->setObjectName(QString::fromUtf8("RBRPE")); RBRPE->setCheckable(true); RBRPE->setChecked(true); - gridLayout->addWidget(RBRPE, 0, 0, 1, 1); + gridLayout4->addWidget(RBRPE, 0, 0, 1, 1); SpinBox_RPE = new QDoubleSpinBox(GBRefinementThresholds); SpinBox_RPE->setObjectName(QString::fromUtf8("SpinBox_RPE")); @@ -291,12 +309,12 @@ public: SpinBox_RPE->setSingleStep(0.1); SpinBox_RPE->setValue(3); - gridLayout->addWidget(SpinBox_RPE, 0, 1, 1, 1); + gridLayout4->addWidget(SpinBox_RPE, 0, 1, 1, 1); RBRRel = new QRadioButton(GBRefinementThresholds); RBRRel->setObjectName(QString::fromUtf8("RBRRel")); - gridLayout->addWidget(RBRRel, 1, 0, 1, 1); + gridLayout4->addWidget(RBRRel, 1, 0, 1, 1); SpinBox_RRel = new QDoubleSpinBox(GBRefinementThresholds); SpinBox_RRel->setObjectName(QString::fromUtf8("SpinBox_RRel")); @@ -305,12 +323,12 @@ public: SpinBox_RRel->setMaximum(100); SpinBox_RRel->setSingleStep(0.1); - gridLayout->addWidget(SpinBox_RRel, 1, 1, 1, 1); + gridLayout4->addWidget(SpinBox_RRel, 1, 1, 1, 1); RBRAbs = new QRadioButton(GBRefinementThresholds); RBRAbs->setObjectName(QString::fromUtf8("RBRAbs")); - gridLayout->addWidget(RBRAbs, 2, 0, 1, 1); + gridLayout4->addWidget(RBRAbs, 2, 0, 1, 1); SpinBox_RAbs = new QDoubleSpinBox(GBRefinementThresholds); SpinBox_RAbs->setObjectName(QString::fromUtf8("SpinBox_RAbs")); @@ -319,26 +337,28 @@ public: SpinBox_RAbs->setMaximum(100); SpinBox_RAbs->setSingleStep(0.1); - gridLayout->addWidget(SpinBox_RAbs, 2, 1, 1, 1); + gridLayout4->addWidget(SpinBox_RAbs, 2, 1, 1, 1); RBRNo = new QRadioButton(GBRefinementThresholds); RBRNo->setObjectName(QString::fromUtf8("RBRNo")); - gridLayout->addWidget(RBRNo, 3, 0, 1, 1); + gridLayout4->addWidget(RBRNo, 3, 0, 1, 1); - horizontalLayout_2->addWidget(GBRefinementThresholds); + hboxLayout4->addWidget(GBRefinementThresholds); GBCoarseningThresholds = new QGroupBox(GBFieldManagement); GBCoarseningThresholds->setObjectName(QString::fromUtf8("GBCoarseningThresholds")); - gridLayout_4 = new QGridLayout(GBCoarseningThresholds); - gridLayout_4->setObjectName(QString::fromUtf8("gridLayout_4")); + gridLayout5 = new QGridLayout(GBCoarseningThresholds); + gridLayout5->setSpacing(6); + gridLayout5->setMargin(9); + gridLayout5->setObjectName(QString::fromUtf8("gridLayout5")); RBCPE = new QRadioButton(GBCoarseningThresholds); RBCPE->setObjectName(QString::fromUtf8("RBCPE")); RBCPE->setCheckable(true); RBCPE->setChecked(false); - gridLayout_4->addWidget(RBCPE, 0, 0, 1, 1); + gridLayout5->addWidget(RBCPE, 0, 0, 1, 1); SpinBox_CPE = new QDoubleSpinBox(GBCoarseningThresholds); SpinBox_CPE->setObjectName(QString::fromUtf8("SpinBox_CPE")); @@ -347,12 +367,12 @@ public: SpinBox_CPE->setMaximum(100); SpinBox_CPE->setSingleStep(0.1); - gridLayout_4->addWidget(SpinBox_CPE, 0, 1, 1, 1); + gridLayout5->addWidget(SpinBox_CPE, 0, 1, 1, 1); RBCRel = new QRadioButton(GBCoarseningThresholds); RBCRel->setObjectName(QString::fromUtf8("RBCRel")); - gridLayout_4->addWidget(RBCRel, 1, 0, 1, 1); + gridLayout5->addWidget(RBCRel, 1, 0, 1, 1); SpinBox_CRel = new QDoubleSpinBox(GBCoarseningThresholds); SpinBox_CRel->setObjectName(QString::fromUtf8("SpinBox_CRel")); @@ -361,12 +381,12 @@ public: SpinBox_CRel->setMaximum(100); SpinBox_CRel->setSingleStep(0.1); - gridLayout_4->addWidget(SpinBox_CRel, 1, 1, 1, 1); + gridLayout5->addWidget(SpinBox_CRel, 1, 1, 1, 1); RBCAbs = new QRadioButton(GBCoarseningThresholds); RBCAbs->setObjectName(QString::fromUtf8("RBCAbs")); - gridLayout_4->addWidget(RBCAbs, 2, 0, 1, 1); + gridLayout5->addWidget(RBCAbs, 2, 0, 1, 1); SpinBox_CAbs = new QDoubleSpinBox(GBCoarseningThresholds); SpinBox_CAbs->setObjectName(QString::fromUtf8("SpinBox_CAbs")); @@ -375,165 +395,170 @@ public: SpinBox_CAbs->setMaximum(100); SpinBox_CAbs->setSingleStep(0.1); - gridLayout_4->addWidget(SpinBox_CAbs, 2, 1, 1, 1); + gridLayout5->addWidget(SpinBox_CAbs, 2, 1, 1, 1); RBCNo = new QRadioButton(GBCoarseningThresholds); RBCNo->setObjectName(QString::fromUtf8("RBCNo")); RBCNo->setChecked(true); - gridLayout_4->addWidget(RBCNo, 3, 0, 1, 1); + gridLayout5->addWidget(RBCNo, 3, 0, 1, 1); - horizontalLayout_2->addWidget(GBCoarseningThresholds); + hboxLayout4->addWidget(GBCoarseningThresholds); - gridLayout_6->addLayout(horizontalLayout_2, 2, 0, 1, 1); + gridLayout3->addLayout(hboxLayout4, 2, 0, 1, 1); - gridLayout_10->addWidget(GBFieldManagement, 4, 0, 1, 2); + gridLayout->addWidget(GBFieldManagement, 4, 0, 1, 2); GBAreaManagement = new QGroupBox(CreateHypothesis); GBAreaManagement->setObjectName(QString::fromUtf8("GBAreaManagement")); - sizePolicy.setHeightForWidth(GBAreaManagement->sizePolicy().hasHeightForWidth()); - GBAreaManagement->setSizePolicy(sizePolicy); - gridLayout_3 = new QGridLayout(GBAreaManagement); - gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3")); - - - + QSizePolicy sizePolicy4(static_cast(0), static_cast(0)); + sizePolicy4.setHorizontalStretch(0); + sizePolicy4.setVerticalStretch(0); + sizePolicy4.setHeightForWidth(GBAreaManagement->sizePolicy().hasHeightForWidth()); + GBAreaManagement->setSizePolicy(sizePolicy4); + gridLayout6 = new QGridLayout(GBAreaManagement); + gridLayout6->setSpacing(6); + gridLayout6->setMargin(9); + gridLayout6->setObjectName(QString::fromUtf8("gridLayout6")); TWZone = new QTableWidget(GBAreaManagement); - if (TWZone->columnCount() < 2) - TWZone->setColumnCount(2); - QTableWidgetItem *__colItem2 = new QTableWidgetItem(); - TWZone->setHorizontalHeaderItem(0, __colItem2); - QTableWidgetItem *__colItem3 = new QTableWidgetItem(); - TWZone->setHorizontalHeaderItem(1, __colItem3); TWZone->setObjectName(QString::fromUtf8("TWZone")); - TWZone->setEditTriggers(QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked); + TWZone->setEditTriggers(QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::NoEditTriggers|QAbstractItemView::SelectedClicked); TWZone->setShowGrid(true); TWZone->setRowCount(0); TWZone->setColumnCount(2); - gridLayout_3->addWidget(TWZone, 0, 0, 1, 1); + gridLayout6->addWidget(TWZone, 0, 0, 1, 1); - verticalLayout_2 = new QVBoxLayout(); - verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2")); - verticalLayout = new QVBoxLayout(); - verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); + vboxLayout1 = new QVBoxLayout(); + vboxLayout1->setSpacing(6); + vboxLayout1->setMargin(0); + vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1")); + vboxLayout2 = new QVBoxLayout(); + vboxLayout2->setSpacing(6); + vboxLayout2->setMargin(0); + vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2")); PBZoneNew = new QPushButton(GBAreaManagement); PBZoneNew->setObjectName(QString::fromUtf8("PBZoneNew")); - verticalLayout->addWidget(PBZoneNew); + vboxLayout2->addWidget(PBZoneNew); PBZoneEdit = new QPushButton(GBAreaManagement); PBZoneEdit->setObjectName(QString::fromUtf8("PBZoneEdit")); - verticalLayout->addWidget(PBZoneEdit); + vboxLayout2->addWidget(PBZoneEdit); PBZoneDelete = new QPushButton(GBAreaManagement); PBZoneDelete->setObjectName(QString::fromUtf8("PBZoneDelete")); - verticalLayout->addWidget(PBZoneDelete); + vboxLayout2->addWidget(PBZoneDelete); - verticalLayout_2->addLayout(verticalLayout); + vboxLayout1->addLayout(vboxLayout2); - verticalSpacer = new QSpacerItem(20, 48, QSizePolicy::Minimum, QSizePolicy::Expanding); + spacerItem2 = new QSpacerItem(20, 48, QSizePolicy::Minimum, QSizePolicy::Expanding); - verticalLayout_2->addItem(verticalSpacer); + vboxLayout1->addItem(spacerItem2); - gridLayout_3->addLayout(verticalLayout_2, 0, 1, 1, 1); + gridLayout6->addLayout(vboxLayout1, 0, 1, 1, 1); - gridLayout_10->addWidget(GBAreaManagement, 5, 0, 1, 2); + gridLayout->addWidget(GBAreaManagement, 5, 0, 1, 2); GBField = new QGroupBox(CreateHypothesis); GBField->setObjectName(QString::fromUtf8("GBField")); - gridLayout_8 = new QGridLayout(GBField); - gridLayout_8->setObjectName(QString::fromUtf8("gridLayout_8")); - gridLayout_7 = new QGridLayout(); - gridLayout_7->setObjectName(QString::fromUtf8("gridLayout_7")); + gridLayout7 = new QGridLayout(GBField); + gridLayout7->setSpacing(6); + gridLayout7->setMargin(9); + gridLayout7->setObjectName(QString::fromUtf8("gridLayout7")); + gridLayout8 = new QGridLayout(); + gridLayout8->setSpacing(6); + gridLayout8->setMargin(0); + gridLayout8->setObjectName(QString::fromUtf8("gridLayout8")); RBFieldNo = new QRadioButton(GBField); RBFieldNo->setObjectName(QString::fromUtf8("RBFieldNo")); RBFieldNo->setChecked(true); - gridLayout_7->addWidget(RBFieldNo, 0, 0, 1, 1); + gridLayout8->addWidget(RBFieldNo, 0, 0, 1, 1); RBFieldAll = new QRadioButton(GBField); RBFieldAll->setObjectName(QString::fromUtf8("RBFieldAll")); RBFieldAll->setChecked(false); - gridLayout_7->addWidget(RBFieldAll, 0, 1, 1, 1); + gridLayout8->addWidget(RBFieldAll, 0, 1, 1, 1); RBFieldChosen = new QRadioButton(GBField); RBFieldChosen->setObjectName(QString::fromUtf8("RBFieldChosen")); RBFieldChosen->setChecked(false); - gridLayout_7->addWidget(RBFieldChosen, 0, 2, 1, 1); + gridLayout8->addWidget(RBFieldChosen, 0, 2, 1, 1); - gridLayout_8->addLayout(gridLayout_7, 0, 0, 1, 1); + gridLayout7->addLayout(gridLayout8, 0, 0, 1, 1); TWField = new QTableWidget(GBField); - if (TWField->columnCount() < 2) - TWField->setColumnCount(2); - QTableWidgetItem *__colItem4 = new QTableWidgetItem(); - TWField->setHorizontalHeaderItem(0, __colItem4); - QTableWidgetItem *__colItem5 = new QTableWidgetItem(); - TWField->setHorizontalHeaderItem(1, __colItem5); TWField->setObjectName(QString::fromUtf8("TWField")); - gridLayout_8->addWidget(TWField, 1, 0, 1, 1); + gridLayout7->addWidget(TWField, 1, 0, 1, 1); - gridLayout_10->addWidget(GBField, 6, 0, 1, 2); + gridLayout->addWidget(GBField, 6, 0, 1, 2); CBGroupe = new QCheckBox(CreateHypothesis); CBGroupe->setObjectName(QString::fromUtf8("CBGroupe")); - gridLayout_10->addWidget(CBGroupe, 7, 0, 1, 2); + gridLayout->addWidget(CBGroupe, 7, 0, 1, 2); GBButtons = new QGroupBox(CreateHypothesis); GBButtons->setObjectName(QString::fromUtf8("GBButtons")); - gridLayout_5 = new QGridLayout(GBButtons); - gridLayout_5->setObjectName(QString::fromUtf8("gridLayout_5")); + gridLayout9 = new QGridLayout(GBButtons); + gridLayout9->setSpacing(6); + gridLayout9->setMargin(9); + gridLayout9->setObjectName(QString::fromUtf8("gridLayout9")); buttonOk = new QPushButton(GBButtons); buttonOk->setObjectName(QString::fromUtf8("buttonOk")); - gridLayout_5->addWidget(buttonOk, 0, 0, 1, 1); + gridLayout9->addWidget(buttonOk, 0, 0, 1, 1); buttonApply = new QPushButton(GBButtons); buttonApply->setObjectName(QString::fromUtf8("buttonApply")); - gridLayout_5->addWidget(buttonApply, 0, 1, 1, 1); + gridLayout9->addWidget(buttonApply, 0, 1, 1, 1); buttonCancel = new QPushButton(GBButtons); buttonCancel->setObjectName(QString::fromUtf8("buttonCancel")); - gridLayout_5->addWidget(buttonCancel, 0, 2, 1, 1); + gridLayout9->addWidget(buttonCancel, 0, 2, 1, 1); buttonHelp = new QPushButton(GBButtons); buttonHelp->setObjectName(QString::fromUtf8("buttonHelp")); - gridLayout_5->addWidget(buttonHelp, 0, 3, 1, 1); + gridLayout9->addWidget(buttonHelp, 0, 3, 1, 1); - gridLayout_10->addWidget(GBButtons, 8, 0, 1, 2); + gridLayout->addWidget(GBButtons, 8, 0, 1, 2); retranslateUi(CreateHypothesis); + QSize size(717, 1166); + size = size.expandedTo(CreateHypothesis->minimumSizeHint()); + CreateHypothesis->resize(size); + + QMetaObject::connectSlotsByName(CreateHypothesis); } // setupUi void retranslateUi(QDialog *CreateHypothesis) { - CreateHypothesis->setWindowTitle(QApplication::translate("CreateHypothesis", "Create Hypothesis", 0, QApplication::UnicodeUTF8)); + CreateHypothesis->setWindowTitle(QApplication::translate("CreateHypothesis", "Create an hypothesis", 0, QApplication::UnicodeUTF8)); Name->setText(QApplication::translate("CreateHypothesis", "Name", 0, QApplication::UnicodeUTF8)); GBTypeAdaptation->setTitle(QApplication::translate("CreateHypothesis", "Type of adaptation", 0, QApplication::UnicodeUTF8)); RBUniforme->setText(QApplication::translate("CreateHypothesis", "Uniform", 0, QApplication::UnicodeUTF8)); - RBChamp->setText(QApplication::translate("CreateHypothesis", "Following a field", 0, QApplication::UnicodeUTF8)); + RBChamp->setText(QApplication::translate("CreateHypothesis", "Driven by a field", 0, QApplication::UnicodeUTF8)); RBZone->setText(QApplication::translate("CreateHypothesis", "With geometrical zones", 0, QApplication::UnicodeUTF8)); GBUniform->setTitle(QApplication::translate("CreateHypothesis", "Uniform adaptation", 0, QApplication::UnicodeUTF8)); RBUniDera->setText(QApplication::translate("CreateHypothesis", "Coarsening", 0, QApplication::UnicodeUTF8)); @@ -541,28 +566,44 @@ public: GBFieldFile->setTitle(QString()); FieldFile->setText(QApplication::translate("CreateHypothesis", "File of the fields", 0, QApplication::UnicodeUTF8)); GBFieldManagement->setTitle(QApplication::translate("CreateHypothesis", "Governing field for the adaptation", 0, QApplication::UnicodeUTF8)); - FieldName->setText(QApplication::translate("CreateHypothesis", "Field Name", 0, QApplication::UnicodeUTF8)); - TWCMP->horizontalHeaderItem(0)->setText(QApplication::translate("CreateHypothesis", "Selection", 0, QApplication::UnicodeUTF8)); - TWCMP->horizontalHeaderItem(1)->setText(QApplication::translate("CreateHypothesis", "Component", 0, QApplication::UnicodeUTF8)); + FieldName->setText(QApplication::translate("CreateHypothesis", "Field name", 0, QApplication::UnicodeUTF8)); + if (TWCMP->columnCount() < 2) + TWCMP->setColumnCount(2); + + QTableWidgetItem *__colItem = new QTableWidgetItem(); + __colItem->setText(QApplication::translate("CreateHypothesis", "Selection", 0, QApplication::UnicodeUTF8)); + TWCMP->setHorizontalHeaderItem(0, __colItem); + + QTableWidgetItem *__colItem1 = new QTableWidgetItem(); + __colItem1->setText(QApplication::translate("CreateHypothesis", "Component", 0, QApplication::UnicodeUTF8)); + TWCMP->setHorizontalHeaderItem(1, __colItem1); RBL2->setText(QApplication::translate("CreateHypothesis", "L2 norm", 0, QApplication::UnicodeUTF8)); RBInf->setText(QApplication::translate("CreateHypothesis", "Infinite norm", 0, QApplication::UnicodeUTF8)); - GBRefinementThresholds->setTitle(QApplication::translate("CreateHypothesis", "Refinement thresholds", 0, QApplication::UnicodeUTF8)); + GBRefinementThresholds->setTitle(QApplication::translate("CreateHypothesis", "Refinement threshold", 0, QApplication::UnicodeUTF8)); RBRPE->setText(QApplication::translate("CreateHypothesis", "Percentage of meshes", 0, QApplication::UnicodeUTF8)); SpinBox_RPE->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8)); RBRRel->setText(QApplication::translate("CreateHypothesis", "Relative", 0, QApplication::UnicodeUTF8)); SpinBox_RRel->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8)); RBRAbs->setText(QApplication::translate("CreateHypothesis", "Absolute", 0, QApplication::UnicodeUTF8)); RBRNo->setText(QApplication::translate("CreateHypothesis", "No refinement", 0, QApplication::UnicodeUTF8)); - GBCoarseningThresholds->setTitle(QApplication::translate("CreateHypothesis", "Coarsening thresholds", 0, QApplication::UnicodeUTF8)); + GBCoarseningThresholds->setTitle(QApplication::translate("CreateHypothesis", "Coarsening threshold", 0, QApplication::UnicodeUTF8)); RBCPE->setText(QApplication::translate("CreateHypothesis", "Percentage of meshes", 0, QApplication::UnicodeUTF8)); SpinBox_CPE->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8)); RBCRel->setText(QApplication::translate("CreateHypothesis", "Relative", 0, QApplication::UnicodeUTF8)); SpinBox_CRel->setSuffix(QApplication::translate("CreateHypothesis", " %", 0, QApplication::UnicodeUTF8)); RBCAbs->setText(QApplication::translate("CreateHypothesis", "Absolute", 0, QApplication::UnicodeUTF8)); RBCNo->setText(QApplication::translate("CreateHypothesis", "No coarsening", 0, QApplication::UnicodeUTF8)); - GBAreaManagement->setTitle(QApplication::translate("CreateHypothesis", "Area management", 0, QApplication::UnicodeUTF8)); - TWZone->horizontalHeaderItem(0)->setText(QApplication::translate("CreateHypothesis", "Selection", 0, QApplication::UnicodeUTF8)); - TWZone->horizontalHeaderItem(1)->setText(QApplication::translate("CreateHypothesis", "Zone name", 0, QApplication::UnicodeUTF8)); + GBAreaManagement->setTitle(QApplication::translate("CreateHypothesis", "Zone management", 0, QApplication::UnicodeUTF8)); + if (TWZone->columnCount() < 2) + TWZone->setColumnCount(2); + + QTableWidgetItem *__colItem2 = new QTableWidgetItem(); + __colItem2->setText(QApplication::translate("CreateHypothesis", "Selection", 0, QApplication::UnicodeUTF8)); + TWZone->setHorizontalHeaderItem(0, __colItem2); + + QTableWidgetItem *__colItem3 = new QTableWidgetItem(); + __colItem3->setText(QApplication::translate("CreateHypothesis", "Zone name", 0, QApplication::UnicodeUTF8)); + TWZone->setHorizontalHeaderItem(1, __colItem3); PBZoneNew->setText(QApplication::translate("CreateHypothesis", "New", 0, QApplication::UnicodeUTF8)); PBZoneEdit->setText(QApplication::translate("CreateHypothesis", "Edit", 0, QApplication::UnicodeUTF8)); PBZoneDelete->setText(QString()); @@ -570,14 +611,22 @@ public: RBFieldNo->setText(QApplication::translate("CreateHypothesis", "None", 0, QApplication::UnicodeUTF8)); RBFieldAll->setText(QApplication::translate("CreateHypothesis", "All", 0, QApplication::UnicodeUTF8)); RBFieldChosen->setText(QApplication::translate("CreateHypothesis", "Chosen", 0, QApplication::UnicodeUTF8)); - TWField->horizontalHeaderItem(0)->setText(QApplication::translate("CreateHypothesis", "Selection", 0, QApplication::UnicodeUTF8)); - TWField->horizontalHeaderItem(1)->setText(QApplication::translate("CreateHypothesis", "Field Name", 0, QApplication::UnicodeUTF8)); + if (TWField->columnCount() < 2) + TWField->setColumnCount(2); + + QTableWidgetItem *__colItem4 = new QTableWidgetItem(); + __colItem4->setText(QApplication::translate("CreateHypothesis", "Selection", 0, QApplication::UnicodeUTF8)); + TWField->setHorizontalHeaderItem(0, __colItem4); + + QTableWidgetItem *__colItem5 = new QTableWidgetItem(); + __colItem5->setText(QApplication::translate("CreateHypothesis", "Field Name", 0, QApplication::UnicodeUTF8)); + TWField->setHorizontalHeaderItem(1, __colItem5); CBGroupe->setText(QApplication::translate("CreateHypothesis", "Filtering with groups", 0, QApplication::UnicodeUTF8)); GBButtons->setTitle(QString()); - buttonOk->setText(QApplication::translate("CreateHypothesis", "&Ok", 0, QApplication::UnicodeUTF8)); - buttonApply->setText(QApplication::translate("CreateHypothesis", "&Apply", 0, QApplication::UnicodeUTF8)); - buttonCancel->setText(QApplication::translate("CreateHypothesis", "&Cancel", 0, QApplication::UnicodeUTF8)); - buttonHelp->setText(QApplication::translate("CreateHypothesis", "&Help", 0, QApplication::UnicodeUTF8)); + buttonOk->setText(QApplication::translate("CreateHypothesis", "OK", 0, QApplication::UnicodeUTF8)); + buttonApply->setText(QApplication::translate("CreateHypothesis", "Apply", 0, QApplication::UnicodeUTF8)); + buttonCancel->setText(QApplication::translate("CreateHypothesis", "Cancel", 0, QApplication::UnicodeUTF8)); + buttonHelp->setText(QApplication::translate("CreateHypothesis", "Help", 0, QApplication::UnicodeUTF8)); Q_UNUSED(CreateHypothesis); } // retranslateUi @@ -587,6 +636,4 @@ namespace Ui { class CreateHypothesis: public Ui_CreateHypothesis {}; } // namespace Ui -QT_END_NAMESPACE - #endif // CREATEHYPOTHESIS_H diff --git a/src/HOMARDGUI/CreateHypothesis.ui b/src/HOMARDGUI/CreateHypothesis.ui index 7e5bc80e..7bc8b7f4 100644 --- a/src/HOMARDGUI/CreateHypothesis.ui +++ b/src/HOMARDGUI/CreateHypothesis.ui @@ -6,25 +6,33 @@ 0 0 717 - 1005 + 1166 - + + 0 + 0 0 0 - Create Hypothesis + Create an hypothesis - false + true true - + + + 9 + + + 6 + @@ -50,7 +58,13 @@ Type of adaptation - + + + 9 + + + 6 + @@ -64,7 +78,7 @@ - Following a field + Driven by a field @@ -83,7 +97,13 @@ Uniform adaptation - + + + 9 + + + 6 + @@ -109,7 +129,13 @@ - + + + 9 + + + 6 + @@ -133,7 +159,9 @@ - + + 0 + 0 0 0 @@ -141,20 +169,34 @@ Governing field for the adaptation - + + + 9 + + + 6 + - + + + 0 + + + 6 + - Field Name + Field name - + + 0 + 0 0 0 @@ -168,11 +210,11 @@ - + Qt::Horizontal - + 48 20 @@ -183,11 +225,17 @@ - + + + 0 + + + 6 + - QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked + QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::NoEditTriggers|QAbstractItemView::SelectedClicked true @@ -211,11 +259,11 @@ - + Qt::Horizontal - + 60 20 @@ -224,9 +272,21 @@ - + + + 0 + + + 6 + - + + + 0 + + + 6 + @@ -254,19 +314,33 @@ - + + + 0 + + + 6 + - + + 0 + 0 0 0 - Refinement thresholds + Refinement threshold - + + + 9 + + + 6 + @@ -361,9 +435,15 @@ - Coarsening thresholds + Coarsening threshold - + + + 9 + + + 6 + @@ -466,19 +546,27 @@ - + + 0 + 0 0 0 - Area management + Zone management - + + + 9 + + + 6 + - QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked + QAbstractItemView::AnyKeyPressed|QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::NoEditTriggers|QAbstractItemView::SelectedClicked true @@ -502,9 +590,21 @@ - + + + 0 + + + 6 + - + + + 0 + + + 6 + @@ -529,11 +629,11 @@ - + Qt::Vertical - + 20 48 @@ -551,9 +651,21 @@ Field Interpolation - + + + 9 + + + 6 + - + + + 0 + + + 6 + @@ -615,32 +727,38 @@ - + + + 9 + + + 6 + - &Ok + OK - &Apply + Apply - &Cancel + Cancel - &Help + Help diff --git a/src/HOMARDGUI/CreateIteration.h b/src/HOMARDGUI/CreateIteration.h index a1d65484..b116d885 100644 --- a/src/HOMARDGUI/CreateIteration.h +++ b/src/HOMARDGUI/CreateIteration.h @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'CreateIteration.ui' ** -** Created: Thu Nov 18 15:59:09 2010 -** by: Qt User Interface Compiler version 4.4.3 +** Created: Tue Mar 15 10:16:06 2011 +** by: Qt User Interface Compiler version 4.2.1 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -25,51 +25,49 @@ #include #include -QT_BEGIN_NAMESPACE - class Ui_CreateIteration { public: - QGridLayout *gridLayout_2; + QGridLayout *gridLayout; QLabel *Iteration_Name; QLineEdit *LEIterationName; QLabel *Iter_Parent; - QSpacerItem *verticalSpacer; + QSpacerItem *spacerItem; QPushButton *PBIterParent; QLineEdit *LEIterationParentName; QLabel *Mesh_n; - QSpacerItem *verticalSpacer_6; + QSpacerItem *spacerItem1; QLineEdit *LEMeshName_n; - QSpacerItem *verticalSpacer_1; + QSpacerItem *spacerItem2; QLabel *Mesh_np1; QLineEdit *LEMeshName_np1; - QSpacerItem *verticalSpacer_3; + QSpacerItem *spacerItem3; QGroupBox *GBField; - QGridLayout *gridLayout; + QGridLayout *gridLayout1; QLabel *FieldFile; QPushButton *PushFieldFile; QLineEdit *LEFieldFile; - QSpacerItem *verticalSpacer_7; + QSpacerItem *spacerItem4; QRadioButton *RBNo; QRadioButton *RBLast; QRadioButton *RBChosen; - QSpacerItem *verticalSpacer_4; + QSpacerItem *spacerItem5; QLabel *TimeStep; QSpinBox *SpinBox_TimeStep; - QSpacerItem *spacer; + QSpacerItem *spacerItem6; QLabel *Rank; QSpinBox *SpinBox_Rank; - QSpacerItem *spacer_3; - QSpacerItem *verticalSpacer_2; + QSpacerItem *spacerItem7; + QSpacerItem *spacerItem8; QGroupBox *Hypothese; - QGridLayout *gridLayout_3; + QGridLayout *gridLayout2; QComboBox *CBHypothese; - QSpacerItem *spacer_2; + QSpacerItem *spacerItem9; QPushButton *PBHypoEdit; QPushButton *PBHypoNew; - QSpacerItem *verticalSpacer_5; + QSpacerItem *spacerItem10; QGroupBox *GroupButtons; - QGridLayout *gridLayout_4; + QGridLayout *gridLayout3; QPushButton *buttonOk; QPushButton *buttonApply; QPushButton *buttonCancel; @@ -77,38 +75,38 @@ public: void setupUi(QWidget *CreateIteration) { - if (CreateIteration->objectName().isEmpty()) - CreateIteration->setObjectName(QString::fromUtf8("CreateIteration")); - CreateIteration->resize(587, 598); - gridLayout_2 = new QGridLayout(CreateIteration); - gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2")); + CreateIteration->setObjectName(QString::fromUtf8("CreateIteration")); + gridLayout = new QGridLayout(CreateIteration); + gridLayout->setSpacing(6); + gridLayout->setMargin(9); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); Iteration_Name = new QLabel(CreateIteration); Iteration_Name->setObjectName(QString::fromUtf8("Iteration_Name")); - gridLayout_2->addWidget(Iteration_Name, 0, 0, 1, 2); + gridLayout->addWidget(Iteration_Name, 0, 0, 1, 2); LEIterationName = new QLineEdit(CreateIteration); LEIterationName->setObjectName(QString::fromUtf8("LEIterationName")); LEIterationName->setMinimumSize(QSize(290, 21)); LEIterationName->setMaxLength(200); - gridLayout_2->addWidget(LEIterationName, 0, 2, 1, 2); + gridLayout->addWidget(LEIterationName, 0, 2, 1, 2); Iter_Parent = new QLabel(CreateIteration); Iter_Parent->setObjectName(QString::fromUtf8("Iter_Parent")); - gridLayout_2->addWidget(Iter_Parent, 1, 0, 1, 1); + gridLayout->addWidget(Iter_Parent, 1, 0, 1, 1); - verticalSpacer = new QSpacerItem(20, 24, QSizePolicy::Minimum, QSizePolicy::Expanding); + spacerItem = new QSpacerItem(20, 24, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout_2->addItem(verticalSpacer, 1, 1, 1, 1); + gridLayout->addItem(spacerItem, 1, 1, 1, 1); PBIterParent = new QPushButton(CreateIteration); PBIterParent->setObjectName(QString::fromUtf8("PBIterParent")); PBIterParent->setEnabled(true); PBIterParent->setMaximumSize(QSize(50, 27)); - gridLayout_2->addWidget(PBIterParent, 1, 2, 1, 1); + gridLayout->addWidget(PBIterParent, 1, 2, 1, 1); LEIterationParentName = new QLineEdit(CreateIteration); LEIterationParentName->setObjectName(QString::fromUtf8("LEIterationParentName")); @@ -116,16 +114,16 @@ public: LEIterationParentName->setMaxLength(200); LEIterationParentName->setReadOnly(true); - gridLayout_2->addWidget(LEIterationParentName, 1, 3, 1, 1); + gridLayout->addWidget(LEIterationParentName, 1, 3, 1, 1); Mesh_n = new QLabel(CreateIteration); Mesh_n->setObjectName(QString::fromUtf8("Mesh_n")); - gridLayout_2->addWidget(Mesh_n, 2, 0, 1, 1); + gridLayout->addWidget(Mesh_n, 2, 0, 1, 1); - verticalSpacer_6 = new QSpacerItem(20, 21, QSizePolicy::Minimum, QSizePolicy::Expanding); + spacerItem1 = new QSpacerItem(20, 21, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout_2->addItem(verticalSpacer_6, 2, 1, 1, 1); + gridLayout->addItem(spacerItem1, 2, 1, 1, 1); LEMeshName_n = new QLineEdit(CreateIteration); LEMeshName_n->setObjectName(QString::fromUtf8("LEMeshName_n")); @@ -133,177 +131,188 @@ public: LEMeshName_n->setMaxLength(32); LEMeshName_n->setReadOnly(true); - gridLayout_2->addWidget(LEMeshName_n, 2, 2, 1, 2); + gridLayout->addWidget(LEMeshName_n, 2, 2, 1, 2); - verticalSpacer_1 = new QSpacerItem(20, 22, QSizePolicy::Minimum, QSizePolicy::Expanding); + spacerItem2 = new QSpacerItem(20, 22, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout_2->addItem(verticalSpacer_1, 3, 1, 1, 1); + gridLayout->addItem(spacerItem2, 3, 1, 1, 1); Mesh_np1 = new QLabel(CreateIteration); Mesh_np1->setObjectName(QString::fromUtf8("Mesh_np1")); - gridLayout_2->addWidget(Mesh_np1, 4, 0, 1, 2); + gridLayout->addWidget(Mesh_np1, 4, 0, 1, 2); LEMeshName_np1 = new QLineEdit(CreateIteration); LEMeshName_np1->setObjectName(QString::fromUtf8("LEMeshName_np1")); LEMeshName_np1->setMinimumSize(QSize(290, 21)); LEMeshName_np1->setMaxLength(32); - gridLayout_2->addWidget(LEMeshName_np1, 4, 2, 1, 2); + gridLayout->addWidget(LEMeshName_np1, 4, 2, 1, 2); - verticalSpacer_3 = new QSpacerItem(20, 21, QSizePolicy::Minimum, QSizePolicy::Expanding); + spacerItem3 = new QSpacerItem(20, 21, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout_2->addItem(verticalSpacer_3, 5, 1, 1, 1); + gridLayout->addItem(spacerItem3, 5, 1, 1, 1); GBField = new QGroupBox(CreateIteration); GBField->setObjectName(QString::fromUtf8("GBField")); - gridLayout = new QGridLayout(GBField); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + gridLayout1 = new QGridLayout(GBField); + gridLayout1->setSpacing(6); + gridLayout1->setMargin(9); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); FieldFile = new QLabel(GBField); FieldFile->setObjectName(QString::fromUtf8("FieldFile")); - gridLayout->addWidget(FieldFile, 0, 0, 1, 1); + gridLayout1->addWidget(FieldFile, 0, 0, 1, 1); PushFieldFile = new QPushButton(GBField); PushFieldFile->setObjectName(QString::fromUtf8("PushFieldFile")); - gridLayout->addWidget(PushFieldFile, 0, 1, 1, 1); + gridLayout1->addWidget(PushFieldFile, 0, 1, 1, 1); LEFieldFile = new QLineEdit(GBField); LEFieldFile->setObjectName(QString::fromUtf8("LEFieldFile")); LEFieldFile->setMinimumSize(QSize(282, 21)); - gridLayout->addWidget(LEFieldFile, 0, 2, 1, 6); + gridLayout1->addWidget(LEFieldFile, 0, 2, 1, 6); - verticalSpacer_7 = new QSpacerItem(138, 18, QSizePolicy::Minimum, QSizePolicy::Expanding); + spacerItem4 = new QSpacerItem(138, 18, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout->addItem(verticalSpacer_7, 1, 3, 1, 4); + gridLayout1->addItem(spacerItem4, 1, 3, 1, 4); RBNo = new QRadioButton(GBField); RBNo->setObjectName(QString::fromUtf8("RBNo")); RBNo->setCheckable(true); RBNo->setChecked(true); - gridLayout->addWidget(RBNo, 2, 0, 1, 3); + gridLayout1->addWidget(RBNo, 2, 0, 1, 3); RBLast = new QRadioButton(GBField); RBLast->setObjectName(QString::fromUtf8("RBLast")); - gridLayout->addWidget(RBLast, 2, 3, 1, 3); + gridLayout1->addWidget(RBLast, 2, 3, 1, 3); RBChosen = new QRadioButton(GBField); RBChosen->setObjectName(QString::fromUtf8("RBChosen")); - gridLayout->addWidget(RBChosen, 2, 7, 1, 1); + gridLayout1->addWidget(RBChosen, 2, 7, 1, 1); - verticalSpacer_4 = new QSpacerItem(138, 28, QSizePolicy::Minimum, QSizePolicy::Expanding); + spacerItem5 = new QSpacerItem(138, 28, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout->addItem(verticalSpacer_4, 3, 0, 1, 4); + gridLayout1->addItem(spacerItem5, 3, 0, 1, 4); TimeStep = new QLabel(GBField); TimeStep->setObjectName(QString::fromUtf8("TimeStep")); - gridLayout->addWidget(TimeStep, 4, 0, 1, 1); + gridLayout1->addWidget(TimeStep, 4, 0, 1, 1); SpinBox_TimeStep = new QSpinBox(GBField); SpinBox_TimeStep->setObjectName(QString::fromUtf8("SpinBox_TimeStep")); - SpinBox_TimeStep->setMinimum(-2); SpinBox_TimeStep->setMaximum(100000); + SpinBox_TimeStep->setMinimum(-2); SpinBox_TimeStep->setValue(-1); - gridLayout->addWidget(SpinBox_TimeStep, 4, 1, 1, 1); + gridLayout1->addWidget(SpinBox_TimeStep, 4, 1, 1, 1); - spacer = new QSpacerItem(40, 13, QSizePolicy::Fixed, QSizePolicy::Minimum); + spacerItem6 = new QSpacerItem(40, 13, QSizePolicy::Fixed, QSizePolicy::Minimum); - gridLayout->addItem(spacer, 4, 2, 1, 2); + gridLayout1->addItem(spacerItem6, 4, 2, 1, 2); Rank = new QLabel(GBField); Rank->setObjectName(QString::fromUtf8("Rank")); - gridLayout->addWidget(Rank, 4, 4, 1, 1); + gridLayout1->addWidget(Rank, 4, 4, 1, 1); SpinBox_Rank = new QSpinBox(GBField); SpinBox_Rank->setObjectName(QString::fromUtf8("SpinBox_Rank")); - SpinBox_Rank->setMinimum(-1); SpinBox_Rank->setMaximum(1010000); + SpinBox_Rank->setMinimum(-1); SpinBox_Rank->setValue(1); - gridLayout->addWidget(SpinBox_Rank, 4, 5, 1, 1); + gridLayout1->addWidget(SpinBox_Rank, 4, 5, 1, 1); - spacer_3 = new QSpacerItem(255, 13, QSizePolicy::Expanding, QSizePolicy::Minimum); + spacerItem7 = new QSpacerItem(255, 13, QSizePolicy::Expanding, QSizePolicy::Minimum); - gridLayout->addItem(spacer_3, 4, 6, 1, 2); + gridLayout1->addItem(spacerItem7, 4, 6, 1, 2); - gridLayout_2->addWidget(GBField, 6, 0, 1, 4); + gridLayout->addWidget(GBField, 6, 0, 1, 4); - verticalSpacer_2 = new QSpacerItem(20, 22, QSizePolicy::Minimum, QSizePolicy::Expanding); + spacerItem8 = new QSpacerItem(20, 22, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout_2->addItem(verticalSpacer_2, 7, 1, 1, 1); + gridLayout->addItem(spacerItem8, 7, 1, 1, 1); Hypothese = new QGroupBox(CreateIteration); Hypothese->setObjectName(QString::fromUtf8("Hypothese")); - gridLayout_3 = new QGridLayout(Hypothese); - gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3")); + gridLayout2 = new QGridLayout(Hypothese); + gridLayout2->setSpacing(6); + gridLayout2->setMargin(9); + gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); CBHypothese = new QComboBox(Hypothese); CBHypothese->setObjectName(QString::fromUtf8("CBHypothese")); CBHypothese->setSizeAdjustPolicy(QComboBox::AdjustToContents); - gridLayout_3->addWidget(CBHypothese, 0, 0, 1, 1); + gridLayout2->addWidget(CBHypothese, 0, 0, 1, 1); - spacer_2 = new QSpacerItem(40, 13, QSizePolicy::Fixed, QSizePolicy::Minimum); + spacerItem9 = new QSpacerItem(40, 13, QSizePolicy::Fixed, QSizePolicy::Minimum); - gridLayout_3->addItem(spacer_2, 0, 1, 1, 1); + gridLayout2->addItem(spacerItem9, 0, 1, 1, 1); PBHypoEdit = new QPushButton(Hypothese); PBHypoEdit->setObjectName(QString::fromUtf8("PBHypoEdit")); - gridLayout_3->addWidget(PBHypoEdit, 0, 2, 1, 1); + gridLayout2->addWidget(PBHypoEdit, 0, 2, 1, 1); PBHypoNew = new QPushButton(Hypothese); PBHypoNew->setObjectName(QString::fromUtf8("PBHypoNew")); - gridLayout_3->addWidget(PBHypoNew, 0, 3, 1, 1); + gridLayout2->addWidget(PBHypoNew, 0, 3, 1, 1); - gridLayout_2->addWidget(Hypothese, 8, 0, 1, 4); + gridLayout->addWidget(Hypothese, 8, 0, 1, 4); - verticalSpacer_5 = new QSpacerItem(20, 21, QSizePolicy::Minimum, QSizePolicy::Expanding); + spacerItem10 = new QSpacerItem(20, 21, QSizePolicy::Minimum, QSizePolicy::Expanding); - gridLayout_2->addItem(verticalSpacer_5, 9, 0, 1, 2); + gridLayout->addItem(spacerItem10, 9, 0, 1, 2); GroupButtons = new QGroupBox(CreateIteration); GroupButtons->setObjectName(QString::fromUtf8("GroupButtons")); - gridLayout_4 = new QGridLayout(GroupButtons); - gridLayout_4->setObjectName(QString::fromUtf8("gridLayout_4")); + gridLayout3 = new QGridLayout(GroupButtons); + gridLayout3->setSpacing(6); + gridLayout3->setMargin(9); + gridLayout3->setObjectName(QString::fromUtf8("gridLayout3")); buttonOk = new QPushButton(GroupButtons); buttonOk->setObjectName(QString::fromUtf8("buttonOk")); buttonOk->setAutoDefault(false); buttonOk->setDefault(false); - gridLayout_4->addWidget(buttonOk, 0, 0, 1, 1); + gridLayout3->addWidget(buttonOk, 0, 0, 1, 1); buttonApply = new QPushButton(GroupButtons); buttonApply->setObjectName(QString::fromUtf8("buttonApply")); - gridLayout_4->addWidget(buttonApply, 0, 1, 1, 1); + gridLayout3->addWidget(buttonApply, 0, 1, 1, 1); buttonCancel = new QPushButton(GroupButtons); buttonCancel->setObjectName(QString::fromUtf8("buttonCancel")); - gridLayout_4->addWidget(buttonCancel, 0, 2, 1, 1); + gridLayout3->addWidget(buttonCancel, 0, 2, 1, 1); buttonHelp = new QPushButton(GroupButtons); buttonHelp->setObjectName(QString::fromUtf8("buttonHelp")); - gridLayout_4->addWidget(buttonHelp, 0, 3, 1, 1); + gridLayout3->addWidget(buttonHelp, 0, 3, 1, 1); - gridLayout_2->addWidget(GroupButtons, 10, 0, 1, 4); + gridLayout->addWidget(GroupButtons, 10, 0, 1, 4); retranslateUi(CreateIteration); + QSize size(587, 598); + size = size.expandedTo(CreateIteration->minimumSizeHint()); + CreateIteration->resize(size); + + CBHypothese->setCurrentIndex(-1); @@ -312,28 +321,28 @@ public: void retranslateUi(QWidget *CreateIteration) { - CreateIteration->setWindowTitle(QApplication::translate("CreateIteration", "Create_Iteration", 0, QApplication::UnicodeUTF8)); + CreateIteration->setWindowTitle(QApplication::translate("CreateIteration", "Create an iteration", 0, QApplication::UnicodeUTF8)); Iteration_Name->setText(QApplication::translate("CreateIteration", "Iteration Name", 0, QApplication::UnicodeUTF8)); Iter_Parent->setText(QApplication::translate("CreateIteration", "Previous iteration", 0, QApplication::UnicodeUTF8)); PBIterParent->setText(QString()); Mesh_n->setText(QApplication::translate("CreateIteration", "Mesh n", 0, QApplication::UnicodeUTF8)); Mesh_np1->setText(QApplication::translate("CreateIteration", "Mesh n+1", 0, QApplication::UnicodeUTF8)); GBField->setTitle(QApplication::translate("CreateIteration", "Field information", 0, QApplication::UnicodeUTF8)); - FieldFile->setText(QApplication::translate("CreateIteration", "Field File", 0, QApplication::UnicodeUTF8)); + FieldFile->setText(QApplication::translate("CreateIteration", "Field file", 0, QApplication::UnicodeUTF8)); PushFieldFile->setText(QString()); - RBNo->setText(QApplication::translate("CreateIteration", "No Time Step", 0, QApplication::UnicodeUTF8)); - RBLast->setText(QApplication::translate("CreateIteration", "Last Time Step", 0, QApplication::UnicodeUTF8)); + RBNo->setText(QApplication::translate("CreateIteration", "No time step", 0, QApplication::UnicodeUTF8)); + RBLast->setText(QApplication::translate("CreateIteration", "Last time step", 0, QApplication::UnicodeUTF8)); RBChosen->setText(QApplication::translate("CreateIteration", "Chosen time step", 0, QApplication::UnicodeUTF8)); - TimeStep->setText(QApplication::translate("CreateIteration", "Time Step", 0, QApplication::UnicodeUTF8)); + TimeStep->setText(QApplication::translate("CreateIteration", "Time step", 0, QApplication::UnicodeUTF8)); Rank->setText(QApplication::translate("CreateIteration", "Rank", 0, QApplication::UnicodeUTF8)); Hypothese->setTitle(QApplication::translate("CreateIteration", "Hypothesis", 0, QApplication::UnicodeUTF8)); PBHypoEdit->setText(QApplication::translate("CreateIteration", "Edit", 0, QApplication::UnicodeUTF8)); PBHypoNew->setText(QApplication::translate("CreateIteration", "New", 0, QApplication::UnicodeUTF8)); GroupButtons->setTitle(QString()); - buttonOk->setText(QApplication::translate("CreateIteration", "&Ok", 0, QApplication::UnicodeUTF8)); - buttonApply->setText(QApplication::translate("CreateIteration", "&Apply", 0, QApplication::UnicodeUTF8)); - buttonCancel->setText(QApplication::translate("CreateIteration", "&Cancel", 0, QApplication::UnicodeUTF8)); - buttonHelp->setText(QApplication::translate("CreateIteration", "&Help", 0, QApplication::UnicodeUTF8)); + buttonOk->setText(QApplication::translate("CreateIteration", "OK", 0, QApplication::UnicodeUTF8)); + buttonApply->setText(QApplication::translate("CreateIteration", "Apply", 0, QApplication::UnicodeUTF8)); + buttonCancel->setText(QApplication::translate("CreateIteration", "Cancel", 0, QApplication::UnicodeUTF8)); + buttonHelp->setText(QApplication::translate("CreateIteration", "Help", 0, QApplication::UnicodeUTF8)); Q_UNUSED(CreateIteration); } // retranslateUi @@ -343,6 +352,4 @@ namespace Ui { class CreateIteration: public Ui_CreateIteration {}; } // namespace Ui -QT_END_NAMESPACE - #endif // CREATEITERATION_H diff --git a/src/HOMARDGUI/CreateIteration.ui b/src/HOMARDGUI/CreateIteration.ui index dbe973d0..1b2eb8e4 100644 --- a/src/HOMARDGUI/CreateIteration.ui +++ b/src/HOMARDGUI/CreateIteration.ui @@ -10,9 +10,15 @@ - Create_Iteration + Create an iteration - + + + 9 + + + 6 + @@ -41,11 +47,11 @@ - + Qt::Vertical - + 20 24 @@ -93,11 +99,11 @@ - + Qt::Vertical - + 20 21 @@ -122,11 +128,11 @@ - + Qt::Vertical - + 20 22 @@ -155,11 +161,11 @@ - + Qt::Vertical - + 20 21 @@ -172,11 +178,17 @@ Field information - + + + 9 + + + 6 + - Field File + Field file @@ -198,11 +210,11 @@ - + Qt::Vertical - + 138 18 @@ -213,7 +225,7 @@ - No Time Step + No time step true @@ -226,7 +238,7 @@ - Last Time Step + Last time step @@ -238,11 +250,11 @@ - + Qt::Vertical - + 138 28 @@ -253,32 +265,32 @@ - Time Step + Time step - - -2 - 100000 + + -2 + -1 - + Qt::Horizontal QSizePolicy::Fixed - + 40 13 @@ -295,26 +307,26 @@ - - -1 - 1010000 + + -1 + 1 - + Qt::Horizontal QSizePolicy::Expanding - + 255 13 @@ -326,11 +338,11 @@ - + Qt::Vertical - + 20 22 @@ -343,7 +355,13 @@ Hypothesis - + + + 9 + + + 6 + @@ -355,14 +373,14 @@ - + Qt::Horizontal QSizePolicy::Fixed - + 40 13 @@ -388,11 +406,11 @@ - + Qt::Vertical - + 20 21 @@ -405,11 +423,17 @@ - + + + 9 + + + 6 + - &Ok + OK false @@ -422,21 +446,21 @@ - &Apply + Apply - &Cancel + Cancel - &Help + Help diff --git a/src/HOMARDGUI/CreateListGroup.h b/src/HOMARDGUI/CreateListGroup.h index cf645bcd..49c5a17f 100644 --- a/src/HOMARDGUI/CreateListGroup.h +++ b/src/HOMARDGUI/CreateListGroup.h @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'CreateListGroup.ui' ** -** Created: Thu Nov 18 16:31:34 2010 -** by: Qt User Interface Compiler version 4.5.2 +** Created: Thu Feb 24 09:10:36 2011 +** by: Qt User Interface Compiler version 4.2.1 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -17,21 +17,18 @@ #include #include #include -#include #include #include -QT_BEGIN_NAMESPACE - class Ui_CreateListGroup { public: QGridLayout *gridLayout; QGroupBox *GBOptions; - QGridLayout *gridLayout_7; + QGridLayout *gridLayout1; QTableWidget *TWGroupe; QGroupBox *GBButtons; - QGridLayout *gridLayout_5; + QGridLayout *gridLayout2; QPushButton *buttonOk; QPushButton *buttonApply; QPushButton *buttonCancel; @@ -39,86 +36,95 @@ public: void setupUi(QDialog *CreateListGroup) { - if (CreateListGroup->objectName().isEmpty()) - CreateListGroup->setObjectName(QString::fromUtf8("CreateListGroup")); - CreateListGroup->resize(717, 600); - QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(CreateListGroup->sizePolicy().hasHeightForWidth()); - CreateListGroup->setSizePolicy(sizePolicy); - CreateListGroup->setAutoFillBackground(false); - CreateListGroup->setSizeGripEnabled(true); - gridLayout = new QGridLayout(CreateListGroup); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); - GBOptions = new QGroupBox(CreateListGroup); - GBOptions->setObjectName(QString::fromUtf8("GBOptions")); - gridLayout_7 = new QGridLayout(GBOptions); - gridLayout_7->setObjectName(QString::fromUtf8("gridLayout_7")); - TWGroupe = new QTableWidget(GBOptions); - if (TWGroupe->columnCount() < 2) - TWGroupe->setColumnCount(2); - QTableWidgetItem *__qtablewidgetitem = new QTableWidgetItem(); - TWGroupe->setHorizontalHeaderItem(0, __qtablewidgetitem); - QTableWidgetItem *__qtablewidgetitem1 = new QTableWidgetItem(); - TWGroupe->setHorizontalHeaderItem(1, __qtablewidgetitem1); - TWGroupe->setObjectName(QString::fromUtf8("TWGroupe")); - TWGroupe->setShowGrid(true); - TWGroupe->setRowCount(0); - TWGroupe->setColumnCount(2); + CreateListGroup->setObjectName(QString::fromUtf8("CreateListGroup")); + QSizePolicy sizePolicy(static_cast(0), static_cast(0)); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(CreateListGroup->sizePolicy().hasHeightForWidth()); + CreateListGroup->setSizePolicy(sizePolicy); + CreateListGroup->setAutoFillBackground(true); + CreateListGroup->setSizeGripEnabled(true); + gridLayout = new QGridLayout(CreateListGroup); + gridLayout->setSpacing(6); + gridLayout->setMargin(9); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + GBOptions = new QGroupBox(CreateListGroup); + GBOptions->setObjectName(QString::fromUtf8("GBOptions")); + gridLayout1 = new QGridLayout(GBOptions); + gridLayout1->setSpacing(6); + gridLayout1->setMargin(9); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); + TWGroupe = new QTableWidget(GBOptions); + TWGroupe->setObjectName(QString::fromUtf8("TWGroupe")); + TWGroupe->setShowGrid(true); + TWGroupe->setRowCount(0); + TWGroupe->setColumnCount(2); + + gridLayout1->addWidget(TWGroupe, 0, 0, 1, 1); + - gridLayout_7->addWidget(TWGroupe, 0, 0, 1, 1); + gridLayout->addWidget(GBOptions, 0, 0, 1, 1); + GBButtons = new QGroupBox(CreateListGroup); + GBButtons->setObjectName(QString::fromUtf8("GBButtons")); + gridLayout2 = new QGridLayout(GBButtons); + gridLayout2->setSpacing(6); + gridLayout2->setMargin(9); + gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); + buttonOk = new QPushButton(GBButtons); + buttonOk->setObjectName(QString::fromUtf8("buttonOk")); - gridLayout->addWidget(GBOptions, 0, 0, 1, 1); + gridLayout2->addWidget(buttonOk, 0, 0, 1, 1); - GBButtons = new QGroupBox(CreateListGroup); - GBButtons->setObjectName(QString::fromUtf8("GBButtons")); - gridLayout_5 = new QGridLayout(GBButtons); - gridLayout_5->setObjectName(QString::fromUtf8("gridLayout_5")); - buttonOk = new QPushButton(GBButtons); - buttonOk->setObjectName(QString::fromUtf8("buttonOk")); + buttonApply = new QPushButton(GBButtons); + buttonApply->setObjectName(QString::fromUtf8("buttonApply")); - gridLayout_5->addWidget(buttonOk, 0, 0, 1, 1); + gridLayout2->addWidget(buttonApply, 0, 1, 1, 1); - buttonApply = new QPushButton(GBButtons); - buttonApply->setObjectName(QString::fromUtf8("buttonApply")); + buttonCancel = new QPushButton(GBButtons); + buttonCancel->setObjectName(QString::fromUtf8("buttonCancel")); - gridLayout_5->addWidget(buttonApply, 0, 1, 1, 1); + gridLayout2->addWidget(buttonCancel, 0, 2, 1, 1); - buttonCancel = new QPushButton(GBButtons); - buttonCancel->setObjectName(QString::fromUtf8("buttonCancel")); + buttonHelp = new QPushButton(GBButtons); + buttonHelp->setObjectName(QString::fromUtf8("buttonHelp")); - gridLayout_5->addWidget(buttonCancel, 0, 2, 1, 1); + gridLayout2->addWidget(buttonHelp, 0, 3, 1, 1); - buttonHelp = new QPushButton(GBButtons); - buttonHelp->setObjectName(QString::fromUtf8("buttonHelp")); - gridLayout_5->addWidget(buttonHelp, 0, 3, 1, 1); + gridLayout->addWidget(GBButtons, 1, 0, 1, 1); - gridLayout->addWidget(GBButtons, 1, 0, 1, 1); + retranslateUi(CreateListGroup); + QSize size(717, 600); + size = size.expandedTo(CreateListGroup->minimumSizeHint()); + CreateListGroup->resize(size); - retranslateUi(CreateListGroup); - QMetaObject::connectSlotsByName(CreateListGroup); + QMetaObject::connectSlotsByName(CreateListGroup); } // setupUi void retranslateUi(QDialog *CreateListGroup) { - CreateListGroup->setWindowTitle(QApplication::translate("CreateListGroup", "Create Hypothesis - Group selection", 0, QApplication::UnicodeUTF8)); - GBOptions->setTitle(QApplication::translate("CreateListGroup", "Selected groups", 0, QApplication::UnicodeUTF8)); - QTableWidgetItem *___qtablewidgetitem = TWGroupe->horizontalHeaderItem(0); - ___qtablewidgetitem->setText(QApplication::translate("CreateListGroup", "Selection", 0, QApplication::UnicodeUTF8)); - QTableWidgetItem *___qtablewidgetitem1 = TWGroupe->horizontalHeaderItem(1); - ___qtablewidgetitem1->setText(QApplication::translate("CreateListGroup", "Group", 0, QApplication::UnicodeUTF8)); - GBButtons->setTitle(QString()); - buttonOk->setText(QApplication::translate("CreateListGroup", "&Ok", 0, QApplication::UnicodeUTF8)); - buttonApply->setText(QApplication::translate("CreateListGroup", "&Apply", 0, QApplication::UnicodeUTF8)); - buttonCancel->setText(QApplication::translate("CreateListGroup", "&Cancel", 0, QApplication::UnicodeUTF8)); - buttonHelp->setText(QApplication::translate("CreateListGroup", "&Help", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(CreateListGroup); + CreateListGroup->setWindowTitle(QApplication::translate("CreateListGroup", "Selection of groups", 0, QApplication::UnicodeUTF8)); + GBOptions->setTitle(QApplication::translate("CreateListGroup", "Selected groups", 0, QApplication::UnicodeUTF8)); + if (TWGroupe->columnCount() < 2) + TWGroupe->setColumnCount(2); + + QTableWidgetItem *__colItem = new QTableWidgetItem(); + __colItem->setText(QApplication::translate("CreateListGroup", "Selection", 0, QApplication::UnicodeUTF8)); + TWGroupe->setHorizontalHeaderItem(0, __colItem); + + QTableWidgetItem *__colItem1 = new QTableWidgetItem(); + __colItem1->setText(QApplication::translate("CreateListGroup", "Group", 0, QApplication::UnicodeUTF8)); + TWGroupe->setHorizontalHeaderItem(1, __colItem1); + GBButtons->setTitle(QString()); + buttonOk->setText(QApplication::translate("CreateListGroup", "OK", 0, QApplication::UnicodeUTF8)); + buttonApply->setText(QApplication::translate("CreateListGroup", "Apply", 0, QApplication::UnicodeUTF8)); + buttonCancel->setText(QApplication::translate("CreateListGroup", "Cancel", 0, QApplication::UnicodeUTF8)); + buttonHelp->setText(QApplication::translate("CreateListGroup", "Help", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(CreateListGroup); } // retranslateUi }; @@ -127,6 +133,4 @@ namespace Ui { class CreateListGroup: public Ui_CreateListGroup {}; } // namespace Ui -QT_END_NAMESPACE - #endif // CREATELISTGROUP_H diff --git a/src/HOMARDGUI/CreateListGroup.ui b/src/HOMARDGUI/CreateListGroup.ui index f496638b..f20fdde0 100644 --- a/src/HOMARDGUI/CreateListGroup.ui +++ b/src/HOMARDGUI/CreateListGroup.ui @@ -10,27 +10,41 @@ - + + 0 + 0 0 0 - Create Hypothesis - Group selection + Selection of groups - false + true true - + + + 9 + + + 6 + Selected groups - + + + 9 + + + 6 + @@ -62,32 +76,38 @@ - + + + 9 + + + 6 + - &Ok + OK - &Apply + Apply - &Cancel + Cancel - &Help + Help diff --git a/src/HOMARDGUI/CreateZone.h b/src/HOMARDGUI/CreateZone.h index bce2565e..1bbdb5a3 100644 --- a/src/HOMARDGUI/CreateZone.h +++ b/src/HOMARDGUI/CreateZone.h @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'CreateZone.ui' ** -** Created: Mon Sep 27 14:45:47 2010 -** by: Qt User Interface Compiler version 4.5.2 +** Created: Thu Feb 24 09:10:36 2011 +** by: Qt User Interface Compiler version 4.2.1 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -19,26 +19,23 @@ #include #include #include -#include #include #include #include #include -QT_BEGIN_NAMESPACE - class Ui_CreateZone { public: - QGridLayout *gridLayout_3; + QGridLayout *gridLayout; QLabel *Name; QLineEdit *LEZoneName; QGroupBox *TypeZone; - QHBoxLayout *horizontalLayout; + QHBoxLayout *hboxLayout; QRadioButton *RBBox; QRadioButton *RBSphere; QGroupBox *gBBox; - QGridLayout *gridLayout; + QGridLayout *gridLayout1; QLabel *TLXmini; QDoubleSpinBox *SpinBox_Xmini; QLabel *TLYmini; @@ -52,7 +49,7 @@ public: QDoubleSpinBox *SpinBox_Xmaxi; QDoubleSpinBox *SpinBox_Ymaxi; QGroupBox *gBSphere; - QGridLayout *gridLayout_2; + QGridLayout *gridLayout2; QLabel *TLXcentre; QDoubleSpinBox *SpinBox_Xcentre; QLabel *TLYcentre; @@ -62,7 +59,7 @@ public: QLabel *TLZcentre; QDoubleSpinBox *SpinBox_Zcentre; QGroupBox *GBButtons; - QHBoxLayout *hboxLayout; + QHBoxLayout *hboxLayout1; QPushButton *buttonOk; QPushButton *buttonApply; QPushButton *buttonCancel; @@ -70,309 +67,351 @@ public: void setupUi(QDialog *CreateZone) { - if (CreateZone->objectName().isEmpty()) - CreateZone->setObjectName(QString::fromUtf8("CreateZone")); - CreateZone->resize(415, 472); - CreateZone->setAutoFillBackground(false); - CreateZone->setSizeGripEnabled(true); - gridLayout_3 = new QGridLayout(CreateZone); - gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3")); - Name = new QLabel(CreateZone); - Name->setObjectName(QString::fromUtf8("Name")); - - gridLayout_3->addWidget(Name, 0, 0, 1, 1); - - LEZoneName = new QLineEdit(CreateZone); - LEZoneName->setObjectName(QString::fromUtf8("LEZoneName")); - LEZoneName->setMaxLength(32); - - gridLayout_3->addWidget(LEZoneName, 0, 1, 1, 1); - - TypeZone = new QGroupBox(CreateZone); - TypeZone->setObjectName(QString::fromUtf8("TypeZone")); - QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(TypeZone->sizePolicy().hasHeightForWidth()); - TypeZone->setSizePolicy(sizePolicy); - TypeZone->setMinimumSize(QSize(340, 0)); - horizontalLayout = new QHBoxLayout(TypeZone); - horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); - RBBox = new QRadioButton(TypeZone); - RBBox->setObjectName(QString::fromUtf8("RBBox")); - QIcon icon; - icon.addFile(QString::fromUtf8("../../resources/zone_boxdxyz.png"), QSize(), QIcon::Normal, QIcon::Off); - RBBox->setIcon(icon); - RBBox->setCheckable(true); - RBBox->setChecked(true); - - horizontalLayout->addWidget(RBBox); - - RBSphere = new QRadioButton(TypeZone); - RBSphere->setObjectName(QString::fromUtf8("RBSphere")); - QIcon icon1; - icon1.addFile(QString::fromUtf8("../../resources/zone_spherepoint.png"), QSize(), QIcon::Normal, QIcon::Off); - RBSphere->setIcon(icon1); - - horizontalLayout->addWidget(RBSphere); - - - gridLayout_3->addWidget(TypeZone, 1, 0, 1, 2); - - gBBox = new QGroupBox(CreateZone); - gBBox->setObjectName(QString::fromUtf8("gBBox")); - sizePolicy.setHeightForWidth(gBBox->sizePolicy().hasHeightForWidth()); - gBBox->setSizePolicy(sizePolicy); - gridLayout = new QGridLayout(gBBox); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); - TLXmini = new QLabel(gBBox); - TLXmini->setObjectName(QString::fromUtf8("TLXmini")); - sizePolicy.setHeightForWidth(TLXmini->sizePolicy().hasHeightForWidth()); - TLXmini->setSizePolicy(sizePolicy); - TLXmini->setWordWrap(false); - - gridLayout->addWidget(TLXmini, 0, 0, 1, 1); - - SpinBox_Xmini = new QDoubleSpinBox(gBBox); - SpinBox_Xmini->setObjectName(QString::fromUtf8("SpinBox_Xmini")); - SpinBox_Xmini->setDecimals(5); - SpinBox_Xmini->setMinimum(-1e+09); - SpinBox_Xmini->setMaximum(1e+09); - SpinBox_Xmini->setValue(0); - - gridLayout->addWidget(SpinBox_Xmini, 0, 1, 1, 1); - - TLYmini = new QLabel(gBBox); - TLYmini->setObjectName(QString::fromUtf8("TLYmini")); - sizePolicy.setHeightForWidth(TLYmini->sizePolicy().hasHeightForWidth()); - TLYmini->setSizePolicy(sizePolicy); - TLYmini->setWordWrap(false); - - gridLayout->addWidget(TLYmini, 1, 0, 1, 1); - - SpinBox_Ymini = new QDoubleSpinBox(gBBox); - SpinBox_Ymini->setObjectName(QString::fromUtf8("SpinBox_Ymini")); - SpinBox_Ymini->setDecimals(5); - SpinBox_Ymini->setMinimum(-1e+09); - SpinBox_Ymini->setMaximum(1e+09); - SpinBox_Ymini->setValue(0); - - gridLayout->addWidget(SpinBox_Ymini, 1, 1, 1, 1); - - TLZmini = new QLabel(gBBox); - TLZmini->setObjectName(QString::fromUtf8("TLZmini")); - sizePolicy.setHeightForWidth(TLZmini->sizePolicy().hasHeightForWidth()); - TLZmini->setSizePolicy(sizePolicy); - TLZmini->setWordWrap(false); - - gridLayout->addWidget(TLZmini, 2, 0, 1, 1); - - SpinBox_Zmini = new QDoubleSpinBox(gBBox); - SpinBox_Zmini->setObjectName(QString::fromUtf8("SpinBox_Zmini")); - SpinBox_Zmini->setDecimals(5); - SpinBox_Zmini->setMinimum(-1e+09); - SpinBox_Zmini->setMaximum(1e+09); - SpinBox_Zmini->setValue(0); - - gridLayout->addWidget(SpinBox_Zmini, 2, 1, 1, 1); - - TLXmaxi = new QLabel(gBBox); - TLXmaxi->setObjectName(QString::fromUtf8("TLXmaxi")); - sizePolicy.setHeightForWidth(TLXmaxi->sizePolicy().hasHeightForWidth()); - TLXmaxi->setSizePolicy(sizePolicy); - TLXmaxi->setWordWrap(false); - - gridLayout->addWidget(TLXmaxi, 0, 2, 1, 1); - - TLZmaxi = new QLabel(gBBox); - TLZmaxi->setObjectName(QString::fromUtf8("TLZmaxi")); - sizePolicy.setHeightForWidth(TLZmaxi->sizePolicy().hasHeightForWidth()); - TLZmaxi->setSizePolicy(sizePolicy); - TLZmaxi->setWordWrap(false); - - gridLayout->addWidget(TLZmaxi, 2, 2, 1, 1); - - SpinBox_Zmaxi = new QDoubleSpinBox(gBBox); - SpinBox_Zmaxi->setObjectName(QString::fromUtf8("SpinBox_Zmaxi")); - SpinBox_Zmaxi->setDecimals(5); - SpinBox_Zmaxi->setMinimum(-1e+09); - SpinBox_Zmaxi->setMaximum(1e+09); - SpinBox_Zmaxi->setValue(0); - - gridLayout->addWidget(SpinBox_Zmaxi, 2, 3, 1, 1); - - TLYmaxi = new QLabel(gBBox); - TLYmaxi->setObjectName(QString::fromUtf8("TLYmaxi")); - sizePolicy.setHeightForWidth(TLYmaxi->sizePolicy().hasHeightForWidth()); - TLYmaxi->setSizePolicy(sizePolicy); - TLYmaxi->setWordWrap(false); - - gridLayout->addWidget(TLYmaxi, 1, 2, 1, 1); - - SpinBox_Xmaxi = new QDoubleSpinBox(gBBox); - SpinBox_Xmaxi->setObjectName(QString::fromUtf8("SpinBox_Xmaxi")); - SpinBox_Xmaxi->setDecimals(5); - SpinBox_Xmaxi->setMinimum(-1e+09); - SpinBox_Xmaxi->setMaximum(1e+09); - SpinBox_Xmaxi->setValue(0); - - gridLayout->addWidget(SpinBox_Xmaxi, 0, 3, 1, 1); - - SpinBox_Ymaxi = new QDoubleSpinBox(gBBox); - SpinBox_Ymaxi->setObjectName(QString::fromUtf8("SpinBox_Ymaxi")); - SpinBox_Ymaxi->setDecimals(5); - SpinBox_Ymaxi->setMinimum(-1e+09); - SpinBox_Ymaxi->setMaximum(1e+09); - SpinBox_Ymaxi->setValue(0); - - gridLayout->addWidget(SpinBox_Ymaxi, 1, 3, 1, 1); - - - gridLayout_3->addWidget(gBBox, 2, 0, 1, 2); - - gBSphere = new QGroupBox(CreateZone); - gBSphere->setObjectName(QString::fromUtf8("gBSphere")); - sizePolicy.setHeightForWidth(gBSphere->sizePolicy().hasHeightForWidth()); - gBSphere->setSizePolicy(sizePolicy); - gridLayout_2 = new QGridLayout(gBSphere); - gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2")); - TLXcentre = new QLabel(gBSphere); - TLXcentre->setObjectName(QString::fromUtf8("TLXcentre")); - sizePolicy.setHeightForWidth(TLXcentre->sizePolicy().hasHeightForWidth()); - TLXcentre->setSizePolicy(sizePolicy); - TLXcentre->setWordWrap(false); - - gridLayout_2->addWidget(TLXcentre, 0, 0, 1, 1); - - SpinBox_Xcentre = new QDoubleSpinBox(gBSphere); - SpinBox_Xcentre->setObjectName(QString::fromUtf8("SpinBox_Xcentre")); - SpinBox_Xcentre->setDecimals(5); - SpinBox_Xcentre->setMinimum(-1e+09); - SpinBox_Xcentre->setMaximum(1e+09); - SpinBox_Xcentre->setValue(0); - - gridLayout_2->addWidget(SpinBox_Xcentre, 0, 1, 1, 1); - - TLYcentre = new QLabel(gBSphere); - TLYcentre->setObjectName(QString::fromUtf8("TLYcentre")); - sizePolicy.setHeightForWidth(TLYcentre->sizePolicy().hasHeightForWidth()); - TLYcentre->setSizePolicy(sizePolicy); - TLYcentre->setWordWrap(false); - - gridLayout_2->addWidget(TLYcentre, 1, 0, 1, 1); + CreateZone->setObjectName(QString::fromUtf8("CreateZone")); + CreateZone->setAutoFillBackground(true); + CreateZone->setSizeGripEnabled(true); + gridLayout = new QGridLayout(CreateZone); + gridLayout->setSpacing(6); + gridLayout->setMargin(9); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + Name = new QLabel(CreateZone); + Name->setObjectName(QString::fromUtf8("Name")); + + gridLayout->addWidget(Name, 0, 0, 1, 1); + + LEZoneName = new QLineEdit(CreateZone); + LEZoneName->setObjectName(QString::fromUtf8("LEZoneName")); + LEZoneName->setMaxLength(32); + + gridLayout->addWidget(LEZoneName, 0, 1, 1, 1); + + TypeZone = new QGroupBox(CreateZone); + TypeZone->setObjectName(QString::fromUtf8("TypeZone")); + QSizePolicy sizePolicy(static_cast(0), static_cast(0)); + sizePolicy.setHorizontalStretch(0); + sizePolicy.setVerticalStretch(0); + sizePolicy.setHeightForWidth(TypeZone->sizePolicy().hasHeightForWidth()); + TypeZone->setSizePolicy(sizePolicy); + TypeZone->setMinimumSize(QSize(340, 0)); + hboxLayout = new QHBoxLayout(TypeZone); + hboxLayout->setSpacing(6); + hboxLayout->setMargin(9); + hboxLayout->setObjectName(QString::fromUtf8("hboxLayout")); + RBBox = new QRadioButton(TypeZone); + RBBox->setObjectName(QString::fromUtf8("RBBox")); + RBBox->setIcon(QIcon(QString::fromUtf8("../../resources/zone_boxdxyz.png"))); + RBBox->setCheckable(true); + RBBox->setChecked(true); + + hboxLayout->addWidget(RBBox); + + RBSphere = new QRadioButton(TypeZone); + RBSphere->setObjectName(QString::fromUtf8("RBSphere")); + RBSphere->setIcon(QIcon(QString::fromUtf8("../../resources/zone_spherepoint.png"))); + + hboxLayout->addWidget(RBSphere); + + + gridLayout->addWidget(TypeZone, 1, 0, 1, 2); + + gBBox = new QGroupBox(CreateZone); + gBBox->setObjectName(QString::fromUtf8("gBBox")); + QSizePolicy sizePolicy1(static_cast(0), static_cast(0)); + sizePolicy1.setHorizontalStretch(0); + sizePolicy1.setVerticalStretch(0); + sizePolicy1.setHeightForWidth(gBBox->sizePolicy().hasHeightForWidth()); + gBBox->setSizePolicy(sizePolicy1); + gridLayout1 = new QGridLayout(gBBox); + gridLayout1->setSpacing(6); + gridLayout1->setMargin(9); + gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); + TLXmini = new QLabel(gBBox); + TLXmini->setObjectName(QString::fromUtf8("TLXmini")); + QSizePolicy sizePolicy2(static_cast(0), static_cast(0)); + sizePolicy2.setHorizontalStretch(0); + sizePolicy2.setVerticalStretch(0); + sizePolicy2.setHeightForWidth(TLXmini->sizePolicy().hasHeightForWidth()); + TLXmini->setSizePolicy(sizePolicy2); + TLXmini->setWordWrap(false); + + gridLayout1->addWidget(TLXmini, 0, 0, 1, 1); + + SpinBox_Xmini = new QDoubleSpinBox(gBBox); + SpinBox_Xmini->setObjectName(QString::fromUtf8("SpinBox_Xmini")); + SpinBox_Xmini->setDecimals(5); + SpinBox_Xmini->setMaximum(1e+09); + SpinBox_Xmini->setMinimum(-1e+09); + SpinBox_Xmini->setValue(0); + + gridLayout1->addWidget(SpinBox_Xmini, 0, 1, 1, 1); + + TLYmini = new QLabel(gBBox); + TLYmini->setObjectName(QString::fromUtf8("TLYmini")); + QSizePolicy sizePolicy3(static_cast(0), static_cast(0)); + sizePolicy3.setHorizontalStretch(0); + sizePolicy3.setVerticalStretch(0); + sizePolicy3.setHeightForWidth(TLYmini->sizePolicy().hasHeightForWidth()); + TLYmini->setSizePolicy(sizePolicy3); + TLYmini->setWordWrap(false); + + gridLayout1->addWidget(TLYmini, 1, 0, 1, 1); + + SpinBox_Ymini = new QDoubleSpinBox(gBBox); + SpinBox_Ymini->setObjectName(QString::fromUtf8("SpinBox_Ymini")); + SpinBox_Ymini->setDecimals(5); + SpinBox_Ymini->setMaximum(1e+09); + SpinBox_Ymini->setMinimum(-1e+09); + SpinBox_Ymini->setValue(0); + + gridLayout1->addWidget(SpinBox_Ymini, 1, 1, 1, 1); + + TLZmini = new QLabel(gBBox); + TLZmini->setObjectName(QString::fromUtf8("TLZmini")); + QSizePolicy sizePolicy4(static_cast(0), static_cast(0)); + sizePolicy4.setHorizontalStretch(0); + sizePolicy4.setVerticalStretch(0); + sizePolicy4.setHeightForWidth(TLZmini->sizePolicy().hasHeightForWidth()); + TLZmini->setSizePolicy(sizePolicy4); + TLZmini->setWordWrap(false); + + gridLayout1->addWidget(TLZmini, 2, 0, 1, 1); + + SpinBox_Zmini = new QDoubleSpinBox(gBBox); + SpinBox_Zmini->setObjectName(QString::fromUtf8("SpinBox_Zmini")); + SpinBox_Zmini->setDecimals(5); + SpinBox_Zmini->setMaximum(1e+09); + SpinBox_Zmini->setMinimum(-1e+09); + SpinBox_Zmini->setValue(0); + + gridLayout1->addWidget(SpinBox_Zmini, 2, 1, 1, 1); + + TLXmaxi = new QLabel(gBBox); + TLXmaxi->setObjectName(QString::fromUtf8("TLXmaxi")); + QSizePolicy sizePolicy5(static_cast(0), static_cast(0)); + sizePolicy5.setHorizontalStretch(0); + sizePolicy5.setVerticalStretch(0); + sizePolicy5.setHeightForWidth(TLXmaxi->sizePolicy().hasHeightForWidth()); + TLXmaxi->setSizePolicy(sizePolicy5); + TLXmaxi->setWordWrap(false); + + gridLayout1->addWidget(TLXmaxi, 0, 2, 1, 1); + + TLZmaxi = new QLabel(gBBox); + TLZmaxi->setObjectName(QString::fromUtf8("TLZmaxi")); + QSizePolicy sizePolicy6(static_cast(0), static_cast(0)); + sizePolicy6.setHorizontalStretch(0); + sizePolicy6.setVerticalStretch(0); + sizePolicy6.setHeightForWidth(TLZmaxi->sizePolicy().hasHeightForWidth()); + TLZmaxi->setSizePolicy(sizePolicy6); + TLZmaxi->setWordWrap(false); + + gridLayout1->addWidget(TLZmaxi, 2, 2, 1, 1); + + SpinBox_Zmaxi = new QDoubleSpinBox(gBBox); + SpinBox_Zmaxi->setObjectName(QString::fromUtf8("SpinBox_Zmaxi")); + SpinBox_Zmaxi->setDecimals(5); + SpinBox_Zmaxi->setMaximum(1e+09); + SpinBox_Zmaxi->setMinimum(-1e+09); + SpinBox_Zmaxi->setValue(0); + + gridLayout1->addWidget(SpinBox_Zmaxi, 2, 3, 1, 1); + + TLYmaxi = new QLabel(gBBox); + TLYmaxi->setObjectName(QString::fromUtf8("TLYmaxi")); + QSizePolicy sizePolicy7(static_cast(0), static_cast(0)); + sizePolicy7.setHorizontalStretch(0); + sizePolicy7.setVerticalStretch(0); + sizePolicy7.setHeightForWidth(TLYmaxi->sizePolicy().hasHeightForWidth()); + TLYmaxi->setSizePolicy(sizePolicy7); + TLYmaxi->setWordWrap(false); + + gridLayout1->addWidget(TLYmaxi, 1, 2, 1, 1); + + SpinBox_Xmaxi = new QDoubleSpinBox(gBBox); + SpinBox_Xmaxi->setObjectName(QString::fromUtf8("SpinBox_Xmaxi")); + SpinBox_Xmaxi->setDecimals(5); + SpinBox_Xmaxi->setMaximum(1e+09); + SpinBox_Xmaxi->setMinimum(-1e+09); + SpinBox_Xmaxi->setValue(0); + + gridLayout1->addWidget(SpinBox_Xmaxi, 0, 3, 1, 1); + + SpinBox_Ymaxi = new QDoubleSpinBox(gBBox); + SpinBox_Ymaxi->setObjectName(QString::fromUtf8("SpinBox_Ymaxi")); + SpinBox_Ymaxi->setDecimals(5); + SpinBox_Ymaxi->setMaximum(1e+09); + SpinBox_Ymaxi->setMinimum(-1e+09); + SpinBox_Ymaxi->setValue(0); + + gridLayout1->addWidget(SpinBox_Ymaxi, 1, 3, 1, 1); + + + gridLayout->addWidget(gBBox, 2, 0, 1, 2); + + gBSphere = new QGroupBox(CreateZone); + gBSphere->setObjectName(QString::fromUtf8("gBSphere")); + QSizePolicy sizePolicy8(static_cast(0), static_cast(0)); + sizePolicy8.setHorizontalStretch(0); + sizePolicy8.setVerticalStretch(0); + sizePolicy8.setHeightForWidth(gBSphere->sizePolicy().hasHeightForWidth()); + gBSphere->setSizePolicy(sizePolicy8); + gridLayout2 = new QGridLayout(gBSphere); + gridLayout2->setSpacing(6); + gridLayout2->setMargin(9); + gridLayout2->setObjectName(QString::fromUtf8("gridLayout2")); + TLXcentre = new QLabel(gBSphere); + TLXcentre->setObjectName(QString::fromUtf8("TLXcentre")); + QSizePolicy sizePolicy9(static_cast(0), static_cast(0)); + sizePolicy9.setHorizontalStretch(0); + sizePolicy9.setVerticalStretch(0); + sizePolicy9.setHeightForWidth(TLXcentre->sizePolicy().hasHeightForWidth()); + TLXcentre->setSizePolicy(sizePolicy9); + TLXcentre->setWordWrap(false); + + gridLayout2->addWidget(TLXcentre, 0, 0, 1, 1); + + SpinBox_Xcentre = new QDoubleSpinBox(gBSphere); + SpinBox_Xcentre->setObjectName(QString::fromUtf8("SpinBox_Xcentre")); + SpinBox_Xcentre->setDecimals(5); + SpinBox_Xcentre->setMaximum(1e+09); + SpinBox_Xcentre->setMinimum(-1e+09); + SpinBox_Xcentre->setValue(0); + + gridLayout2->addWidget(SpinBox_Xcentre, 0, 1, 1, 1); + + TLYcentre = new QLabel(gBSphere); + TLYcentre->setObjectName(QString::fromUtf8("TLYcentre")); + QSizePolicy sizePolicy10(static_cast(0), static_cast(0)); + sizePolicy10.setHorizontalStretch(0); + sizePolicy10.setVerticalStretch(0); + sizePolicy10.setHeightForWidth(TLYcentre->sizePolicy().hasHeightForWidth()); + TLYcentre->setSizePolicy(sizePolicy10); + TLYcentre->setWordWrap(false); + + gridLayout2->addWidget(TLYcentre, 1, 0, 1, 1); + + SpinBox_Ycentre = new QDoubleSpinBox(gBSphere); + SpinBox_Ycentre->setObjectName(QString::fromUtf8("SpinBox_Ycentre")); + SpinBox_Ycentre->setDecimals(5); + SpinBox_Ycentre->setMaximum(1e+09); + SpinBox_Ycentre->setMinimum(-1e+09); + SpinBox_Ycentre->setValue(0); + + gridLayout2->addWidget(SpinBox_Ycentre, 1, 1, 1, 1); + + TLRayon = new QLabel(gBSphere); + TLRayon->setObjectName(QString::fromUtf8("TLRayon")); + QSizePolicy sizePolicy11(static_cast(0), static_cast(0)); + sizePolicy11.setHorizontalStretch(0); + sizePolicy11.setVerticalStretch(0); + sizePolicy11.setHeightForWidth(TLRayon->sizePolicy().hasHeightForWidth()); + TLRayon->setSizePolicy(sizePolicy11); + TLRayon->setWordWrap(false); + + gridLayout2->addWidget(TLRayon, 1, 2, 1, 1); + + SpinBox_Rayon = new QDoubleSpinBox(gBSphere); + SpinBox_Rayon->setObjectName(QString::fromUtf8("SpinBox_Rayon")); + SpinBox_Rayon->setDecimals(5); + SpinBox_Rayon->setMaximum(1e+09); + SpinBox_Rayon->setMinimum(-1e+09); + SpinBox_Rayon->setValue(0); + + gridLayout2->addWidget(SpinBox_Rayon, 1, 3, 1, 1); + + TLZcentre = new QLabel(gBSphere); + TLZcentre->setObjectName(QString::fromUtf8("TLZcentre")); + QSizePolicy sizePolicy12(static_cast(0), static_cast(0)); + sizePolicy12.setHorizontalStretch(0); + sizePolicy12.setVerticalStretch(0); + sizePolicy12.setHeightForWidth(TLZcentre->sizePolicy().hasHeightForWidth()); + TLZcentre->setSizePolicy(sizePolicy12); + TLZcentre->setWordWrap(false); + + gridLayout2->addWidget(TLZcentre, 2, 0, 1, 1); + + SpinBox_Zcentre = new QDoubleSpinBox(gBSphere); + SpinBox_Zcentre->setObjectName(QString::fromUtf8("SpinBox_Zcentre")); + SpinBox_Zcentre->setDecimals(5); + SpinBox_Zcentre->setMaximum(1e+09); + SpinBox_Zcentre->setMinimum(-1e+09); + SpinBox_Zcentre->setValue(0); + + gridLayout2->addWidget(SpinBox_Zcentre, 2, 1, 1, 1); - SpinBox_Ycentre = new QDoubleSpinBox(gBSphere); - SpinBox_Ycentre->setObjectName(QString::fromUtf8("SpinBox_Ycentre")); - SpinBox_Ycentre->setDecimals(5); - SpinBox_Ycentre->setMinimum(-1e+09); - SpinBox_Ycentre->setMaximum(1e+09); - SpinBox_Ycentre->setValue(0); - gridLayout_2->addWidget(SpinBox_Ycentre, 1, 1, 1, 1); + gridLayout->addWidget(gBSphere, 3, 0, 1, 2); - TLRayon = new QLabel(gBSphere); - TLRayon->setObjectName(QString::fromUtf8("TLRayon")); - sizePolicy.setHeightForWidth(TLRayon->sizePolicy().hasHeightForWidth()); - TLRayon->setSizePolicy(sizePolicy); - TLRayon->setWordWrap(false); + GBButtons = new QGroupBox(CreateZone); + GBButtons->setObjectName(QString::fromUtf8("GBButtons")); + QSizePolicy sizePolicy13(static_cast(0), static_cast(0)); + sizePolicy13.setHorizontalStretch(0); + sizePolicy13.setVerticalStretch(0); + sizePolicy13.setHeightForWidth(GBButtons->sizePolicy().hasHeightForWidth()); + GBButtons->setSizePolicy(sizePolicy13); + hboxLayout1 = new QHBoxLayout(GBButtons); + hboxLayout1->setSpacing(6); + hboxLayout1->setMargin(9); + hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1")); + buttonOk = new QPushButton(GBButtons); + buttonOk->setObjectName(QString::fromUtf8("buttonOk")); - gridLayout_2->addWidget(TLRayon, 1, 2, 1, 1); + hboxLayout1->addWidget(buttonOk); - SpinBox_Rayon = new QDoubleSpinBox(gBSphere); - SpinBox_Rayon->setObjectName(QString::fromUtf8("SpinBox_Rayon")); - SpinBox_Rayon->setDecimals(5); - SpinBox_Rayon->setMinimum(-1e+09); - SpinBox_Rayon->setMaximum(1e+09); - SpinBox_Rayon->setValue(0); + buttonApply = new QPushButton(GBButtons); + buttonApply->setObjectName(QString::fromUtf8("buttonApply")); - gridLayout_2->addWidget(SpinBox_Rayon, 1, 3, 1, 1); + hboxLayout1->addWidget(buttonApply); - TLZcentre = new QLabel(gBSphere); - TLZcentre->setObjectName(QString::fromUtf8("TLZcentre")); - sizePolicy.setHeightForWidth(TLZcentre->sizePolicy().hasHeightForWidth()); - TLZcentre->setSizePolicy(sizePolicy); - TLZcentre->setWordWrap(false); + buttonCancel = new QPushButton(GBButtons); + buttonCancel->setObjectName(QString::fromUtf8("buttonCancel")); - gridLayout_2->addWidget(TLZcentre, 2, 0, 1, 1); + hboxLayout1->addWidget(buttonCancel); - SpinBox_Zcentre = new QDoubleSpinBox(gBSphere); - SpinBox_Zcentre->setObjectName(QString::fromUtf8("SpinBox_Zcentre")); - SpinBox_Zcentre->setDecimals(5); - SpinBox_Zcentre->setMinimum(-1e+09); - SpinBox_Zcentre->setMaximum(1e+09); - SpinBox_Zcentre->setValue(0); + buttonHelp = new QPushButton(GBButtons); + buttonHelp->setObjectName(QString::fromUtf8("buttonHelp")); - gridLayout_2->addWidget(SpinBox_Zcentre, 2, 1, 1, 1); + hboxLayout1->addWidget(buttonHelp); - gridLayout_3->addWidget(gBSphere, 3, 0, 1, 2); + gridLayout->addWidget(GBButtons, 4, 0, 1, 2); - GBButtons = new QGroupBox(CreateZone); - GBButtons->setObjectName(QString::fromUtf8("GBButtons")); - sizePolicy.setHeightForWidth(GBButtons->sizePolicy().hasHeightForWidth()); - GBButtons->setSizePolicy(sizePolicy); - hboxLayout = new QHBoxLayout(GBButtons); -#ifndef Q_OS_MAC - hboxLayout->setSpacing(6); -#endif -#ifndef Q_OS_MAC - hboxLayout->setMargin(9); -#endif - hboxLayout->setObjectName(QString::fromUtf8("hboxLayout")); - buttonOk = new QPushButton(GBButtons); - buttonOk->setObjectName(QString::fromUtf8("buttonOk")); - hboxLayout->addWidget(buttonOk); + retranslateUi(CreateZone); - buttonApply = new QPushButton(GBButtons); - buttonApply->setObjectName(QString::fromUtf8("buttonApply")); + QSize size(454, 472); + size = size.expandedTo(CreateZone->minimumSizeHint()); + CreateZone->resize(size); - hboxLayout->addWidget(buttonApply); - buttonCancel = new QPushButton(GBButtons); - buttonCancel->setObjectName(QString::fromUtf8("buttonCancel")); - - hboxLayout->addWidget(buttonCancel); - - buttonHelp = new QPushButton(GBButtons); - buttonHelp->setObjectName(QString::fromUtf8("buttonHelp")); - - hboxLayout->addWidget(buttonHelp); - - - gridLayout_3->addWidget(GBButtons, 4, 0, 1, 2); - - - retranslateUi(CreateZone); - - QMetaObject::connectSlotsByName(CreateZone); + QMetaObject::connectSlotsByName(CreateZone); } // setupUi void retranslateUi(QDialog *CreateZone) { - CreateZone->setWindowTitle(QApplication::translate("CreateZone", "Create Zone", 0, QApplication::UnicodeUTF8)); - Name->setText(QApplication::translate("CreateZone", "Name", 0, QApplication::UnicodeUTF8)); - TypeZone->setTitle(QApplication::translate("CreateZone", "Type of zone", 0, QApplication::UnicodeUTF8)); - RBBox->setText(QString()); - RBSphere->setText(QString()); - gBBox->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8)); - TLXmini->setText(QApplication::translate("CreateZone", "X mini", 0, QApplication::UnicodeUTF8)); - TLYmini->setText(QApplication::translate("CreateZone", "Y mini", 0, QApplication::UnicodeUTF8)); - TLZmini->setText(QApplication::translate("CreateZone", "Z mini", 0, QApplication::UnicodeUTF8)); - TLXmaxi->setText(QApplication::translate("CreateZone", "X maxi", 0, QApplication::UnicodeUTF8)); - TLZmaxi->setText(QApplication::translate("CreateZone", "Z maxi", 0, QApplication::UnicodeUTF8)); - TLYmaxi->setText(QApplication::translate("CreateZone", "Y maxi", 0, QApplication::UnicodeUTF8)); - gBSphere->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8)); - TLXcentre->setText(QApplication::translate("CreateZone", "X centre", 0, QApplication::UnicodeUTF8)); - TLYcentre->setText(QApplication::translate("CreateZone", "Y centre", 0, QApplication::UnicodeUTF8)); - TLRayon->setText(QApplication::translate("CreateZone", "Radius", 0, QApplication::UnicodeUTF8)); - TLZcentre->setText(QApplication::translate("CreateZone", "Z centre", 0, QApplication::UnicodeUTF8)); - GBButtons->setTitle(QString()); - buttonOk->setText(QApplication::translate("CreateZone", "&Ok", 0, QApplication::UnicodeUTF8)); - buttonApply->setText(QApplication::translate("CreateZone", "&Apply", 0, QApplication::UnicodeUTF8)); - buttonCancel->setText(QApplication::translate("CreateZone", "&Cancel", 0, QApplication::UnicodeUTF8)); - buttonHelp->setText(QApplication::translate("CreateZone", "&Help", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(CreateZone); + CreateZone->setWindowTitle(QApplication::translate("CreateZone", "Create a zone", 0, QApplication::UnicodeUTF8)); + Name->setText(QApplication::translate("CreateZone", "Name", 0, QApplication::UnicodeUTF8)); + TypeZone->setTitle(QApplication::translate("CreateZone", "Type of zone", 0, QApplication::UnicodeUTF8)); + RBBox->setText(QString()); + RBSphere->setText(QString()); + gBBox->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8)); + TLXmini->setText(QApplication::translate("CreateZone", "X mini", 0, QApplication::UnicodeUTF8)); + TLYmini->setText(QApplication::translate("CreateZone", "Y mini", 0, QApplication::UnicodeUTF8)); + TLZmini->setText(QApplication::translate("CreateZone", "Z mini", 0, QApplication::UnicodeUTF8)); + TLXmaxi->setText(QApplication::translate("CreateZone", "X maxi", 0, QApplication::UnicodeUTF8)); + TLZmaxi->setText(QApplication::translate("CreateZone", "Z maxi", 0, QApplication::UnicodeUTF8)); + TLYmaxi->setText(QApplication::translate("CreateZone", "Y maxi", 0, QApplication::UnicodeUTF8)); + gBSphere->setTitle(QApplication::translate("CreateZone", "Coordinates", 0, QApplication::UnicodeUTF8)); + TLXcentre->setText(QApplication::translate("CreateZone", "X centre", 0, QApplication::UnicodeUTF8)); + TLYcentre->setText(QApplication::translate("CreateZone", "Y centre", 0, QApplication::UnicodeUTF8)); + TLRayon->setText(QApplication::translate("CreateZone", "Radius", 0, QApplication::UnicodeUTF8)); + TLZcentre->setText(QApplication::translate("CreateZone", "Z centre", 0, QApplication::UnicodeUTF8)); + GBButtons->setTitle(QString()); + buttonOk->setText(QApplication::translate("CreateZone", "OK", 0, QApplication::UnicodeUTF8)); + buttonApply->setText(QApplication::translate("CreateZone", "Apply", 0, QApplication::UnicodeUTF8)); + buttonCancel->setText(QApplication::translate("CreateZone", "Cancel", 0, QApplication::UnicodeUTF8)); + buttonHelp->setText(QApplication::translate("CreateZone", "Help", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(CreateZone); } // retranslateUi }; @@ -381,6 +420,4 @@ namespace Ui { class CreateZone: public Ui_CreateZone {}; } // namespace Ui -QT_END_NAMESPACE - #endif // CREATEZONE_H diff --git a/src/HOMARDGUI/CreateZone.ui b/src/HOMARDGUI/CreateZone.ui index 0c98d284..e851ad47 100644 --- a/src/HOMARDGUI/CreateZone.ui +++ b/src/HOMARDGUI/CreateZone.ui @@ -1,288 +1,319 @@ - - + CreateZone - - + + 0 0 - 415 + 454 472 - - Create Zone + + Create a zone - - false + + true - + true - - - - + + + 9 + + + 6 + + + + Name - - - + + + 32 - - - - + + + + + 0 + 0 0 0 - + 340 0 - + Type of zone - + + + 9 + + + 6 + - - + + - - - ../../resources/zone_boxdxyz.png../../resources/zone_boxdxyz.png + + ../../resources/zone_boxdxyz.png - + true - + true - - + + - - - ../../resources/zone_spherepoint.png../../resources/zone_spherepoint.png + + ../../resources/zone_spherepoint.png - - - - + + + + + 0 + 0 0 0 - + Coordinates - - - - - + + + 9 + + + 6 + + + + + + 0 + 0 0 0 - + X mini - + false - - - + + + 5 - - -999999999.000000000000000 - - + 999999999.000000000000000 - + + -999999999.000000000000000 + + 0.000000000000000 - - - - + + + + + 0 + 0 0 0 - + Y mini - + false - - - + + + 5 - - -999999999.000000000000000 - - + 999999999.000000000000000 - + + -999999999.000000000000000 + + 0.000000000000000 - - - - + + + + + 0 + 0 0 0 - + Z mini - + false - - - + + + 5 - - -999999999.000000000000000 - - + 999999999.000000000000000 - + + -999999999.000000000000000 + + 0.000000000000000 - - - - + + + + + 0 + 0 0 0 - + X maxi - + false - - - - + + + + + 0 + 0 0 0 - + Z maxi - + false - - - + + + 5 - - -999999999.000000000000000 - - + 999999999.000000000000000 - + + -999999999.000000000000000 + + 0.000000000000000 - - - - + + + + + 0 + 0 0 0 - + Y maxi - + false - - - + + + 5 - - -999999999.000000000000000 - - + 999999999.000000000000000 - + + -999999999.000000000000000 + + 0.000000000000000 - - - + + + 5 - - -999999999.000000000000000 - - + 999999999.000000000000000 - + + -999999999.000000000000000 + + 0.000000000000000 @@ -290,142 +321,158 @@ - - - - + + + + + 0 + 0 0 0 - + Coordinates - - - - - + + + 9 + + + 6 + + + + + + 0 + 0 0 0 - + X centre - + false - - - + + + 5 - - -999999999.000000000000000 - - + 999999999.000000000000000 - + + -999999999.000000000000000 + + 0.000000000000000 - - - - + + + + + 0 + 0 0 0 - + Y centre - + false - - - + + + 5 - - -999999999.000000000000000 - - + 999999999.000000000000000 - + + -999999999.000000000000000 + + 0.000000000000000 - - - - + + + + + 0 + 0 0 0 - + Radius - + false - - - + + + 5 - - -999999999.000000000000000 - - + 999999999.000000000000000 - + + -999999999.000000000000000 + + 0.000000000000000 - - - - + + + + + 0 + 0 0 0 - + Z centre - + false - - - + + + 5 - - -999999999.000000000000000 - - + 999999999.000000000000000 - + + -999999999.000000000000000 + + 0.000000000000000 @@ -433,49 +480,51 @@ - - - - + + + + + 0 + 0 0 0 - + - - - 6 - - + + 9 + + 6 + - - - &Ok + + + OK - - - &Apply + + + Apply - - - &Cancel + + + Cancel - - - &Help + + + Help diff --git a/src/HOMARDGUI/EditFile.h b/src/HOMARDGUI/EditFile.h index a3c982f6..4248dd51 100644 --- a/src/HOMARDGUI/EditFile.h +++ b/src/HOMARDGUI/EditFile.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading ui file 'EditFile.ui' ** -** Created: Tue Feb 1 14:56:22 2011 +** Created: Tue Mar 15 10:38:58 2011 ** by: Qt User Interface Compiler version 4.2.1 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! @@ -82,7 +82,7 @@ public: retranslateUi(EditFile); - QSize size(548, 901); + QSize size(675, 901); size = size.expandedTo(EditFile->minimumSizeHint()); EditFile->resize(size); @@ -92,10 +92,10 @@ public: void retranslateUi(QWidget *EditFile) { - EditFile->setWindowTitle(QApplication::translate("EditFile", "Edit File", 0, QApplication::UnicodeUTF8)); + EditFile->setWindowTitle(QApplication::translate("EditFile", "Edit a file", 0, QApplication::UnicodeUTF8)); GroupButtons->setTitle(QString()); - buttonPrint->setText(QApplication::translate("EditFile", "&Print", 0, QApplication::UnicodeUTF8)); - buttonQuit->setText(QApplication::translate("EditFile", "&Quit", 0, QApplication::UnicodeUTF8)); + buttonPrint->setText(QApplication::translate("EditFile", "Print", 0, QApplication::UnicodeUTF8)); + buttonQuit->setText(QApplication::translate("EditFile", "Quit", 0, QApplication::UnicodeUTF8)); Q_UNUSED(EditFile); } // retranslateUi diff --git a/src/HOMARDGUI/EditFile.ui b/src/HOMARDGUI/EditFile.ui index 8c7b2087..266c3d35 100644 --- a/src/HOMARDGUI/EditFile.ui +++ b/src/HOMARDGUI/EditFile.ui @@ -5,12 +5,12 @@ 0 0 - 548 + 675 901 - Edit File + Edit a file @@ -47,14 +47,14 @@ - &Print + Print - &Quit + Quit true diff --git a/src/HOMARDGUI/HOMARDGUI.cxx b/src/HOMARDGUI/HOMARDGUI.cxx index 41b6721f..fd1f2c60 100644 --- a/src/HOMARDGUI/HOMARDGUI.cxx +++ b/src/HOMARDGUI/HOMARDGUI.cxx @@ -107,6 +107,7 @@ void HOMARDGUI::initialize( CAM_Application* app ) //================================================ void HOMARDGUI::createHOMARDAction( const int id, const QString& po_id, const QString& icon_id, const int key, const bool toggle ) { + MESSAGE("HOMARDGUI::createHOMARDAction"); QIcon icon; QWidget* parent = application()->desktop(); SUIT_ResourceMgr* resMgr = application()->resourceMgr(); @@ -114,13 +115,13 @@ void HOMARDGUI::createHOMARDAction( const int id, const QString& po_id, const QS if ( icon_id.length() ) pix = resMgr->loadPixmap( "HOMARD", tr( icon_id .toLatin1().data()) ); else - pix = resMgr->loadPixmap( "HOMARD", tr( QString( "ICO_%1" ).arg( po_id ).toLatin1().data() ), false ); + pix = resMgr->loadPixmap( "HOMARD", tr( QString( "ICO_%1" ).arg( po_id ).toLatin1().data()), false ); if ( !pix.isNull() ) icon = QIcon( pix ); - QString tooltip = tr( QString( "TOP_%1" ).arg( po_id ).toLatin1().data() ), - menu = tr( QString( "MEN_%1" ).arg( po_id ).toLatin1().data() ), - status_bar = tr( QString( "STB_%1" ).arg( po_id ).toLatin1().data() ); + QString tooltip = tr(QString( "HOM_TOP_%1" ).arg( po_id ).toLatin1().data()), + menu = tr(QString( "HOM_MEN_%1" ).arg( po_id ).toLatin1().data()), + status_bar = tr(QString( "HOM_STB_%1" ).arg( po_id ).toLatin1().data()); createAction( id, tooltip, icon, menu, status_bar, key, parent, toggle, this, SLOT( OnGUIEvent() ) ); } @@ -162,6 +163,7 @@ void HOMARDGUI::createPreferences(){ // Verifier l'avant dernier nombre passe en parametre //================================================ void HOMARDGUI::createMenus(){ + MESSAGE("HOMARDGUI::createMenus") int HOMARD_Id = createMenu( tr( "HOMARD" ), -1, 5, 10 ); createMenu( 1101, HOMARD_Id, -1 ); //Create_Case createMenu( 1102, HOMARD_Id, -1 ); //Create_Iteration @@ -227,8 +229,9 @@ bool HOMARDGUI::OnGUIEvent (int theCommandID) { case 1101: // Creation d un Cas { + MESSAGE("etape 1101") MESSAGE("command " << theCommandID << " activated"); - MonCreateCase *aDlg = new MonCreateCase( parent, TRUE, + MonCreateCase *aDlg = new MonCreateCase( parent, TRUE, HOMARD::HOMARD_Gen::_duplicate(homardGen) ) ; aDlg->show(); break; @@ -239,7 +242,7 @@ bool HOMARDGUI::OnGUIEvent (int theCommandID) MESSAGE("command " << theCommandID << " activated"); QString IterParentName=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("IterationHomard"), 0); MESSAGE("IterParentName " << IterParentName.toStdString().c_str() << " choisi dans arbre"); - MonCreateIteration *IterDlg = new MonCreateIteration( parent, true, + MonCreateIteration *IterDlg = new MonCreateIteration( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), IterParentName ) ; IterDlg->show(); break; @@ -256,9 +259,8 @@ bool HOMARDGUI::OnGUIEvent (int theCommandID) } catch( SALOME::SALOME_Exception& S_ex ) { - QMessageBox::information( 0, "Error", - QString(CORBA::string_dup(S_ex.details.text)), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QString(CORBA::string_dup(S_ex.details.text)) ); getApp()->updateObjectBrowser(); return false; } @@ -398,13 +400,13 @@ void HOMARDGUI::windows( QMap& theMap ) const void HOMARDGUI::setOrb() //============================================================================= { - try + try { ORB_INIT &init = *SINGLETON_::Instance(); ASSERT(SINGLETON_::IsAlreadyExisting()); _orb = init( 0 , 0 ); - } - catch (...) + } + catch (...) { INFOS("internal error : orb not found"); _orb = 0; @@ -420,7 +422,7 @@ _PTR(SObject) HOMARDGUI::chercheMonObjet() _PTR(SObject) obj; SALOME_ListIO lst; getApp()->selectionMgr()->selectedObjects( lst ); - if ( lst.Extent() == 1 ) + if ( lst.Extent() == 1 ) { Handle(SALOME_InteractiveObject) io = lst.First(); SalomeApp_Study* appStudy = dynamic_cast( application()->activeStudy() ); @@ -436,7 +438,7 @@ _PTR(SObject) HOMARDGUI::chercheMonObjet() void HOMARDGUI::contextMenuPopup( const QString& client, QMenu* menu, QString& title ) //============================================================================= { - MESSAGE("Debut de contextMenuPopup"); + MESSAGE("Debut de HOMARDGUI::contextMenuPopup"); _PTR(SObject) obj = chercheMonObjet(); if ( obj ) { @@ -447,41 +449,41 @@ void HOMARDGUI::contextMenuPopup( const QString& client, QMenu* menu, QString& t if ( HOMARD_UTILS::isBoundaryAn(obj) ) { QPixmap pix = resMgr->loadPixmap( "HOMARD", "whatis.png" ); - menu->addAction(QIcon(pix), "Edit boundary", this,SLOT(EditBoDi())); + menu->addAction(QIcon(pix), tr(QString("HOM_MEN_EDIT_BOUNDARY").toLatin1().data()), this,SLOT(EditBoDi())); } else if ( HOMARD_UTILS::isBoundaryDi(obj) ) { QPixmap pix = resMgr->loadPixmap( "HOMARD", "whatis.png" ); - menu->addAction(QIcon(pix), "Edit boundary", this,SLOT(EditBoDi())); + menu->addAction(QIcon(pix), tr(QString("HOM_MEN_EDIT_BOUNDARY").toLatin1().data()), this,SLOT(EditBoDi())); } else if ( HOMARD_UTILS::isZone(obj) ) { QPixmap pix = resMgr->loadPixmap( "HOMARD", "whatis.png" ); - menu->addAction(QIcon(pix), "Edit zone", this,SLOT(EditZone())); + menu->addAction(QIcon(pix), tr(QString("HOM_MEN_EDIT_ZONE").toLatin1().data()), this,SLOT(EditZone())); } else if ( HOMARD_UTILS::isHypo(obj) ) { QPixmap pix = resMgr->loadPixmap( "HOMARD", "whatis.png" ); - menu->addAction(QIcon(pix), "Edit hypothesis", this,SLOT(EditHypo())); + menu->addAction(QIcon(pix), tr(QString("HOM_MEN_EDIT_HYPO").toLatin1().data()), this,SLOT(EditHypo())); } else if ( HOMARD_UTILS::isIter(obj) ) { QPixmap pix = resMgr->loadPixmap( "HOMARD", "iter_next.png" ); - menu->addAction(QIcon(pix), "Next iteration", this,SLOT(NextIter())); + menu->addAction(QIcon(pix), tr(QString("HOM_MEN_NEW_ITERATION").toLatin1().data()), this,SLOT(NextIter())); QPixmap pix1 = resMgr->loadPixmap( "HOMARD", "whatis.png" ); - menu->addAction(QIcon(pix1), "Edit iteration", this,SLOT(EditIter())); + menu->addAction(QIcon(pix1), tr(QString("HOM_MEN_EDIT_ITERATION").toLatin1().data()), this,SLOT(EditIter())); QPixmap pix2 = resMgr->loadPixmap( "HOMARD", "mesh_compute.png" ); - menu->addAction(QIcon(pix2), "Compute", this,SLOT(LanceCalcul())); + menu->addAction(QIcon(pix2), tr(QString("HOM_MEN_COMPUTE").toLatin1().data()), this,SLOT(LanceCalcul())); } else if ( HOMARD_UTILS::isCase(obj) ) { QPixmap pix = resMgr->loadPixmap( "HOMARD", "whatis.png" ); - menu->addAction(QIcon(pix), "Edit case", this,SLOT(EditCase())); + menu->addAction(QIcon(pix), tr(QString("HOM_MEN_EDIT_CASE").toLatin1().data()), this,SLOT(EditCase())); } else if ( HOMARD_UTILS::isFileMess(obj) or HOMARD_UTILS::isFileSummary(obj) ) { QPixmap pix = resMgr->loadPixmap( "HOMARD", "texte.png" ); - menu->addAction(QIcon(pix), "Show file", this,SLOT(EditAsciiFile())); + menu->addAction(QIcon(pix), tr(QString("HOM_MEN_EDIT_MESS_FILE").toLatin1().data()), this,SLOT(EditAsciiFile())); } } } @@ -501,9 +503,9 @@ void HOMARDGUI::EditCase() this->OnGUIEvent(1120); } -void HOMARDGUI::EditIter() +void HOMARDGUI::EditIter() { - this->OnGUIEvent(1121); + this->OnGUIEvent(1121); } void HOMARDGUI::EditHypo() diff --git a/src/HOMARDGUI/HOMARD_icons.po b/src/HOMARDGUI/HOMARD_icons.po deleted file mode 100644 index b386757a..00000000 --- a/src/HOMARDGUI/HOMARD_icons.po +++ /dev/null @@ -1,11 +0,0 @@ -# This is a Qt message file in .po format. Each msgid starts with -# a scope. This scope should *NOT* be translated - eg. "Foo::Bar" -# would be translated to "Pub", not "Foo::Pub". -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2002-05-28 10:57:43 AM CEST\n" -"PO-Revision-Date: YYYY-MM-DD\n" -"Last-Translator: FULLNAME \n" -"Content-Type: text/plain; charset=iso-8859-1\n" - diff --git a/src/HOMARDGUI/HOMARD_msg_en.po b/src/HOMARDGUI/HOMARD_msg_en.po deleted file mode 100644 index eea471a9..00000000 --- a/src/HOMARDGUI/HOMARD_msg_en.po +++ /dev/null @@ -1,111 +0,0 @@ -# This is a Qt message file in .po format. Each msgid starts with -# a scope. This scope should *NOT* be translated - eg. translating -# from French to English, "Foo::Bar" would be translated to "Pub", -# not "Foo::Pub". -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2003-11-19 03:10:19 PM CET\n" -"PO-Revision-Date: YYYY-MM-DD\n" -"Last-Translator: FULLNAME \n" -"Content-Type: text/plain; charset=iso-8859-1\n" - -#: HOMARDGUI.cxx:76 -msgid "HOMARDGUI::BUT_OK" -msgstr "OK" - -#: HOMARDGUI.cxx:76 -msgid "HOMARDGUI::INF_HOMARD_BANNER" -msgstr "HOMARD Information" - -#: HOMARDGUI.cxx:76 -msgid "HOMARDGUI::INF_HOMARD_MENU" -msgstr "This is just a test" - -#: HOMARDGUI.cxx:57 -msgid "HOMARDGUI::QUE_HOMARD_LABEL" -msgstr "Name Import" - -#: HOMARDGUI.cxx:57 -msgid "HOMARDGUI::QUE_HOMARD_NAME" -msgstr "Please, Enter your name" - -msgid "PREF_GROUP_GENERAL" -msgstr "General" - -msgid "PREF_TAB_SETTINGS" -msgstr "Settings" - -msgid "PREF_TEST" -msgstr "Pascale" - - -#------------------------------------------------------------------------- -# MEN -#------------------------------------------------------------------------- - -msgid "MEN_HOMARD" -msgstr "HOMARD" - -msgid "ROOT_INFO" -msgstr "Informations" - -#----------- Menu bar ----------# -#------ MEN -----# -msgid "MEN_EDIT" -msgstr "Edition d un fichier de commande Homard par Eficas" - -msgid "MEN_INFO" -msgstr "Information Maillage (interactif)" - -msgid "MEN_ADAPT_GESTION" -msgstr "Adaptation : gestion d une iteration" - -msgid "MEN_ADAPT_CREATION" -msgstr "Adaptation : creation du cas" - -msgid "MEN_UNIFORME" -msgstr "Raffiment Uniforme" - -msgid "MEN_POURLESNULS" -msgstr "Homard Pour Les Nuls" - -msgid "SSM_AVANCE" -msgstr "Utilisation Avancee" - -#----------- Menu bar ----------# -#------ MEN -----# -msgid "MEN_EDIT" -msgstr "Edition d un fichier de commande Homard par Eficas" - -msgid "MEN_INFO" -msgstr "Information Maillage (interactif)" - -msgid "MEN_ADAPT_GESTION" -msgstr "Adaptation : gestion d une iteration" - -msgid "MEN_ADAPT_CREATION" -msgstr "Adaptation : creation du cas" - - -#------ STB -----# -msgid "STB_EDIT" -msgstr "Lance Eficas pour editer le fichier de commande Homard" - -msgid "STB_INFO" -msgstr "Information Homard (interactif)" - -msgid "STB_ADAPT_GESTION" -msgstr "Adaptation Homard" - -msgid "STB_ADAPT_CREATION" -msgstr "Creation d un cas Homard" - - -#-------Popup Menu ----------------# -msgid "MEN_FILE_EDIT" -msgstr "Edition" -msgid "TOP_FILE_EDIT" -msgstr "Edition" -msgid "MEN_FILE_EDIT" -msgstr "Edition" diff --git a/src/HOMARDGUI/HOMARD_msg_en.ts b/src/HOMARDGUI/HOMARD_msg_en.ts index bcc2452b..6f5f7684 100644 --- a/src/HOMARDGUI/HOMARD_msg_en.ts +++ b/src/HOMARDGUI/HOMARD_msg_en.ts @@ -1,69 +1,319 @@ + - - - - @default - - MEN_HOMARD - HOMARD - - - MEN_NEW_CASE - New case - - - MEN_NEW_ITERATION - Next iteration - - - MEN_COMPUTE - Compute - - - MEN_EDIT_CASE - Edit case - - - MEN_EDIT_ITERATION - Edit iteration - - - MEN_EDIT_HYPO - Edit hypothesis - - - MEN_EDIT_ZONE - Edit zone - - - MEN_EDIT_BOUNDARY - Edit boundary - - - MEN_EDIT_MESS_FILE - Show file - - + + + @default + + HOM_MEN_HOMARD + HOMARD + + + HOM_MEN_NEW_CASE + New case + + + HOM_MEN_NEW_ITERATION + Next iteration + + + HOM_MEN_COMPUTE + Compute + + + HOM_MEN_EDIT_CASE + Edit the case + + + HOM_MEN_EDIT_ITERATION + Edit the iteration + + + HOM_MEN_EDIT_HYPO + Edit the hypothesis + + + HOM_MEN_EDIT_ZONE + Edit the zone + + + HOM_MEN_EDIT_BOUNDARY + Edit the boundary + + + HOM_MEN_EDIT_MESS_FILE + Show the file + + + HOM_TOP_HOMARD + HOMARD + + + HOM_TOP_NEW_CASE + New case + + + HOM_TOP_NEW_ITERATION + Next iteration + + + HOM_TOP_COMPUTE + Compute + + + HOM_TOP_EDIT_CASE + Edit the case + + + HOM_TOP_EDIT_ITERATION + Edit the iteration + + + HOM_TOP_EDIT_HYPO + Edit the hypothesis + + + HOM_TOP_EDIT_ZONE + Edit the zone + + + HOM_TOP_EDIT_BOUNDARY + Edit the boundary + + + HOM_TOP_EDIT_MESS_FILE + Show the file + + + HOM_STB_HOMARD + HOMARD + + + HOM_STB_NEW_CASE + New case + + + HOM_STB_NEW_ITERATION + Next iteration + + + HOM_STB_COMPUTE + Compute + + + HOM_STB_EDIT_CASE + Edit the case + + + HOM_STB_EDIT_ITERATION + Edit the iteration + + + HOM_STB_EDIT_HYPO + Edit the hypothesis + + + HOM_STB_EDIT_ZONE + Edit the zone + + + HOM_STB_EDIT_BOUNDARY + Edit the boundary + + + HOM_STB_EDIT_MESS_FILE + Show the file + + + HOM_WARNING + Warning + + + HOM_ERROR + Error + + + HOM_INACTIVE_BUTTON + Inactive button + + + HOM_SELECT_OBJECT_1 + Select an object. + + + HOM_SELECT_OBJECT_2 + Select only one object. + + + HOM_SELECT_OBJECT_3 + Select an object with type %1. + + + HOM_SELECT_FILE_1 + Select a file. + + + HOM_SELECT_FILE_2 + Select only one file. + + + HOM_MED_FILE_1 + This MED file cannot be read. + + + HOM_MED_FILE_2 + No mesh in this MED file. + + + HOM_MED_FILE_3 + More than one mesh in this MED file. + + + HOM_MED_FILE_4 + The mesh in this MED file cannot be read. + + + HOM_MED_FILE_5 + No field in this MED file. + + + HOM_MED_FILE_6 + The field(s) in this MED file cannot be read. + + + HOM_SELECT_STUDY + Select a study object with associated MED file \n or select a MED file. + + + HOM_CASE_NAME + The case must be named. + + + HOM_CASE_DIRECTORY_1 + A directory for the case must be selected. + + + HOM_CASE_DIRECTORY_2 + This directory is already used. + + + HOM_CASE_DIRECTORY_3 + A valid directory for the case must be selected. + + + HOM_CASE_MESH + The file of the initial mesh must be selected. + + + HOM_CASE_GROUP + The group "%1" cannot be given for more than 1 boundary. + + + HOM_CASE_EDIT_WINDOW_TITLE + Edition of a case + + + HOM_ITER_NAME + The iteration must be named. + + + HOM_ITER_STARTING_POINT + The previous iteration must be given. + + + HOM_ITER_MESH + Give a name for the final mesh. + + + HOM_ITER_HYPO + An hypothesis must be selected. + + + HOM_ITER_FIELD_FILE + With this hypothesis, a file for the field must be given. + + + HOM_ITER_STARTING_POINT_0 + Mesh + + + HOM_ITER_STARTING_POINT_1 + First iteration of the case + + + HOM_ITER_EDIT_WINDOW_TITLE + Edition of an iteration + + + HOM_HYPO_NAME + The hypothesis must be named. + + + HOM_HYPO_FIELD_FILE + A file for the field must be given. + + + HOM_HYPO_ZONE_1 + A zone must be selected. + + + HOM_HYPO_ZONE_2 + At least, one zone must be selected. + + + HOM_HYPO_NORM_L2 + L2 norm + + + HOM_HYPO_NORM_INF + Infinite norm + + + HOM_HYPO_NORM_ABS + Absolute + + + HOM_HYPO_NORM_REL + Relative + + + HOM_HYPO_COMP + At least, one component must be selected. + + + HOM_HYPO_EDIT_WINDOW_TITLE + Edition of an hypothesis + + + HOM_ZONE_NAME + The zone must be named. + + + HOM_ZONE_LIMIT + %1 maxi must be greater than %1 mini. + + + HOM_ZONE_EDIT_WINDOW_TITLE + Edition of a zone + + + HOM_BOUN_NAME + The boundary must be named. + + + HOM_BOUN_MESH + The file for the mesh of the boundary must be selected. + + + HOM_BOUN_CASE + The meshfile of the case is unknown. + + + HOM_BOUN_A_EDIT_WINDOW_TITLE + Edition of an analytical boundary + + + HOM_BOUN_D_EDIT_WINDOW_TITLE + Edition of a discrete boundary + + diff --git a/src/HOMARDGUI/HOMARD_msg_fr.po b/src/HOMARDGUI/HOMARD_msg_fr.po deleted file mode 100644 index 9023c6a0..00000000 --- a/src/HOMARDGUI/HOMARD_msg_fr.po +++ /dev/null @@ -1,31 +0,0 @@ -# This is a Qt message file in .po format. Each msgid starts with -# a scope. This scope should *NOT* be translated - eg. translating -# from French to English, "Foo::Bar" would be translated to "Pub", -# not "Foo::Pub". -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2003-11-19 03:10:25 PM CET\n" -"PO-Revision-Date: YYYY-MM-DD\n" -"Last-Translator: FULLNAME \n" -"Content-Type: text/plain; charset=iso-8859-1\n" - -#: HOMARDGUI.cxx:76 -msgid "HOMARDGUI::BUT_OK" -msgstr "OK" - -#: HOMARDGUI.cxx:76 -msgid "HOMARDGUI::INF_HOMARD_BANNER" -msgstr "Information HOMARD" - -#: HOMARDGUI.cxx:76 -msgid "HOMARDGUI::INF_HOMARD_MENU" -msgstr "Ceci est un simple test" - -#: HOMARDGUI.cxx:57 -msgid "HOMARDGUI::QUE_HOMARD_LABEL" -msgstr "Import Prénom" - -#: HOMARDGUI.cxx:57 -msgid "HOMARDGUI::QUE_HOMARD_NAME" -msgstr "Entrez votre prénom, s'il vous plait" diff --git a/src/HOMARDGUI/HOMARD_msg_fr.ts b/src/HOMARDGUI/HOMARD_msg_fr.ts index 9a1a4271..5e0bbe15 100644 --- a/src/HOMARDGUI/HOMARD_msg_fr.ts +++ b/src/HOMARDGUI/HOMARD_msg_fr.ts @@ -1,65 +1,619 @@ + - - - - @default - - MEN_HOMARD - HOMARD - - - MEN_NEW_CASE - New case - - - MEN_NEW_ITERATION - New iteration - - - MEN_COMPUTE - Compute - - - MEN_EDIT_CASE - Edit case - - - MEN_EDIT_ITERATION - Edit iteration - - - MEN_EDIT_HYPO - Edit hypothesis - - - MEN_EDIT_ZONE - Edit zone - - - MEN_EDIT_BOUNDARY - Edit boundary - - + + + @default + + HOM_MEN_HOMARD + HOMARD + + + HOM_MEN_NEW_CASE + Nouveau cas + + + HOM_MEN_NEW_ITERATION + Nouvelle itération + + + HOM_MEN_COMPUTE + Calculer + + + HOM_MEN_EDIT_CASE + Editer le cas + + + HOM_MEN_EDIT_ITERATION + Editer l'itération + + + HOM_MEN_EDIT_HYPO + Editer l'hypothèse + + + HOM_MEN_EDIT_ZONE + Editer la zone + + + HOM_MEN_EDIT_BOUNDARY + Editer la frontière + + + HOM_MEN_EDIT_MESS_FILE + Afficher le fichier + + + HOM_TOP_HOMARD + HOMARD + + + HOM_TOP_NEW_CASE + Nouveau cas + + + HOM_TOP_NEW_ITERATION + Nouvelle itération + + + HOM_TOP_COMPUTE + Calculer + + + HOM_TOP_EDIT_CASE + Editer le cas + + + HOM_TOP_EDIT_ITERATION + Editer l'itération + + + HOM_TOP_EDIT_HYPO + Editer l'hypothèse + + + HOM_TOP_EDIT_ZONE + Editer la zone + + + HOM_TOP_EDIT_BOUNDARY + Editer la frontière + + + HOM_TOP_EDIT_MESS_FILE + Afficher le fichier + + + HOM_STB_HOMARD + HOMARD + + + HOM_STB_NEW_CASE + Nouveau cas + + + HOM_STB_NEW_ITERATION + Nouvelle itération + + + HOM_STB_COMPUTE + Calculer + + + HOM_STB_EDIT_CASE + Editer le cas + + + HOM_STB_EDIT_ITERATION + Editer l'itération + + + HOM_STB_EDIT_HYPO + Editer l'hypothèse + + + HOM_STB_EDIT_ZONE + Editer la zone + + + HOM_STB_EDIT_BOUNDARY + Editer la frontière + + + HOM_STB_EDIT_MESS_FILE + Afficher le fichier + + + HOM_WARNING + Avertissement + + + HOM_ERROR + Erreur + + + HOM_INACTIVE_BUTTON + Bouton inactif + + + OK + Appliquer et fermer + + + Apply + Appliquer + + + Cancel + Annuler + + + Help + Aide + + + New + Nouveau + + + Edit + Editer + + + Quit + Quitter + + + Name + Nom + + + Directory + Répertoire + + + Mesh + Maillage + + + Selection + Sélection + + + None + Aucun + + + All + Tout + + + HOM_SELECT_OBJECT_1 + Selectionner un objet. + + + HOM_SELECT_OBJECT_2 + Selectionner un seul objet. + + + HOM_SELECT_OBJECT_3 + Selectionner un objet de type %1. + + + HOM_SELECT_FILE_1 + Selectionner un fichier. + + + HOM_SELECT_FILE_2 + Selectionner un seul fichier. + + + HOM_MED_FILE_1 + Ce fichier MED est illisible. + + + HOM_MED_FILE_2 + Ce fichier MED ne contient aucun maillage. + + + HOM_MED_FILE_3 + Ce fichier MED contient plus d'un maillage. + + + HOM_MED_FILE_4 + Impossible de lire le maillage de ce fichier MED. + + + HOM_MED_FILE_5 + Ce fichier MED ne contient aucun champ. + + + HOM_MED_FILE_6 + Impossible de lire le(s) champ(s) de ce fichier MED. + + + HOM_SELECT_STUDY + Selectionner une étude avec un fichier MED associé\n ou sélectionner un fichier MED. + + + Create a case + Création d'un cas + + + HOM_CASE_NAME + Il faut donner un nom au cas. + + + HOM_CASE_DIRECTORY_1 + Il faut choisir un répertoire de travail pour le cas. + + + HOM_CASE_DIRECTORY_2 + Ce répertoire est déjà utilisé. + + + HOM_CASE_DIRECTORY_3 + Un répertoire valide doit être choisi. + + + HOM_CASE_MESH + Il faut choisir le maillage initial. + + + HOM_CASE_GROUP + Le groupe "%1" ne peut pas être attribué à plus d'une frontière. + + + HOM_CASE_EDIT_WINDOW_TITLE + Edition d'un cas + + + HOM_ITER_NAME + Il faut donner un nom à l'itération. + + + HOM_ITER_STARTING_POINT + Il faut désigner l'itération précédente. + + + HOM_ITER_MESH + Donner le nom du maillage final. + + + HOM_ITER_HYPO + Choisir une hypothèse. + + + HOM_ITER_FIELD_FILE + Avec cette hypothese, il faut fournir le fichier du champ. + + + HOM_ITER_STARTING_POINT_0 + Maillage + + + HOM_ITER_STARTING_POINT_1 + Itération initiale du cas + + + HOM_ITER_EDIT_WINDOW_TITLE + Edition d'une itération + + + Discrete boundary + Frontière discrète + + + Analytical boundary + Frontière analytique + + + Conformity type + Type de conformité + + + Conformal + Conforme + + + Non conformal + Non conforme + + + Non conformal option + Option de non conformité + + + Free + Libre + + + 1 hanging node per mesh + 1 noeud pendant par maille + + + 1 node per edge + 1 noeud pendant par arête + + + Create an iteration + Création d'une itération + + + Iteration Name + Nom de l'itération + + + Previous iteration + Itération précédente + + + Mesh n + Maillage n + + + Mesh n+1 + Maillage n+1 + + + Field information + Information sur les champs + + + Field file + Fichier des champs + + + No time step + Sans pas de temps + + + Last time step + Dernier pas de temps + + + Chosen time step + Pas de temps choisi + + + Time step + Pas de temps + + + Rank + Numéro d'ordre + + + Hypothesis + Hypothèse + + + Create an hypothesis + Création d'une hypothèse + + + HOM_HYPO_NAME + Il faut donner un nom à l'hypothèse. + + + HOM_HYPO_FIELD_FILE + Il faut fournir le fichier du champ. + + + HOM_HYPO_ZONE_1 + Choisir une zone. + + + HOM_HYPO_ZONE_2 + Il faut choisir au moins une zone. + + + HOM_HYPO_COMP + Il faut choisir au moins une composante. + + + HOM_HYPO_NORM_L2 + Norme L2 + + + HOM_HYPO_NORM_INF + Norme infinie + + + HOM_HYPO_NORM_ABS + Absolu + + + HOM_HYPO_NORM_REL + Relatif + + + HOM_HYPO_EDIT_WINDOW_TITLE + Edition d'une hypothèse + + + Type of adaptation + Type d'adaptation + + + Uniform + Uniforme + + + Driven by a field + Pilotage par un champ + + + With geometrical zones + Selon des zones géométriques + + + Uniform adaptation + Adaptation uniforme + + + Coarsening + Déraffinement + + + Refinement + Raffinement + + + File of the fields + Fichier des champs + + + Governing field for the adaptation + Champ pilotant l'adaptation + + + Field name + Nom du champ + + + Component + Composante + + + Refinement threshold + Seuil de raffinement + + + Coarsening threshold + Seuil de déraffinement + + + Percentage of meshes + Pourcentage de mailles + + + No refinement + Sans raffinement + + + No coarsening + Sans déraffinement + + + Zone management + Gestion des zones + + + Zone name + Nom de la zone + + + Field Interpolation + Interpolation des champs + + + Chosen + Choisi + + + Create a zone + Création d'une zone + + + HOM_ZONE_NAME + Il faut donner un nom à la zone. + + + HOM_ZONE_LIMIT + %1 maxi doit être plus grand que %1 mini. + + + HOM_ZONE_EDIT_WINDOW_TITLE + Edition d'une zone + + + Type of zone + Type de la zone + + + Coordinates + Coordonnées + + + Create an analytical boundary + Création d'une frontière analytique + + + Create a discrete boundary + Création d'une frontière discrète + + + Type of boundary + Type de la frontière + + + Coordinates of the cylindre + Coordonnées du cylindre + + + Coordinates of the sphere + Coordonnées de la sphère + + + Radius + Rayon + + + X axis + X axe + + + Y axis + Y axe + + + Z axis + Z axe + + + HOM_BOUN_NAME + Il faut donner un nom à la frontière. + + + HOM_BOUN_MESH + Il faut choisir le maillage qui contient la frontière. + + + HOM_BOUN_CASE + Le fichier du maillage du cas est inconnu. + + + HOM_BOUN_A_EDIT_WINDOW_TITLE + Edition d'une frontière analytique + + + HOM_BOUN_D_EDIT_WINDOW_TITLE + Edition d'une frontière discrète + + + Filtering with groups + Filtrage par les groupes + + + Selection of groups + Choix des groupes + + + Selected groups + Groupes choisis + + + Group + Groupe + + + Edit a file + Affichage d'un fichier + + + Print + Imprimer + + diff --git a/src/HOMARDGUI/HomardQtCommun.cxx b/src/HOMARDGUI/HomardQtCommun.cxx index 08ae65d5..79746df4 100644 --- a/src/HOMARDGUI/HomardQtCommun.cxx +++ b/src/HOMARDGUI/HomardQtCommun.cxx @@ -15,7 +15,7 @@ #include "SalomeApp_Tools.h" using namespace std; -extern "C" +extern "C" { #include } @@ -30,141 +30,145 @@ QString HOMARD_QT_COMMUN::SelectionArbreEtude(QString commentaire, int grave ) // Si grave = 0, ce n'est pas grave de ne rien trouver et pas de message // Si grave = 1, ce n'est pas grave de ne rien trouver mais on emet un message { - int nbSel = HOMARD_UTILS::IObjectCount() ; - if ( nbSel == 0 ) - { - if ( grave == 1 ) - { - QMessageBox::information( 0, "Bad selection", - QString("Select an object."), - QMessageBox::Ok + QMessageBox::Default ); - } - return QString(""); - } - if ( nbSel > 1 ) - { - QMessageBox::information( 0, "Bad selection", - QString("Select one object only."), - QMessageBox::Ok + QMessageBox::Default ); - return QString(""); + int nbSel = HOMARD_UTILS::IObjectCount() ; + if ( nbSel == 0 ) + { + if ( grave == 1 ) + { + QMessageBox::warning( 0, QObject::tr("HOM_WARNING"), + QObject::tr("HOM_SELECT_OBJECT_1") ); } - - Handle(SALOME_InteractiveObject) aIO = HOMARD_UTILS::firstIObject(); - if ( aIO->hasEntry() ) + return QString(""); + } + if ( nbSel > 1 ) + { + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_SELECT_OBJECT_2") ); + return QString(""); + } +// + Handle(SALOME_InteractiveObject) aIO = HOMARD_UTILS::firstIObject(); + if ( aIO->hasEntry() ) + { + _PTR(Study) aStudy = HOMARD_UTILS::GetActiveStudyDocument(); + _PTR(SObject) aSO ( aStudy->FindObjectID( aIO->getEntry() ) ); + _PTR(GenericAttribute) anAttr; + if (aSO->FindAttribute(anAttr, "AttributeComment") ) { - _PTR(Study) aStudy = HOMARD_UTILS::GetActiveStudyDocument(); - _PTR(SObject) aSO ( aStudy->FindObjectID( aIO->getEntry() ) ); - _PTR(GenericAttribute) anAttr; - if (aSO->FindAttribute(anAttr, "AttributeComment") ) + _PTR(AttributeComment) attributComment = anAttr; + QString aComment= QString(attributComment->Value().data()); + int iteration = aComment.lastIndexOf(commentaire); + if ( iteration !=0 ) + { + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_SELECT_OBJECT_3").arg(commentaire) ); + return QString(""); + } + if (aSO->FindAttribute(anAttr, "AttributeName") ) { - _PTR(AttributeComment) attributComment = anAttr; - QString aComment= QString(attributComment->Value().data()); - int iteration = aComment.lastIndexOf(commentaire); - if ( iteration !=0 ) - { - QString message=QString("Select an object : "); - message += commentaire; - QMessageBox::information( 0, "Bad selection", message, - QMessageBox::Ok + QMessageBox::Default ); - return QString(""); - } - if (aSO->FindAttribute(anAttr, "AttributeName") ) - { - _PTR(AttributeName) attributName = anAttr; - QString aName= QString(attributName->Value().data()); - return aName; - } + _PTR(AttributeName) attributName = anAttr; + QString aName= QString(attributName->Value().data()); + return aName; } } - return QString(""); + } +// + return QString(""); } // ======================================================================= QString HOMARD_QT_COMMUN::SelectionCasEtude() // ======================================================================= { - QString aName = QString(""); - int nbSel = HOMARD_UTILS::IObjectCount() ; - if ((nbSel > 1) or ( nbSel == 0 )) - { - QMessageBox::information( 0, "Bad selection", - QString("Select one object only"), - QMessageBox::Ok + QMessageBox::Default ); - return QString(""); + QString aName = QString(""); + int nbSel = HOMARD_UTILS::IObjectCount() ; + if ( nbSel == 0 ) + { + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_SELECT_OBJECT_1") ); + return QString(""); + } + if ( nbSel > 1 ) + { + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_SELECT_OBJECT_2") ); + return QString(""); + } + Handle(SALOME_InteractiveObject) aIO = HOMARD_UTILS::firstIObject(); + if ( aIO->hasEntry() ) + { + _PTR(Study) aStudy = HOMARD_UTILS::GetActiveStudyDocument(); + _PTR(SObject) aSO ( aStudy->FindObjectID( aIO->getEntry() ) ); + _PTR(SObject) aSObjCas = aSO->GetFather(); + _PTR(GenericAttribute) anAttr; + if (aSObjCas->FindAttribute(anAttr, "AttributeName") ) + { + _PTR(AttributeName) attributName = anAttr; + aName= QString(attributName->Value().data()); + } + return aName; } - Handle(SALOME_InteractiveObject) aIO = HOMARD_UTILS::firstIObject(); - if ( aIO->hasEntry() ) - { - _PTR(Study) aStudy = HOMARD_UTILS::GetActiveStudyDocument(); - _PTR(SObject) aSO ( aStudy->FindObjectID( aIO->getEntry() ) ); - _PTR(SObject) aSObjCas = aSO->GetFather(); - _PTR(GenericAttribute) anAttr; - if (aSObjCas->FindAttribute(anAttr, "AttributeName") ) - { - _PTR(AttributeName) attributName = anAttr; - aName= QString(attributName->Value().data()); - } - return aName; - } - return QString(""); + return QString(""); } // ======================================================================= QString HOMARD_QT_COMMUN::PushNomFichier(bool avertir) // ======================================================================= -// Gestion les boutons qui permettent de +// Gestion les boutons qui permettent de // 1) retourne le nom d'un fichier par une fenetre de dialogue si aucun // objet est selectionne dans l arbre d etude -// 2) retourne le nom du fichier asocie a l objet +// 2) retourne le nom du fichier asocie a l objet // selectionne dans l arbre d etude { - MESSAGE("HOMARD_QT_COMMUN::PushNomFichier"); - QString aFile=QString::null; - int nbSel = HOMARD_UTILS::IObjectCount() ; - if ( nbSel == 0 ) - { - aFile = QFileDialog::getOpenFileName(0,QString("File Selection"),QString("") ,QString("Med files (*.med);;all (*) ") ); - } - if (nbSel > 1) - { - QMessageBox::information( 0, "Bad selection", - QString("Select one file only"), - QMessageBox::Ok + QMessageBox::Default ); - } - if (nbSel == 1) - { - Handle(SALOME_InteractiveObject) aIO = HOMARD_UTILS::firstIObject(); - if ( aIO->hasEntry() ) - { - _PTR(Study) aStudy = HOMARD_UTILS::GetActiveStudyDocument(); - _PTR(SObject) aSO ( aStudy->FindObjectID( aIO->getEntry() ) ); - _PTR(GenericAttribute) anAttr; - _PTR(AttributeFileType) aFileType; - _PTR(AttributeExternalFileDef) aFileName; - if (aSO) { - if (aSO->FindAttribute(anAttr, "AttributeFileType") ) { - aFileType=anAttr; - QString fileType=QString(aFileType->Value().data()); - if ( fileType==QString("FICHIERMED")) { - if (aSO->FindAttribute(anAttr,"AttributeExternalFileDef")) { - aFileName=anAttr; - aFile= QString(aFileName->Value().data()); } } } } } - - if ( aFile==QString::null ) - { - if (avertir ) { - QMessageBox::information( 0, "Bad selection", - QString(" Select a study object with associated MED file \n or a MED file"), - QMessageBox::Ok + QMessageBox::Default ); + MESSAGE("HOMARD_QT_COMMUN::PushNomFichier"); + QString aFile=QString::null; + int nbSel = HOMARD_UTILS::IObjectCount() ; + if ( nbSel == 0 ) + { + aFile = QFileDialog::getOpenFileName(0,QString("File Selection"),QString("") ,QString("Med files (*.med);;all (*) ") ); + } + if (nbSel > 1) + { + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_SELECT_FILE_2") ); + } + if (nbSel == 1) + { + Handle(SALOME_InteractiveObject) aIO = HOMARD_UTILS::firstIObject(); + if ( aIO->hasEntry() ) + { + _PTR(Study) aStudy = HOMARD_UTILS::GetActiveStudyDocument(); + _PTR(SObject) aSO ( aStudy->FindObjectID( aIO->getEntry() ) ); + _PTR(GenericAttribute) anAttr; + _PTR(AttributeFileType) aFileType; + _PTR(AttributeExternalFileDef) aFileName; + if (aSO) { + if (aSO->FindAttribute(anAttr, "AttributeFileType") ) { + aFileType=anAttr; + QString fileType=QString(aFileType->Value().data()); + if ( fileType==QString("FICHIERMED")) { + if (aSO->FindAttribute(anAttr,"AttributeExternalFileDef")) { + aFileName=anAttr; + aFile= QString(aFileName->Value().data()); } } - aFile = QFileDialog::getOpenFileName(); - if (!aFile.isEmpty()) - { - aFile=aFile; - } + } } - } - return aFile; + } + + if ( aFile==QString::null ) + { + if ( avertir ) { + QMessageBox::warning( 0, QObject::tr("HOM_WARNING"), + QObject::tr("HOM_SELECT_STUDY") ); + } + aFile = QFileDialog::getOpenFileName(); + if (!aFile.isEmpty()) + { + aFile=aFile; + } + } + } + return aFile; } @@ -174,33 +178,35 @@ int HOMARD_QT_COMMUN::OuvrirFichier(QString aFile) // ======================================================================= // renvoie le medId associe au fichier Med apres ouverture { - int MedIdt = MEDouvrir(const_cast(aFile.toStdString().c_str()),MED_LECTURE); - if (MedIdt <0) - { - QMessageBox::information( 0, "Bad selection", - QString("MED File is unreadable"), - QMessageBox::Ok + QMessageBox::Default ); - } - return MedIdt; + int MedIdt = MEDouvrir(const_cast(aFile.toStdString().c_str()),MED_LECTURE); + if (MedIdt <0) + { + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_MED_FILE_1") ); + } + return MedIdt; } // ====================================================== QString HOMARD_QT_COMMUN::LireNomMaillage(QString aFile) // ======================================================== { - - int MedIdt = HOMARD_QT_COMMUN::OuvrirFichier(aFile); - int numberOfMeshes = MEDnMaa(MedIdt) ; - if (numberOfMeshes != 1 ) - { - QMessageBox::information( 0, "Bad selection", - QString("MED File contains more than one mesh"), - QMessageBox::Ok + QMessageBox::Default ); - } - - QString nomMaillage= HOMARD_QT_COMMUN::LireNomMaillage(MedIdt,1); - MEDfermer(MedIdt); - return nomMaillage; + int MedIdt = HOMARD_QT_COMMUN::OuvrirFichier(aFile); + int numberOfMeshes = MEDnMaa(MedIdt) ; + if (numberOfMeshes == 0 ) + { + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_MED_FILE_2") ); + } + if (numberOfMeshes > 1 ) + { + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_MED_FILE_3") ); + } + + QString nomMaillage= HOMARD_QT_COMMUN::LireNomMaillage(MedIdt,1); + MEDfermer(MedIdt); + return nomMaillage; } // ======================================================================= QString HOMARD_QT_COMMUN::LireNomMaillage(int MedIdt ,int MeshId) @@ -214,13 +220,12 @@ QString HOMARD_QT_COMMUN::LireNomMaillage(int MedIdt ,int MeshId) if ( MEDmaaInfo(MedIdt,MeshId,maa,&mdim,&type,desc) < 0 ) { - QMessageBox::information( 0, "Bad selection", - QString("Error : Mesh is unreadable"), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_MED_FILE_4") ); } else { - NomMaillage=QString(maa); + NomMaillage=QString(maa); } return NomMaillage; } @@ -243,7 +248,7 @@ std::list HOMARD_QT_COMMUN::GetListeChamps(QString aFile) SCRUTE(aFile.toStdString()); int MedIdt = HOMARD_QT_COMMUN::OuvrirFichier(aFile); if ( MedIdt < 0 ) { return ListeChamp; } - + // Le fichier Med est lisible // Lecture du maillage @@ -251,35 +256,25 @@ std::list HOMARD_QT_COMMUN::GetListeChamps(QString aFile) med_int ncha = MEDnChamp(MedIdt, 0) ; if (ncha < 1 ) { - QMessageBox::information( 0, "Bad selection", - QString(" Error : Fields are unreadable"), - QMessageBox::Ok + QMessageBox::Default ); - MEDfermer(MedIdt); - return ListeChamp; + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_MED_FILE_5") ); + MEDfermer(MedIdt); + return ListeChamp; } for (int i=0; i< ncha; i++) { - if ((ncomp = MEDnChamp(MedIdt,i+1)) < 0) - { - QMessageBox::information( 0, "Bad selection", - QString("Error : field's componants are unreadable"), - QMessageBox::Ok + QMessageBox::Default ); - MEDfermer(MedIdt); - return ListeChamp; - } - /* Lecture du type du champ, des noms des composantes et du nom de l'unite*/ - comp = (char*) malloc(ncomp*MED_TAILLE_PNOM+1); - unit = (char*) malloc(ncomp*MED_TAILLE_PNOM+1); - if ( MEDchampInfo(MedIdt,i+1,nomcha,&typcha,comp,unit,ncomp) < 0 ) - { - QMessageBox::information( 0, "Bad selection", - QString(" Error : Fields are unreadable"), - QMessageBox::Ok + QMessageBox::Default ); - MEDfermer(MedIdt); - return ListeChamp; - } + ncomp = MEDnChamp(MedIdt,i+1); + comp = (char*) malloc(ncomp*MED_TAILLE_PNOM+1); + unit = (char*) malloc(ncomp*MED_TAILLE_PNOM+1); + if ( MEDchampInfo(MedIdt,i+1,nomcha,&typcha,comp,unit,ncomp) < 0 ) + { + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_MED_FILE_6") ); + MEDfermer(MedIdt); + return ListeChamp; + } ListeChamp.push_back(QString(nomcha)); free(comp); @@ -305,49 +300,39 @@ std::list HOMARD_QT_COMMUN::GetListeComposants(QString aFile, QString a int MedIdt = HOMARD_QT_COMMUN::OuvrirFichier(aFile); if ( MedIdt < 0 ) { return ListeComposants; } - + // Lecture du nombre de champs med_int ncha = MEDnChamp(MedIdt, 0) ; if (ncha < 1 ) { - QMessageBox::information( 0, "Bad selection", - QString(" Error : Fields are unreadable"), - QMessageBox::Ok + QMessageBox::Default ); - MEDfermer(MedIdt); - return ListeComposants; + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_MED_FILE_5") ); + MEDfermer(MedIdt); + return ListeComposants; } for (int i=0; i< ncha; i++) { - if ((ncomp = MEDnChamp(MedIdt,i+1)) < 0) - { - QMessageBox::information( 0, "Bad selection", - QString("Error : field's componants are unreadable"), - QMessageBox::Ok + QMessageBox::Default ); - MEDfermer(MedIdt); - return ListeComposants; - } - /* Lecture du type du champ, des noms des composantes et du nom de l'unite*/ + ncomp = MEDnChamp(MedIdt,i+1); comp = (char*) malloc(ncomp*MED_TAILLE_PNOM+1); unit = (char*) malloc(ncomp*MED_TAILLE_PNOM+1); - if ( MEDchampInfo(MedIdt,i+1,nomcha,&typcha,comp,unit,ncomp) < 0 ) + if ( MEDchampInfo(MedIdt,i+1,nomcha,&typcha,comp,unit,ncomp) < 0 ) { - QMessageBox::information( 0, "Bad selection", - QString(" Error : Fields are unreadable"), - QMessageBox::Ok + QMessageBox::Default ); - MEDfermer(MedIdt); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_MED_FILE_6") ); + MEDfermer(MedIdt); return ListeComposants; } if ( QString(nomcha) != aChamp ) { - free(comp); + free(comp); free (unit); continue;} - for (int j = 0; j HOMARD_QT_COMMUN::GetListeComposants(QString aFile, QString a MEDfermer(MedIdt); return ListeComposants; } - -// ======================================================================= -void HOMARD_QT_COMMUN::Recopie(QString aDir, QString aFichier) -// ======================================================================= -{ - if (chdir(aDir.toLatin1()) != 0) - { - if (mkdir(aDir.toLatin1(), S_IRWXU|S_IRGRP|S_IXGRP) != 0) - { - QMessageBox::information( 0, "ERROR", - QString("Unable to create directory."), - QMessageBox::Ok + QMessageBox::Default ); - return; - //ASSERT("Pb a la creation de la directory" == 0); - } - if (chdir(aDir.toLatin1()) != 0) - { - QMessageBox::information( 0, "ERROR", - QString("Unable to access directory."), - QMessageBox::Ok + QMessageBox::Default ); - return; - //ASSERT("Pb pour acceder la directory" == 0); - } - } - QString copie = QString("cp ")+aFichier+QString(" ")+aDir; - system(copie.toLatin1()); -} - -// ======================================================================= -void HOMARD_QT_COMMUN::Creetmp() -// ======================================================================= -{ - QString aDir=QString("/tmp/Homard/"); - if (chdir(aDir.toLatin1()) != 0) - { - if (mkdir(aDir.toLatin1(), S_IRWXU|S_IRGRP|S_IXGRP) != 0) - { - QMessageBox::information( 0, "ERROR", - QString("Unable to create directory /tmp/Homard."), - QMessageBox::Ok + QMessageBox::Default ); - return; - } - if (chdir(aDir.toLatin1()) != 0) - { - QMessageBox::information( 0, "ERROR", - QString("Unable to access directory /tmp/Homard."), - QMessageBox::Ok + QMessageBox::Default ); - return; - } - } -} diff --git a/src/HOMARDGUI/HomardQtCommun.h b/src/HOMARDGUI/HomardQtCommun.h index a7538b99..490ebaa9 100644 --- a/src/HOMARDGUI/HomardQtCommun.h +++ b/src/HOMARDGUI/HomardQtCommun.h @@ -32,9 +32,6 @@ namespace HOMARD_QT_COMMUN std::list GetListeChamps(QString aFile); std::list GetListeComposants(QString aFile, QString aChamp); - void Recopie(QString aDir, QString aFichier); - void Creetmp(); - QString SelectionArbreEtude(QString commentaire, int grave ); QString SelectionCasEtude(); diff --git a/src/HOMARDGUI/Makefile.am b/src/HOMARDGUI/Makefile.am index e46c3acd..cab06942 100644 --- a/src/HOMARDGUI/Makefile.am +++ b/src/HOMARDGUI/Makefile.am @@ -19,11 +19,11 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# -* Makefile *- -# Author : +# -* Makefile *- +# Author : # Modified by : Alexander BORODIN (OCN) - autotools usage # -# header files +# header files include $(top_srcdir)/adm_local/unix/make_common_starter.am @@ -131,6 +131,5 @@ libHOMARD_la_LDFLAGS = \ # resources files nodist_salomeres_DATA = \ - HOMARD_msg_en.qm -# HOMARD_msg_fr.qm -# HOMARD_icons.qm + HOMARD_msg_en.qm \ + HOMARD_msg_fr.qm diff --git a/src/HOMARDGUI/MonCreateBoundaryAn.cxx b/src/HOMARDGUI/MonCreateBoundaryAn.cxx index 08cd6478..a637685f 100644 --- a/src/HOMARDGUI/MonCreateBoundaryAn.cxx +++ b/src/HOMARDGUI/MonCreateBoundaryAn.cxx @@ -169,9 +169,8 @@ bool MonCreateBoundaryAn::PushOnApply() std::cerr << LEBoundaryName->text().trimmed().toStdString() << std::endl; if (LEBoundaryName->text().trimmed()=="") { - QMessageBox::information( 0, "Error", - "The boundary must be named.", - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_BOUN_NAME") ); return false; } @@ -236,14 +235,13 @@ bool MonCreateBoundaryAn:: CreateOrUpdateBoundaryAn() CORBA::string_dup(_aBoundaryAnName.toStdString().c_str()), \ CORBA::Long(_BoundaryType) ); _parent->addBoundaryAn(_aBoundaryAnName); - } - catch( SALOME::SALOME_Exception& S_ex ) - { - QMessageBox::information( 0, "Error", - QString(CORBA::string_dup(S_ex.details.text)), - QMessageBox::Ok + QMessageBox::Default ); - return false; - } + } + catch( SALOME::SALOME_Exception& S_ex ) + { + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QString(CORBA::string_dup(S_ex.details.text)) ); + return false; + } } // Mise en place des attributs aBoundaryAn->SetBoundaryType(_BoundaryType); diff --git a/src/HOMARDGUI/MonCreateBoundaryDi.cxx b/src/HOMARDGUI/MonCreateBoundaryDi.cxx index 2cd27abb..277216f5 100644 --- a/src/HOMARDGUI/MonCreateBoundaryDi.cxx +++ b/src/HOMARDGUI/MonCreateBoundaryDi.cxx @@ -60,9 +60,8 @@ bool MonCreateBoundaryDi::PushOnApply() QString aBoundaryName=LEBoundaryName->text().trimmed(); if (aBoundaryName=="") { - QMessageBox::information( 0, "Error", - "The boundary must be named.", - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_BOUN_NAME") ); return false; } @@ -70,9 +69,8 @@ bool MonCreateBoundaryDi::PushOnApply() QString aMeshFile=LEFileName->text().trimmed(); if (aMeshFile ==QString("")) { - QMessageBox::information( 0, "Error", - QString("The mesh of the boundary must be selected."), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_BOUN_MESH") ); return false; } @@ -80,9 +78,8 @@ bool MonCreateBoundaryDi::PushOnApply() QString aMeshName = HOMARD_QT_COMMUN::LireNomMaillage(aMeshFile); if (aMeshName == "" ) { - QMessageBox::information( 0, "Error", - QString("no mesh in mesh file"), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_MED_FILE_2") ); return false; } @@ -98,9 +95,8 @@ bool MonCreateBoundaryDi::PushOnApply() } catch( SALOME::SALOME_Exception& S_ex ) { - QMessageBox::information( 0, "Error", - QString(CORBA::string_dup(S_ex.details.text)), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QString(CORBA::string_dup(S_ex.details.text)) ); return false; } } @@ -183,16 +179,15 @@ void MonCreateBoundaryDi::setGroups (QStringList listGroup) void MonCreateBoundaryDi::SetFiltrage() // // ------------------------------------------------------------------------ { - if (!CBGroupe->isChecked()) return; - if (_aCaseName.toStdString().c_str() == QString()) { - QMessageBox::information( 0, "Error", - "Case MeshFile unknowned.", - QMessageBox::Ok + QMessageBox::Default ); - return; - } + if (!CBGroupe->isChecked()) return; + if (_aCaseName.toStdString().c_str() == QString()) { + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_BOUN_CASE") ); + return; + } - MonCreateListGroup *aDlg = new MonCreateListGroup(NULL,this, TRUE, HOMARD::HOMARD_Gen::_duplicate(_myHomardGen), - _aCaseName, _listeGroupesBoundary) ; + MonCreateListGroup *aDlg = new MonCreateListGroup(NULL,this, TRUE, HOMARD::HOMARD_Gen::_duplicate(_myHomardGen), + _aCaseName, _listeGroupesBoundary) ; aDlg->show(); } diff --git a/src/HOMARDGUI/MonCreateCase.cxx b/src/HOMARDGUI/MonCreateCase.cxx index 71474db5..a3032711 100644 --- a/src/HOMARDGUI/MonCreateCase.cxx +++ b/src/HOMARDGUI/MonCreateCase.cxx @@ -90,54 +90,48 @@ void MonCreateCase::GetBoundarys() bool MonCreateCase::PushOnApply() // -------------------------------- { - MESSAGE("PushOnApply"); + MESSAGE("MonCreateCase::PushOnApply"); QString aCaseName=LECaseName->text().trimmed(); if ( aCaseName == "" ) { - QMessageBox::information( 0, "Error", - QString("The case must be named"), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_CASE_NAME") ); return false; } QString aDirName=LEDirName->text().trimmed(); if (aDirName == QString("")) { - QMessageBox::information( 0, "Error", - QString("A directory for the case must be selected."), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_CASE_DIRECTORY_1") ); return false; } if ((aDirName != _aDirName) and (_myHomardGen->VerifieDir( aDirName.toStdString().c_str()) == false)) { - QMessageBox::information( 0, "Error", - QString("This directory is already used"), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_CASE_DIRECTORY_2") ); return false; } if (chdir(aDirName.toStdString().c_str()) != 0) { - QMessageBox::information( 0, "Error", - QString("A valid directory for the case must be selected."), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_CASE_DIRECTORY_3") ); return false; } QString aFileName=LEFileName->text().trimmed(); if (aFileName ==QString("")) { - QMessageBox::information( 0, "Error", - QString("The initial mesh must be selected."), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_CASE_MESH") ); return false; } QString aMeshName = HOMARD_QT_COMMUN::LireNomMaillage(aFileName); if (aMeshName == "" ) { - QMessageBox::information( 0, "Error", - QString("no mesh in mesh file"), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_MED_FILE_2") ); return false; } @@ -161,9 +155,8 @@ bool MonCreateCase::PushOnApply() // MESSAGE("....... "<GetCas(_aCaseName.toStdString().c_str()); @@ -293,8 +285,10 @@ void MonCreateCase::SetDirName() void MonCreateCase::SetFileName() // ------------------------------------------------------------------------ { + QString fileName0 = LEFileName->text().trimmed(); QString fileName = HOMARD_QT_COMMUN::PushNomFichier(); - if (!(fileName.isEmpty())) LEFileName->setText(fileName); + if (fileName.isEmpty()) fileName = fileName0 ; + LEFileName->setText(fileName); } // ------------------------------------------------------------------------ void MonCreateCase::SetConforme() @@ -376,7 +370,7 @@ void MonCreateCase::PushBoundaryDiEdit() void MonCreateCase::SetBoundaryA() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetBoundaryA "); + MESSAGE("Debut de MonCreateCase::SetBoundaryA "); if (CBBoundaryA->isChecked()) { bool bOK = PushOnApply(); @@ -404,13 +398,13 @@ void MonCreateCase::SetBoundaryA() else { GBBoundaryA->setVisible(0); } adjustSize(); // - MESSAGE("Fin de SetBoundaryA "); +// MESSAGE("Fin de MonCreateCase::SetBoundaryA "); } // ------------------------------------------------------------------------ void MonCreateCase::addBoundaryAn(QString newBoundary) // ------------------------------------------------------------------------ { - MESSAGE("Debut de addBoundaryAn "); + MESSAGE("Debut de MonCreateCase::addBoundaryAn "); // Ajout d'une nouvelle colonne int nbcol = TWBoundary->columnCount(); MESSAGE("nbcol " << nbcol); @@ -432,7 +426,7 @@ void MonCreateCase::addBoundaryAn(QString newBoundary) } TWBoundary->resizeColumnToContents(nbcol-1); // TWBoundary->resizeRowsToContents(); - MESSAGE("Fin de addBoundaryAn "); +// MESSAGE("Fin de addBoundaryAn "); } // ------------------------------------------------------------------------ void MonCreateCase::PushBoundaryAnNew() diff --git a/src/HOMARDGUI/MonCreateHypothesis.cxx b/src/HOMARDGUI/MonCreateHypothesis.cxx index 2ad73d09..ac0a28d2 100644 --- a/src/HOMARDGUI/MonCreateHypothesis.cxx +++ b/src/HOMARDGUI/MonCreateHypothesis.cxx @@ -24,7 +24,7 @@ MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal, : QDialog(0), Ui_CreateHypothesis(), _parent(parent), _aHypothesisName(aHypothesisName), - _aCaseName(caseName), _aFieldFile(aFieldFile), + _aCaseName(caseName), _aFieldFile(aFieldFile), _aFieldName(""), _aTypeAdap(-2), _aTypeRaff(1), _aTypeDera(0), _TypeThR(3), _ThreshR(0), @@ -97,9 +97,8 @@ bool MonCreateHypothesis::PushOnApply() if (LEHypothesisName->text().trimmed()=="") { - QMessageBox::information( 0, "Error", - "The hypothesis must be named.", - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_HYPO_NAME") ); return false; } @@ -117,9 +116,8 @@ bool MonCreateHypothesis::PushOnApply() } catch( SALOME::SALOME_Exception& S_ex ) { - QMessageBox::information( 0, "Error", - QString(CORBA::string_dup(S_ex.details.text)), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QString(CORBA::string_dup(S_ex.details.text)) ); return false; } } @@ -158,7 +156,7 @@ void MonCreateHypothesis::SetNewHypothesisName() { HOMARD::listeHypotheses_var MyHypos = _myHomardGen->GetAllHypotheses(); - int num = 0;// + int num = 0;// QString aHypothesisName=""; while (aHypothesisName=="" ) { @@ -196,9 +194,8 @@ void MonCreateHypothesis::SetChamp() { if (_aFieldFile == QString("")) { - QMessageBox::information( 0, "Error", - QString("Enter FieldFile please "), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_HYPO_FIELD_FILE") ); close(); if ( _parent ) { _parent->raise(); _parent->activateWindow(); }; return; @@ -239,7 +236,7 @@ void MonCreateHypothesis::SetZone() void MonCreateHypothesis::PushZoneNew() // ------------------------------------------------------------------------ { - MESSAGE("Debut de PushZoneNew") + MESSAGE("Debut de MonCreateHypothesis::PushZoneNew") MonCreateZone *aDlg = new MonCreateZone(this, TRUE, HOMARD::HOMARD_Gen::_duplicate(_myHomardGen), _aCaseName) ; aDlg->show(); } @@ -248,14 +245,13 @@ void MonCreateHypothesis::PushZoneNew() void MonCreateHypothesis::PushZoneEdit() // ------------------------------------------------------------------------ { - MESSAGE("Debut de PushZoneEdit") + MESSAGE("Debut de MonCreateHypothesis::PushZoneEdit") int colonne = TWZone->currentColumn(); QTableWidgetItem * monItem = TWZone->currentItem(); - if (colonne !=1 or monItem == NULL) + if (colonne !=1 or monItem == NULL) { - QMessageBox::information( 0, "Error", - "Please, Select a Zone", - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_HYPO_ZONE_1") ); return; } QString zoneName = monItem->text().trimmed(); @@ -266,10 +262,9 @@ void MonCreateHypothesis::PushZoneEdit() void MonCreateHypothesis::PushZoneDelete() // ------------------------------------------------------------------------ { - MESSAGE("Debut de PushZoneDelete") - QMessageBox::information( 0, "Error", - "Inactive button.", - QMessageBox::Ok + QMessageBox::Default ); + MESSAGE("Debut de MonCreateHypothesis::PushZoneDelete") + QMessageBox::warning( 0, QObject::tr("HOM_WARNING"), + QObject::tr("HOM_INACTIVE_BUTTON") ); return; } @@ -279,8 +274,8 @@ void MonCreateHypothesis::GetAllZones() // Recuperation de toutes les zones enregistrees dans l'arbre d'etude { HOMARD::listeZones_var mesZones = _myHomardGen->GetAllZones(); - int stop=TWZone->rowCount(); - for ( int row=0; row< stop; row++) + int nbrow=TWZone->rowCount(); + for ( int row=0; row< nbrow; row++) { TWZone->removeRow(row); } @@ -301,7 +296,7 @@ void MonCreateHypothesis::GetAllZones() TWZone->resizeRowsToContents(); TWZone->clearSelection(); } - + // ------------------------------------------------------------------------ void MonCreateHypothesis::addZone(QString newZone) // ------------------------------------------------------------------------ @@ -338,7 +333,7 @@ QStringList MonCreateHypothesis::GetListCompChecked() // ------------------------------------------------------------------------ // Retourne les composantes retenues { - MESSAGE( "Dans GetListCompChecked" ); + MESSAGE( "Dans MonCreateHypothesis::GetListCompChecked" ); QStringList ListeComposant ; ListeComposant.clear(); @@ -347,12 +342,12 @@ QStringList MonCreateHypothesis::GetListCompChecked() ListeComposant.insert(0, QString(TWCMP->item(row, 1)->text()) ) ; // Choix du texte des radio-boutons selon 1 ou plusieurs composantes if ( ListeComposant.count() < 2 ) - { RBL2->setText(QString("Absolute value")); - RBInf->setText(QString("Relative value")); + { RBL2->setText(QObject::tr("HOM_HYPO_NORM_ABS")); + RBInf->setText(QObject::tr("HOM_HYPO_NORM_REL")); } else - { RBL2->setText(QString("L2 norm")); - RBInf->setText(QString("Infinite Norm")); + { RBL2->setText(QObject::tr("HOM_HYPO_NORM_L2")); + RBInf->setText(QObject::tr("HOM_HYPO_NORM_INF")); } return ListeComposant ; // @@ -399,14 +394,16 @@ void MonCreateHypothesis::InitFields() void MonCreateHypothesis::SetFieldName() // ------------------------------------------- { + MESSAGE("MonCreateHypothesis::SetFieldName"); _aFieldName=CBFieldName->currentText(); if (QString(_aFieldFile) == QString("") or QString(_aFieldName) == QString("") ) { return; } - for ( int row=0; row < TWCMP->rowCount() ; row++) + int nbrow= TWCMP->rowCount() ; + for ( int row=0; row < nbrow ; row++) { TWCMP->removeRow(row); } - //TWCMP->setRowCount(0); + TWCMP->setRowCount(0); //TWCMP->resizeRowsToContents(); std::list maListe =HOMARD_QT_COMMUN::GetListeComposants(_aFieldFile, _aFieldName); @@ -426,12 +423,12 @@ void MonCreateHypothesis::SetFieldName() TWCMP->clearSelection(); // Choix du texte des radio-boutons selon 1 ou plusieurs composantes if ( TWCMP->rowCount() == 1 ) - { RBL2->setText(QString("Absolute value")); - RBInf->setText(QString("Relative value")); + { RBL2->setText(QObject::tr("HOM_HYPO_NORM_ABS")); + RBInf->setText(QObject::tr("HOM_HYPO_NORM_REL")); } else - { RBL2->setText(QString("L2 norm")); - RBInf->setText(QString("Infinite Norm")); + { RBL2->setText(QObject::tr("HOM_HYPO_NORM_L2")); + RBInf->setText(QObject::tr("HOM_HYPO_NORM_INF")); } // Par defaut, on propose la valeur absolue / norme L2 SetUCL2(); @@ -561,9 +558,8 @@ bool MonCreateHypothesis::VerifieZone() _aListeZone = GetZonesChecked() ; if (_aListeZone.count() == 0) { - QMessageBox::information( 0, "Error", - QString("At least, one zone must be given."), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_HYPO_ZONE_2") ); return false; } return true; @@ -576,9 +572,8 @@ bool MonCreateHypothesis::VerifieComposant() _aListeComposant = GetListCompChecked() ; if (_aListeComposant.count() == 0) { - QMessageBox::information( 0, "Error", - QString("At least, one composant must be given."), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_HYPO_COMP") ); return false; } return true; @@ -652,9 +647,8 @@ void MonCreateHypothesis::SetFieldAll() { if (_aFieldFile == QString("")) { - QMessageBox::information( 0, "Error", - QString("Enter FieldFile please "), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_HYPO_FIELD_FILE") ); close(); if ( _parent ) { _parent->raise(); _parent->activateWindow(); }; return; @@ -673,9 +667,8 @@ void MonCreateHypothesis::SetFieldChosen() { if (_aFieldFile == QString("")) { - QMessageBox::information( 0, "Error", - QString("Enter FieldFile please "), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_HYPO_FIELD_FILE") ); close(); if ( _parent ) { _parent->raise(); _parent->activateWindow(); }; return; @@ -688,9 +681,11 @@ void MonCreateHypothesis::SetFieldChosen() // Initialisation de la table TWField->clear(); - for ( int row=0; row< TWField->rowCount(); row++) + int nbrow=TWField->rowCount(); + for ( int row=0; row< nbrow; row++) + { TWField->removeRow(row); - + } TWField->setRowCount(0); std:: list::const_iterator it; int row=0; diff --git a/src/HOMARDGUI/MonCreateIteration.cxx b/src/HOMARDGUI/MonCreateIteration.cxx index ae49c2b2..31843423 100644 --- a/src/HOMARDGUI/MonCreateIteration.cxx +++ b/src/HOMARDGUI/MonCreateIteration.cxx @@ -14,7 +14,7 @@ using namespace std; // ----------------------------------------------------------------------------------------------------- -MonCreateIteration::MonCreateIteration(QWidget* parent, bool modal, +MonCreateIteration::MonCreateIteration(QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen, QString IterParentName ): // ----------------------------------------------------------------------------------------------------- /* Constructs a MonCreateIteration @@ -35,9 +35,9 @@ MonCreateIteration::MonCreateIteration(QWidget* parent, bool modal, SetNewIterationName(); GetHypotheses(); - if (_IterParentName != QString("")) + if (_IterParentName != QString("")) { SetIterParentName(); } - else + else {setModal(false); /* permet selection de l iteration dans l arbre d etude */} SetTSNo(); } @@ -81,38 +81,34 @@ bool MonCreateIteration::PushOnApply() // ------------------------------------------------------------------------ // Appele lorsque l'un des boutons Ok ou Apply est presse { - MESSAGE("PushOnApply"); + MESSAGE("MonCreateIteration::PushOnApply"); // QString aIterationName = LEIterationName->text().trimmed(); if ( aIterationName == QString ("")) { - QMessageBox::information( 0, "Error", - QString(" Nommer l iteration "), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_ITER_NAME") ); return false; } if ( _IterParentName == QString ("")) { - QMessageBox::information( 0, "Error", - QString(" Donner le point de depart "), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_ITER_STARTING_POINT") ); return false; } QString aMeshName_np1=LEMeshName_np1->text().trimmed(); if (aMeshName_np1 == "" ) { - QMessageBox::information( 0, "Error", - QString(" Donner le nom du maillage final."), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_ITER_MESH") ); return false; } QString monHypoName=CBHypothese->currentText(); if (monHypoName == "" ) { - QMessageBox::information( 0, "Error", - QString(" Choisir une hypothese "), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_ITER_HYPO") ); return false; } HOMARD::HOMARD_Hypothesis_var _myHypothesis = _myHomardGen->GetHypothesis(monHypoName.toStdString().c_str()); @@ -120,9 +116,8 @@ bool MonCreateIteration::PushOnApply() int TypeAdap = ListTypes[0]; if ( TypeAdap == 1 and LEFieldFile->text().trimmed() == QString("") ) { - QMessageBox::information( 0, "Error", - QString("Avec cette hypothese, il faut fournir le fichier du champ."), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_ITER_FIELD_FILE") ); return false; } @@ -141,11 +136,10 @@ bool MonCreateIteration::PushOnApply() CORBA::string_dup(_IterationName.toStdString().c_str()), CORBA::string_dup(_IterParentName.toStdString().c_str())); } - catch( SALOME::SALOME_Exception& S_ex ) + catch( SALOME::SALOME_Exception& S_ex ) { - QMessageBox::information( 0, "Error", - QString(CORBA::string_dup(S_ex.details.text)), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QString(CORBA::string_dup(S_ex.details.text)) ); return false; } } @@ -181,7 +175,7 @@ void MonCreateIteration::PushOnOK() void MonCreateIteration::PushOnHelp() // ------------------------------------------------------------------------ { - HOMARD_UTILS::PushOnHelp(QString("gui_create_iteration.html")); + HOMARD_UTILS::PushOnHelp(QString("gui_create_iteration.html")); } // ------------------------------------------------------------------------ @@ -199,7 +193,7 @@ void MonCreateIteration::SetIterParentName() LEMeshName_n->setText(MeshName); LEMeshName_n->setReadOnly(1); LEMeshName_np1->setText(MeshName); - + LEIterationParentName->setText(_IterParentName); } @@ -210,7 +204,7 @@ void MonCreateIteration::SetNewIterationName() // Recherche d'un nom par defaut qui n'existe pas encore HOMARD::listeIterations_var myIters=_myHomardGen->GetAllIterations(); - int num = 0;// + int num = 0;// QString aIterationName=""; while (aIterationName=="" ) { @@ -237,11 +231,10 @@ void MonCreateIteration::PushHypoEdit() if (CBHypothese->currentText() == QString("")) return; if (_IterParentName == QString("")) { - QMessageBox::information( 0, "Error", - QString("The previous iteration must be given."), - QMessageBox::Ok + QMessageBox::Default ); - raise(); - return; + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_ITER_STARTING_POINT") ); + raise(); + return; } QString aFieldFile=LEFieldFile->text().trimmed(); MonEditHypothesis *HypoDlg = new MonEditHypothesis(this,TRUE, HOMARD::HOMARD_Gen::_duplicate(_myHomardGen),CBHypothese->currentText(), _CaseName, aFieldFile) ; @@ -252,28 +245,27 @@ void MonCreateIteration::PushHypoEdit() void MonCreateIteration::addHypothese(QString newHypothese) // ------------------------------------------------------------------------ { - CBHypothese->insertItem(0,newHypothese); - CBHypothese->setCurrentIndex(0); + CBHypothese->insertItem(0,newHypothese); + CBHypothese->setCurrentIndex(0); } // ------------------------------------------------------------------------ void MonCreateIteration::PushHypoNew() // ------------------------------------------------------------------------ { - if (_IterParentName == QString("")) - { - QMessageBox::information( 0, "Error", - QString("The previous iteration must be given."), - QMessageBox::Ok + QMessageBox::Default ); - raise(); - return; - } - if ( _CaseName == QString("")) - { - _CaseName = _myHomardGen->GetCaseName(CORBA::string_dup(_IterParentName.toStdString().c_str())); - } - QString aFieldFile=LEFieldFile->text().trimmed(); - MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this,TRUE,HOMARD::HOMARD_Gen::_duplicate(_myHomardGen),QString(""),_CaseName, aFieldFile) ; - HypoDlg->show(); + if (_IterParentName == QString("")) + { + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_ITER_STARTING_POINT") ); + raise(); + return; + } + if ( _CaseName == QString("")) + { + _CaseName = _myHomardGen->GetCaseName(CORBA::string_dup(_IterParentName.toStdString().c_str())); + } + QString aFieldFile=LEFieldFile->text().trimmed(); + MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this,TRUE,HOMARD::HOMARD_Gen::_duplicate(_myHomardGen),QString(""),_CaseName, aFieldFile) ; + HypoDlg->show(); } // ------------------------------------------------------------------------ diff --git a/src/HOMARDGUI/MonCreateListGroup.cxx b/src/HOMARDGUI/MonCreateListGroup.cxx index 8b9dab97..1875666e 100644 --- a/src/HOMARDGUI/MonCreateListGroup.cxx +++ b/src/HOMARDGUI/MonCreateListGroup.cxx @@ -19,8 +19,8 @@ using namespace std; #include // -------------------------------------------------------------------------------------------------------------- -MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo) : +MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, + HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo) : // -------------------------------------------------------------------------------------------------------------- // QDialog(0), Ui_CreateListGroup(), @@ -37,8 +37,8 @@ MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreate InitGroupes(); } // -------------------------------------------------------------------------------------------------------------- -MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, - HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo) : +MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, + HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo) : // -------------------------------------------------------------------------------------------------------------- // QDialog(0), Ui_CreateListGroup(), @@ -103,7 +103,7 @@ void MonCreateListGroup::PushOnHelp() void MonCreateListGroup::InitGroupes() // ------------------------------------------------------------------------ { - MESSAGE("Debut de InitGroupes "); + MESSAGE("Debut de MonCreateListGroup::InitGroupes "); for ( int row=0; row< TWGroupe->rowCount(); row++) TWGroupe->removeRow(row); TWGroupe->setRowCount(0); @@ -126,6 +126,6 @@ void MonCreateListGroup::InitGroupes() TWGroupe->resizeColumnsToContents(); TWGroupe->resizeRowsToContents(); TWGroupe->clearSelection(); - MESSAGE("Fin de InitGroupes "); +// MESSAGE("Fin de MonCreateListGroup::InitGroupes "); } diff --git a/src/HOMARDGUI/MonCreateZone.cxx b/src/HOMARDGUI/MonCreateZone.cxx index 7e766f83..5070b4a8 100644 --- a/src/HOMARDGUI/MonCreateZone.cxx +++ b/src/HOMARDGUI/MonCreateZone.cxx @@ -234,35 +234,34 @@ bool MonCreateZone::PushOnApply() std::cerr << LEZoneName->text().trimmed().toStdString() << std::endl; if (LEZoneName->text().trimmed()=="") { - QMessageBox::information( 0, "Error", - "The zone must be named.", - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_ZONE_NAME") ); return false; } switch (_ZoneType) { - case 2 : // il s agit d une boite - { - 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 (_ZoneZmax != SpinBox_Zmaxi->value()) ) - Chgt = true; - break; - } + case 2 : // il s agit d une boite + { + 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 (_ZoneZmax != SpinBox_Zmaxi->value()) ) + Chgt = true; + break; + } - case 4 : // il s agit d une sphere - { - if ((_ZoneXcentre != SpinBox_Xcentre->value()) or (_ZoneYcentre != SpinBox_Ycentre->value()) - or (_ZoneZcentre != SpinBox_Zcentre->value()) or (_ZoneRayon != SpinBox_Rayon->value())) - Chgt = true; - break; - } + case 4 : // il s agit d une sphere + { + if ((_ZoneXcentre != SpinBox_Xcentre->value()) or (_ZoneYcentre != SpinBox_Ycentre->value()) + or (_ZoneZcentre != SpinBox_Zcentre->value()) or (_ZoneRayon != SpinBox_Rayon->value())) + Chgt = true; + break; + } } - _ZoneXmin= SpinBox_Xmini->value(); _ZoneXmax= SpinBox_Xmaxi->value(); - _ZoneYmin= SpinBox_Ymini->value(); _ZoneYmax= SpinBox_Ymaxi->value(); - _ZoneZmin= SpinBox_Zmini->value(); _ZoneZmax= SpinBox_Zmaxi->value(); + _ZoneXmin= SpinBox_Xmini->value(); _ZoneXmax= SpinBox_Xmaxi->value(); + _ZoneYmin= SpinBox_Ymini->value(); _ZoneYmax= SpinBox_Ymaxi->value(); + _ZoneZmin= SpinBox_Zmini->value(); _ZoneZmax= SpinBox_Zmaxi->value(); _ZoneXcentre=SpinBox_Xcentre->value();_ZoneYcentre=SpinBox_Ycentre->value(); _ZoneZcentre=SpinBox_Zcentre->value();_ZoneRayon=SpinBox_Rayon->value(); @@ -270,21 +269,18 @@ bool MonCreateZone::PushOnApply() if( _ZoneType == 2 ) { if ((_ZoneXmin>= _ZoneXmax) and (_Xincr > 0)) { - QMessageBox::information( 0, "Error", - QString("X maxi must be greater than X mini."), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_ZONE_LIMIT").arg("X") ); return false; } if ((_ZoneYmin>= _ZoneYmax) and (_Yincr > 0)) { - QMessageBox::information( 0, "Error", - QString("Y maxi must be greater than Y mini."), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_ZONE_LIMIT").arg("Y") ); return false; } if ((_ZoneZmin>= _ZoneZmax) and (_Zincr > 0)) { - QMessageBox::information( 0, "Error", - QString("Z maxi must be greater than Z mini."), - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_ZONE_LIMIT").arg("Z") ); return false; } } @@ -308,14 +304,13 @@ bool MonCreateZone:: CreateOrUpdateZone() CORBA::string_dup(_aZoneName.toStdString().c_str()), \ CORBA::Long(_ZoneType) ); _parent->addZone(_aZoneName); - } - catch( SALOME::SALOME_Exception& S_ex ) - { - QMessageBox::information( 0, "Error", - QString(CORBA::string_dup(S_ex.details.text)), - QMessageBox::Ok + QMessageBox::Default ); - return false; - } + } + catch( SALOME::SALOME_Exception& S_ex ) + { + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QString(CORBA::string_dup(S_ex.details.text)) ); + return false; + } } // Mise en place des attributs aZone->SetZoneType(_ZoneType); @@ -347,19 +342,19 @@ void MonCreateZone::SetNewZoneName() HOMARD::listeZones_var MyZones = _myHomardGen->GetAllZones(); int num = 0; QString aZoneName=""; - while (aZoneName=="" ) + while (aZoneName=="" ) { aZoneName.setNum(num+1) ; aZoneName.insert(0, QString("Zone_")) ; - for ( int i=0; ilength(); i++) + for ( int i=0; ilength(); i++) { - if ( aZoneName == QString(MyZones[i])) + if ( aZoneName == QString(MyZones[i])) { num=num+1; aZoneName=""; break; - } - } + } + } } LEZoneName->clear() ; LEZoneName->insert(aZoneName); @@ -405,7 +400,7 @@ void MonCreateZone::SetSphere() if ( _Zincr > 0 ) { SpinBox_Zcentre->setValue(_Zcentre); } - SpinBox_Rayon->setValue(_Rayon); + SpinBox_Rayon->setValue(_Rayon); } diff --git a/src/HOMARDGUI/MonEditBoundaryAn.cxx b/src/HOMARDGUI/MonEditBoundaryAn.cxx index 50794ca9..3e7511a3 100644 --- a/src/HOMARDGUI/MonEditBoundaryAn.cxx +++ b/src/HOMARDGUI/MonEditBoundaryAn.cxx @@ -18,7 +18,7 @@ MonEditBoundaryAn::MonEditBoundaryAn( MonCreateCase* parent, bool modal, MonCreateBoundaryAn(parent, myHomardGen, caseName) { MESSAGE("Debut de MonEditBoundaryAn pour " << zoneName.toStdString().c_str()); - setWindowTitle("Edit BoundaryAn"); + setWindowTitle(QObject::tr("HOM_BOUN_A_EDIT_WINDOW_TITLE")); _aBoundaryAnName=zoneName; aBoundaryAn = _myHomardGen->GetBoundary(_aBoundaryAnName.toStdString().c_str()); InitValEdit(); diff --git a/src/HOMARDGUI/MonEditBoundaryDi.cxx b/src/HOMARDGUI/MonEditBoundaryDi.cxx index cae08250..49ceddd4 100644 --- a/src/HOMARDGUI/MonEditBoundaryDi.cxx +++ b/src/HOMARDGUI/MonEditBoundaryDi.cxx @@ -22,7 +22,7 @@ MonEditBoundaryDi::MonEditBoundaryDi( MonCreateCase* parent, bool modal, MonCreateBoundaryDi(parent, modal, myHomardGen, caseName, BoundaryName) { MESSAGE("Debut de Boundary pour " << BoundaryName.toStdString().c_str()); - setWindowTitle("Edit BoundaryDi"); + setWindowTitle(QObject::tr("HOM_BOUN_D_EDIT_WINDOW_TITLE")); try { _aBoundary=_myHomardGen->GetBoundary(CORBA::string_dup(_aBoundaryName.toStdString().c_str())); @@ -31,10 +31,9 @@ MonEditBoundaryDi::MonEditBoundaryDi( MonCreateCase* parent, bool modal, } catch( SALOME::SALOME_Exception& S_ex ) { - QMessageBox::information( 0, "Error", - QString(CORBA::string_dup(S_ex.details.text)), - QMessageBox::Ok + QMessageBox::Default ); - return; + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QString(CORBA::string_dup(S_ex.details.text)) ); + return; } HOMARD::ListGroupType_var maListe = _aBoundary->GetGroups(); @@ -71,19 +70,18 @@ bool MonEditBoundaryDi::PushOnApply() void MonEditBoundaryDi::SetFiltrage() // // ------------------------------------------------------------------------ { - if (!CBGroupe->isChecked()) return; - if (_aCaseName.toStdString().c_str() == QString()) - { - QMessageBox::information( 0, "Error", - "Case MeshFile unknowned.", - QMessageBox::Ok + QMessageBox::Default ); - return; - } - HOMARD::HOMARD_Cas_var monCas= _myHomardGen->GetCas(_aCaseName.toStdString().c_str()); - HOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups(); + if (!CBGroupe->isChecked()) return; + if (_aCaseName.toStdString().c_str() == QString()) + { + QMessageBox::critical( 0, QObject::tr("HOM_ERROR"), + QObject::tr("HOM_BOUN_CASE") ); + return; + } + HOMARD::HOMARD_Cas_var monCas= _myHomardGen->GetCas(_aCaseName.toStdString().c_str()); + HOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups(); - MonEditListGroup *aDlg = new MonEditListGroup(NULL,this, TRUE, HOMARD::HOMARD_Gen::_duplicate(_myHomardGen), - _aCaseName, _listeGroupesBoundary) ; - aDlg->show(); + MonEditListGroup *aDlg = new MonEditListGroup(NULL,this, TRUE, HOMARD::HOMARD_Gen::_duplicate(_myHomardGen), + _aCaseName, _listeGroupesBoundary) ; + aDlg->show(); } diff --git a/src/HOMARDGUI/MonEditCase.cxx b/src/HOMARDGUI/MonEditCase.cxx index 111f271b..6fdebc01 100644 --- a/src/HOMARDGUI/MonEditCase.cxx +++ b/src/HOMARDGUI/MonEditCase.cxx @@ -2,8 +2,6 @@ using namespace std; #include "MonEditCase.h" -#include - #include "SalomeApp_Tools.h" #include "HOMARDGUI_Utils.h" #include "HomardQtCommun.h" @@ -21,7 +19,7 @@ MonEditCase::MonEditCase ( QWidget* parent, bool modal, MonCreateCase(parent, modal, myHomardGen) { MESSAGE("Debut de MonEditCase" << CaseName.toStdString().c_str()); - setWindowTitle("Edit case"); + setWindowTitle(QObject::tr("HOM_CASE_EDIT_WINDOW_TITLE")); _aCaseName = CaseName; aCase = _myHomardGen->GetCas(_aCaseName.toStdString().c_str()); InitValEdit(); @@ -37,7 +35,7 @@ MonEditCase::~MonEditCase() void MonEditCase::InitValEdit() // ------------------------------ { - MESSAGE("Debut de InitValEdit"); + MESSAGE("Debut de MonEditCase::InitValEdit"); LECaseName->setText(_aCaseName); LECaseName->setReadOnly(true); diff --git a/src/HOMARDGUI/MonEditFile.cxx b/src/HOMARDGUI/MonEditFile.cxx index 5d09d71c..91bbbd61 100644 --- a/src/HOMARDGUI/MonEditFile.cxx +++ b/src/HOMARDGUI/MonEditFile.cxx @@ -83,9 +83,8 @@ void MonEditFile::PushOnPrint() // ------------------------------------------------------------------------ { MESSAGE("Debut de MonEditFile::PushOnPrint") - QMessageBox::information( 0, "Error", - "Inactive button.", - QMessageBox::Ok + QMessageBox::Default ); + QMessageBox::warning( 0, QObject::tr("HOM_WARNING"), + QObject::tr("HOM_INACTIVE_BUTTON") ); return; } diff --git a/src/HOMARDGUI/MonEditHypothesis.cxx b/src/HOMARDGUI/MonEditHypothesis.cxx index c7f33432..5aa8bbce 100644 --- a/src/HOMARDGUI/MonEditHypothesis.cxx +++ b/src/HOMARDGUI/MonEditHypothesis.cxx @@ -23,7 +23,7 @@ MonEditHypothesis::MonEditHypothesis( MonCreateIteration* parent, bool modal, MonCreateHypothesis(parent, modal,myHomardGen, aHypothesisName, caseName, aFieldFile) { MESSAGE("Hypothese " << aHypothesisName.toStdString().c_str()); - setWindowTitle("Edit Hypothesis"); + setWindowTitle(QObject::tr("HOM_HYPO_EDIT_WINDOW_TITLE")); _aHypothesis = _myHomardGen->GetHypothesis(_aHypothesisName.toStdString().c_str()); if (caseName == QString("") ){ _aCaseName = _aHypothesis->GetCaseCreation();} InitValEdit(); @@ -243,12 +243,12 @@ void MonEditHypothesis::InitAdaptChamps() } // Le choix de la prise en compte des composantes if ( TWCMP->rowCount() == 1 ) - { RBL2->setText(QString("Absolute value")); - RBInf->setText(QString("Relative value")); + { RBL2->setText(QObject::tr("HOM_HYPO_NORM_ABS")); + RBInf->setText(QObject::tr("HOM_HYPO_NORM_REL")); } else - { RBL2->setText(QString("L2 norm")); - RBInf->setText(QString("Infinite Norm")); + { RBL2->setText(QObject::tr("HOM_HYPO_NORM_L2")); + RBInf->setText(QObject::tr("HOM_HYPO_NORM_INF")); } if ( _UsCmpI == 0 ) { diff --git a/src/HOMARDGUI/MonEditIteration.cxx b/src/HOMARDGUI/MonEditIteration.cxx index 4363da12..fadef9ba 100644 --- a/src/HOMARDGUI/MonEditIteration.cxx +++ b/src/HOMARDGUI/MonEditIteration.cxx @@ -22,7 +22,7 @@ MonEditIteration::MonEditIteration ( QWidget* parent, bool modal, _rank(0), _step(0), _IterationName(""), _FieldFile(""),_aTypeAdap() { MESSAGE("Debut de MonEditIteration" << IterName.toStdString().c_str()); - setWindowTitle("Edit iteration"); + setWindowTitle(QObject::tr("HOM_ITER_EDIT_WINDOW_TITLE")); _IterationName = IterName; aIter = _myHomardGen->GetIteration(_IterationName.toStdString().c_str()); @@ -53,12 +53,12 @@ void MonEditIteration::InitValEdit0() // Affichage bloque du nom du maillage de l'iteration courante QString MeshName = aIter->GetMeshName(); - Mesh_n->setText(QString("Mesh name")); + Mesh_n->setText(QObject::tr("HOM_ITER_STARTING_POINT_0")); LEMeshName_n->setText(MeshName); LEMeshName_n->setReadOnly(1); // Message general - Mesh_np1->setText(QString("First iteration of the case.")); + Mesh_np1->setText(QObject::tr("HOM_ITER_STARTING_POINT_1")); LEMeshName_np1->setVisible(0); // // Invisibilite des hypotheses et des champs @@ -150,7 +150,7 @@ bool MonEditIteration::PushOnApply() if ( _aTypeAdap == 1) { // Pour du raffinement selon un champ, les instants ont-ils change ? - if ( (_FieldFile != LEFieldFile->text().trimmed()) or + if ( (_FieldFile != LEFieldFile->text().trimmed()) or ( _rank != SpinBox_Rank->value()) or ( _step != SpinBox_TimeStep->value())) { diff --git a/src/HOMARDGUI/MonEditListGroup.cxx b/src/HOMARDGUI/MonEditListGroup.cxx index 40ee236b..ecd635e8 100644 --- a/src/HOMARDGUI/MonEditListGroup.cxx +++ b/src/HOMARDGUI/MonEditListGroup.cxx @@ -4,17 +4,17 @@ using namespace std; #include //--------------------------------------------------------------------- -MonEditListGroup::MonEditListGroup( MonCreateHypothesis* parentHyp, - MonCreateBoundaryDi* parentBound, - bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, - QString aCaseName, +MonEditListGroup::MonEditListGroup( MonCreateHypothesis* parentHyp, + MonCreateBoundaryDi* parentBound, + bool modal, + HOMARD::HOMARD_Gen_var myHomardGen, + QString aCaseName, QStringList listeGroupesHypo): //--------------------------------------------------------------------- MonCreateListGroup(parentHyp,parentBound,myHomardGen,aCaseName,listeGroupesHypo) { MESSAGE("Debut de MonEditListGroup"); - setWindowTitle("Edit ListGroup"); + setWindowTitle(QObject::tr("HOM_GROU_EDIT_WINDOW_TITLE")); setModal(true); InitGroupes(); } diff --git a/src/HOMARDGUI/MonEditZone.cxx b/src/HOMARDGUI/MonEditZone.cxx index 50226e8c..7be92406 100644 --- a/src/HOMARDGUI/MonEditZone.cxx +++ b/src/HOMARDGUI/MonEditZone.cxx @@ -18,7 +18,7 @@ MonEditZone::MonEditZone( MonCreateHypothesis* parent, bool modal, MonCreateZone(parent, myHomardGen, caseName) { MESSAGE("Debut de MonEditZone pour " << zoneName.toStdString().c_str()); - setWindowTitle("Edit Zone"); + setWindowTitle(QObject::tr("HOM_ZONE_EDIT_WINDOW_TITLE")); _aZoneName=zoneName; aZone = _myHomardGen->GetZone(_aZoneName.toStdString().c_str()); InitValEdit(); @@ -153,7 +153,7 @@ void MonEditZone::SetSphere() bool MonEditZone::CreateOrUpdateZone() //---------------------------------------------------- // Pas de Creation de la zone -// Mise a jour des attributs de la Zone +// Mise a jour des attributs de la Zone { try @@ -165,7 +165,7 @@ bool MonEditZone::CreateOrUpdateZone() HOMARD_UTILS::updateObjBrowser(); } catch( const SALOME::SALOME_Exception& S_ex ) { - SalomeApp_Tools::QtCatchCorbaException( S_ex ); + SalomeApp_Tools::QtCatchCorbaException( S_ex ); return false; } return true; diff --git a/src/HOMARDGUI/MonHomardDlg.cxx b/src/HOMARDGUI/MonHomardDlg.cxx deleted file mode 100644 index a79e1376..00000000 --- a/src/HOMARDGUI/MonHomardDlg.cxx +++ /dev/null @@ -1,331 +0,0 @@ -#include "MonHomardDlg.h" -#include "HomardConfigFile.hxx" -#include "HomardQtCommun.h" - -#include - -#include -#include -#include - -#include "HOMARDGUI_Utils.h" - -#include -#include "utilities.h" - -#define MIN_LISTBOX_WIDTH 150 -#define MIN_LISTBOX_HEIGHT 100 - -int MonHomardDlg::RootInfo = 100; - -//-------------------------------------------------------------------------------------------------------------------- -MonHomardDlg::MonHomardDlg( QWidget * parent, bool modal, HOMARD::HOMARD_Gen_ptr myHomardGen): - QWidget(0), - Ui_HomardDlg(), - bHisto(true),bBilan(true), bNomFichier(false), bNomMaillage(false), - _aFile(QString::null), _aMesh (QString::null) -//-------------------------------------------------------------------------------------------------------------------- -{ - setupUi(this); - setModal(true); - _myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen); - - _monCas = new HomardConfigFile(); - _monCas->initVal(string("Interpe3"),string("non")); - _monCas->initVal(string("Qualite5"),string("oui")); - _monCas->initVal(string("Nb_Enti7"),string("oui")); - _monCas->initVal(string("Connex11"),string("oui")); - _monCas->initVal(string("Taille13"),string("oui")); - _monCas->setBilan(true); - - initConnect(); - -} - -//----------------------------- -MonHomardDlg::~MonHomardDlg() -//----------------------------- -{ - // no need to delete child widgets, Qt does it all for us -} - -//----------------------------- -void MonHomardDlg::initConnect() -//----------------------------- -{ - connect( lancement, SIGNAL( pressed() ), this, SLOT( Lancement() ) ); - connect( terminer, SIGNAL( pressed() ), this, SLOT( close() ) ); - connect( ListeMeshName, SIGNAL( activated(int) ), this, SLOT( SetMaillage() ) ); - connect( NomFichier, SIGNAL( returnPressed() ), this, SLOT( SetNomFichier() ) ); - connect( PushFichier, SIGNAL( clicked() ), this, SLOT( PushNomFichier() ) ); - connect( Connexite, SIGNAL( stateChanged(int) ), this, SLOT( SetConnexite() ) ); - connect( Inter, SIGNAL( stateChanged(int) ), this, SLOT( SetInter() ) ); - connect( NbEntites, SIGNAL( stateChanged(int) ), this, SLOT( SetNbEntites() ) ); - connect( Histo, SIGNAL( stateChanged(int) ), this, SLOT( SetHisto() ) ); - connect( Qualite, SIGNAL( stateChanged(int) ), this, SLOT( SetQualite() ) ); - connect( Volumes, SIGNAL( stateChanged(int) ), this, SLOT( SetVolumes() ) ); - connect( Bilan, SIGNAL( stateChanged(int) ), this, SLOT( SetBilans() ) ); -} - -//----------------------------- -void MonHomardDlg::Lancement() -//----------------------------- -{ - if( ( bNomFichier==false) || (bNomMaillage ==false)) - { - QMessageBox::information( 0, "Mauvaise Selection", - QString(" Selectionner un Fichier et un Maillage SVP "), - QMessageBox::Ok + QMessageBox::Default ); - return; - } - - bool ok; - ok=_monCas->initVal(string("ModeHOMA"),string("2")); - ok=_monCas->initVal(string("ListeStd"),string(_aMesh.toStdString())+string(".info")); - ok=_monCas->initVal(string("CCAssoci"),string("MED")); - ok=_monCas->initVal(string("CCSolN__"),string(_aFile.toStdString())); - ok=_monCas->initVal(string("CCMaiN__"),string(_aFile.toStdString())); - ok=_monCas->initVal(string("CCNoMN__"),string(_aMesh.toStdString())); - ok=_monCas->initVal(string("PPBasFic"),string(_aMesh.toStdString())); - ok=_monCas->initVal(string("EcriFiHO"),string("non")); - - ok = _monCas->createFile(); - if ( ok == false) - { - QMessageBox::information( 0, "Mauvaise Selection", - QString("Probleme � la cr�ation du fichier Homard "), - QMessageBox::Ok + QMessageBox::Default ); - return; - } - - string fileDir=string(_monCas->getMyDir().c_str()); - char * dirchar; char * execchar; - string dir; string executable; - string result=string(_aMesh.toStdString())+string(".info"); - - if ( !(dirchar = getenv("HOMARD_REP_EXE")) ) - { dir=string("/local/logiciels/Homard"); } - else - { dir=string(dirchar); } - - if ( !(execchar = getenv("HOMARD_EXE")) ) - { executable =string("HOMARD"); } - else - { executable =string(execchar); } - - string commande = dir+"/"+executable; - string info = ";more *.info"; - string ou=string("cd ") + string(fileDir); - string tout=ou +string("; xterm -sb -hold -e \" ") + commande + info + string ("\""); - system(tout.c_str()); - int MonCasRoot = MonHomardDlg::RootInfo; - int TagInfo = 0; - MonHomardDlg::RootInfo = MonHomardDlg::RootInfo+1; - HOMARD_UTILS::AddNewRoot(MonCasRoot,QString(_aMesh)); - - if (bBilan == true) - { - QStringList Lesfichiers=HOMARD_UTILS::ChercheDansDir(fileDir.c_str(),QString("info"),-1); - QString FileComment=QString("HomardOuputInfo"); - for ( QStringList::Iterator it = Lesfichiers.begin(); it != Lesfichiers.end(); ++it ) - { - HOMARD_UTILS::RangeSousTag(MonCasRoot,(*it),TagInfo,FileComment,fileDir.c_str()); - TagInfo ++; - } - } - if (bHisto == true) - { - QStringList Lesfichiers=HOMARD_UTILS::ChercheDansDir(fileDir.c_str(),QString("qual"),-1); - QString FileComment=QString("HomardOuputQual"); - for ( QStringList::Iterator it = Lesfichiers.begin(); it != Lesfichiers.end(); ++it ) - { - HOMARD_UTILS::RangeSousTag(MonCasRoot,(*it),TagInfo,FileComment,fileDir.c_str()); - TagInfo ++; - } - } - HOMARD_UTILS::updateObjBrowser(); - close(); - -} - -//----------------------------- -void MonHomardDlg::SetBilans() -//----------------------------- -{ - if (Bilan->isChecked()) - { - _monCas->setBilan(true); - bBilan=true; - } - else - { - _monCas->setBilan(false); - bBilan=false; - } -} - -//----------------------------- -void MonHomardDlg::SetConnexite() -//----------------------------- -{ - bool ok; - if (Connexite->isChecked()) - { - ok=_monCas->initVal(string("Connex11"),string("oui")); - } - else - { - ok=_monCas->initVal(string("Connex11"),string("non")); - } - if ( ok ==false) - { - QMessageBox::information( 0, "Mauvaise Selection", - QString("Mauvaise valeur pour ce mot clef"), - QMessageBox::Ok + QMessageBox::Default ); - } -} - -//----------------------------- -void MonHomardDlg::SetInter() -//----------------------------- -{ - bool ok; - if (Inter->isChecked()) - { - ok=_monCas->initVal(string("Interpe3"),string("oui")); - } - else - { - ok=_monCas->initVal(string("Interpe3"),string("non")); - } - if ( ok ==false) - { - QMessageBox::information( 0, "Mauvaise Selection", - QString("Mauvaise valeur pour ce mot clef"), - QMessageBox::Ok + QMessageBox::Default ); - } -} - -//----------------------------- -void MonHomardDlg::SetNbEntites() -//----------------------------- -{ - bool ok; - if (NbEntites->isChecked()) - { - ok=_monCas->initVal(string("Nb_Enti7"),string("oui")); - } - else - { - ok=_monCas->initVal(string("Nb_Enti7"),string("non")); - } - if ( ok ==false) - { - QMessageBox::information( 0, "Mauvaise Selection", - QString("Mauvaise valeur pour ce mot clef"), - QMessageBox::Ok + QMessageBox::Default ); - } -} - -//----------------------------- -void MonHomardDlg::SetHisto() -//----------------------------- -{ - if (Histo->isChecked()) - { - bHisto=true; - } - else - { - bHisto=false; - } -} - -//----------------------------- -void MonHomardDlg::SetQualite() -//----------------------------- -{ - bool ok; - if (Qualite->isChecked()) - { - ok=_monCas->initVal(string("Qualite5"),string("oui")); - } - else - { - ok=_monCas->initVal(string("Qualite5"),string("non")); - } - if ( ok ==false) - { - QMessageBox::information( 0, "Mauvaise Selection", - QString("Mauvaise valeur pour ce mot clef"), - QMessageBox::Ok + QMessageBox::Default ); - } -} - -//----------------------------- -void MonHomardDlg::SetVolumes() -//----------------------------- -{ - bool ok; - if (Volumes->isChecked()) - { - ok=_monCas->initVal(string("Taille13"),string("oui")); - } - else - { - ok=_monCas->initVal(string("Taille13"),string("non")); - } - if ( ok ==false) - { - QMessageBox::information( 0, "Mauvaise Selection", - QString("Mauvaise valeur pour ce mot clef"), - QMessageBox::Ok + QMessageBox::Default ); - } - -} - -//--------------------------------- -void MonHomardDlg::PushNomFichier() -//--------------------------------- -{ - MESSAGE("Debut de PushNomFichier"); - bNomFichier=false; - _aFile=HOMARD_QT_COMMUN::PushNomFichier(); - if ( _aFile != QString::null) - { - NomFichier->setText(_aFile); - bNomFichier=true; - this->SetNomFichier(); - } -} - -//----------------------------------- -void MonHomardDlg::SetNomFichier() -//----------------------------------- -/* Ce slot est appele quand on entre le nom du fichier */ -{ - MESSAGE("Debut de SetNomFichier"); - _aFile=NomFichier->text(); - bNomFichier=true; - if ( HOMARD_QT_COMMUN::SetListeMaillages(_aFile,ListeMeshName)) - { - if (ListeMeshName->count() == 1) this->SetMaillage(); - } - else - { - bNomFichier=false; - _aFile=QString::null; - NomFichier->setText(_aFile); - } -} - - -//----------------------------------- -void MonHomardDlg::SetMaillage() -//----------------------------------- -{ - MESSAGE("Debut de SetMaillage"); - bNomMaillage = true; - _aMesh=ListeMeshName->currentText(); -} - diff --git a/src/HOMARDGUI/MonHomardDlg.h b/src/HOMARDGUI/MonHomardDlg.h deleted file mode 100644 index 2b044cf6..00000000 --- a/src/HOMARDGUI/MonHomardDlg.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef MONHOMARDDLG_H -#define MONHOMARDDLG_H - -#include "utilities.h" -#include "HomardDlg.h" -#include -#include -#include "SALOME_Selection.h" - -#include - -#include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) - - -class HomardConfigFile; -class MonHomardDlg : public QWidget,public Ui_HomardDlg -{ - Q_OBJECT - -public: - MonHomardDlg( QWidget* parent, bool modal, HOMARD::HOMARD_Gen_ptr myHomardGen ); - ~MonHomardDlg(); - - virtual void initConnect(); - -public slots: - virtual void SetNomFichier(); - virtual void PushNomFichier(); - virtual void SetMaillage(); - virtual void SetNbEntites(); - virtual void Lancement(); - virtual void SetInter(); - virtual void SetBilans(); - virtual void SetConnexite(); - virtual void SetHisto(); - virtual void SetQualite(); - virtual void SetVolumes(); - -protected : - bool bHisto, bBilan; - bool bNomFichier, bNomMaillage; - - HOMARD::HOMARD_Gen_ptr _myHomardGen; - - HomardConfigFile* _monCas; - - QString _aFile; - QString _aMesh; - -private: - static int RootInfo; -}; - -#endif // MONHOMARDDLG_H -- 2.39.2