ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-15 18:50:40 +05:00
Code Issues Packages Projects Releases Wiki Activity

rnc : commit of previous work done before opening of the branch

Browse Source
This commit is contained in:
gdd 2011-09-13 12:39:31 +00:00
parent 28c48d7e24
commit 0008dcb5cc
13 changed files with 269 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/BasicGUI/Makefile.am
View File

@ -101,7 +101,9 @@ libBasicGUI_la_CPPFLAGS = \
-I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMImpl \
-I$(srcdir)/../GEOMClient \ -I$(srcdir)/../GEOMClient \
-I$(top_builddir)/src/DlgRef \ -I$(top_builddir)/src/DlgRef \
-I$(top_builddir)/idl -I$(top_builddir)/idl \
-I/home/palmco/OpenCV/OpenCV-2.3.0/install/include/opencv \
-I/home/palmco/OpenCV/OpenCV-2.3.0/install/include
libBasicGUI_la_LDFLAGS = \ libBasicGUI_la_LDFLAGS = \
@ -109,4 +111,5 @@ libBasicGUI_la_LDFLAGS = \
../GEOMBase/libGEOMBase.la \ ../GEOMBase/libGEOMBase.la \
../GEOMGUI/libGEOM.la \ ../GEOMGUI/libGEOM.la \
$(CAS_LDFLAGS) -lTKGeomBase \ $(CAS_LDFLAGS) -lTKGeomBase \
$(GUI_LDFLAGS) -lsuit $(GUI_LDFLAGS) -lsuit \
-L/home/palmco/OpenCV/OpenCV-2.3.0/install/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann

77
src/EntityGUI/EntityGUI.cxx
View File

