Fixing of bug concerning the resizing dialogue after choice another tabs

diff --git a/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx
index 924ad35894f6aa7e85c12eea0dc3b0ae28d14b6b..368aa77ca6624905b542afd43c2ca2571e31d680 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx
@@ -384,7 +384,9 @@ void SMESHGUI_DuplicateNodesDlg::onConstructorsClicked (int constructorId)
       break;
     }
   }
       break;
     }
   }

-  
+  myGroupArguments->hide();
+  myGroupArguments->show();
+  this->resize(this->sizeHint().width(), this->minimumSizeHint().height());

   // Process selection
   onSelectionChanged();
 }
   // Process selection
   onSelectionChanged();
 }

diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
index 672c679758514f80fd9dd77a137dd4e207c9f569..5dba32360f703511d8bb65eb19559ffd724f2acf 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
@@ -487,6 +487,9 @@ void SMESHGUI_ExtrusionDlg::ConstructorsClicked (int constructorId)
   if (CheckBoxMesh->isChecked())
     onSelectMesh(true);
 
   if (CheckBoxMesh->isChecked())
     onSelectMesh(true);
 

+  myEditCurrentArgument->hide();
+  myEditCurrentArgument->show();
+

   connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
 }
 
   connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
 }
 

diff --git a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
index 73d384cae7843ed2c6004babe71384af6b90f179..46bf3ef55f73d3773143e785055c307d01a84b01 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
@@ -119,13 +119,13 @@ SMESHGUI_MeshPatternDlg::SMESHGUI_MeshPatternDlg( SMESHGUI* theModule )
   aDlgLay->setMargin( MARGIN );
   aDlgLay->setSpacing( SPACING );
 
   aDlgLay->setMargin( MARGIN );
   aDlgLay->setSpacing( SPACING );
 

-  QWidget* aMainFrame = createMainFrame  ( this );
+  myMainFrame = createMainFrame  ( this );

   QWidget* aBtnFrame  = createButtonFrame( this );
 
   QWidget* aBtnFrame  = createButtonFrame( this );
 

-  aDlgLay->addWidget( aMainFrame );
+  aDlgLay->addWidget( myMainFrame );

   aDlgLay->addWidget( aBtnFrame );
 
   aDlgLay->addWidget( aBtnFrame );
 

-  aDlgLay->setStretchFactor( aMainFrame, 1 );
+  aDlgLay->setStretchFactor( myMainFrame, 1 );

 
   mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
 
 
   mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
 


@@ -1201,11 +1201,16 @@ void SMESHGUI_MeshPatternDlg::onTypeChanged (int theType)
     myNode2Lbl->show();
     myNode2   ->show();
   }
     myNode2Lbl->show();
     myNode2   ->show();
   }

-

   mySelInput = Mesh;
   activateSelection();
   updateWgState();
   displayPreview();
   mySelInput = Mesh;
   activateSelection();
   updateWgState();
   displayPreview();

+  myPicture2d->hide();
+  myPicture2d->show();
+  myPicture2d->resize(minimumSizeHint());
+  myMainFrame->hide();
+  myMainFrame->show();
+  resize(minimumSizeHint());

 }
 
 //=======================================================================
 }
 
 //=======================================================================


@@ -1331,8 +1336,10 @@ void SMESHGUI_MeshPatternDlg::onModeToggled (bool on)
 {
   on ? myRefineGrp->show() : myRefineGrp->hide();
   on ? myGeomGrp->hide()   : myGeomGrp->show();
 {
   on ? myRefineGrp->show() : myRefineGrp->hide();
   on ? myGeomGrp->hide()   : myGeomGrp->show();

-
+  myMainFrame->hide();
+  myMainFrame->show();

   displayPreview();
   displayPreview();

+  resize(minimumSizeHint());

 }
 
 //=======================================================================
 }
 
 //=======================================================================

diff --git a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.h b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.h
index 4f140731cfeb31f38f4b61f1dc0376308b7711a6..43317618f40971ba28f2585a431c4495963be220 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.h
+++ b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.h
@@ -141,6 +141,8 @@ private:
   QMap<int, QLineEdit*>               mySelEdit;
   QMap<int, QLabel*>                  mySelLbl;
 
   QMap<int, QLineEdit*>               mySelEdit;
   QMap<int, QLabel*>                  mySelLbl;
 

