Merge branch 'BR_MULTI_BATHS' into HEAD

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_RecognizeContoursOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx b/src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx
index 860d361ec8a84373dcf167638ebbfa4c887368d8..dfb279ffed474376c0fe8054dc05b783b8ed6105 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx
@@ -21,7 +21,7 @@
 #include "HYDROGUI_RecognizeContoursDlg.h"
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_Shape.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_UpdateFlags.h"
 #include "HYDROGUI_OCCSelector.h"
 #include "HYDROGUI_ZLayers.h"
@@ -53,6 +53,7 @@
 #include <gp_GTrsf.hxx>
 
 #include <QDialog>
+#include <QDir>
 #include <QTemporaryFile>
 
 /**
@@ -99,7 +100,7 @@ void HYDROGUI_RecognizeContoursOp::startOperation()
 
   // Create temporary graphics file
   QImage aQImage = myImage->Image();
-  myTmpImageFile = new QTemporaryFile( anImageName );
+  myTmpImageFile = new QTemporaryFile( QDir::tempPath() + QDir::separator() + anImageName );
   if ( !myTmpImageFile->open() || 
        !aQImage.save( myTmpImageFile->fileName(), "PNG", 100 ) ) {
     abort();
@@ -227,7 +228,7 @@ bool HYDROGUI_RecognizeContoursOp::processApply( int& theUpdateFlags,
 
     if( !aPolylineObj.IsNull() ) {
       aPolylineObj->SetName( aName );
-      aPolylineObj->ImportShape( aShape );
+      aPolylineObj->ImportShape( aShape, false, NULL );
       aPolylineObj->SetWireColor( HYDROData_PolylineXY::DefaultWireColor() );
 
       aPolylineObj->Update();
@@ -378,7 +379,7 @@ void HYDROGUI_RecognizeContoursOp::updateRecognizedPolylines()
       TopoDS_Shape aSubShape = aSubShapes.Value( i );
 
       // Transform the sub-shape
-      aPolylineObj->ImportShape( aSubShape );
+      aPolylineObj->ImportShape( aSubShape, false, NULL );
       aPolylineObj->Transform( aTrsf );
 
       /*
@@ -513,4 +514,4 @@ void HYDROGUI_RecognizeContoursOp::cleanup()
     // update the object browser
     module()->getApp()->updateObjectBrowser( true );
   }
-}
\ No newline at end of file
+}