Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V9_9_BR'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupOnShapeDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.h
b/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.h
index 60dff8129fb19f0dd8dcf1c1a5e1fdc14483614c..d72ac5a2ffec743c9682065eabbb6b60579ac1a0 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-49,6
+49,7
@@
public:
virtual LightApp_Dialog* dlg() const;
static QString GetDefaultName(const QString& theOperation);
virtual LightApp_Dialog* dlg() const;
static QString GetDefaultName(const QString& theOperation);
+ static SMESH::ElementType ElementType(GEOM::GEOM_Object_var geom);
public slots:
public slots:
@@
-57,27
+58,15
@@
protected:
virtual void startOperation();
virtual void selectionDone();
virtual SUIT_SelectionFilter* createFilter( const int ) const;
virtual void startOperation();
virtual void selectionDone();
virtual SUIT_SelectionFilter* createFilter( const int ) const;
- //virtual bool isValid( SUIT_Operation* ) const;
private slots:
bool onApply();
void onButtonClick();
private slots:
bool onApply();
void onButtonClick();
-
-// void onSelectColor();
-
-
private:
void init();
private:
void init();
-// void setGroupColor( const SALOMEDS::Color& );
-// SALOMEDS::Color getGroupColor() const;
-
-// void setGroupQColor( const QColor& );
-// QColor getGroupQColor() const;
-
-// void setDefaultGroupColor();
private:
private:
@@
-85,7
+74,6
@@
private:
QString myMeshID;
QStringList myElemGeoIDs, myNodeGeoIDs;
QString myMeshID;
QStringList myElemGeoIDs, myNodeGeoIDs;
- //GEOM::ListOfGO_var myElemGObj;
};
class SMESHGUI_EXPORT SMESHGUI_GroupOnShapeDlg : public SMESHGUI_Dialog
};
class SMESHGUI_EXPORT SMESHGUI_GroupOnShapeDlg : public SMESHGUI_Dialog
@@
-103,22
+91,14
@@
public slots:
private:
private:
- //QLineEdit* myGrpNameLine;
-
QPushButton* myMeshBtn;
QLineEdit* myMeshLine;
QPushButton* myElemGeomBtn;
QPushButton* myMeshBtn;
QLineEdit* myMeshLine;
QPushButton* myElemGeomBtn;
- QListWidget*
myElemGeomList;
+ QListWidget* myElemGeomList;
QPushButton* myNodeGeomBtn;
QPushButton* myNodeGeomBtn;
- QListWidget* myNodeGeomList;
-
-// QPushButton* myColorBtn;
-
-// bool myCreate, myIsBusy;
-
-// QString myHelpFileName;
+ QListWidget* myNodeGeomList;
friend class SMESHGUI_GroupOnShapeOp;
};
friend class SMESHGUI_GroupOnShapeOp;
};