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
correct update status of stream and DTM
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Image.cxx
diff --git
a/src/HYDROData/HYDROData_Image.cxx
b/src/HYDROData/HYDROData_Image.cxx
index 3647683011ee99d21e7b59a92219c4fc56eb835c..9cabbc12d5b547358f66cc37ec2c8e09ae2d064c 100644
(file)
--- a/
src/HYDROData/HYDROData_Image.cxx
+++ b/
src/HYDROData/HYDROData_Image.cxx
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 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
@@
-25,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>
@@
-34,15
+31,21
@@
#include <TDataStd_UAttribute.hxx>
#include <TDataStd_AsciiString.hxx>
#include <TDataStd_UAttribute.hxx>
#include <TDataStd_AsciiString.hxx>
+#ifdef WIN32
+ #pragma warning ( disable: 4251 )
+#endif
+
#include <ImageComposer_Operator.h>
#include <ImageComposer_MetaTypes.h>
#include <QStringList>
#include <QFile>
#include <ImageComposer_Operator.h>
#include <ImageComposer_MetaTypes.h>
#include <QStringList>
#include <QFile>
-#include <boost/math/special_functions/fpclassify.hpp>
+#ifdef WIN32
+ #pragma warning ( default: 4251 )
+#endif
-static const Standard_GUID GUID_SELF_SPLIT
TED
("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");
@@
-50,7
+53,7
@@
IMPLEMENT_STANDARD_HANDLE(HYDROData_Image, HYDROData_Entity)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Image, HYDROData_Entity)
HYDROData_Image::HYDROData_Image()
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Image, HYDROData_Entity)
HYDROData_Image::HYDROData_Image()
-: HYDROData_Entity()
+: HYDROData_Entity(
Geom_2d
)
{
}
{
}
@@
-58,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();
@@
-67,8
+71,9
@@
QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
if ( !aFilePath.isEmpty() )
{
aResList << QString( "" );
if ( !aFilePath.isEmpty() )
{
aResList << QString( "" );
- aResList << QString( "
%1.LoadImage( \"%2\" );
" )
+ aResList << QString( "
if not(%1.LoadImage( \"%2\" )):
" )
.arg( anImageName ).arg( aFilePath );
.arg( anImageName ).arg( aFilePath );
+ aResList << QString( " raise ValueError('problem while loading image')" );
aResList << QString( "" );
// Dump transformation points for image
aResList << QString( "" );
// Dump transformation points for image
@@
-87,12
+92,12
@@
QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
if ( !anIsByTwoPoints )
{
aResList.last().append( "," );
if ( !anIsByTwoPoints )
{
aResList.last().append( "," );
- aResList << QString( aGap + "QPoint( %1, %2 ) )
;
" )
+ aResList << QString( aGap + "QPoint( %1, %2 ) )" )
.arg( aLocalPointC.x() ).arg( aLocalPointC.y() );
}
else
{
.arg( aLocalPointC.x() ).arg( aLocalPointC.y() );
}
else
{
- aResList.last().append( " )
;
" );
+ aResList.last().append( " )" );
}
aResList << QString( "" );
}
}
aResList << QString( "" );
}
@@
-106,24
+111,24
@@
QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
aResList << QString( "%1.SetGlobalPoints( %2," )
.arg( anImageName ).arg( aTransformationMode );
aResList << QString( aGap + "QPointF( %1, %2 )," )
aResList << QString( "%1.SetGlobalPoints( %2," )
.arg( anImageName ).arg( aTransformationMode );
aResList << QString( aGap + "QPointF( %1, %2 )," )
- .arg( aTrsfPointA.x()
).arg( aTrsfPointA.y()
);
+ .arg( aTrsfPointA.x()
, 0, 'f', 3 ).arg( aTrsfPointA.y(), 0, 'f', 3
);
aResList << QString( aGap + "QPointF( %1, %2 )" )
aResList << QString( aGap + "QPointF( %1, %2 )" )
- .arg( aTrsfPointB.x()
).arg( aTrsfPointB.y()
);
+ .arg( aTrsfPointB.x()
, 0, 'f', 3 ).arg( aTrsfPointB.y(), 0, 'f', 3
);
if ( !anIsByTwoPoints )
{
aResList.last().append( "," );
if ( !anIsByTwoPoints )
{
aResList.last().append( "," );
- aResList << QString( aGap + "QPointF( %1, %2 ) )
;
" )
- .arg( aTrsfPointC.x()
).arg( aTrsfPointC.y()
);
+ aResList << QString( aGap + "QPointF( %1, %2 ) )" )
+ .arg( aTrsfPointC.x()
, 0, 'f', 3 ).arg( aTrsfPointC.y(), 0, 'f', 3
);
}
else
{
}
else
{
- aResList.last().append( " )
;
" );
+ aResList.last().append( " )" );
}
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" );
}
}
}
}
}
}
@@
-136,7
+141,7
@@
QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
{
aResList << QString( "" );
{
aResList << QString( "" );
- aResList << QString( "%1.SetOperatorName( \"%2\" )
;
" )
+ aResList << QString( "%1.SetOperatorName( \"%2\" )" )
.arg( anImageName ).arg( anOperatorName );
ImageComposer_Operator* anImageOp =
.arg( anImageName ).arg( anOperatorName );
ImageComposer_Operator* anImageOp =
@@
-152,7
+157,7
@@
QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
aResList << anOpArgs;
aResList << QString( "" );
aResList << anOpArgs;
aResList << QString( "" );
- aResList << QString( "%1.SetArgs( %2 )
;
" )
+ aResList << QString( "%1.SetArgs( %2 )" )
.arg( anImageName ).arg( anOpArgsArrayName );
}
}
.arg( anImageName ).arg( anOpArgsArrayName );
}
}
@@
-166,20
+171,20
@@
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" );
}
}
}
aResList << QString( "" );
}
}
}
aResList << QString( "" );
- aResList << QString( "%1.Update()
;
" ).arg( anImageName );
+ aResList << QString( "%1.Update()" ).arg( anImageName );
return aResList;
}
void HYDROData_Image::Update()
{
return aResList;
}
void HYDROData_Image::Update()
{
- bool anIsToUpdate = IsMustBeUpdated();
+ bool anIsToUpdate = IsMustBeUpdated(
Geom_2d
);
HYDROData_Entity::Update();
HYDROData_Entity::Update();
@@
-230,7
+235,7
@@
void HYDROData_Image::Update()
UpdateTrsf();
}
UpdateTrsf();
}
-
SetToUpdate( false
);
+
ClearChanged(
);
}
bool HYDROData_Image::IsHas2dPrs() const
}
bool HYDROData_Image::IsHas2dPrs() const
@@
-298,7
+303,7
@@
void HYDROData_Image::SetImage(const QImage& theImage)
SaveByteArray(0, aData, anImage.byteCount());
}
SaveByteArray(0, aData, anImage.byteCount());
}
-
SetToUpdate( true
);
+
Changed( Geom_2d
);
}
bool HYDROData_Image::LoadImage( const QString& theFilePath )
}
bool HYDROData_Image::LoadImage( const QString& theFilePath )
@@
-330,7
+335,7
@@
void HYDROData_Image::SetFilePath( const QString& theFilePath )
TCollection_AsciiString anAsciiStr( theFilePath.toStdString().c_str() );
TDataStd_AsciiString::Set( myLab.FindChild( DataTag_FilePath ), anAsciiStr );
TCollection_AsciiString anAsciiStr( theFilePath.toStdString().c_str() );
TDataStd_AsciiString::Set( myLab.FindChild( DataTag_FilePath ), anAsciiStr );
-
SetToUpdate( true
);
+
Changed( Geom_2d
);
}
QString HYDROData_Image::GetFilePath() const
}
QString HYDROData_Image::GetFilePath() const
@@
-366,7
+371,7
@@
void HYDROData_Image::SetTrsf(const QTransform& theTrsf)
anArray->SetValue(8, theTrsf.m32());
anArray->SetValue(9, theTrsf.m33());
anArray->SetValue(8, theTrsf.m32());
anArray->SetValue(9, theTrsf.m33());
-
SetToUpdate( true
);
+
Changed( Geom_2d
);
}
QTransform HYDROData_Image::Trsf() const
}
QTransform HYDROData_Image::Trsf() const
@@
-503,7
+508,7
@@
void HYDROData_Image::RemoveAllReferences()
ClearReferences();
SetOperatorName( "" );
SetArgs( "" );
ClearReferences();
SetOperatorName( "" );
SetArgs( "" );
- SetIsSelfSplit
ted
( false );
+ SetIsSelfSplit( false );
}
bool anIsByTwoPoints = IsByTwoPoints();
}
bool anIsByTwoPoints = IsByTwoPoints();
@@
-511,7
+516,7
@@
void HYDROData_Image::RemoveAllReferences()
QImage anImage = Image();
if ( anImage.isNull() )
{
QImage anImage = Image();
if ( anImage.isNull() )
{
-
SetToUpdate( false
);
+
ClearChanged(
);
return;
}
return;
}
@@
-532,7
+537,7
@@
void HYDROData_Image::RemoveAllReferences()
SetGlobalPoints( ManualCartesian, aTrsfPointA, aTrsfPointB, aTrsfPointC );
SetGlobalPoints( ManualCartesian, aTrsfPointA, aTrsfPointB, aTrsfPointC );
-
SetToUpdate( false
);
+
ClearChanged(
);
}
void HYDROData_Image::SetLocalPoints( const QPoint& thePointA,
}
void HYDROData_Image::SetLocalPoints( const QPoint& thePointA,
@@
-556,7
+561,7
@@
void HYDROData_Image::SetLocalPoints( const QPoint& thePointA,
if ( theIsUpdate )
UpdateTrsf();
if ( theIsUpdate )
UpdateTrsf();
-
SetToUpdate( true
);
+
Changed( Geom_2d
);
}
bool HYDROData_Image::GetLocalPoints( QPoint& thePointA,
}
bool HYDROData_Image::GetLocalPoints( QPoint& thePointA,
@@
-611,7
+616,7
@@
void HYDROData_Image::SetGlobalPoints( const TransformationMode& theMode,
if ( theIsUpdate )
UpdateTrsf();
if ( theIsUpdate )
UpdateTrsf();
-
SetToUpdate( true
);
+
Changed( Geom_2d
);
}
bool HYDROData_Image::GetGlobalPoints( TransformationMode& theMode,
}
bool HYDROData_Image::GetGlobalPoints( TransformationMode& theMode,
@@
-667,8
+672,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;
}
@@
-763,7
+768,7
@@
bool HYDROData_Image::HasReferencePoints() const
void HYDROData_Image::SetTrsfMode( const TransformationMode& theMode )
{
TDataStd_Integer::Set( myLab.FindChild( DataTag_TrsfMode ), (int)theMode );
void HYDROData_Image::SetTrsfMode( const TransformationMode& theMode )
{
TDataStd_Integer::Set( myLab.FindChild( DataTag_TrsfMode ), (int)theMode );
-
SetToUpdate( true
);
+
Changed( Geom_2d
);
}
HYDROData_Image::TransformationMode HYDROData_Image::GetTrsfMode() const
}
HYDROData_Image::TransformationMode HYDROData_Image::GetTrsfMode() const
@@
-784,7
+789,7
@@
HYDROData_Image::TransformationMode HYDROData_Image::GetTrsfMode() const
void HYDROData_Image::SetTrsfReferenceImage( const Handle(HYDROData_Image)& theRefImage )
{
SetReferenceObject( theRefImage, DataTag_TrsfImage );
void HYDROData_Image::SetTrsfReferenceImage( const Handle(HYDROData_Image)& theRefImage )
{
SetReferenceObject( theRefImage, DataTag_TrsfImage );
-
SetToUpdate( true
);
+
Changed( Geom_2d
);
}
Handle(HYDROData_Image) HYDROData_Image::GetTrsfReferenceImage() const
}
Handle(HYDROData_Image) HYDROData_Image::GetTrsfReferenceImage() const
@@
-795,13
+800,13
@@
Handle(HYDROData_Image) HYDROData_Image::GetTrsfReferenceImage() const
void HYDROData_Image::RemoveTrsfReferenceImage()
{
RemoveReferenceObject( DataTag_TrsfImage );
void HYDROData_Image::RemoveTrsfReferenceImage()
{
RemoveReferenceObject( DataTag_TrsfImage );
-
SetToUpdate( true
);
+
Changed( Geom_2d
);
}
void HYDROData_Image::AppendReference( const Handle(HYDROData_Entity)& theReferenced )
{
AddReferenceObject( theReferenced, 0 );
}
void HYDROData_Image::AppendReference( const Handle(HYDROData_Entity)& theReferenced )
{
AddReferenceObject( theReferenced, 0 );
-
SetToUpdate( true
);
+
Changed( Geom_2d
);
}
int HYDROData_Image::NbReferences() const
}
int HYDROData_Image::NbReferences() const
@@
-818,26
+823,26
@@
void HYDROData_Image::ChangeReference(
const int theIndex, Handle(HYDROData_Entity) theReferenced)
{
SetReferenceObject( theReferenced, 0, theIndex );
const int theIndex, Handle(HYDROData_Entity) theReferenced)
{
SetReferenceObject( theReferenced, 0, theIndex );
-
SetToUpdate( true
);
+
Changed( Geom_2d
);
}
void HYDROData_Image::RemoveReference(const int theIndex)
{
RemoveReferenceObject( 0, theIndex );
}
void HYDROData_Image::RemoveReference(const int theIndex)
{
RemoveReferenceObject( 0, theIndex );
-
SetToUpdate( true
);
+
Changed( Geom_2d
);
}
void HYDROData_Image::ClearReferences()
{
ClearReferenceObjects( 0 );
}
void HYDROData_Image::ClearReferences()
{
ClearReferenceObjects( 0 );
-
SetToUpdate( true
);
+
Changed( Geom_2d
);
}
void HYDROData_Image::SetOperatorName( const QString theOpName )
{
TCollection_AsciiString anAsciiStr( theOpName.toStdString().c_str() );
TDataStd_AsciiString::Set( myLab.FindChild( DataTag_Operator ), anAsciiStr );
}
void HYDROData_Image::SetOperatorName( const QString theOpName )
{
TCollection_AsciiString anAsciiStr( theOpName.toStdString().c_str() );
TDataStd_AsciiString::Set( myLab.FindChild( DataTag_Operator ), anAsciiStr );
-
SetToUpdate( true
);
+
Changed( Geom_2d
);
}
QString HYDROData_Image::OperatorName() const
}
QString HYDROData_Image::OperatorName() const
@@
-858,7
+863,7
@@
QString HYDROData_Image::OperatorName() const
void HYDROData_Image::SetArgs(const QByteArray& theArgs)
{
SaveByteArray(DataTag_Operator, theArgs.constData(), theArgs.length());
void HYDROData_Image::SetArgs(const QByteArray& theArgs)
{
SaveByteArray(DataTag_Operator, theArgs.constData(), theArgs.length());
-
SetToUpdate( true
);
+
Changed( Geom_2d
);
}
QByteArray HYDROData_Image::Args() const
}
QByteArray HYDROData_Image::Args() const
@@
-870,19
+875,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);
}
}
-
SetToUpdate( true
);
+
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,