X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Arc.h;h=2f2f4abcd03cd9f09ad060621c61130e5703daef;hb=645e2cb70c0e40290725f28fdc5fec8a93338d28;hp=812123b04e142af2de742fcb98d8353da923e622;hpb=7f3b57915287757d4f5d7db281c3867ac00f5f6a;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Arc.h b/src/SketchPlugin/SketchPlugin_Arc.h index 812123b04..2f2f4abcd 100644 --- a/src/SketchPlugin/SketchPlugin_Arc.h +++ b/src/SketchPlugin/SketchPlugin_Arc.h @@ -1,16 +1,30 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: SketchPlugin_Arc.h -// Created: 26 May 2014 -// Author: Artem ZHIDKOV +// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #ifndef SketchPlugin_Arc_H_ #define SketchPlugin_Arc_H_ #include "SketchPlugin.h" -#include -#include -#include + +#include "SketchPlugin_SketchEntity.h" + + /**\class SketchPlugin_Arc * \ingroup Plugins @@ -19,99 +33,56 @@ * calculated when there is non-initialized attributes of the arc. The second is a result and * it is calculated if all attributes are initialized. */ -class SketchPlugin_Arc : public SketchPlugin_SketchEntity, public GeomAPI_IPresentable +class SketchPlugin_Arc: public SketchPlugin_SketchEntity { - /// to avoid cyclic dependencies in automatic updates: they mean that - /// update is performed right now and automatic updates are not needed - bool myStartUpdate, myEndUpdate; - /// to avoid (if possible) additional modification of changed coordinate (issue #855) - double myXEndBefore, myYEndBefore; - - /// to define in which direction draw arc - double myParamBefore; - public: /// Arc feature kind inline static const std::string& ID() { - static const std::string MY_SKETCH_ARC_ID("SketchArc"); - return MY_SKETCH_ARC_ID; - } - - inline static const std::string& ARC_TYPE() - { - static const std::string TYPE("ArcType"); - return TYPE; - } - - inline static const std::string& ARC_TYPE_TANGENT() - { - static const std::string TYPE("Tangent"); - return TYPE; - } - - static const std::string& ARC_TYPE_CENTER_START_END() - { - static const std::string TYPE("CenterStartEnd"); - return TYPE; - } - static const std::string& ARC_TYPE_THREE_POINTS() - { - static const std::string TYPE("ThreePoints"); - return TYPE; - } - - static const std::string& TANGENT_POINT_ID() - { - static const std::string TANGENT_PNT("ArcTangentPoint"); - return TANGENT_PNT; + static const std::string ID("SketchArc"); + return ID; } /// Central 2D point of the circle which contains the arc inline static const std::string& CENTER_ID() { - static const std::string MY_CENTER_ID = "ArcCenter"; - return MY_CENTER_ID; + static const std::string ID = "center_point"; + return ID; } + /// Start 2D point of the arc inline static const std::string& START_ID() { - static const std::string MY_START_ID = "ArcStartPoint"; - return MY_START_ID; + static const std::string ID = "start_point"; + return ID; } + /// End 2D point of the arc inline static const std::string& END_ID() { - static const std::string MY_END_ID = "ArcEndPoint"; - return MY_END_ID; - } - - /// Inversed flag - inline static const std::string& INVERSED_ID() - { - static const std::string MY_INVERSED_ID("InversedArc"); - return MY_INVERSED_ID; - } - - /// Passed point of the arc. - static const std::string& PASSED_POINT_ID() - { - static const std::string PASSED_PNT("ArcPassedPoint"); - return PASSED_PNT; + static const std::string ID = "end_point"; + return ID; } /// Arc radius. static const std::string& RADIUS_ID() { - static const std::string RADIUS("ArcRadius"); - return RADIUS; + static const std::string ID("radius"); + return ID; } /// Arc angle. static const std::string& ANGLE_ID() { - static const std::string ANGLE("ArcAngle"); - return ANGLE; + static const std::string ID("angle"); + return ID; + } + + /// Reversed flag + inline static const std::string& REVERSED_ID() + { + static const std::string ID("reversed"); + return ID; } /// Returns the kind of a feature @@ -124,24 +95,17 @@ class SketchPlugin_Arc : public SketchPlugin_SketchEntity, public GeomAPI_IPrese /// Returns true is sketch element is under the rigid constraint SKETCHPLUGIN_EXPORT virtual bool isFixed(); - /// Creates an arc-shape - SKETCHPLUGIN_EXPORT virtual void execute(); - /// Called on change of any argument-attribute of this object /// \param theID identifier of changed attribute SKETCHPLUGIN_EXPORT virtual void attributeChanged(const std::string& theID); - /// Returns the AIS preview - virtual AISObjectPtr getAISObject(AISObjectPtr thePrevious); - - /// Moves the feature - /// \param theDeltaX the delta for X coordinate is moved - /// \param theDeltaY the delta for Y coordinate is moved - SKETCHPLUGIN_EXPORT virtual void move(const double theDeltaX, const double theDeltaY); + /// Creates an arc-shape + SKETCHPLUGIN_EXPORT virtual void execute(); /// Updates the "reversed" flag /// \param isReversed whether the arc will be reversed void setReversed(bool isReversed); + /// Returns \c true is the arc is reversed bool isReversed(); @@ -153,12 +117,8 @@ protected: virtual void initDerivedClassAttributes(); private: - /// Returns true if all obligatory attributes are initialized - bool isFeatureValid(); - - /// Compose constraints to build tangency arc - void tangencyArcConstraints(); - + /// to define in which direction draw arc + double myParamBefore; }; #endif