+// 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
+// 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
#include "HYDROData_Image.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_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 <boost/math/special_functions/fpclassify.hpp>
+#ifdef WIN32
+ #pragma warning ( default: 4251 )
+#endif
-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");
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Image, HYDROData_Entity)
HYDROData_Image::HYDROData_Image()
-: HYDROData_Entity()
+: HYDROData_Entity( Geom_2d )
{
}
{
}
-QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_Image::DumpToPython( const QString& thePyScriptPath,
+ MapOfTreatedObjects& theTreatedObjects ) const
{
QStringList aResList = dumpObjectCreation( theTreatedObjects );
- QString anImageName = GetName();
+ QString anImageName = GetObjPyName();
QString aFilePath = GetFilePath();
if ( !aFilePath.isEmpty() )
{
aResList << QString( "" );
- aResList << QString( "%1.LoadImage( \"%2\" );" )
+ aResList << QString( "%1.LoadImage( \"%2\" )" )
.arg( anImageName ).arg( aFilePath );
aResList << QString( "" );
// Dump transformation points for image
- QString aGap = QString().fill( ' ', anImageName.size() + 16 );
-
bool anIsByTwoPoints = IsByTwoPoints();
QPoint aLocalPointA, aLocalPointB, aLocalPointC;
if ( GetLocalPoints( aLocalPointA, aLocalPointB, aLocalPointC ) )
{
+ QString aGap = QString().fill( ' ', anImageName.size() + 17 );
+
aResList << QString( "%1.SetLocalPoints( QPoint( %2, %3 )," )
.arg( anImageName ).arg( aLocalPointA.x() ).arg( aLocalPointA.y() );
- aResList << QString( aGap + "QPoint( %1, %2 )," )
+ aResList << QString( aGap + "QPoint( %1, %2 )" )
.arg( aLocalPointB.x() ).arg( aLocalPointB.y() );
- aResList << QString( aGap + "QPoint( %1, %2 ) );" )
- .arg( aLocalPointC.x() ).arg( aLocalPointC.y() );
+ if ( !anIsByTwoPoints )
+ {
+ aResList.last().append( "," );
+ aResList << QString( aGap + "QPoint( %1, %2 ) )" )
+ .arg( aLocalPointC.x() ).arg( aLocalPointC.y() );
+ }
+ else
+ {
+ aResList.last().append( " )" );
+ }
aResList << QString( "" );
}
QPointF aTrsfPointA, aTrsfPointB, aTrsfPointC;
if ( GetGlobalPoints( aTransformationMode, aTrsfPointA, aTrsfPointB, aTrsfPointC ) )
{
+ QString aGap = QString().fill( ' ', anImageName.size() + 18 );
+
aResList << QString( "%1.SetGlobalPoints( %2," )
.arg( anImageName ).arg( aTransformationMode );
aResList << QString( aGap + "QPointF( %1, %2 )," )
.arg( aTrsfPointA.x() ).arg( aTrsfPointA.y() );
- aResList << QString( aGap + "QPointF( %1, %2 )," )
+ aResList << QString( aGap + "QPointF( %1, %2 )" )
.arg( aTrsfPointB.x() ).arg( aTrsfPointB.y() );
- aResList << QString( aGap + "QPointF( %1, %2 ) );" )
- .arg( aTrsfPointC.x() ).arg( aTrsfPointC.y() );
+ if ( !anIsByTwoPoints )
+ {
+ aResList.last().append( "," );
+ aResList << QString( aGap + "QPointF( %1, %2 ) )" )
+ .arg( aTrsfPointC.x() ).arg( aTrsfPointC.y() );
+ }
+ else
+ {
+ aResList.last().append( " )" );
+ }
if ( aTransformationMode == ReferenceImage )
{
Handle(HYDROData_Image) aRefImg = GetTrsfReferenceImage();
- setPythonReferenceObject( theTreatedObjects, aResList, aRefImg, "SetTrsfReferenceImage" );
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefImg, "SetTrsfReferenceImage" );
}
}
}
{
aResList << QString( "" );
- aResList << QString( "%1.SetOperatorName( \"%2\" );" )
+ aResList << QString( "%1.SetOperatorName( \"%2\" )" )
.arg( anImageName ).arg( anOperatorName );
ImageComposer_Operator* anImageOp =
aResList << anOpArgs;
aResList << QString( "" );
- aResList << QString( "%1.SetArgs( %2 );" )
+ aResList << QString( "%1.SetArgs( %2 )" )
.arg( anImageName ).arg( anOpArgsArrayName );
}
}
for ( int i = 0; i < aNbReferences; ++i )
{
Handle(HYDROData_Image) aRefImg = Handle(HYDROData_Image)::DownCast( Reference( i ) );
- setPythonReferenceObject( theTreatedObjects, aResList, aRefImg, "AppendReference" );
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefImg, "AppendReference" );
}
}
-
- // Necessary to update image in case of composed operator
- aResList << QString( "" );
- aResList << QString( "%1.Update();" ).arg( anImageName );
}
+ aResList << QString( "" );
+ aResList << QString( "%1.Update()" ).arg( anImageName );
+
return aResList;
}
void HYDROData_Image::Update()
{
- bool anIsToUpdate = IsMustBeUpdated();
+ bool anIsToUpdate = IsMustBeUpdated( Geom_2d );
HYDROData_Entity::Update();
UpdateTrsf();
}
- SetToUpdate( false );
+ ClearChanged();
+}
+
+bool HYDROData_Image::IsHas2dPrs() const
+{
+ return true;
}
QVariant HYDROData_Image::GetDataVariant()
SaveByteArray(0, aData, anImage.byteCount());
}
- SetToUpdate( true );
+ Changed( Geom_2d );
}
bool HYDROData_Image::LoadImage( const QString& theFilePath )
{
QImage anImage( theFilePath );
SetImage( anImage );
+
+ SetFilePath( theFilePath );
+
return !anImage.isNull();
}
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
anArray->SetValue(8, theTrsf.m32());
anArray->SetValue(9, theTrsf.m33());
- SetToUpdate( true );
+ Changed( Geom_2d );
}
QTransform HYDROData_Image::Trsf() const
ClearReferences();
SetOperatorName( "" );
SetArgs( "" );
- SetIsSelfSplitted( false );
+ SetIsSelfSplit( false );
}
bool anIsByTwoPoints = IsByTwoPoints();
QImage anImage = Image();
if ( anImage.isNull() )
{
- SetToUpdate( false );
+ ClearChanged();
return;
}
SetGlobalPoints( ManualCartesian, aTrsfPointA, aTrsfPointB, aTrsfPointC );
- SetToUpdate( false );
+ ClearChanged();
}
void HYDROData_Image::SetLocalPoints( const QPoint& thePointA,
if ( theIsUpdate )
UpdateTrsf();
- SetToUpdate( true );
+ Changed( Geom_2d );
}
bool HYDROData_Image::GetLocalPoints( QPoint& thePointA,
if ( theIsUpdate )
UpdateTrsf();
- SetToUpdate( true );
+ Changed( Geom_2d );
}
bool HYDROData_Image::GetGlobalPoints( TransformationMode& theMode,
// Check the result
if ( !isDoubleOk ||
- boost::math::isnan( aDoubleValue ) ||
- boost::math::isinf( aDoubleValue ) ) {
+ HYDROData_Tool::IsNan( aDoubleValue ) ||
+ HYDROData_Tool::IsInf( aDoubleValue ) ) {
continue;
}
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
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
void HYDROData_Image::RemoveTrsfReferenceImage()
{
RemoveReferenceObject( DataTag_TrsfImage );
- SetToUpdate( true );
+ Changed( Geom_2d );
}
void HYDROData_Image::AppendReference( const Handle(HYDROData_Entity)& theReferenced )
{
AddReferenceObject( theReferenced, 0 );
- SetToUpdate( true );
+ Changed( Geom_2d );
}
int HYDROData_Image::NbReferences() const
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 );
- SetToUpdate( true );
+ Changed( Geom_2d );
}
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 );
- SetToUpdate( true );
+ Changed( Geom_2d );
}
QString HYDROData_Image::OperatorName() const
void HYDROData_Image::SetArgs(const QByteArray& theArgs)
{
SaveByteArray(DataTag_Operator, theArgs.constData(), theArgs.length());
- SetToUpdate( true );
+ Changed( Geom_2d );
}
QByteArray HYDROData_Image::Args() const
return QByteArray(aData, aLen);
}
-void HYDROData_Image::SetIsSelfSplitted(bool theFlag)
+void HYDROData_Image::SetIsSelfSplit(bool theFlag)
{
if (theFlag) {
- TDataStd_UAttribute::Set(myLab, GUID_SELF_SPLITTED);
+ TDataStd_UAttribute::Set(myLab, GUID_SELF_SPLIT);
} else {
- myLab.ForgetAttribute(GUID_SELF_SPLITTED);
+ myLab.ForgetAttribute(GUID_SELF_SPLIT);
}
- SetToUpdate( true );
+ Changed( Geom_2d );
}
-bool HYDROData_Image::IsSelfSplitted() const
+bool HYDROData_Image::IsSelfSplit() const
{
- return myLab.IsAttribute(GUID_SELF_SPLITTED);
+ return myLab.IsAttribute(GUID_SELF_SPLIT);
}
QPointF HYDROData_Image::generateThirdPoint( const QPointF& thePointA,
