Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/BR_SHAPE_RECOGNITION' into BR_v14_rc
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_RecognizeContoursOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx
b/src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx
index a3166c19372857cd137d367de2755f49384b8678..2bee9b76568d36e848f24979752ee160d8290baf 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx
@@
-24,7
+24,7
@@
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_UpdateFlags.h"
#include "HYDROGUI_OCCSelector.h"
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_UpdateFlags.h"
#include "HYDROGUI_OCCSelector.h"
-#include "HYDROGUI_ZLayers.h"
//@MZN
+#include "HYDROGUI_ZLayers.h"
#include <HYDROData_Document.h>
#include <HYDROData_GeomTool.h>
#include <HYDROData_Document.h>
#include <HYDROData_GeomTool.h>
@@
-79,6
+79,12
@@
void HYDROGUI_RecognizeContoursOp::startOperation()
{
HYDROGUI_Operation::startOperation();
{
HYDROGUI_Operation::startOperation();
+ // Set preview view manager
+ if ( !getPreviewManager() ) {
+ setPreviewManager( ::qobject_cast<OCCViewer_ViewManager*>(
+ module()->getApp()->getViewManager( OCCViewer_Viewer::Type(), true ) ) );
+ }
+
if ( !isApplyAndClose() ) {
return;
}
if ( !isApplyAndClose() ) {
return;
}
@@
-334,11
+340,6
@@
void HYDROGUI_RecognizeContoursOp::updateRecognizedPolylines()
Handle(AIS_InteractiveContext) aCtx = NULL;
// Display preview
Handle(AIS_InteractiveContext) aCtx = NULL;
// Display preview
- if ( !getPreviewManager() ) {
- setPreviewManager( ::qobject_cast<OCCViewer_ViewManager*>(
- module()->getApp()->getViewManager( OCCViewer_Viewer::Type(), true ) ) );
- }
-
OCCViewer_ViewManager* aViewManager = getPreviewManager();
if ( aViewManager ) {
if ( OCCViewer_Viewer* aViewer = aViewManager->getOCCViewer() ) {
OCCViewer_ViewManager* aViewManager = getPreviewManager();
if ( aViewManager ) {
if ( OCCViewer_Viewer* aViewer = aViewManager->getOCCViewer() ) {
@@
-357,7
+358,7
@@
void HYDROGUI_RecognizeContoursOp::updateRecognizedPolylines()
aTrsf.m21(), -aTrsf.m22(), aTrsf.m23(),
aTrsf.m31() + aRect.width() * 0.5, aTrsf.m32 () - aRect.height() * 0.5, aTrsf.m33() );
aTrsf.m21(), -aTrsf.m22(), aTrsf.m23(),
aTrsf.m31() + aRect.width() * 0.5, aTrsf.m32 () - aRect.height() * 0.5, aTrsf.m33() );
- /*
@MZN
+ /*
QTransform aTrsf = myImage->Trsf();
gp_Mat aMat( aTrsf.m11(), aTrsf.m21(), 0,
aTrsf.m12(), -aTrsf.m22(), 0,
QTransform aTrsf = myImage->Trsf();
gp_Mat aMat( aTrsf.m11(), aTrsf.m21(), 0,
aTrsf.m12(), -aTrsf.m22(), 0,