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
[bos #41122][EDF] Quadrangle radial for face which curved edges didn't discretize...
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_DistrTable.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_DistrTable.cxx
b/src/StdMeshersGUI/StdMeshersGUI_DistrTable.cxx
index 582b92b2585ab0bd1df17b282c932c538be729f7..64b48b6d4993b8ce60b9c32b3b476885fc4d3972 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_DistrTable.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_DistrTable.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-28,7
+28,7
@@
#include <SMESHGUI_SpinBox.h>
#include <SMESHGUI_SpinBox.h>
-// Qt incl
du
es
+// Qt incl
ud
es
#include <QItemDelegate>
#include <QTableWidget>
#include <QHeaderView>
#include <QItemDelegate>
#include <QTableWidget>
#include <QHeaderView>
@@
-316,9
+316,9
@@
setValue( int r, int c, double v )
v = funcMinimum( r ); // correct func value according to the valid min value
if ( c == FuncColumn && v > funcMaximum( r ) )
v = funcMaximum( r ); // correct func value according to the valid max value
v = funcMinimum( r ); // correct func value according to the valid min value
if ( c == FuncColumn && v > funcMaximum( r ) )
v = funcMaximum( r ); // correct func value according to the valid max value
- else if ( r == ArgColumn && v < argMinimum( r ) )
+ else if (
c != FuncColumn &&
r == ArgColumn && v < argMinimum( r ) )
v = argMinimum( r ); // correct arg value according to the valid min value
v = argMinimum( r ); // correct arg value according to the valid min value
- else if ( r == ArgColumn && v > argMaximum( r ) )
+ else if (
c != FuncColumn &&
r == ArgColumn && v > argMaximum( r ) )
v = argMaximum( r ); // correct arg value according to the valid max value
if ( !item( r, c ) )
v = argMaximum( r ); // correct arg value according to the valid max value
if ( !item( r, c ) )
@@
-331,7
+331,7
@@
StdMeshersGUI_DistrTableFrame::Table::
argMinimum( int r ) const
{
// for the first row the minimum value is always 0.0
argMinimum( int r ) const
{
// for the first row the minimum value is always 0.0
- // for the other rows the min
u
mum value is the above row's value
+ // for the other rows the min
i
mum value is the above row's value
double val = 0.0;
if ( r > 0 && r < rowCount() )
val = value( r-1, ArgColumn );
double val = 0.0;
if ( r > 0 && r < rowCount() )
val = value( r-1, ArgColumn );
@@
-343,7
+343,7
@@
StdMeshersGUI_DistrTableFrame::Table::
argMaximum( int r ) const
{
// for the last row the maximum value is always 1.0
argMaximum( int r ) const
{
// for the last row the maximum value is always 1.0
- // for the other rows the max
u
mum value is the below row's value
+ // for the other rows the max
i
mum value is the below row's value
double val = 1.0;
if ( r >= 0 && r < rowCount()-1 ) {
val = value( r+1, ArgColumn );
double val = 1.0;
if ( r >= 0 && r < rowCount()-1 ) {
val = value( r+1, ArgColumn );
@@
-445,7
+445,7
@@
deleteRow()
{
QList<int> selRows = selectedRows();
for ( int r = selRows.count()-1; r >= 0; r-- )
{
QList<int> selRows = selectedRows();
for ( int r = selRows.count()-1; r >= 0; r-- )
- removeRow(
r
);
+ removeRow(
selRows.at(r)
);
}
void
}
void
@@
-574,7
+574,7
@@
StdMeshersGUI_DistrTableFrame::
setData( const DataArray& array )
{
QList<double> d;
setData( const DataArray& array )
{
QList<double> d;
- for (
int
i = 0; i < array.length(); i++ )
+ for (
CORBA::ULong
i = 0; i < array.length(); i++ )
d.append( array[i] );
sortData( d );
d.append( array[i] );
sortData( d );