Merge master branch into V9_dev.

[modules/geom.git] / src / GEOMToolsGUI / GEOMToolsGUI_MarkerDlg.cxx

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
index 24571515223be349ff3518812bfa0ca2fba314c1..62177da188ac250ff81541e18f70436d4b9078e5 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
@@ -235,7 +235,7 @@ void GEOMToolsGUI_MarkerDlg::accept()
               }
             }
           }
-          GEOM_Displayer displayer( getStudy() );
+          GEOM_Displayer displayer;
           displayer.Redisplay( selected, true );
           selMgr->setSelectedObjects( selected );
         }
@@ -275,7 +275,7 @@ void GEOMToolsGUI_MarkerDlg::init()
   // ---
   
   GEOM::GEOM_Gen_var engine = GeometryGUI::GetGeomGen();
-  myOperation = engine->GetIInsertOperations( getStudy()->id() );
+  myOperation = engine->GetIInsertOperations();
   GEOM::ListOfLong_var ids = myOperation->GetAllTextures();
   for ( int i = 0; i < ids->length(); i++ )
     addTexture( ids[i] );
@@ -337,7 +337,7 @@ void GEOMToolsGUI_MarkerDlg::addTexture( int id, bool select ) const
   if ( id > 0 && myCustomTypeCombo->index( id ) == -1 ) {
     int tWidth, tHeight;
 
-    Handle(TColStd_HArray1OfByte) texture = GeometryGUI::getTexture(getStudy(), id, tWidth, tHeight);
+    Handle(TColStd_HArray1OfByte) texture = GeometryGUI::getTexture(id, tWidth, tHeight);
 
     if ( !texture.IsNull() && texture->Length() == tWidth*tHeight/8 ) {
       QImage image( tWidth, tHeight, QImage::Format_Mono );