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
merge master
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Image.cxx
diff --git
a/src/HYDROData/HYDROData_Image.cxx
b/src/HYDROData/HYDROData_Image.cxx
index 4e91edafb18e9e543e5069a31cb8f3f5ca54827b..287541b1c3131095202b12021f50b2c7b3c0085b 100644
(file)
--- a/
src/HYDROData/HYDROData_Image.cxx
+++ b/
src/HYDROData/HYDROData_Image.cxx
@@
-21,6
+21,7
@@
#include "HYDROData_Document.h"
#include "HYDROData_Lambert93.h"
#include "HYDROData_OperationsFactory.h"
#include "HYDROData_Document.h"
#include "HYDROData_Lambert93.h"
#include "HYDROData_OperationsFactory.h"
+#include "HYDROData_Tool.h"
#include <TDataStd_RealArray.hxx>
#include <TDataStd_ByteArray.hxx>
#include <TDataStd_RealArray.hxx>
#include <TDataStd_ByteArray.hxx>
@@
-44,9
+45,7
@@
#pragma warning ( default: 4251 )
#endif
#pragma warning ( default: 4251 )
#endif
-#include <boost/math/special_functions/fpclassify.hpp>
-
-static const Standard_GUID GUID_SELF_SPLITTED("997995aa-5c19-40bf-9a60-ab4b70ad04d8");
+static const Standard_GUID GUID_SELF_SPLIT("997995aa-5c19-40bf-9a60-ab4b70ad04d8");
static const Standard_GUID GUID_HAS_LOCAL_POINTS("FD8841AA-FC44-42fa-B6A7-0F682CCC6F27");
static const Standard_GUID GUID_HAS_GLOBAL_POINTS("330D0E81-742D-4ea3-92D4-484877CFA7C1");
static const Standard_GUID GUID_HAS_LOCAL_POINTS("FD8841AA-FC44-42fa-B6A7-0F682CCC6F27");
static const Standard_GUID GUID_HAS_GLOBAL_POINTS("330D0E81-742D-4ea3-92D4-484877CFA7C1");
@@
-62,7
+61,8
@@
HYDROData_Image::~HYDROData_Image()
{
}
{
}
-QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_Image::DumpToPython( const QString& thePyScriptPath,
+ MapOfTreatedObjects& theTreatedObjects ) const
{
QStringList aResList = dumpObjectCreation( theTreatedObjects );
QString anImageName = GetObjPyName();
{
QStringList aResList = dumpObjectCreation( theTreatedObjects );
QString anImageName = GetObjPyName();
@@
-127,7
+127,7
@@
QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
if ( aTransformationMode == ReferenceImage )
{
Handle(HYDROData_Image) aRefImg = GetTrsfReferenceImage();
if ( aTransformationMode == ReferenceImage )
{
Handle(HYDROData_Image) aRefImg = GetTrsfReferenceImage();
- setPythonReferenceObject( theTreatedObjects, aResList, aRefImg, "SetTrsfReferenceImage" );
+ setPythonReferenceObject( the
PyScriptPath, the
TreatedObjects, aResList, aRefImg, "SetTrsfReferenceImage" );
}
}
}
}
}
}
@@
-170,7
+170,7
@@
QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
for ( int i = 0; i < aNbReferences; ++i )
{
Handle(HYDROData_Image) aRefImg = Handle(HYDROData_Image)::DownCast( Reference( i ) );
for ( int i = 0; i < aNbReferences; ++i )
{
Handle(HYDROData_Image) aRefImg = Handle(HYDROData_Image)::DownCast( Reference( i ) );
- setPythonReferenceObject( theTreatedObjects, aResList, aRefImg, "AppendReference" );
+ setPythonReferenceObject( the
PyScriptPath, the
TreatedObjects, aResList, aRefImg, "AppendReference" );
}
}
}
}
}
}
@@
-507,7
+507,7
@@
void HYDROData_Image::RemoveAllReferences()
ClearReferences();
SetOperatorName( "" );
SetArgs( "" );
ClearReferences();
SetOperatorName( "" );
SetArgs( "" );
- SetIsSelfSplit
ted
( false );
+ SetIsSelfSplit( false );
}
bool anIsByTwoPoints = IsByTwoPoints();
}
bool anIsByTwoPoints = IsByTwoPoints();
@@
-671,8
+671,8
@@
bool HYDROData_Image::SetGlobalPointsFromFile( const QString& theFileName )
// Check the result
if ( !isDoubleOk ||
// Check the result
if ( !isDoubleOk ||
-
boost::math::isn
an( aDoubleValue ) ||
-
boost::math::isi
nf( aDoubleValue ) ) {
+
HYDROData_Tool::IsN
an( aDoubleValue ) ||
+
HYDROData_Tool::IsI
nf( aDoubleValue ) ) {
continue;
}
continue;
}
@@
-874,19
+874,19
@@
QByteArray HYDROData_Image::Args() const
return QByteArray(aData, aLen);
}
return QByteArray(aData, aLen);
}
-void HYDROData_Image::SetIsSelfSplit
ted
(bool theFlag)
+void HYDROData_Image::SetIsSelfSplit(bool theFlag)
{
if (theFlag) {
{
if (theFlag) {
- TDataStd_UAttribute::Set(myLab, GUID_SELF_SPLIT
TED
);
+ TDataStd_UAttribute::Set(myLab, GUID_SELF_SPLIT);
} else {
} else {
- myLab.ForgetAttribute(GUID_SELF_SPLIT
TED
);
+ myLab.ForgetAttribute(GUID_SELF_SPLIT);
}
Changed( Geom_2d );
}
}
Changed( Geom_2d );
}
-bool HYDROData_Image::IsSelfSplit
ted
() const
+bool HYDROData_Image::IsSelfSplit() const
{
{
- return myLab.IsAttribute(GUID_SELF_SPLIT
TED
);
+ return myLab.IsAttribute(GUID_SELF_SPLIT);
}
QPointF HYDROData_Image::generateThirdPoint( const QPointF& thePointA,
}
QPointF HYDROData_Image::generateThirdPoint( const QPointF& thePointA,