ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 09:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/cge/msvc10_porting'

Browse Source
This commit is contained in:
vsr 2014-08-28 17:31:26 +04:00
commit bf2eb6dd2e
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx
View File

@ -83,12 +83,6 @@ enum{
LINES LINES
}; };
enum {
RADIO_BUTTONS,
MSG,
PUSH_BUTTON,
};
enum { enum {
KERNEL_SIZE, KERNEL_SIZE,
FIND_CONTOURS_METHOD, FIND_CONTOURS_METHOD,
@ -859,11 +853,11 @@ bool EntityGUI_FeatureDetectorDlg::execute( ObjectList& objects )
double u_v_det = (it->x - it_previous->x) * (it_next->y - it->y) - double u_v_det = (it->x - it_previous->x) * (it_next->y - it->y) -
(it->y - it_previous->y) * (it_next->x - it->x); (it->y - it_previous->y) * (it_next->x - it->x);
double norme_u = sqrt ( (it->x - it_previous->x)*(it->x - it_previous->x) + double norme_u = sqrt ( double(it->x - it_previous->x) * double(it->x - it_previous->x) +
(it->y - it_previous->y)*(it->y - it_previous->y) ); double(it->y - it_previous->y) * double(it->y - it_previous->y) );
double norme_v = sqrt ( (it->x - it_next->x)*(it->x - it_next->x) + double norme_v = sqrt ( double(it->x - it_next->x) * double(it->x - it_next->x) +
(it->y - it_next->y)*(it->y - it_next->y) ); double(it->y - it_next->y) * double(it->y - it_next->y) );
double u_v_sinus = u_v_det / (norme_u * norme_v); double u_v_sinus = u_v_det / (norme_u * norme_v);

20
src/ShapeRecognition/ShapeRec_FeatureDetector.hxx
View File

@ -32,7 +32,17 @@
// Qt // Qt
#include <QRect> #include <QRect>
class ShapeRec_Parameters #ifdef WIN32
#if defined GEOM_SHAPEREC_EXPORTS || defined GEOMShapeRec_EXPORTS
#define GEOM_SHAPEREC_EXPORT __declspec( dllexport )
#else
#define GEOM_SHAPEREC_EXPORT __declspec( dllimport )
#endif
#else
#define GEOM_SHAPEREC_EXPORT
#endif
class GEOM_SHAPEREC_EXPORT ShapeRec_Parameters
{ {
public: public:
ShapeRec_Parameters(); ShapeRec_Parameters();
@ -42,7 +52,7 @@ public:
int findContoursMethod; int findContoursMethod;
}; };
class ShapeRec_CornersParameters : public ShapeRec_Parameters class GEOM_SHAPEREC_EXPORT ShapeRec_CornersParameters : public ShapeRec_Parameters
{ {
public: public:
ShapeRec_CornersParameters(); ShapeRec_CornersParameters();
@ -55,7 +65,7 @@ public:
double epsilon; double epsilon;
}; };
class ShapeRec_CannyParameters : public ShapeRec_Parameters class GEOM_SHAPEREC_EXPORT ShapeRec_CannyParameters : public ShapeRec_Parameters
{ {
public: public:
ShapeRec_CannyParameters(); ShapeRec_CannyParameters();
@ -66,7 +76,7 @@ public:
bool L2gradient; bool L2gradient;
}; };
class ShapeRec_ColorFilterParameters : public ShapeRec_Parameters class GEOM_SHAPEREC_EXPORT ShapeRec_ColorFilterParameters : public ShapeRec_Parameters
{ {
public: public:
ShapeRec_ColorFilterParameters(); ShapeRec_ColorFilterParameters();
@ -79,7 +89,7 @@ public:
double maxThreshold; double maxThreshold;
}; };
class ShapeRec_FeatureDetector class GEOM_SHAPEREC_EXPORT ShapeRec_FeatureDetector
{ {
public: public: