X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Image.cxx;h=ea1fed9cac64ed1f1c764bd8569ed1ccfdffdf6b;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=1a0bec79ebd2b0251d9023a07cfc1f42eb716887;hpb=4abd02af12c3c66fd773ba41a0ff63ae3deca979;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx index 1a0bec79..ea1fed9c 100644 --- a/src/HYDROData/HYDROData_Image.cxx +++ b/src/HYDROData/HYDROData_Image.cxx @@ -17,13 +17,14 @@ #include #include +#include + +#include static const Standard_GUID GUID_SELF_SPLITTED("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) @@ -38,19 +39,8 @@ HYDROData_Image::~HYDROData_Image() QStringList HYDROData_Image::DumpToPython( 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() ) @@ -62,19 +52,27 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject // 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( "" ); } @@ -82,14 +80,24 @@ 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 )," ) + 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 ) { @@ -140,12 +148,11 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject setPythonReferenceObject( 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; } @@ -205,6 +212,11 @@ void HYDROData_Image::Update() SetToUpdate( false ); } +bool HYDROData_Image::IsHas2dPrs() const +{ + return true; +} + QVariant HYDROData_Image::GetDataVariant() { QTransform aTransform = Trsf(); @@ -242,18 +254,27 @@ void HYDROData_Image::SetImage(const QImage& theImage) } 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, theImage.width()); - aParams->SetValue(2, theImage.height()); - aParams->SetValue(3, theImage.bytesPerLine()); - aParams->SetValue(4, (int)(theImage.format())); + 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*)(theImage.bits()); - SaveByteArray(0, aData, theImage.byteCount()); + const char* aData = (const char*)(anImage.bits()); + SaveByteArray(0, aData, anImage.byteCount()); } SetToUpdate( true ); @@ -263,6 +284,9 @@ bool HYDROData_Image::LoadImage( const QString& theFilePath ) { QImage anImage( theFilePath ); SetImage( anImage ); + + SetFilePath( theFilePath ); + return !anImage.isNull(); } @@ -589,6 +613,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 || + boost::math::isnan( aDoubleValue ) || + boost::math::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 );