From 8cd58af79b9ec001afdadd36fbcbd034b51404fc Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 27 Aug 2015 19:20:02 +0300 Subject: [PATCH] -- --HG-- branch : develop --- src/libs/vmisc/def.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index 7e22090e7..c3385c897 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -35,16 +35,11 @@ #define SceneSize 50000 #define DefPointRadius 1.5//mm + enum class NodeDetail : char { Contour, Modeling }; enum class SceneObject : char { Point, Line, Spline, Arc, SplinePath, Detail, Unknown }; -#ifdef STUPIDMERGE -enum class MeasurementsType : char { Standard, Individual, Unknown }; -enum class Unit : char { Mm, Cm, Inch, Px }; -#endif - enum class MeasurementsType : char { Standard, Individual , Unknown}; enum class Unit : char { Mm = 0, Cm, Inch, Px, LAST_UNIT_DO_NOT_USE}; - enum class Source : char { FromGui, FromFile, FromTool }; enum class Tool : unsigned char