@ -46,10 +46,12 @@
#include <ElSLib.hxx> #include <ElSLib.hxx>
#include <QMouseEvent> #include <QMouseEvent>
#include <QApplication>
#include "EntityGUI_SketcherDlg.h" // Sketcher #include "EntityGUI_SketcherDlg.h" // Sketcher
#include "EntityGUI_3DSketcherDlg.h" // Sketcher #include "EntityGUI_3DSketcherDlg.h" // Sketcher
#include "EntityGUI_SubShapeDlg.h" // Method SUBSHAPE #include "EntityGUI_SubShapeDlg.h" // Method SUBSHAPE
#include "EntityGUI_FeatureDetectorDlg.h" // Feature Detection
//======================================================================= //=======================================================================
// function : EntityGUI() // function : EntityGUI()
@ -93,6 +95,9 @@ bool EntityGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
case GEOMOp::OpExplode: // EXPLODE case GEOMOp::OpExplode: // EXPLODE
aDlg = new EntityGUI_SubShapeDlg( getGeometryGUI(), parent ); aDlg = new EntityGUI_SubShapeDlg( getGeometryGUI(), parent );
break; break;
case GEOMOp::OpFeatureDetect: // CORNER DETECTION
aDlg = new EntityGUI_FeatureDetectorDlg( getGeometryGUI(), parent );
break;
default: default:
app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); app->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) );
break; break;
@ -113,18 +118,20 @@ bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWi
QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox(); QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox();
// Create Point dialog, OCC viewer // Create Point dialog, OCC viewer
if ( aDlg && ( QString( aDlg->metaObject()->className() ).compare( "EntityGUI_SketcherDlg" ) == 0 ) && if ( aDlg &&
theViewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() && theViewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() &&
pe->modifiers() != Qt::ControlModifier ) { pe->modifiers() != Qt::ControlModifier ) {
MESSAGE("Premier if ok!")
EntityGUI_SketcherDlg* aPntDlg = (EntityGUI_SketcherDlg*) aDlg; gp_Pnt aPnt;
if ( aPntDlg->acceptMouseEvent() ) {
if ( QString( aDlg->metaObject()->className() ).compare( "EntityGUI_SketcherDlg" ) == 0 )
{
EntityGUI_SketcherDlg* aSketcherDlg = (EntityGUI_SketcherDlg*) aDlg;
if ( aSketcherDlg->acceptMouseEvent() ) {
OCCViewer_Viewer* anOCCViewer = OCCViewer_Viewer* anOCCViewer =
( (OCCViewer_ViewManager*)( theViewWindow->getViewManager() ) )->getOCCViewer(); ( (OCCViewer_ViewManager*)( theViewWindow->getViewManager() ) )->getOCCViewer();
Handle(AIS_InteractiveContext) ic = anOCCViewer->getAISContext(); Handle(AIS_InteractiveContext) ic = anOCCViewer->getAISContext();
gp_Pnt aPnt;
ic->InitSelected(); ic->InitSelected();
if ( pe->modifiers() == Qt::ShiftModifier ) if ( pe->modifiers() == Qt::ShiftModifier )
ic->ShiftSelect(); // Append selection ic->ShiftSelect(); // Append selection
@ -143,9 +150,65 @@ bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWi
} }
Qt::KeyboardModifiers modifiers = pe->modifiers(); Qt::KeyboardModifiers modifiers = pe->modifiers();
aPntDlg->OnPointSelected( modifiers, aPnt ); // "feed" the point to point construction dialog aSketcherDlg->OnPointSelected( modifiers, aPnt ); // "feed" the point to point construction dialog
} // acceptMouseEvent() } // acceptMouseEvent()
} }
if ( QString( aDlg->metaObject()->className() ).compare( "EntityGUI_FeatureDetectorDlg" ) == 0 )
{
EntityGUI_FeatureDetectorDlg* aCornerDlg = (EntityGUI_FeatureDetectorDlg*) aDlg;
if ( aCornerDlg->acceptMouseEvent() ) {
OCCViewer_Viewer* anOCCViewer =
( (OCCViewer_ViewManager*)( theViewWindow->getViewManager() ) )->getOCCViewer();
Handle(AIS_InteractiveContext) ic = anOCCViewer->getAISContext();
ic->InitSelected();
ic->Select(); // New selection
ic->InitSelected();
if ( ic->MoreSelected() ) {
TopoDS_Shape aShape = ic->SelectedShape();
if ( !aShape.IsNull() && aShape.ShapeType() == TopAbs_VERTEX )
aPnt = BRep_Tool::Pnt( TopoDS::Vertex( ic->SelectedShape() ) );
}
else {
OCCViewer_ViewPort3d* vp = ((OCCViewer_ViewWindow*)theViewWindow)->getViewPort();
aPnt = ConvertClickToPoint( pe->x(), pe->y(), vp->getView() );
}
aCornerDlg->OnPointSelected( aPnt ); // "feed" the point to corner detection dialog
QPoint start = QPoint(pe->x(),pe->y());
aCornerDlg->setStartPnt( start );
} // acceptMouseEvent()
}
}
return false;
}
//=================================================================================
// function : 0nMouseMove()
// purpose : [static] manage mouse events
//=================================================================================
bool EntityGUI::OnMouseMove( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow )
{
// MESSAGE("EntityGUI::OnMouseMove")
QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox();
if ( aDlg && ( QString( aDlg->metaObject()->className() ).compare( "EntityGUI_FeatureDetectorDlg" ) == 0 ) &&
theViewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() &&
pe->modifiers() != Qt::ControlModifier ) {
EntityGUI_FeatureDetectorDlg* aCornerDlg = (EntityGUI_FeatureDetectorDlg*) aDlg;
gp_Pnt aPnt;
if ( QApplication::mouseButtons() == Qt::LeftButton &&
aCornerDlg->acceptMouseEvent() )
{
QPoint end = QPoint(pe->x(),pe->y());
aCornerDlg->setEndPnt( end );
}
}
return false; return false;
} }

3
src/EntityGUI/EntityGUI.h
View File

@ -49,8 +49,9 @@ public :
bool OnGUIEvent( int, SUIT_Desktop* ); bool OnGUIEvent( int, SUIT_Desktop* );
bool OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow ); bool OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow );
bool OnMouseMove( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow );
gp_Pnt ConvertClickToPoint( int x, int y, Handle(V3d_View) aView ); static gp_Pnt ConvertClickToPoint( int x, int y, Handle(V3d_View) aView );
void DisplaySimulationShape( const TopoDS_Shape&, const TopoDS_Shape& ); void DisplaySimulationShape( const TopoDS_Shape&, const TopoDS_Shape& );
void EraseSimulationShape(); void EraseSimulationShape();

11
src/EntityGUI/EntityGUI_SketcherDlg.cxx
View File

