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 from V5_1_main 14/05/2010
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_DistrTable.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_DistrTable.cxx
b/src/StdMeshersGUI/StdMeshersGUI_DistrTable.cxx
index 18659e787a2b854a0d5c8ae4c07688cbbd97307e..7963dbe360e31e3768951ab435157d127942ec31 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_DistrTable.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_DistrTable.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
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
@@
-19,16
+19,18
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// File : StdMeshersGUI_DistrTable.cxx
// Author : Open CASCADE S.A.S.
// SMESH includes
//
#include "StdMeshersGUI_DistrTable.h"
// File : StdMeshersGUI_DistrTable.cxx
// Author : Open CASCADE S.A.S.
// SMESH includes
//
#include "StdMeshersGUI_DistrTable.h"
+#include <SMESHGUI_SpinBox.h>
+
// Qt incldues
#include <QItemDelegate>
#include <QTableWidget>
// Qt incldues
#include <QItemDelegate>
#include <QTableWidget>
-#include <QDoubleSpinBox>
#include <QPushButton>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QPushButton>
#include <QVBoxLayout>
#include <QHBoxLayout>
@@
-109,7
+111,7
@@
private:
struct EditorData
{
int r, c;
struct EditorData
{
int r, c;
-
QDouble
SpinBox* sb;
+
SMESHGUI_
SpinBox* sb;
EditorData() { reset(); }
void reset() { r = -1; c = -1; sb = 0; }
};
EditorData() { reset(); }
void reset() { r = -1; c = -1; sb = 0; }
};
@@
-138,7
+140,7
@@
public:
void addRow();
void deleteRow();
void addRow();
void deleteRow();
- void setEditor( int, int,
QDouble
SpinBox* );
+ void setEditor( int, int,
SMESHGUI_
SpinBox* );
protected:
void closeEditor( QWidget*, QAbstractItemDelegate::EndEditHint );
protected:
void closeEditor( QWidget*, QAbstractItemDelegate::EndEditHint );
@@
-176,18
+178,22
@@
createEditor( QWidget* parent,
const QStyleOptionViewItem& /*option*/,
const QModelIndex& index ) const
{
const QStyleOptionViewItem& /*option*/,
const QModelIndex& index ) const
{
- QDoubleSpinBox* sb = new QDoubleSpinBox( parent );
- sb->setFrame(false);
- sb->setMinimum( index.column() == StdMeshersGUI_DistrTableFrame::ArgColumn ?
+ SMESHGUI_SpinBox* sb = new SMESHGUI_SpinBox( parent );
+
+ sb->setAcceptNames(false); // No Notebook variables allowed
+ double aMin = index.column() == StdMeshersGUI_DistrTableFrame::ArgColumn ?
myTable->argMinimum( index.row() ) :
myTable->argMinimum( index.row() ) :
- myTable->funcMinimum( index.row() )
)
;
-
sb->setMaximum(
index.column() == StdMeshersGUI_DistrTableFrame::ArgColumn ?
+ myTable->funcMinimum( index.row() );
+
double aMax =
index.column() == StdMeshersGUI_DistrTableFrame::ArgColumn ?
myTable->argMaximum( index.row() ) :
myTable->argMaximum( index.row() ) :
- myTable->funcMaximum( index.row() )
)
;
-
sb->setSingleStep(
index.column() == StdMeshersGUI_DistrTableFrame::ArgColumn ?
+ myTable->funcMaximum( index.row() );
+
double aStep =
index.column() == StdMeshersGUI_DistrTableFrame::ArgColumn ?
myTable->argStep( index.row() ) :
myTable->argStep( index.row() ) :
- myTable->funcStep( index.row() ) );
- myTable->setEditor( index.row(), index.column(), sb );
+ myTable->funcStep( index.row() );
+ sb->RangeStepAndValidator( aMin, aMax, aStep, "parametric_precision" );
+ sb->setFrame(false);
+
+ myTable->setEditor( index.row(), index.column(), sb );
return sb;
}
return sb;
}
@@
-196,7
+202,7
@@
StdMeshersGUI_DistrTableFrame::SpinBoxDelegate::
setEditorData( QWidget* editor, const QModelIndex& index ) const
{
QString value = index.model()->data(index, Qt::DisplayRole).toString();
setEditorData( QWidget* editor, const QModelIndex& index ) const
{
QString value = index.model()->data(index, Qt::DisplayRole).toString();
-
QDoubleSpinBox* sb = static_cast<QDouble
SpinBox*>(editor);
+
SMESHGUI_SpinBox* sb = static_cast<SMESHGUI_
SpinBox*>(editor);
bool bOk = false;
double v = value.toDouble( &bOk );
bool bOk = false;
double v = value.toDouble( &bOk );
@@
-210,7
+216,7
@@
StdMeshersGUI_DistrTableFrame::SpinBoxDelegate::
setModelData( QWidget* editor, QAbstractItemModel* model,
const QModelIndex& index ) const
{
setModelData( QWidget* editor, QAbstractItemModel* model,
const QModelIndex& index ) const
{
-
QDoubleSpinBox* sb = static_cast<QDouble
SpinBox*>(editor);
+
SMESHGUI_SpinBox* sb = static_cast<SMESHGUI_
SpinBox*>(editor);
model->setData( index, QString::number( sb->value() ), Qt::DisplayRole );
}
model->setData( index, QString::number( sb->value() ), Qt::DisplayRole );
}
@@
-247,7
+253,7
@@
Table( QWidget* parent, int rows )
void
StdMeshersGUI_DistrTableFrame::Table::
void
StdMeshersGUI_DistrTableFrame::Table::
-setEditor( int r, int c,
QDouble
SpinBox* sb )
+setEditor( int r, int c,
SMESHGUI_
SpinBox* sb )
{
myEditorData.r = r;
myEditorData.c = c;
{
myEditorData.r = r;
myEditorData.c = c;