+  QWidget*                            myMainFrame;
+

   QLineEdit*                          myName;
   QPushButton*                        myOpenBtn;
   QPushButton*                        myNewBtn;
   QLineEdit*                          myName;
   QPushButton*                        myOpenBtn;
   QPushButton*                        myNewBtn;

diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
index 60c48dd914686d91e5fadd9cfc995f8228fbac88..503de82d7bb741cfb0f69c037a8d6be5d5cef31b 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
@@ -1700,6 +1700,9 @@ void SMESHGUI_SplitVolumesDlg::on3d2dChanged(int isPrism)
   }
   SMESHGUI_MultiEditDlg::on3d2dChanged( !myEntityType );
   myEntityType = 1; // == VOLUME
   }
   SMESHGUI_MultiEditDlg::on3d2dChanged( !myEntityType );
   myEntityType = 1; // == VOLUME

+  myChoiceWidget->hide();
+  myChoiceWidget->show();
+  resize(minimumSizeHint());

   onSelectionDone();
 }
 
   onSelectionDone();
 }
 

diff --git a/src/SMESHGUI/SMESHGUI_PatternWidget.cxx b/src/SMESHGUI/SMESHGUI_PatternWidget.cxx
index ce344081373d5690d69eddbd8803c7288d66e8c7..747cd59a82be15a6220fdc5a746fdee67d7cdd88 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_PatternWidget.cxx
+++ b/src/SMESHGUI/SMESHGUI_PatternWidget.cxx
@@ -42,7 +42,7 @@ SMESHGUI_PatternWidget::SMESHGUI_PatternWidget( QWidget* parent )
   : QFrame( parent )
 {
   myMinU = myMinV = myMaxU = myMaxV = 0;
   : QFrame( parent )
 {
   myMinU = myMinV = myMaxU = myMaxV = 0;

-  setMinimumHeight( 150 );
+  //setMinimumHeight( 150 );

 }
 
 //=================================================================================
 }
 
 //=================================================================================

diff --git a/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx b/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
index 99b86a89dfb3411fec80821d6144c23dd2e25bc2..9da433c69e549de8b2fd66354087949690232bed 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
@@ -425,6 +425,8 @@ void SMESHGUI_ScaleDlg::ConstructorsClicked (int constructorId)
   connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
 
   QApplication::instance()->processEvents();
   connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
 
   QApplication::instance()->processEvents();

+  myEditCurrentArgument->hide();
+  myEditCurrentArgument->show();

   updateGeometry();
   resize(100,100);
 }
   updateGeometry();
   resize(100,100);
 }

diff --git a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx b/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
index a9744f462beef8909b23088bdda19999c2cf0435..c887edf8444acb16874fd3e34bbd720ceab7d714 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
@@ -453,6 +453,8 @@ void SMESHGUI_SymmetryDlg::ConstructorsClicked (int constructorId)
   onDisplaySimulation(true);
 
   QApplication::instance()->processEvents();
   onDisplaySimulation(true);
 
   QApplication::instance()->processEvents();

+  myEditCurrentArgument->hide();
+  myEditCurrentArgument->show();

   updateGeometry();
   resize(100,100);
 }
   updateGeometry();
   resize(100,100);
 }

diff --git a/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx b/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
index 0c2d376976d959773b872d8778e8dd5fd519f363..e4bf823f8c700252996134fb8f92cf1cc4a82332 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
@@ -451,7 +451,8 @@ void SMESHGUI_TranslationDlg::ConstructorsClicked (int constructorId)
   connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
 
   onDisplaySimulation(true);
   connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
 
   onDisplaySimulation(true);

-
+  myEditCurrentArgument->hide();
+  myEditCurrentArgument->show();

   QApplication::instance()->processEvents();
   updateGeometry();
   resize(100,100);
   QApplication::instance()->processEvents();
   updateGeometry();
   resize(100,100);