@ -28,6 +28,9 @@
#include "EntityGUI_Widgets.h" #include "EntityGUI_Widgets.h"
#include <SalomeApp_DoubleSpinBox.h> #include <SalomeApp_DoubleSpinBox.h>
#include <OCCViewer_ViewPort3d.h>
#include <OCCViewer_ViewWindow.h>
#include <GEOMBase.h> #include <GEOMBase.h>
#include <GeometryGUI.h> #include <GeometryGUI.h>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
@ -1525,6 +1528,10 @@ void EntityGUI_SketcherDlg::OnPointSelected(Qt::KeyboardModifiers modifiers, con
{ {
MESSAGE("EntityGUI_SketcherDlg::OnPointSelected") MESSAGE("EntityGUI_SketcherDlg::OnPointSelected")
SUIT_ViewWindow* theViewWindow = getDesktop()->activeWindow();
OCCViewer_ViewPort3d* vp = ((OCCViewer_ViewWindow*)theViewWindow)->getViewPort();
QString theImgFileName = vp->backgroundImageFilename();
double x, y; double x, y;
x = y = 0; x = y = 0;
@ -1542,8 +1549,8 @@ void EntityGUI_SketcherDlg::OnPointSelected(Qt::KeyboardModifiers modifiers, con
gp_Pnt aTrsfPnt; gp_Pnt aTrsfPnt;
GEOMBase::VertexToPoint( aShape, aTrsfPnt ); GEOMBase::VertexToPoint( aShape, aTrsfPnt );
autoApply = ( getPnt2ConstructorId() == 1 && false ); // If no additional argument needed after selection autoApply = ( (getPnt2ConstructorId() == 1) && (!theImgFileName.isEmpty()) ); // If no additional argument needed after selection and there is a backgroundimage
// -> apply automatically --> disabled for now // -> apply automatically
if ( getPnt1ConstructorId() == 0 ){ // Relative selection mode if ( getPnt1ConstructorId() == 0 ){ // Relative selection mode
x = aTrsfPnt.X() - myLastX1; x = aTrsfPnt.X() - myLastX1;

17
src/EntityGUI/Makefile.am
View File

@ -33,20 +33,23 @@ salomeinclude_HEADERS = \
EntityGUI_Widgets.h \ EntityGUI_Widgets.h \
EntityGUI_SketcherDlg.h \ EntityGUI_SketcherDlg.h \
EntityGUI_3DSketcherDlg.h \ EntityGUI_3DSketcherDlg.h \
EntityGUI_SubShapeDlg.h EntityGUI_SubShapeDlg.h \
EntityGUI_FeatureDetectorDlg.h
dist_libEntityGUI_la_SOURCES = \ dist_libEntityGUI_la_SOURCES = \
EntityGUI.cxx \ EntityGUI.cxx \
EntityGUI_Widgets.cxx \ EntityGUI_Widgets.cxx \
EntityGUI_SketcherDlg.cxx \ EntityGUI_SketcherDlg.cxx \
EntityGUI_3DSketcherDlg.cxx \ EntityGUI_3DSketcherDlg.cxx \
EntityGUI_SubShapeDlg.cxx EntityGUI_SubShapeDlg.cxx \
EntityGUI_FeatureDetectorDlg.cxx
MOC_FILES = \ MOC_FILES = \
EntityGUI_Widgets_moc.cxx \ EntityGUI_Widgets_moc.cxx \
EntityGUI_SketcherDlg_moc.cxx \ EntityGUI_SketcherDlg_moc.cxx \
EntityGUI_3DSketcherDlg_moc.cxx \ EntityGUI_3DSketcherDlg_moc.cxx \
EntityGUI_SubShapeDlg_moc.cxx EntityGUI_SubShapeDlg_moc.cxx \
EntityGUI_FeatureDetectorDlg_moc.cxx
nodist_libEntityGUI_la_SOURCES = \ nodist_libEntityGUI_la_SOURCES = \
$(MOC_FILES) $(MOC_FILES)
@ -88,8 +91,11 @@ libEntityGUI_la_CPPFLAGS = \
-I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMImpl \
-I$(srcdir)/../GEOMFiltersSelection \ -I$(srcdir)/../GEOMFiltersSelection \
-I$(srcdir)/../SKETCHER \ -I$(srcdir)/../SKETCHER \
-I$(srcdir)/../GEOM \
-I$(top_builddir)/src/DlgRef \ -I$(top_builddir)/src/DlgRef \
-I$(top_builddir)/idl -I$(top_builddir)/idl \
-I/home/palmco/OpenCV/OpenCV-2.3.0/install/include/opencv \
-I/home/palmco/OpenCV/OpenCV-2.3.0/install/include
libEntityGUI_la_LDFLAGS = \ libEntityGUI_la_LDFLAGS = \
../GEOMFiltersSelection/libGEOMFiltersSelection.la \ ../GEOMFiltersSelection/libGEOMFiltersSelection.la \
@ -97,5 +103,6 @@ libEntityGUI_la_LDFLAGS = \
../SKETCHER/libGEOMSketcher.la \ ../SKETCHER/libGEOMSketcher.la \
../GEOMGUI/libGEOM.la \ ../GEOMGUI/libGEOM.la \
$(QT_MT_LIBS) \ $(QT_MT_LIBS) \
$(CAS_TKTopAlgo) -lTKernel $(CAS_TKTopAlgo) -lTKernel \
-L/home/palmco/OpenCV/OpenCV-2.3.0/install/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann

19
src/GEOMBase/GEOMBase_Helper.cxx
View File

@ -700,7 +700,10 @@ bool GEOMBase_Helper::openCommand()
{ {
bool res = false; bool res = false;
if ( !getStudy() || hasCommand() ) if ( !getStudy() || hasCommand() )
{
MESSAGE("Getting out from openCommand()")
return res; return res;
}
GEOM::GEOM_IOperations_var anOp = GEOM::GEOM_IOperations::_narrow( getOperation() ); GEOM::GEOM_IOperations_var anOp = GEOM::GEOM_IOperations::_narrow( getOperation() );
if ( !anOp->_is_nil() ) { if ( !anOp->_is_nil() ) {
@ -708,6 +711,10 @@ bool GEOMBase_Helper::openCommand()
myCommand->start(); myCommand->start();
res = true; res = true;
} }
else
{
MESSAGE("anOp->_is_nil() = true")
}
return res; return res;
} }
@ -750,6 +757,8 @@ bool GEOMBase_Helper::commitCommand( const char* )
//================================================================ //================================================================
bool GEOMBase_Helper::hasCommand() const bool GEOMBase_Helper::hasCommand() const
{ {
bool res = (bool) myCommand;
MESSAGE("hasCommand = "<<res)
return (bool)myCommand; return (bool)myCommand;
} }
@ -795,7 +804,11 @@ bool GEOMBase_Helper::checkViewWindow()
bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction ) bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
{ {
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() ); SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
if ( !appStudy ) return false; if ( !appStudy )
{
MESSAGE("appStudy is empty")
return false;
}
_PTR(Study) aStudy = appStudy->studyDS(); _PTR(Study) aStudy = appStudy->studyDS();
bool aLocked = (_PTR(AttributeStudyProperties) (aStudy->GetProperties()))->IsLocked(); bool aLocked = (_PTR(AttributeStudyProperties) (aStudy->GetProperties()))->IsLocked();
@ -819,7 +832,9 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
bool result = false; bool result = false;
try { try {
MESSAGE("publish ="<<publish<<"useTransaction ="<<useTransaction)
if ( ( !publish && !useTransaction ) || openCommand() ) { if ( ( !publish && !useTransaction ) || openCommand() ) {
MESSAGE("Entered the if")
SUIT_OverrideCursor wc; SUIT_OverrideCursor wc;
SUIT_Session::session()->activeApplication()->putInfo( "" ); SUIT_Session::session()->activeApplication()->putInfo( "" );
ObjectList objects; ObjectList objects;
@ -889,10 +904,12 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction )
catch( const SALOME::SALOME_Exception& e ) { catch( const SALOME::SALOME_Exception& e ) {
SalomeApp_Tools::QtCatchCorbaException( e ); SalomeApp_Tools::QtCatchCorbaException( e );
abortCommand(); abortCommand();
MESSAGE("Exception catched")
} }
updateViewer(); updateViewer();
MESSAGE("result ="<<result)
return result; return result;
} }

8
src/GEOMBase/Makefile.am
View File

@ -67,7 +67,9 @@ libGEOMBase_la_CPPFLAGS = \
-I$(srcdir)/../GEOMGUI \ -I$(srcdir)/../GEOMGUI \
-I$(srcdir)/../DlgRef \ -I$(srcdir)/../DlgRef \
-I$(top_builddir)/src/DlgRef \ -I$(top_builddir)/src/DlgRef \
-I$(top_builddir)/idl -I$(top_builddir)/idl \
-I/home/palmco/OpenCV/OpenCV-2.3.0/install/include/opencv \
-I/home/palmco/OpenCV/OpenCV-2.3.0/install/include
libGEOMBase_la_LDFLAGS = \ libGEOMBase_la_LDFLAGS = \
../../idl/libSalomeIDLGEOM.la \ ../../idl/libSalomeIDLGEOM.la \
@ -75,4 +77,6 @@ libGEOMBase_la_LDFLAGS = \
../DlgRef/libDlgRef.la \ ../DlgRef/libDlgRef.la \
$(KERNEL_LDFLAGS) -lOpUtil \ $(KERNEL_LDFLAGS) -lOpUtil \
$(GUI_LDFLAGS) -lsuit -lOCCViewer -lVTKViewer -lSVTK -lSalomePrs -lSalomeApp -lCAM \ $(GUI_LDFLAGS) -lsuit -lOCCViewer -lVTKViewer -lSVTK -lSalomePrs -lSalomeApp -lCAM \
$(CAS_LDPATH) -lTKPrim $(CAS_LDPATH) -lTKPrim \
-L/home/palmco/OpenCV/OpenCV-2.3.0/install/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann

63
src/GEOMGUI/GEOM_msg_en.ts
View File

@ -2181,6 +2181,10 @@ Please, select face, shell or solid and try again</translation>
<source>MEN_BUILD</source> <source>MEN_BUILD</source>
<translation>Build</translation> <translation>Build</translation>
</message> </message>
<message>
<source>MEN_FEATURE_DETECTION</source>
<translation>Feature detection</translation>
</message>
<message> <message>
<source>MEN_CHAMFER</source> <source>MEN_CHAMFER</source>
<translation>Chamfer</translation> <translation>Chamfer</translation>
@ -4552,6 +4556,65 @@ Otherwise the dimensions will be kept without modifications.</translation>
Number of sketch points too small</translation> Number of sketch points too small</translation>
</message> </message>
</context> </context>
<context>
<name>EntityGUI_FeatureDetectorDlg</name>
<message>
<source>GEOM_DETECT_TITLE</source>
<translation>Feature Detection</translation>
</message>
<message>
<source>GEOM_SCALING</source>
<translation>Scaling</translation>
</message>
<message>
<source>GEOM_PNT1</source>
<translation>Top left corner</translation>
</message>
<message>
<source>GEOM_PNT2</source>
<translation>Top right corner</translation>
</message>
<message>
<source>GEOM_CORNER</source>
<translation>Detected_corners</translation>
</message>
<message>
<source>GEOM_CORNERS</source>
<translation>Corners</translation>
</message>
<message>
<source>GEOM_CONTOURS</source>
<translation>Contours</translation>
</message>
<message>
<source>GEOM_FEATURES</source>
<translation>Features</translation>
</message>
<message>
<source>GEOM_DETECT_ZONE</source>
<translation>Select a detection zone (default is whole picture)</translation>
</message>
<message>
<source>GEOM_COLOR_FILTER</source>
<translation>Select the color of the zone you want to find the frontier of</translation>
</message>
<message>
<source>GEOM_VIEW</source>
<translation>View</translation>
</message>
<message>
<source>GEOM_FRONT</source>
<translation>Front (Y-Z)</translation>
</message>
<message>
<source>GEOM_TOP</source>
<translation>Top (X-Y)</translation>
</message>
<message>
<source>GEOM_LEFT</source>
<translation>Left (X-Z)</translation>
</message>
</context>
<context> <context>
<name>EntityGUI_SubShapeDlg</name> <name>EntityGUI_SubShapeDlg</name>
<message> <message>

31
src/GEOMGUI/GEOM_msg_fr.ts
View File

@ -2181,6 +2181,10 @@ Choisissez une face, une coque ou un solide et essayez de nouveau</translation>
<source>MEN_BUILD</source> <source>MEN_BUILD</source>
<translation>Construire</translation> <translation>Construire</translation>
</message> </message>
<message>
<source>MEN_CORNER_DETECTION</source>
<translation>Détecter les angles (image ou plan)</translation>
</message>
<message> <message>
<source>MEN_CHAMFER</source> <source>MEN_CHAMFER</source>
<translation>Chanfrein</translation> <translation>Chanfrein</translation>
@ -4552,6 +4556,33 @@ le paramètre &apos;%1&apos; aux préférences du module Géométrie.</translati
Le nombre de points n&apos;est pas suffisant</translation> Le nombre de points n&apos;est pas suffisant</translation>
</message> </message>
</context> </context>
<context>
<name>EntityGUI_CornerDetectionDlg</name>
<message>
<source>GEOM_DETECT_TITLE</source>
<translation>Détecter les angles</translation>
</message>
<message>
<source>GEOM_SCALING</source>
<translation>Mise à l&apos;échelle</translation>
</message>
<message>
<source>GEOM_PNT1</source>
<translation>Coin supérieur gauche</translation>
</message>
<message>
<source>GEOM_PNT2</source>
<translation>Coin supérieur droit</translation>
</message>
<message>
<source>GEOM_CORNER</source>
<translation>Angles_détectés</translation>
</message>
<message>
<source>GEOM_CORNERS</source>
<translation>Angles</translation>
</message>
</context>
<context> <context>
<name>EntityGUI_SubShapeDlg</name> <name>EntityGUI_SubShapeDlg</name>
<message> <message>

10
src/GEOMGUI/GeometryGUI.cxx
View File

@ -282,7 +282,7 @@ void GeometryGUI::ActiveWorkingPlane()
view3d->SetProj(DZ.X(), DZ.Y(), DZ.Z()); view3d->SetProj(DZ.X(), DZ.Y(), DZ.Z());
view3d->SetUp(DY.X(), DY.Y(), DY.Z()); view3d->SetUp(DY.X(), DY.Y(), DY.Z());
vw->onViewFitAll(); // vw->onViewFitAll(); TEST (don't forget to remove comments)
} }
} }
else if( ViewVTK ) { else if( ViewVTK ) {
@ -460,6 +460,7 @@ void GeometryGUI::OnGUIEvent( int id )
case GEOMOp::Op2dSketcher: // MENU ENTITY - SKETCHER case GEOMOp::Op2dSketcher: // MENU ENTITY - SKETCHER
case GEOMOp::Op3dSketcher: // MENU ENTITY - 3D SKETCHER case GEOMOp::Op3dSketcher: // MENU ENTITY - 3D SKETCHER
case GEOMOp::OpExplode: // MENU ENTITY - EXPLODE case GEOMOp::OpExplode: // MENU ENTITY - EXPLODE
case GEOMOp::OpFeatureDetect: // MENU ENTITY - FEATURE DETECTION
libName = "EntityGUI"; libName = "EntityGUI";
break; break;
case GEOMOp::OpEdge: // MENU BUILD - EDGE case GEOMOp::OpEdge: // MENU BUILD - EDGE
@ -707,6 +708,7 @@ void GeometryGUI::initialize( CAM_Application* app )
createGeomAction( GEOMOp::Op2dSketcher, "SKETCH" ); createGeomAction( GEOMOp::Op2dSketcher, "SKETCH" );
createGeomAction( GEOMOp::Op3dSketcher, "3DSKETCH" ); createGeomAction( GEOMOp::Op3dSketcher, "3DSKETCH" );
createGeomAction( GEOMOp::OpExplode, "EXPLODE" ); createGeomAction( GEOMOp::OpExplode, "EXPLODE" );
createGeomAction( GEOMOp::OpFeatureDetect,"FEATURE_DETECTION" );
createGeomAction( GEOMOp::OpEdge, "EDGE" ); createGeomAction( GEOMOp::OpEdge, "EDGE" );
createGeomAction( GEOMOp::OpWire, "WIRE" ); createGeomAction( GEOMOp::OpWire, "WIRE" );
@ -901,6 +903,10 @@ void GeometryGUI::initialize( CAM_Application* app )
createMenu( GEOMOp::OpSolid, buildId, -1 ); createMenu( GEOMOp::OpSolid, buildId, -1 );
createMenu( GEOMOp::OpCompound, buildId, -1 ); createMenu( GEOMOp::OpCompound, buildId, -1 );
createMenu( separator(), newEntId, -1 );
createMenu( GEOMOp::OpFeatureDetect, newEntId, -1 );
int operId = createMenu( tr( "MEN_OPERATIONS" ), -1, -1, 10 ); int operId = createMenu( tr( "MEN_OPERATIONS" ), -1, -1, 10 );
int boolId = createMenu( tr( "MEN_BOOLEAN" ), operId, -1 ); int boolId = createMenu( tr( "MEN_BOOLEAN" ), operId, -1 );
@ -1065,6 +1071,8 @@ void GeometryGUI::initialize( CAM_Application* app )
createTool( separator(), operTbId ); createTool( separator(), operTbId );
createTool( GEOMOp::OpExplode, operTbId ); createTool( GEOMOp::OpExplode, operTbId );
createTool( separator(), operTbId ); createTool( separator(), operTbId );
createTool( GEOMOp::OpFeatureDetect, operTbId );
createTool( separator(), operTbId );
createTool( GEOMOp::OpPartition, operTbId ); createTool( GEOMOp::OpPartition, operTbId );
createTool( GEOMOp::OpArchimede, operTbId ); createTool( GEOMOp::OpArchimede, operTbId );
createTool( GEOMOp::OpShapesOnShape, operTbId ); createTool( GEOMOp::OpShapesOnShape, operTbId );

1
src/GEOMGUI/GeometryGUI_Operations.h
View File

@ -92,6 +92,7 @@ namespace GEOMOp {
Op2dSketcher = 3300, // MENU NEW ENTITY - SKETCHER Op2dSketcher = 3300, // MENU NEW ENTITY - SKETCHER
Op3dSketcher = 3301, // MENU NEW ENTITY - 3D SKETCHER Op3dSketcher = 3301, // MENU NEW ENTITY - 3D SKETCHER
OpExplode = 3302, // MENU NEW ENTITY - EXPLODE OpExplode = 3302, // MENU NEW ENTITY - EXPLODE
OpFeatureDetect = 3303, // MENU NEW ENTITY - FEATURE DETECTION
// BuildGUI ------------------//-------------------------------- // BuildGUI ------------------//--------------------------------
OpEdge = 3400, // MENU NEW ENTITY - BUILD - EDGE OpEdge = 3400, // MENU NEW ENTITY - BUILD - EDGE
OpWire = 3401, // MENU NEW ENTITY - BUILD - WIRE OpWire = 3401, // MENU NEW ENTITY - BUILD - WIRE

8
src/GEOMGUI/Makefile.am
View File

@ -76,7 +76,9 @@ libGEOM_la_CPPFLAGS = \
-I$(srcdir)/../GEOMClient \ -I$(srcdir)/../GEOMClient \
-I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMImpl \
-I$(top_builddir)/idl \ -I$(top_builddir)/idl \
-I$(top_builddir) -I$(top_builddir) \
-I/home/palmco/OpenCV/OpenCV-2.3.0/install/include/opencv \
-I/home/palmco/OpenCV/OpenCV-2.3.0/install/include
libGEOM_la_LDFLAGS = \ libGEOM_la_LDFLAGS = \
$(PYTHON_LIBS) \ $(PYTHON_LIBS) \
@ -84,7 +86,9 @@ libGEOM_la_LDFLAGS = \
../GEOMClient/libGEOMClient.la \ ../GEOMClient/libGEOMClient.la \
../OBJECT/libGEOMObject.la \ ../OBJECT/libGEOMObject.la \
$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lSalomeDSClient \ $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lSalomeDSClient \
$(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent -lSalomePrs -lstd $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent -lSalomePrs -lstd \
-L/home/palmco/OpenCV/OpenCV-2.3.0/install/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann
# -lSalomeApp # -lSalomeApp
# -lToolsGUI # -lToolsGUI
# $(CORBA_LIBS) \ # $(CORBA_LIBS) \

8
src/OperationGUI/Makefile.am
View File

@ -81,11 +81,15 @@ libOperationGUI_la_CPPFLAGS = \
-I$(srcdir)/../GEOMImpl \ -I$(srcdir)/../GEOMImpl \
-I$(srcdir)/../GEOMAlgo \ -I$(srcdir)/../GEOMAlgo \
-I$(top_builddir)/src/DlgRef \ -I$(top_builddir)/src/DlgRef \
-I$(top_builddir)/idl -I$(top_builddir)/idl \
-I/home/palmco/OpenCV/OpenCV-2.3.0/install/include/opencv \
-I/home/palmco/OpenCV/OpenCV-2.3.0/install/include
libOperationGUI_la_LDFLAGS = \ libOperationGUI_la_LDFLAGS = \
../GEOMBase/libGEOMBase.la \ ../GEOMBase/libGEOMBase.la \
$(CAS_LDPATH) -lTKFillet $(CAS_LDPATH) -lTKFillet \
-L/home/palmco/OpenCV/OpenCV-2.3.0/install/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann
############################### ###############################
# Obsolete files ? # Obsolete files ?