Increment version: 7.4.0

[plugins/ghs3dplugin.git] / src / GUI / GHS3DPluginGUI_HypothesisCreator.cxx

diff --git a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
index 5f97bafb84cf491082bed6db34618a3591d4f845..b368961eab0e55488e999542c2aef3dbb0946269 100644 (file)
--- a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2004-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2004-2014  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -416,13 +416,11 @@ QFrame* GHS3DPluginGUI_HypothesisCreator::buildFrame()
   myAdvWidget->maxMemoryCheck->setText(tr( "MAX_MEMORY_SIZE" ));
   myAdvWidget->initialMemoryCheck->setText(tr( "INIT_MEMORY_SIZE" ));
 
-  myAdvWidget->maxMemorySpin ->setMinimum( 1 );
-  myAdvWidget->maxMemorySpin ->setMaximum( maxAvailableMemory() );
-  myAdvWidget->maxMemorySpin ->setSingleStep( 10 );
-  
-  myAdvWidget->initialMemorySpin->setMinimum( 1 );
-  myAdvWidget->initialMemorySpin->setMaximum( maxAvailableMemory() );
-  myAdvWidget->initialMemorySpin->setSingleStep( 10 );
+  myAdvWidget->maxMemorySpin->RangeStepAndValidator(20.0, 1e6, 10.0);
+  myAdvWidget->maxMemorySpin->setValue( 128.0 );
+
+  myAdvWidget->initialMemorySpin->RangeStepAndValidator(0.0, 1e6, 10.0);
+  myAdvWidget->initialMemorySpin->setValue( 100.0 );
 
   myAdvWidget->initialMemoryLabel            ->setText (tr( "MEGABYTE" ));
   myAdvWidget->maxMemoryLabel                ->setText (tr( "MEGABYTE" ));
@@ -504,17 +502,17 @@ QFrame* GHS3DPluginGUI_HypothesisCreator::buildFrame()
 //   myGlobalGroupName = new QCheckBox(tr("GHS3D_ENF_VER_GROUPS"), myEnfGroup);
 //   myGlobalGroupName->setChecked(false);
   
-  QGroupBox* GroupBox = new QGroupBox( myEnfGroup );
-  QLabel* info = new QLabel( GroupBox );
-  info->setText( tr( "GHS3D_ENF_VER_INFO" ) );
-  info->setWordWrap( true );
-  QVBoxLayout* GroupBoxVLayout = new QVBoxLayout( GroupBox );
-  GroupBoxVLayout->setSpacing( 6 );
-  GroupBoxVLayout->setMargin( 11 );
-  GroupBoxVLayout->addWidget( info );
+  // QGroupBox* GroupBox = new QGroupBox( myEnfGroup );
+  // QLabel* info = new QLabel( GroupBox );
+  // info->setText( tr( "GHS3D_ENF_VER_INFO" ) );
+  // info->setWordWrap( true );
+  // QVBoxLayout* GroupBoxVLayout = new QVBoxLayout( GroupBox );
+  // GroupBoxVLayout->setSpacing( 6 );
+  // GroupBoxVLayout->setMargin( 11 );
+  // GroupBoxVLayout->addWidget( info );
   
 
-  anEnfLayout->addWidget(GroupBox,                  ENF_VER_WARNING, 0, 1, 2 );
+  //anEnfLayout->addWidget(GroupBox,                  ENF_VER_WARNING, 0, 1, 2 );
   anEnfLayout->addWidget(myEnforcedTableWidget,     ENF_VER_VERTEX, 0, ENF_VER_NB_LINES, 1);
   
   QGridLayout* anEnfLayout2 = new QGridLayout(myEnfGroup);
@@ -583,16 +581,16 @@ QFrame* GHS3DPluginGUI_HypothesisCreator::buildFrame()
 //   addEnfMeshButton->setEnabled(false);
   removeEnfMeshButton = new QPushButton(tr("GHS3D_ENF_REMOVE"),myEnfMeshGroup);
     
-  QGroupBox* GroupBox2 = new QGroupBox( myEnfMeshGroup );
-  QLabel* info2 = new QLabel( GroupBox2 );
-  info2->setText( tr( "GHS3D_ENF_MESH_INFO" ) );
-  info2->setWordWrap( true );
-  QVBoxLayout* GroupBox2VLayout = new QVBoxLayout( GroupBox2 );
-  GroupBox2VLayout->setSpacing( 6 );
-  GroupBox2VLayout->setMargin( 11 );
-  GroupBox2VLayout->addWidget( info2 );
+  // QGroupBox* GroupBox2 = new QGroupBox( myEnfMeshGroup );
+  // QLabel* info2 = new QLabel( GroupBox2 );
+  // info2->setText( tr( "GHS3D_ENF_MESH_INFO" ) );
+  // info2->setWordWrap( true );
+  // QVBoxLayout* GroupBox2VLayout = new QVBoxLayout( GroupBox2 );
+  // GroupBox2VLayout->setSpacing( 6 );
+  // GroupBox2VLayout->setMargin( 11 );
+  // GroupBox2VLayout->addWidget( info2 );
   
-  anEnfMeshLayout->addWidget( GroupBox2,                ENF_MESH_WARNING, 0, 1, 2 );
+  // anEnfMeshLayout->addWidget( GroupBox2,                ENF_MESH_WARNING, 0, 1, 2 );
   anEnfMeshLayout->addWidget(myEnforcedMeshTableWidget, ENF_MESH_MESH, 0, ENF_MESH_NB_LINES , 1);
   
   QGridLayout* anEnfMeshLayout2 = new QGridLayout(myEnfMeshGroup);