Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master'
[modules/gui.git]
/
src
/
QDS
/
QDS_Datum.h
diff --git
a/src/QDS/QDS_Datum.h
b/src/QDS/QDS_Datum.h
index 0217602e35498d5a1fd21b1c4b50af62822d307c..72fc56e3b5b2f12260f5f69de2c1300fa0ee823c 100644
(file)
--- a/
src/QDS/QDS_Datum.h
+++ b/
src/QDS/QDS_Datum.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
@@
-114,6
+114,8
@@
public:
static QString format( const double, const QString&, const bool = false );
static QString units( const QString& );
static QString format( const double, const QString&, const bool = false );
static QString units( const QString& );
+ virtual QString getString() const = 0;
+
virtual bool eventFilter( QObject*, QEvent* );
operator QWidget*() const;
virtual bool eventFilter( QObject*, QEvent* );
operator QWidget*() const;
@@
-151,7
+153,6
@@
protected:
virtual QLabel* createUnits( QWidget* );
virtual QWidget* createControl( QWidget* ) = 0;
virtual QLabel* createUnits( QWidget* );
virtual QWidget* createControl( QWidget* ) = 0;
- virtual QString getString() const = 0;
virtual void setString( const QString& ) = 0;
virtual bool validate( const QString& ) const;
virtual void setString( const QString& ) = 0;
virtual bool validate( const QString& ) const;