Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #550: fix crash when myObject is NULL
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ObjSelector.h
diff --git
a/src/HYDROGUI/HYDROGUI_ObjSelector.h
b/src/HYDROGUI/HYDROGUI_ObjSelector.h
index b3e1019e62de7484b45a35788e03c686f4dace4a..137b50b232b0304ec54d2f3552c22af9fe16b4f5 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ObjSelector.h
+++ b/
src/HYDROGUI/HYDROGUI_ObjSelector.h
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-23,6
+19,8
@@
#ifndef HYDROGUI_OBJSELECTOR_H
#define HYDROGUI_OBJSELECTOR_H
#ifndef HYDROGUI_OBJSELECTOR_H
#define HYDROGUI_OBJSELECTOR_H
+#include <HYDROData_Object.h>
+
#include <QAbstractButton>
class QToolButton;
#include <QAbstractButton>
class QToolButton;
@@
-34,11
+32,33
@@
class HYDROGUI_ObjSelector : public QAbstractButton
Q_OBJECT
public:
Q_OBJECT
public:
- HYDROGUI_ObjSelector( HYDROGUI_Module* theModule, QWidget* theParent );
+ enum ObjectFlags {
+ NoFlags = 0x00000000,
+ ClosedPolyline = 0x00000001
+ };
+
+public:
+ HYDROGUI_ObjSelector( HYDROGUI_Module* theModule,
+ const ObjectKind theObjectKind,
+ QWidget* theParent,
+ const int theObjectFlags = NoFlags );
virtual ~HYDROGUI_ObjSelector();
virtual ~HYDROGUI_ObjSelector();
+ void Clear();
+ void SetChecked( const bool );
+
+ void SetName( const QString& );
QString GetName() const;
QString GetName() const;
+signals:
+ /** Signal is emitted if the name has already been selected
+ * in other selector of the same parent widget.
+ * @param theName the selected object name
+ */
+ void alreadySelected( const QString& theName );
+
+ void selectionChanged();
+
protected:
virtual void paintEvent( QPaintEvent* );
virtual bool hitButton( const QPoint& thePnt ) const;
protected:
virtual void paintEvent( QPaintEvent* );
virtual bool hitButton( const QPoint& thePnt ) const;
@@
-49,8
+69,12
@@
protected slots:
private:
HYDROGUI_Module* myModule;
private:
HYDROGUI_Module* myModule;
+ ObjectKind myObjectKind;
+
QToolButton* myBtn;
QLineEdit* myObjName;
QToolButton* myBtn;
QLineEdit* myObjName;
+
+ int myObjectFlags;
};
#endif
};
#endif