X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Image.cxx;h=74c278b4c3328957c03c1145e96e9a075b9f4791;hb=e35b4caf3341d2cece2b7921f349acd17fb89351;hp=05bb314ca0848d97fbe9a91311de37d7a3f5a2d1;hpb=a461802565827e4d63ce4b834b32f5a29ddc73f2;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx index 05bb314c..74c278b4 100644 --- a/src/HYDROData/HYDROData_Image.cxx +++ b/src/HYDROData/HYDROData_Image.cxx @@ -1,36 +1,58 @@ +// 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_Tool.h" #include "HYDROData_OperationsFactory.h" +#include "HYDROData_Tool.h" #include #include #include #include #include -#include #include #include +#ifdef WIN32 + #pragma warning ( disable: 4251 ) +#endif + #include #include #include +#include -static const Standard_GUID GUID_SELF_SPLITTED("997995aa-5c19-40bf-9a60-ab4b70ad04d8"); +#ifdef WIN32 + #pragma warning ( default: 4251 ) +#endif + +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"); -#define PYTHON_IMAGE_ID "KIND_IMAGE" - -IMPLEMENT_STANDARD_HANDLE(HYDROData_Image, HYDROData_Entity) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Image, HYDROData_Entity) HYDROData_Image::HYDROData_Image() -: HYDROData_Entity() +: HYDROData_Entity( Geom_2d ) { } @@ -38,45 +60,44 @@ HYDROData_Image::~HYDROData_Image() { } -QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const +QStringList HYDROData_Image::DumpToPython( const QString& thePyScriptPath, + MapOfTreatedObjects& theTreatedObjects ) const { - QStringList aResList; - - Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); - if ( aDocument.IsNull() ) - return aResList; - - QString aDocName = aDocument->GetDocPyName(); - QString anImageName = GetName(); - - aResList << QString( "%1 = %2.CreateObject( %3 );" ) - .arg( anImageName ).arg( aDocName ).arg( PYTHON_IMAGE_ID ); - aResList << QString( "%1.SetName( \"%2\" );" ) - .arg( anImageName ).arg( anImageName ); + QStringList aResList = dumpObjectCreation( theTreatedObjects ); + QString anImageName = GetObjPyName(); QString aFilePath = GetFilePath(); if ( !aFilePath.isEmpty() ) { aResList << QString( "" ); - aResList << QString( "%1.LoadImage( \"%2\" );" ) + aResList << QString( "if not(%1.LoadImage( \"%2\" )):" ) .arg( anImageName ).arg( aFilePath ); + aResList << QString( " raise ValueError('problem while loading image')" ); 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( "" ); } @@ -84,19 +105,29 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject 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 )," ) - .arg( aTrsfPointB.x() ).arg( aTrsfPointB.y() ); - aResList << QString( aGap + "QPointF( %1, %2 ) );" ) - .arg( aTrsfPointC.x() ).arg( aTrsfPointC.y() ); + .arg( aTrsfPointA.x(), 0, 'f', 3 ).arg( aTrsfPointA.y(), 0, 'f', 3 ); + aResList << QString( aGap + "QPointF( %1, %2 )" ) + .arg( aTrsfPointB.x(), 0, 'f', 3 ).arg( aTrsfPointB.y(), 0, 'f', 3 ); + if ( !anIsByTwoPoints ) + { + aResList.last().append( "," ); + aResList << QString( aGap + "QPointF( %1, %2 ) )" ) + .arg( aTrsfPointC.x(), 0, 'f', 3 ).arg( aTrsfPointC.y(), 0, 'f', 3 ); + } + else + { + aResList.last().append( " )" ); + } if ( aTransformationMode == ReferenceImage ) { Handle(HYDROData_Image) aRefImg = GetTrsfReferenceImage(); - setPythonReferenceObject( theTreatedObjects, aResList, aRefImg, "SetTrsfReferenceImage" ); + setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefImg, "SetTrsfReferenceImage" ); } } } @@ -109,7 +140,7 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject { aResList << QString( "" ); - aResList << QString( "%1.SetOperatorName( \"%2\" );" ) + aResList << QString( "%1.SetOperatorName( \"%2\" )" ) .arg( anImageName ).arg( anOperatorName ); ImageComposer_Operator* anImageOp = @@ -125,7 +156,7 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject aResList << anOpArgs; aResList << QString( "" ); - aResList << QString( "%1.SetArgs( %2 );" ) + aResList << QString( "%1.SetArgs( %2 )" ) .arg( anImageName ).arg( anOpArgsArrayName ); } } @@ -139,26 +170,34 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject 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( Geom_2d ); + + HYDROData_Entity::Update(); + + if ( !anIsToUpdate ) + return; + HYDROData_OperationsFactory* aFactory = HYDROData_OperationsFactory::Factory(); ImageComposer_Operator* anOp = aFactory->Operator( OperatorName() ); if ( anOp ) // Update image if there is an operation { // Fill by arguments and process the operation + anOp->setBinArgs( Args() ); + QVariant anObj1, anObj2; int aNbReferences = NbReferences(); @@ -195,14 +234,12 @@ void HYDROData_Image::Update() UpdateTrsf(); } - Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); - if ( !aDocument.IsNull() ) - { - // Change the states of this and all depended images - SetToUpdate( true ); - HYDROData_Tool::SetMustBeUpdatedImages( aDocument ); - SetToUpdate( false ); - } + ClearChanged(); +} + +bool HYDROData_Image::IsHas2dPrs() const +{ + return true; } QVariant HYDROData_Image::GetDataVariant() @@ -234,30 +271,47 @@ HYDROData_SequenceOfObjects HYDROData_Image::GetAllReferenceObjects() const void HYDROData_Image::SetImage(const QImage& theImage) { - if (theImage.isNull()) { + if ( theImage.isNull() ) + { // for empty image remove all previously stored attributes myLab.ForgetAttribute(TDataStd_IntegerArray::GetID()); myLab.ForgetAttribute(TDataStd_ByteArray::GetID()); - return; } - // store width, height, bytes per line and format in integer array - Handle(TDataStd_IntegerArray) aParams; - if (!myLab.FindAttribute(TDataStd_IntegerArray::GetID(), aParams)) { - aParams = TDataStd_IntegerArray::Set(myLab, 1, 4); + else + { + QImage anImage; + + // convert 8-bits images + if ( theImage.format() == QImage::Format_Indexed8 ) { + anImage = theImage.convertToFormat( QImage::Format_RGB32 ); + } else { + anImage = theImage; + } + + // store width, height, bytes per line and format in integer array + Handle(TDataStd_IntegerArray) aParams; + if (!myLab.FindAttribute(TDataStd_IntegerArray::GetID(), aParams)) { + aParams = TDataStd_IntegerArray::Set(myLab, 1, 4); + } + aParams->SetValue(1, anImage.width()); + aParams->SetValue(2, anImage.height()); + aParams->SetValue(3, anImage.bytesPerLine()); + aParams->SetValue(4, (int)(anImage.format())); + // store data of image in byte array + const char* aData = (const char*)(anImage.bits()); + SaveByteArray(0, aData, anImage.byteCount()); } - aParams->SetValue(1, theImage.width()); - aParams->SetValue(2, theImage.height()); - aParams->SetValue(3, theImage.bytesPerLine()); - aParams->SetValue(4, (int)(theImage.format())); - // store data of image in byte array - const char* aData = (const char*)(theImage.bits()); - SaveByteArray(0, aData, theImage.byteCount()); + + Changed( Geom_2d ); } -bool HYDROData_Image::LoadImage(const QString& theFilePath) +bool HYDROData_Image::LoadImage( const QString& theFilePath ) { QImage anImage( theFilePath ); SetImage( anImage ); + + SetFilePath( theFilePath ); + return !anImage.isNull(); } @@ -275,19 +329,25 @@ QImage HYDROData_Image::Image() return aResult; } -void HYDROData_Image::SetFilePath(const QString& theFilePath) +void HYDROData_Image::SetFilePath( const QString& theFilePath ) { TCollection_AsciiString anAsciiStr( theFilePath.toStdString().c_str() ); TDataStd_AsciiString::Set( myLab.FindChild( DataTag_FilePath ), anAsciiStr ); + + Changed( Geom_2d ); } QString HYDROData_Image::GetFilePath() const { QString aRes; - Handle(TDataStd_AsciiString) anAsciiStr; - if ( myLab.FindChild( DataTag_FilePath ).FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) ) - aRes = QString( anAsciiStr->Get().ToCString() ); + TDF_Label aLabel = myLab.FindChild( DataTag_FilePath, false ); + if ( !aLabel.IsNull() ) + { + Handle(TDataStd_AsciiString) anAsciiStr; + if ( aLabel.FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) ) + aRes = QString( anAsciiStr->Get().ToCString() ); + } return aRes; } @@ -309,6 +369,8 @@ void HYDROData_Image::SetTrsf(const QTransform& theTrsf) anArray->SetValue(7, theTrsf.m31()); anArray->SetValue(8, theTrsf.m32()); anArray->SetValue(9, theTrsf.m33()); + + Changed( Geom_2d ); } QTransform HYDROData_Image::Trsf() const @@ -445,16 +507,17 @@ void HYDROData_Image::RemoveAllReferences() ClearReferences(); SetOperatorName( "" ); SetArgs( "" ); - SetIsSelfSplitted( false ); + SetIsSelfSplit( false ); } - SetToUpdate( false ); - bool anIsByTwoPoints = IsByTwoPoints(); QImage anImage = Image(); if ( anImage.isNull() ) + { + ClearChanged(); return; + } // Set local points to default position QPoint aLocalPointA = QPoint( 0, 0 ); @@ -472,6 +535,8 @@ void HYDROData_Image::RemoveAllReferences() QPointF( aTransform.map( aLocalPointC ) ); SetGlobalPoints( ManualCartesian, aTrsfPointA, aTrsfPointB, aTrsfPointC ); + + ClearChanged(); } void HYDROData_Image::SetLocalPoints( const QPoint& thePointA, @@ -494,6 +559,8 @@ void HYDROData_Image::SetLocalPoints( const QPoint& thePointA, if ( theIsUpdate ) UpdateTrsf(); + + Changed( Geom_2d ); } bool HYDROData_Image::GetLocalPoints( QPoint& thePointA, @@ -548,31 +615,7 @@ void HYDROData_Image::SetGlobalPoints( const TransformationMode& theMode, if ( theIsUpdate ) UpdateTrsf(); - /* - if( anIsRefImage ) - { - aCPointA = QPointF( aTransform.map( aPointA ) ); - aCPointB = QPointF( aTransform.map( aPointB ) ); - aCPointC = QPointF( aTransform.map( aPointC ) ); - - // compute Lambert93 points - xca = aCPointA.x(); - yca = aCPointA.y(); - xcb = aCPointB.x(); - ycb = aCPointB.y(); - xcc = aCPointC.x(); - ycc = aCPointC.y(); - - double xla = 0, yla = 0, xlb = 0, ylb = 0, xlc = 0, ylc = 0; - HYDROData_Lambert93::toGeo( xca, yca, yla, xla ); - HYDROData_Lambert93::toGeo( xcb, ycb, ylb, xlb ); - HYDROData_Lambert93::toGeo( xcc, ycc, ylc, xlc ); - - aLPointA = QPointF( xla * 3600.0, yla * 3600.0 ); // convert degrees to seconds - aLPointB = QPointF( xlb * 3600.0, ylb * 3600.0 ); // convert degrees to seconds - aLPointC = QPointF( xlc * 3600.0, ylc * 3600.0 ); // convert degrees to seconds - } - */ + Changed( Geom_2d ); } bool HYDROData_Image::GetGlobalPoints( TransformationMode& theMode, @@ -595,6 +638,80 @@ bool HYDROData_Image::GetGlobalPoints( TransformationMode& theMode, return true; } +bool HYDROData_Image::SetGlobalPointsFromFile( const QString& theFileName ) +{ + bool aRes = false; + + // Try to open the file + QFile aFile( theFileName ); + if ( !aFile.exists() || !aFile.open( QIODevice::ReadOnly ) ) { + return aRes; + } + + QPointF aPointA, aPointB; + double aXmin, anYmin, aXmax, anYmax; + aXmin = anYmin = aXmax = anYmax = -1; + + while ( !aFile.atEnd() && + ( aXmin < 0 || anYmin < 0 || aXmax < 0 || anYmax < 0 ) ) { + // Read line + QString aLine = aFile.readLine().simplified(); + aLine.replace( " ", "" ); + if ( aLine.isEmpty() ) { + continue; + } + + // Try to read double value after ":" + bool isDoubleOk = false; + double aDoubleValue = -1; + QStringList aValues = aLine.split( ":", QString::SkipEmptyParts ); + if ( aValues.count() == 2 ) { + aDoubleValue = aValues.last().toDouble( &isDoubleOk ); + } + + // Check the result + if ( !isDoubleOk || + HYDROData_Tool::IsNan( aDoubleValue ) || + HYDROData_Tool::IsInf( aDoubleValue ) ) { + continue; + } + + // Set the value + if ( aLine.startsWith( "Xminimum" ) ) { + aXmin = aDoubleValue; + } + else if ( aLine.startsWith( "Yminimum" ) ) { + anYmin = aDoubleValue; + } + else if ( aLine.startsWith( "Xmaximum" ) ) { + aXmax = aDoubleValue; + } + else if ( aLine.startsWith( "Ymaximum" ) ) { + anYmax = aDoubleValue; + } + } + + // Close the file + aFile.close(); + + if ( aXmin >= 0 && anYmin >= 0 ) { + aPointA.setX( aXmin ); + aPointA.setY( anYmin ); + } + + if ( aXmax >= 0 && anYmax >= 0 ) { + aPointB.setX( aXmax ); + aPointB.setY( anYmax ); + } + + if ( !aPointA.isNull() && !aPointB.isNull() ) { + SetGlobalPoints( ManualCartesian, aPointA, aPointB ); + aRes = true; + } + + return aRes; +} + bool HYDROData_Image::HasGlobalPoints() const { TDF_Label aLabel = myLab.FindChild( DataTag_TrsfPoints, false ); @@ -650,6 +767,7 @@ bool HYDROData_Image::HasReferencePoints() const void HYDROData_Image::SetTrsfMode( const TransformationMode& theMode ) { TDataStd_Integer::Set( myLab.FindChild( DataTag_TrsfMode ), (int)theMode ); + Changed( Geom_2d ); } HYDROData_Image::TransformationMode HYDROData_Image::GetTrsfMode() const @@ -670,6 +788,7 @@ HYDROData_Image::TransformationMode HYDROData_Image::GetTrsfMode() const void HYDROData_Image::SetTrsfReferenceImage( const Handle(HYDROData_Image)& theRefImage ) { SetReferenceObject( theRefImage, DataTag_TrsfImage ); + Changed( Geom_2d ); } Handle(HYDROData_Image) HYDROData_Image::GetTrsfReferenceImage() const @@ -679,12 +798,14 @@ Handle(HYDROData_Image) HYDROData_Image::GetTrsfReferenceImage() const void HYDROData_Image::RemoveTrsfReferenceImage() { - return RemoveReferenceObject( DataTag_TrsfImage ); + RemoveReferenceObject( DataTag_TrsfImage ); + Changed( Geom_2d ); } void HYDROData_Image::AppendReference( const Handle(HYDROData_Entity)& theReferenced ) { AddReferenceObject( theReferenced, 0 ); + Changed( Geom_2d ); } int HYDROData_Image::NbReferences() const @@ -701,38 +822,47 @@ void HYDROData_Image::ChangeReference( const int theIndex, Handle(HYDROData_Entity) theReferenced) { SetReferenceObject( theReferenced, 0, theIndex ); + Changed( Geom_2d ); } void HYDROData_Image::RemoveReference(const int theIndex) { RemoveReferenceObject( 0, theIndex ); + Changed( Geom_2d ); } void HYDROData_Image::ClearReferences() { ClearReferenceObjects( 0 ); + Changed( Geom_2d ); } -void HYDROData_Image::SetOperatorName(const QString theOpName) +void HYDROData_Image::SetOperatorName( const QString theOpName ) { - TDataStd_Name::Set(myLab.FindChild(DataTag_Operator), - TCollection_ExtendedString(theOpName.toLatin1().constData())); + TCollection_AsciiString anAsciiStr( theOpName.toStdString().c_str() ); + TDataStd_AsciiString::Set( myLab.FindChild( DataTag_Operator ), anAsciiStr ); + Changed( Geom_2d ); } QString HYDROData_Image::OperatorName() const { - Handle(TDataStd_Name) aName; - if (myLab.FindChild(DataTag_Operator). - FindAttribute(TDataStd_Name::GetID(), aName)) { - TCollection_AsciiString aStr(aName->Get()); - return QString(aStr.ToCString()); + QString aRes; + + TDF_Label aLabel = myLab.FindChild( DataTag_Operator, false ); + if ( !aLabel.IsNull() ) + { + Handle(TDataStd_AsciiString) anAsciiStr; + if ( aLabel.FindAttribute( TDataStd_AsciiString::GetID(), anAsciiStr ) ) + aRes = QString( anAsciiStr->Get().ToCString() ); } - return QString(); + + return aRes; } void HYDROData_Image::SetArgs(const QByteArray& theArgs) { SaveByteArray(DataTag_Operator, theArgs.constData(), theArgs.length()); + Changed( Geom_2d ); } QByteArray HYDROData_Image::Args() const @@ -744,18 +874,19 @@ 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); } + 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, @@ -763,7 +894,7 @@ QPointF HYDROData_Image::generateThirdPoint( const QPointF& thePointA, const bool& theIsLocal ) const { // Rotate vector to 90 degrees : clockwise - for local - // anticlockwise - for global + // counterclockwise - for global const double aTheta = theIsLocal ? -M_PI_2 : M_PI_2; QPointF aResPoint;