Fix compilation error (conflict of OK name between OCCT Plate_Plate.hxx and GEOM...

[modules/geom.git] / src / EntityGUI / EntityGUI_PictureImportDlg.cxx

diff --git a/src/EntityGUI/EntityGUI_PictureImportDlg.cxx b/src/EntityGUI/EntityGUI_PictureImportDlg.cxx
index 2d6d80193091a0f40386be4c426b816719212159..21ec2087dc860caaded148a64b08736414d95750 100644 (file)
--- a/src/EntityGUI/EntityGUI_PictureImportDlg.cxx
+++ b/src/EntityGUI/EntityGUI_PictureImportDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -135,7 +135,7 @@ void EntityGUI_PictureImportDlg::FileSelectionClicked()
 //=================================================================================
 void EntityGUI_PictureImportDlg::ClickOnOk()
 {
-  MESSAGE("EntityGUI_PictureImportDlg::ClickOnOk()")
+  MESSAGE("EntityGUI_PictureImportDlg::ClickOnOk()");
   setIsApplyAndClose( true );
   if ( ClickOnApply() )
     ClickOnCancel();
@@ -147,7 +147,7 @@ void EntityGUI_PictureImportDlg::ClickOnOk()
 //=================================================================================
 bool EntityGUI_PictureImportDlg::ClickOnApply()
 {
-  MESSAGE("EntityGUI_PictureImportDlg::ClickOnApply()")
+  MESSAGE("EntityGUI_PictureImportDlg::ClickOnApply()");
   if ( !onAccept() )
     return false;
   
@@ -163,7 +163,7 @@ bool EntityGUI_PictureImportDlg::ClickOnApply()
 //=================================================================================
 GEOM::GEOM_IOperations_ptr EntityGUI_PictureImportDlg::createOperation()
 {
-  return myGeomGUI->GetGeomGen()->GetIBlocksOperations( getStudyId() );
+  return myGeomGUI->GetGeomGen()->GetIBlocksOperations();
 }
 
 //=================================================================================
@@ -175,7 +175,7 @@ bool EntityGUI_PictureImportDlg::execute( ObjectList& objects )
   bool res = false;
   
   GEOM::GEOM_Object_var anObj;
-  GEOM::GEOM_IBasicOperations_var aBasicOperations = myGeomGUI->GetGeomGen()->GetIBasicOperations( getStudyId() );
+  GEOM::GEOM_IBasicOperations_var aBasicOperations = myGeomGUI->GetGeomGen()->GetIBasicOperations();
   GEOM::GEOM_IBlocksOperations_var aBlocksOperations = GEOM::GEOM_IBlocksOperations::_narrow( getOperation() );
   QString theImgFileName = myLineEdit->text();
   if ( theImgFileName.isEmpty() )
@@ -188,9 +188,9 @@ bool EntityGUI_PictureImportDlg::execute( ObjectList& objects )
   delete pixmap;
   
   GEOM::GEOM_Object_var P1 = aBasicOperations->MakePointXYZ( -0.5*width, -0.5*height, 0 );
-  GEOM::GEOM_Object_var P2 = aBasicOperations->MakePointXYZ( -0.5*width,  0.5*height, 0 );
+  GEOM::GEOM_Object_var P2 = aBasicOperations->MakePointXYZ(  0.5*width, -0.5*height, 0 );
   GEOM::GEOM_Object_var P3 = aBasicOperations->MakePointXYZ(  0.5*width,  0.5*height, 0 );
-  GEOM::GEOM_Object_var P4 = aBasicOperations->MakePointXYZ(  0.5*width, -0.5*height, 0 );
+  GEOM::GEOM_Object_var P4 = aBasicOperations->MakePointXYZ( -0.5*width,  0.5*height, 0 );
   
   GEOM::GEOM_Object_var aFace = aBlocksOperations->MakeQuad4Vertices(P1,P2,P3,P4);
   getDisplayer()->SetDisplayMode(3);