1) IPAL15174 (Dump study works wrong for Concatenate):

fix of Problem 1 (no icon ?Build compound? in dialog box).
2) add the checking of the study lock.
This commit is contained in:
akl 2007-03-09 09:26:28 +00:00
parent 5406be05fd
commit 66b687c454

View File

@ -25,8 +25,8 @@
// Author : Alexander KOVALEV // Author : Alexander KOVALEV
// Module : SMESH // Module : SMESH
#ifndef DIALOGBOX_BUILD_MESH_H #ifndef SMESHGUI_BuildCompoundDlg_H
#define DIALOGBOX_BUILD_MESH_H #define SMESHGUI_BuildCompoundDlg_H
#include "LightApp_SelectionMgr.h" #include "LightApp_SelectionMgr.h"
#include "SUIT_SelectionFilter.h" #include "SUIT_SelectionFilter.h"
@ -67,10 +67,7 @@ class SMESHGUI_BuildCompoundDlg : public QDialog
public: public:
SMESHGUI_BuildCompoundDlg (SMESHGUI * theModule, SMESHGUI_BuildCompoundDlg (SMESHGUI * theModule);
const char* title,
const char* icon,
int theAction);
~SMESHGUI_BuildCompoundDlg(); ~SMESHGUI_BuildCompoundDlg();
public : public :
@ -91,8 +88,6 @@ public :
SUIT_SelectionFilter* myMeshFilter; SUIT_SelectionFilter* myMeshFilter;
SMESH::mesh_array_var myMeshArray; SMESH::mesh_array_var myMeshArray;
int myAction;
// Widgets // Widgets
QButtonGroup* GroupConstructors; QButtonGroup* GroupConstructors;
QRadioButton* Constructor1; QRadioButton* Constructor1;
@ -129,7 +124,7 @@ public :
private slots: private slots:
void ClickOnOk(); void ClickOnOk();
void ClickOnCancel(); void ClickOnCancel();
void ClickOnApply(); bool ClickOnApply();
void ClickOnHelp(); void ClickOnHelp();
void SelectionIntoArgument(); void SelectionIntoArgument();
void DeactivateActiveDialog(); void DeactivateActiveDialog();
@ -137,4 +132,4 @@ public :
void onSelectMerge(bool); void onSelectMerge(bool);
}; };
#endif // DIALOGBOX_BUILD_MESH_H #endif // SMESHGUI_BuildCompoundDlg_H