From: spo Date: Mon, 13 Jul 2015 08:54:09 +0000 (+0300) Subject: Issue #653 - Double and triple click edges -- Fix Debian dynamic_pointer_cast problem... X-Git-Tag: V_1.3.0~27 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1a0d48211014d96db9125fe973eacbae895c4490;p=modules%2Fshaper.git Issue #653 - Double and triple click edges -- Fix Debian dynamic_pointer_cast problem for all files. --- diff --git a/src/ExchangePlugin/ExchangePlugin_Tools.cpp b/src/ExchangePlugin/ExchangePlugin_Tools.cpp index 43b9de649..26391487d 100644 --- a/src/ExchangePlugin/ExchangePlugin_Tools.cpp +++ b/src/ExchangePlugin/ExchangePlugin_Tools.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: ExchangePlugin_Tools.h +// File: ExchangePlugin_Tools.cpp // Created: May 15, 2015 // Author: Sergey POKHODENKO diff --git a/src/ExchangePlugin/ExchangePlugin_Validators.cpp b/src/ExchangePlugin/ExchangePlugin_Validators.cpp index 4d1a8ce01..052140b81 100644 --- a/src/ExchangePlugin/ExchangePlugin_Validators.cpp +++ b/src/ExchangePlugin/ExchangePlugin_Validators.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: ExchangePlugin_Validators.h +// File: ExchangePlugin_Validators.cpp // Created: Aug 01, 2014 // Author: Sergey BELASH diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt index 952e741fc..77f89e52c 100644 --- a/src/FeaturesPlugin/CMakeLists.txt +++ b/src/FeaturesPlugin/CMakeLists.txt @@ -33,7 +33,11 @@ SET(PROJECT_SOURCES FeaturesPlugin_Placement.cpp FeaturesPlugin_CompositeBoolean.cpp FeaturesPlugin_ExtrusionBoolean.cpp + FeaturesPlugin_ExtrusionCut.cpp + FeaturesPlugin_ExtrusionFuse.cpp FeaturesPlugin_RevolutionBoolean.cpp + FeaturesPlugin_RevolutionCut.cpp + FeaturesPlugin_RevolutionFuse.cpp ) SET(XML_RESOURCES diff --git a/src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.cpp b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.cpp index a89523b88..4df58cd62 100755 --- a/src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionBoolean.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: FeaturesPlugin_ExtrusionBoolean.h +// File: FeaturesPlugin_ExtrusionBoolean.cpp // Created: 11 June 2015 // Author: Dmitry Bobylev diff --git a/src/FeaturesPlugin/FeaturesPlugin_ExtrusionCut.cpp b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionCut.cpp new file mode 100644 index 000000000..908986033 --- /dev/null +++ b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionCut.cpp @@ -0,0 +1,12 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + +// File: FeaturesPlugin_ExtrusionCut.cpp +// Created: 11 June 2015 +// Author: Dmitry Bobylev + +#include "FeaturesPlugin_ExtrusionCut.h" + +FeaturesPlugin_ExtrusionCut::FeaturesPlugin_ExtrusionCut() +{ + myBooleanOperationType = GeomAlgoAPI_Boolean::BOOL_CUT; +} diff --git a/src/FeaturesPlugin/FeaturesPlugin_ExtrusionCut.h b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionCut.h index fbff14c5e..54937b150 100755 --- a/src/FeaturesPlugin/FeaturesPlugin_ExtrusionCut.h +++ b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionCut.h @@ -30,10 +30,7 @@ class FeaturesPlugin_ExtrusionCut : public FeaturesPlugin_ExtrusionBoolean } /// Use plugin manager for features creation. - FeaturesPlugin_ExtrusionCut() - { - myBooleanOperationType = GeomAlgoAPI_Boolean::BOOL_CUT; - } + FeaturesPlugin_ExtrusionCut(); }; #endif diff --git a/src/FeaturesPlugin/FeaturesPlugin_ExtrusionFuse.cpp b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionFuse.cpp new file mode 100644 index 000000000..a30db9205 --- /dev/null +++ b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionFuse.cpp @@ -0,0 +1,12 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + +// File: FeaturesPlugin_ExtrusionFuse.cpp +// Created: 11 June 2015 +// Author: Dmitry Bobylev + +#include "FeaturesPlugin_ExtrusionFuse.h" + +FeaturesPlugin_ExtrusionFuse::FeaturesPlugin_ExtrusionFuse() +{ + myBooleanOperationType = GeomAlgoAPI_Boolean::BOOL_FUSE; +} diff --git a/src/FeaturesPlugin/FeaturesPlugin_ExtrusionFuse.h b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionFuse.h index 558a02893..e3c2ed9e2 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_ExtrusionFuse.h +++ b/src/FeaturesPlugin/FeaturesPlugin_ExtrusionFuse.h @@ -30,10 +30,7 @@ class FeaturesPlugin_ExtrusionFuse : public FeaturesPlugin_ExtrusionBoolean } /// Use plugin manager for features creation. - FeaturesPlugin_ExtrusionFuse() - { - myBooleanOperationType = GeomAlgoAPI_Boolean::BOOL_FUSE; - } + FeaturesPlugin_ExtrusionFuse(); }; #endif diff --git a/src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp b/src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp index d2ec7bd66..e99a26428 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: FeaturesPlugin_RevolutionBoolean.h +// File: FeaturesPlugin_RevolutionBoolean.cpp // Created: 11 June 2015 // Author: Dmitry Bobylev diff --git a/src/FeaturesPlugin/FeaturesPlugin_RevolutionCut.cpp b/src/FeaturesPlugin/FeaturesPlugin_RevolutionCut.cpp new file mode 100644 index 000000000..521e7337b --- /dev/null +++ b/src/FeaturesPlugin/FeaturesPlugin_RevolutionCut.cpp @@ -0,0 +1,12 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + +// File: FeaturesPlugin_RevolutionCut.cpp +// Created: 11 June 2015 +// Author: Dmitry Bobylev + +#include "FeaturesPlugin_RevolutionCut.h" + +FeaturesPlugin_RevolutionCut::FeaturesPlugin_RevolutionCut() +{ + myBooleanOperationType = GeomAlgoAPI_Boolean::BOOL_CUT; +} diff --git a/src/FeaturesPlugin/FeaturesPlugin_RevolutionCut.h b/src/FeaturesPlugin/FeaturesPlugin_RevolutionCut.h index 9116a46cd..f5a79a11a 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_RevolutionCut.h +++ b/src/FeaturesPlugin/FeaturesPlugin_RevolutionCut.h @@ -30,10 +30,7 @@ class FeaturesPlugin_RevolutionCut : public FeaturesPlugin_RevolutionBoolean } /// Use plugin manager for features creation. - FeaturesPlugin_RevolutionCut() - { - myBooleanOperationType = GeomAlgoAPI_Boolean::BOOL_CUT; - } + FeaturesPlugin_RevolutionCut(); }; #endif diff --git a/src/FeaturesPlugin/FeaturesPlugin_RevolutionFuse.cpp b/src/FeaturesPlugin/FeaturesPlugin_RevolutionFuse.cpp new file mode 100644 index 000000000..a4efacba7 --- /dev/null +++ b/src/FeaturesPlugin/FeaturesPlugin_RevolutionFuse.cpp @@ -0,0 +1,12 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + +// File: FeaturesPlugin_RevolutionFuse.cpp +// Created: 11 June 2015 +// Author: Dmitry Bobylev + +#include "FeaturesPlugin_RevolutionFuse.h" + +FeaturesPlugin_RevolutionFuse::FeaturesPlugin_RevolutionFuse() +{ + myBooleanOperationType = GeomAlgoAPI_Boolean::BOOL_FUSE; +} diff --git a/src/FeaturesPlugin/FeaturesPlugin_RevolutionFuse.h b/src/FeaturesPlugin/FeaturesPlugin_RevolutionFuse.h index f7e939773..cf957781b 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_RevolutionFuse.h +++ b/src/FeaturesPlugin/FeaturesPlugin_RevolutionFuse.h @@ -30,10 +30,7 @@ class FeaturesPlugin_RevolutionFuse : public FeaturesPlugin_RevolutionBoolean } /// Use plugin manager for features creation. - FeaturesPlugin_RevolutionFuse() - { - myBooleanOperationType = GeomAlgoAPI_Boolean::BOOL_FUSE; - } + FeaturesPlugin_RevolutionFuse(); }; #endif diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeList.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeList.cpp index 50e621abe..58518ea49 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeList.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_MakeShapeList.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: GeomAlgoAPI_MakeShapeListList.h +// File: GeomAlgoAPI_MakeShapeListList.cpp // Created: 27 May 2015 // Author: Dmitry Bobylev diff --git a/src/GeomValidators/GeomValidators_BooleanArguments.cpp b/src/GeomValidators/GeomValidators_BooleanArguments.cpp index 738b1ecc0..cfd5620ea 100644 --- a/src/GeomValidators/GeomValidators_BooleanArguments.cpp +++ b/src/GeomValidators/GeomValidators_BooleanArguments.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: GeomValidators_BooleanArguments.h +// File: GeomValidators_BooleanArguments.cpp // Created: 30 June 2015 // Author: Dmitry Bobylev diff --git a/src/GeomValidators/GeomValidators_ZeroOffset.cpp b/src/GeomValidators/GeomValidators_ZeroOffset.cpp index 6eb651f57..4bfe414a1 100644 --- a/src/GeomValidators/GeomValidators_ZeroOffset.cpp +++ b/src/GeomValidators/GeomValidators_ZeroOffset.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: GeomValidators_ZeroOffset.h +// File: GeomValidators_ZeroOffset.cpp // Created: 13 May 2015 // Author: Dmitry Bobylev diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp index 864975b2e..69a1185d2 100644 --- a/src/Model/Model_AttributeSelection.cpp +++ b/src/Model/Model_AttributeSelection.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: Model_AttributeSelection.h +// File: Model_AttributeSelection.cpp // Created: 2 Oct 2014 // Author: Mikhail PONIKAROV diff --git a/src/Model/Model_AttributeSelectionList.cpp b/src/Model/Model_AttributeSelectionList.cpp index ae079d7a1..f547a797f 100644 --- a/src/Model/Model_AttributeSelectionList.cpp +++ b/src/Model/Model_AttributeSelectionList.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: Model_AttributeSelectionList.h +// File: Model_AttributeSelectionList.cpp // Created: 22 Oct 2014 // Author: Mikhail PONIKAROV diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt index 2fb0d5ba4..96a42d7a8 100644 --- a/src/ModelAPI/CMakeLists.txt +++ b/src/ModelAPI/CMakeLists.txt @@ -58,6 +58,7 @@ SET(PROJECT_SOURCES ModelAPI_Document.cpp ModelAPI_Events.cpp ModelAPI_Feature.cpp + ModelAPI_FeatureValidator.cpp ModelAPI_Object.cpp ModelAPI_Plugin.cpp ModelAPI_Result.cpp diff --git a/src/ModelAPI/ModelAPI_CompositeFeature.cpp b/src/ModelAPI/ModelAPI_CompositeFeature.cpp index 5cad229fa..71b6fc280 100644 --- a/src/ModelAPI/ModelAPI_CompositeFeature.cpp +++ b/src/ModelAPI/ModelAPI_CompositeFeature.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: ModelAPI_CompositeFeature.h +// File: ModelAPI_CompositeFeature.cpp // Created: 20 Oct 2014 // Author: Mikhail PONIKAROV diff --git a/src/ModelAPI/ModelAPI_FeatureValidator.cpp b/src/ModelAPI/ModelAPI_FeatureValidator.cpp new file mode 100644 index 000000000..da63768f7 --- /dev/null +++ b/src/ModelAPI/ModelAPI_FeatureValidator.cpp @@ -0,0 +1,17 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + +// File: ModelAPI_Validator.hxx +// Created: 2 Jul 2014 +// Author: Mikhail PONIKAROV + +#include "ModelAPI_FeatureValidator.h" + +ModelAPI_FeatureValidator::ModelAPI_FeatureValidator() +{ + +} + +ModelAPI_FeatureValidator::~ModelAPI_FeatureValidator() +{ + +} diff --git a/src/ModelAPI/ModelAPI_FeatureValidator.h b/src/ModelAPI/ModelAPI_FeatureValidator.h index 59161acbe..5d6eb3b1c 100644 --- a/src/ModelAPI/ModelAPI_FeatureValidator.h +++ b/src/ModelAPI/ModelAPI_FeatureValidator.h @@ -18,9 +18,14 @@ * used: it checks each argument of the feature and if one of it is not valid (and obligatory), * the hole feature is invalid. */ -class ModelAPI_FeatureValidator : public ModelAPI_Validator +class MODELAPI_EXPORT ModelAPI_FeatureValidator : public ModelAPI_Validator { public: + /// Default constructor + ModelAPI_FeatureValidator(); + /// Virtual destructor + virtual ~ModelAPI_FeatureValidator(); + /// Returns true if feature and/or attributes are valid /// \param theFeature the validated feature /// \param theArguments list of string, feature attribute names: dependent attributes diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt index 9f0497c54..a15c841c5 100644 --- a/src/ModuleBase/CMakeLists.txt +++ b/src/ModuleBase/CMakeLists.txt @@ -48,7 +48,7 @@ SET(PROJECT_HEADERS ModuleBase_WidgetExprEditor.h ModuleBase_ParamSpinBox.h ModuleBase_WidgetIntValue.h - ModuleBase_IDocumentDataModel.h + ModuleBase_IDocumentDataModel.h ) SET(PROJECT_SOURCES @@ -58,6 +58,7 @@ SET(PROJECT_SOURCES ModuleBase_Tools.cpp ModuleBase_IModule.cpp ModuleBase_ISelection.cpp + ModuleBase_IViewer.cpp ModuleBase_IWorkshop.cpp ModuleBase_Operation.cpp ModuleBase_OperationDescription.cpp @@ -69,11 +70,14 @@ SET(PROJECT_SOURCES ModuleBase_WidgetChoice.cpp ModuleBase_WidgetFileSelector.cpp ModuleBase_DoubleSpinBox.cpp + ModuleBase_IPropertyPanel.cpp ModuleBase_WidgetLineEdit.cpp ModuleBase_WidgetMultiSelector.cpp ModuleBase_ViewerFilters.cpp ModuleBase_ResultPrs.cpp + ModuleBase_IViewWindow.cpp ModuleBase_WidgetLabel.cpp + ModuleBase_IPrefMgr.cpp ModuleBase_Preferences.cpp ModuleBase_ActionInfo.cpp ModuleBase_PageBase.cpp @@ -88,7 +92,9 @@ SET(PROJECT_SOURCES ModuleBase_WidgetExprEditor.cpp ModuleBase_ParamSpinBox.cpp ModuleBase_SelectionValidator.cpp + ModuleBase_ViewerPrs.cpp ModuleBase_WidgetIntValue.cpp + ModuleBase_IDocumentDataModel.cpp ) SET(PROJECT_LIBRARIES diff --git a/src/ModuleBase/ModuleBase_FilterFactory.cpp b/src/ModuleBase/ModuleBase_FilterFactory.cpp index f89d6e71b..e511e5223 100644 --- a/src/ModuleBase/ModuleBase_FilterFactory.cpp +++ b/src/ModuleBase/ModuleBase_FilterFactory.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: ModuleBase_FilterFactory.h +// File: ModuleBase_FilterFactory.cpp // Created: 10 Dec 2014 // Author: Natalia ERMOLAEVA diff --git a/src/ModuleBase/ModuleBase_FilterValidated.cpp b/src/ModuleBase/ModuleBase_FilterValidated.cpp index 3fdb61e15..a1b9bdb94 100644 --- a/src/ModuleBase/ModuleBase_FilterValidated.cpp +++ b/src/ModuleBase/ModuleBase_FilterValidated.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: ModuleBase_FilterValidated.h +// File: ModuleBase_FilterValidated.cpp // Created: 17 Mar 2015 // Author: Natalia ERMOLAEVA diff --git a/src/ModuleBase/ModuleBase_IDocumentDataModel.cpp b/src/ModuleBase/ModuleBase_IDocumentDataModel.cpp new file mode 100644 index 000000000..f59990fe1 --- /dev/null +++ b/src/ModuleBase/ModuleBase_IDocumentDataModel.cpp @@ -0,0 +1,22 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> + +// File: ModuleBase_IDocumentDataModel.cpp +// Created: 28 Apr 2015 +// Author: Vitaly SMETANNIKOV + +#include "ModuleBase_IDocumentDataModel.h" + +ModuleBase_IDocumentDataModel::ModuleBase_IDocumentDataModel(QObject* theParent) : QAbstractItemModel(theParent) +{ + +} + +void ModuleBase_IDocumentDataModel::clear() +{ + +} + +void ModuleBase_IDocumentDataModel::rebuildDataTree() +{ + +} diff --git a/src/ModuleBase/ModuleBase_IDocumentDataModel.h b/src/ModuleBase/ModuleBase_IDocumentDataModel.h index b18866eea..a5e3d95c8 100644 --- a/src/ModuleBase/ModuleBase_IDocumentDataModel.h +++ b/src/ModuleBase/ModuleBase_IDocumentDataModel.h @@ -16,7 +16,7 @@ class MODULEBASE_EXPORT ModuleBase_IDocumentDataModel : public QAbstractItemMode { Q_OBJECT public: - ModuleBase_IDocumentDataModel(QObject* theParent): QAbstractItemModel(theParent) {} + ModuleBase_IDocumentDataModel(QObject* theParent); //! Returns an object by the given Model index. //! Returns 0 if the given index is not index of an object @@ -27,10 +27,10 @@ public: virtual QModelIndex objectIndex(const ObjectPtr theObject) const = 0; //! Clear internal data - virtual void clear() {} + virtual void clear(); //! Rebuild data tree - virtual void rebuildDataTree() {} + virtual void rebuildDataTree(); }; #endif \ No newline at end of file diff --git a/src/ModuleBase/ModuleBase_IPrefMgr.cpp b/src/ModuleBase/ModuleBase_IPrefMgr.cpp new file mode 100644 index 000000000..21e27681b --- /dev/null +++ b/src/ModuleBase/ModuleBase_IPrefMgr.cpp @@ -0,0 +1,17 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + +// File: ModuleBase_IPrefMgr.cpp +// Created: 10 Sept 2014 +// Author: Vitaly SMETANNIKOV + +#include "ModuleBase_IPrefMgr.h" + +ModuleBase_IPrefMgr::ModuleBase_IPrefMgr() +{ + +} + +ModuleBase_IPrefMgr::~ModuleBase_IPrefMgr() +{ + +} diff --git a/src/ModuleBase/ModuleBase_IPrefMgr.h b/src/ModuleBase/ModuleBase_IPrefMgr.h index 147defa4b..3d4e7cefd 100644 --- a/src/ModuleBase/ModuleBase_IPrefMgr.h +++ b/src/ModuleBase/ModuleBase_IPrefMgr.h @@ -8,6 +8,8 @@ #ifndef ModuleBase_IPrefMgr_H #define ModuleBase_IPrefMgr_H +#include "ModuleBase.h" + #include #include @@ -17,9 +19,13 @@ * It is used in order to make common interface to Preference manager in Salome * and this application */ -class ModuleBase_IPrefMgr +class MODULEBASE_EXPORT ModuleBase_IPrefMgr { public: + /// Default constructor + ModuleBase_IPrefMgr(); + /// Virtual destructor + virtual ~ModuleBase_IPrefMgr(); /** * Add preference item into preference dialog box diff --git a/src/ModuleBase/ModuleBase_IPropertyPanel.cpp b/src/ModuleBase/ModuleBase_IPropertyPanel.cpp new file mode 100644 index 000000000..ee4490aca --- /dev/null +++ b/src/ModuleBase/ModuleBase_IPropertyPanel.cpp @@ -0,0 +1,15 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + +/* + * ModuleBase_IPropertyPanel.cpp + * + * Created on: Oct 01, 2014 + * Author: vsv + */ + +#include "ModuleBase_IPropertyPanel.h" + +ModuleBase_IPropertyPanel::ModuleBase_IPropertyPanel(QWidget* theParent) : QDockWidget(theParent), myIsEditing(false) +{ + +} diff --git a/src/ModuleBase/ModuleBase_IPropertyPanel.h b/src/ModuleBase/ModuleBase_IPropertyPanel.h index 59c2f8435..12c96548e 100644 --- a/src/ModuleBase/ModuleBase_IPropertyPanel.h +++ b/src/ModuleBase/ModuleBase_IPropertyPanel.h @@ -27,7 +27,7 @@ Q_OBJECT public: /// Constructor /// \param theParent is a parent of the property panel - ModuleBase_IPropertyPanel(QWidget* theParent) : QDockWidget(theParent), myIsEditing(false) {} + ModuleBase_IPropertyPanel(QWidget* theParent); /// Returns currently active widget virtual ModuleBase_ModelWidget* activeWidget() const = 0; diff --git a/src/ModuleBase/ModuleBase_IViewWindow.cpp b/src/ModuleBase/ModuleBase_IViewWindow.cpp new file mode 100644 index 000000000..2a0390101 --- /dev/null +++ b/src/ModuleBase/ModuleBase_IViewWindow.cpp @@ -0,0 +1,13 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + +#include "ModuleBase_IViewWindow.h" + +ModuleBase_IViewWindow::ModuleBase_IViewWindow() +{ + +} + +ModuleBase_IViewWindow::~ModuleBase_IViewWindow() +{ + +} diff --git a/src/ModuleBase/ModuleBase_IViewWindow.h b/src/ModuleBase/ModuleBase_IViewWindow.h index 756baa64a..597d884a3 100644 --- a/src/ModuleBase/ModuleBase_IViewWindow.h +++ b/src/ModuleBase/ModuleBase_IViewWindow.h @@ -1,20 +1,26 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D - - #ifndef ModuleBase_IViewWindow_H #define ModuleBase_IViewWindow_H +#include "ModuleBase.h" + #include +class QWidget; /** * \ingroup GUI * Interface to ViewWindow object which contains 3d scene */ -class ModuleBase_IViewWindow +class MODULEBASE_EXPORT ModuleBase_IViewWindow { public: + /// Default constructor + ModuleBase_IViewWindow(); + /// Virtual destructor + virtual ~ModuleBase_IViewWindow(); + /// Returns OCCT object which contains 3d view object virtual Handle(V3d_View) v3dView() const = 0; diff --git a/src/ModuleBase/ModuleBase_IViewer.cpp b/src/ModuleBase/ModuleBase_IViewer.cpp new file mode 100644 index 000000000..ca7e4619a --- /dev/null +++ b/src/ModuleBase/ModuleBase_IViewer.cpp @@ -0,0 +1,8 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + +#include "ModuleBase_IViewer.h" + +ModuleBase_IViewer::ModuleBase_IViewer(QObject* theParent) : QObject(theParent) +{ + +} diff --git a/src/ModuleBase/ModuleBase_IViewer.h b/src/ModuleBase/ModuleBase_IViewer.h index 3e557504a..b4c37edd5 100644 --- a/src/ModuleBase/ModuleBase_IViewer.h +++ b/src/ModuleBase/ModuleBase_IViewer.h @@ -25,10 +25,7 @@ Q_OBJECT public: /// Constructor /// \param theParent a parent object - ModuleBase_IViewer(QObject* theParent) - : QObject(theParent) - { - } + ModuleBase_IViewer(QObject* theParent); //! Returns AIS_InteractiveContext from current OCCViewer virtual Handle(AIS_InteractiveContext) AISContext() const = 0; diff --git a/src/ModuleBase/ModuleBase_IWorkshop.cpp b/src/ModuleBase/ModuleBase_IWorkshop.cpp index 6105bf263..60d1d5fd1 100644 --- a/src/ModuleBase/ModuleBase_IWorkshop.cpp +++ b/src/ModuleBase/ModuleBase_IWorkshop.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: ModuleBase_ModelWidget.h +// File: ModuleBase_IWorkshop.cpp // Created: 25 Apr 2014 // Author: Natalia ERMOLAEVA diff --git a/src/ModuleBase/ModuleBase_ModelWidget.cpp b/src/ModuleBase/ModuleBase_ModelWidget.cpp index f3818ed52..057b2936c 100644 --- a/src/ModuleBase/ModuleBase_ModelWidget.cpp +++ b/src/ModuleBase/ModuleBase_ModelWidget.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: ModuleBase_ModelWidget.h +// File: ModuleBase_ModelWidget.cpp // Created: 25 Apr 2014 // Author: Natalia ERMOLAEVA diff --git a/src/ModuleBase/ModuleBase_ParamSpinBox.cpp b/src/ModuleBase/ModuleBase_ParamSpinBox.cpp index 82e5757e5..8b09ac9fe 100644 --- a/src/ModuleBase/ModuleBase_ParamSpinBox.cpp +++ b/src/ModuleBase/ModuleBase_ParamSpinBox.cpp @@ -73,6 +73,7 @@ void ModuleBase_ParamSpinBox::connectSignalsAndSlots() */ void ModuleBase_ParamSpinBox::onTextChanged(const QString& text) { + ModuleBase_DoubleSpinBox::onTextChanged(text); myTextValue = text; } diff --git a/src/ModuleBase/ModuleBase_ParamSpinBox.h b/src/ModuleBase/ModuleBase_ParamSpinBox.h index 46af29092..3feafb780 100644 --- a/src/ModuleBase/ModuleBase_ParamSpinBox.h +++ b/src/ModuleBase/ModuleBase_ParamSpinBox.h @@ -49,7 +49,7 @@ public: virtual void showEvent(QShowEvent*); protected slots: - void onTextChanged(const QString&); + virtual void onTextChanged(const QString&); private: void connectSignalsAndSlots(); diff --git a/src/ModuleBase/ModuleBase_ViewerPrs.cpp b/src/ModuleBase/ModuleBase_ViewerPrs.cpp new file mode 100644 index 000000000..c515e2b4b --- /dev/null +++ b/src/ModuleBase/ModuleBase_ViewerPrs.cpp @@ -0,0 +1,27 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + +// File: ModuleBase_ViewerPrs.cpp +// Created: 20 Apr 2014 +// Author: Natalia ERMOLAEVA + +#include "ModuleBase_ViewerPrs.h" + +ModuleBase_ViewerPrs::ModuleBase_ViewerPrs() +{ + +} + +ModuleBase_ViewerPrs::ModuleBase_ViewerPrs(ObjectPtr theResult, + const TopoDS_Shape& theShape, + Handle_SelectMgr_EntityOwner theOwner) +: myResult(theResult), + myShape(theShape), + myOwner(theOwner) +{ + +} + +ModuleBase_ViewerPrs::~ModuleBase_ViewerPrs() +{ + +} diff --git a/src/ModuleBase/ModuleBase_ViewerPrs.h b/src/ModuleBase/ModuleBase_ViewerPrs.h index ebc274981..419447edb 100644 --- a/src/ModuleBase/ModuleBase_ViewerPrs.h +++ b/src/ModuleBase/ModuleBase_ViewerPrs.h @@ -20,30 +20,21 @@ * \ingroup GUI * \brief Presentation. Provides container to have feature, shape and/or selection owner. */ -class ModuleBase_ViewerPrs +class MODULEBASE_EXPORT ModuleBase_ViewerPrs { public: /// Constructor - ModuleBase_ViewerPrs() - { - } + ModuleBase_ViewerPrs(); /// Constructor /// \param theResult an object /// \param theShape a viewer shape /// \param theOwner a selection owner ModuleBase_ViewerPrs(ObjectPtr theResult, const TopoDS_Shape& theShape, - Handle_SelectMgr_EntityOwner theOwner) - : myResult(theResult), - myShape(theShape), - myOwner(theOwner) - { - } + Handle_SelectMgr_EntityOwner theOwner); /// Destructor - virtual ~ModuleBase_ViewerPrs() - { - } + virtual ~ModuleBase_ViewerPrs(); /// Sets the object. /// \param theResult an object instance diff --git a/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp b/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp index a019404f5..854a93a48 100644 --- a/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp +++ b/src/ModuleBase/ModuleBase_WidgetBoolValue.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: ModuleBase_Widgets.h +// File: ModuleBase_WidgetBoolValue.cpp // Created: 04 June 2014 // Author: Vitaly Smetannikov diff --git a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp index 230f49220..ba196af65 100644 --- a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp +++ b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: ModuleBase_Widgets.h +// File: ModuleBase_WidgetDoubleValue.cpp // Created: 04 June 2014 // Author: Vitaly Smetannikov diff --git a/src/ModuleBase/ModuleBase_WidgetIntValue.cpp b/src/ModuleBase/ModuleBase_WidgetIntValue.cpp index a0daa7124..45f3e7d94 100644 --- a/src/ModuleBase/ModuleBase_WidgetIntValue.cpp +++ b/src/ModuleBase/ModuleBase_WidgetIntValue.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: ModuleBase_Widgets.h +// File: ModuleBase_WidgetIntValue.cpp // Created: 04 June 2014 // Author: Vitaly Smetannikov diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.cpp b/src/ModuleBase/ModuleBase_WidgetSelector.cpp index f720767df..e2233ab7c 100755 --- a/src/ModuleBase/ModuleBase_WidgetSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetSelector.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: ModuleBase_WidgetSelector.h +// File: ModuleBase_WidgetSelector.cpp // Created: 19 June 2015 // Author: Natalia ERMOLAEVA diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp index 0064bcec1..a69708094 100644 --- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: ModuleBase_WidgetShapeSelector.h +// File: ModuleBase_WidgetShapeSelector.cpp // Created: 2 June 2014 // Author: Vitaly Smetannikov diff --git a/src/PartSet/CMakeLists.txt b/src/PartSet/CMakeLists.txt index 47ba5390a..eabe491f0 100644 --- a/src/PartSet/CMakeLists.txt +++ b/src/PartSet/CMakeLists.txt @@ -55,6 +55,7 @@ SET(PROJECT_SOURCES PartSet_MenuMgr.cpp PartSet_DocumentDataModel.cpp PartSet_PartDataModel.cpp + PartSet_DataTreeModel.cpp PartSet_WidgetSketchCreator.cpp PartSet_TopDataModel.cpp ) diff --git a/src/PartSet/PartSet_DataTreeModel.cpp b/src/PartSet/PartSet_DataTreeModel.cpp new file mode 100644 index 000000000..2c433f78b --- /dev/null +++ b/src/PartSet/PartSet_DataTreeModel.cpp @@ -0,0 +1,21 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> + +#include "PartSet_DataTreeModel.h" + +PartSet_FeaturesModel::PartSet_FeaturesModel(QObject* theParent) +: QAbstractItemModel(theParent), + myItemsColor(Qt::black) +{ + +} + +PartSet_PartModel::PartSet_PartModel(QObject* theParent) +: PartSet_FeaturesModel(theParent) +{ + +} + +PartSet_PartModel::~PartSet_PartModel() +{ + myPart = FeaturePtr(); +} diff --git a/src/PartSet/PartSet_DataTreeModel.h b/src/PartSet/PartSet_DataTreeModel.h index 0e45f4555..0fa8f6380 100644 --- a/src/PartSet/PartSet_DataTreeModel.h +++ b/src/PartSet/PartSet_DataTreeModel.h @@ -22,11 +22,7 @@ class PARTSET_EXPORT PartSet_FeaturesModel : public QAbstractItemModel public: /// Constructor /// \param theParent a parent object - PartSet_FeaturesModel(QObject* theParent) - : QAbstractItemModel(theParent), - myItemsColor(Qt::black) - { - } + PartSet_FeaturesModel(QObject* theParent); //! Returns Feature object by the given Model index. //! Returns 0 if the given index is not index of a feature @@ -70,14 +66,9 @@ class PartSet_PartModel : public PartSet_FeaturesModel public: /// Constructor /// \param theParent a parent object - PartSet_PartModel(QObject* theParent) - : PartSet_FeaturesModel(theParent) - { - } - ~PartSet_PartModel() - { - myPart = FeaturePtr(); - } + PartSet_PartModel(QObject* theParent); + /// Destructor + ~PartSet_PartModel(); /// Set part id /// \param theId a new id diff --git a/src/PartSet/PartSet_Tools.cpp b/src/PartSet/PartSet_Tools.cpp index 33e7601a8..b883dda35 100644 --- a/src/PartSet/PartSet_Tools.cpp +++ b/src/PartSet/PartSet_Tools.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: PartSet_Tools.h +// File: PartSet_Tools.cpp // Created: 28 Apr 2014 // Author: Natalia ERMOLAEVA diff --git a/src/PartSet/PartSet_WidgetPoint2dAngle.cpp b/src/PartSet/PartSet_WidgetPoint2dAngle.cpp index 06e9b4386..86c4def18 100644 --- a/src/PartSet/PartSet_WidgetPoint2dAngle.cpp +++ b/src/PartSet/PartSet_WidgetPoint2dAngle.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: PartSet_WidgetPoint2dAngle.h +// File: PartSet_WidgetPoint2dAngle.cpp // Created: 23 June 2014 // Author: Vitaly Smetannikov diff --git a/src/PartSet/PartSet_WidgetPoint2dDistance.cpp b/src/PartSet/PartSet_WidgetPoint2dDistance.cpp index c573499fb..ee59d8aee 100644 --- a/src/PartSet/PartSet_WidgetPoint2dDistance.cpp +++ b/src/PartSet/PartSet_WidgetPoint2dDistance.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: PartSet_WidgetPoint2dDistance.h +// File: PartSet_WidgetPoint2dDistance.cpp // Created: 23 June 2014 // Author: Vitaly Smetannikov diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt index 16c4488bc..0c49b56a9 100644 --- a/src/SketchPlugin/CMakeLists.txt +++ b/src/SketchPlugin/CMakeLists.txt @@ -44,6 +44,7 @@ SET(PROJECT_SOURCES SketchPlugin_Point.cpp SketchPlugin_Circle.cpp SketchPlugin_Arc.cpp + SketchPlugin_Constraint.cpp SketchPlugin_ConstraintBase.cpp SketchPlugin_ConstraintCoincidence.cpp SketchPlugin_ConstraintDistance.cpp diff --git a/src/SketchPlugin/SketchPlugin_Constraint.cpp b/src/SketchPlugin/SketchPlugin_Constraint.cpp new file mode 100644 index 000000000..c3d2d0093 --- /dev/null +++ b/src/SketchPlugin/SketchPlugin_Constraint.cpp @@ -0,0 +1,12 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> + +// File: SketchPlugin_Constraint.cpp +// Created: 08 May 2014 +// Author: Artem ZHIDKOV + +#include "SketchPlugin_Constraint.h" + +SketchPlugin_Constraint::SketchPlugin_Constraint() +{ + +} diff --git a/src/SketchPlugin/SketchPlugin_Constraint.h b/src/SketchPlugin/SketchPlugin_Constraint.h index 49f98b0cf..dc4a228cb 100644 --- a/src/SketchPlugin/SketchPlugin_Constraint.h +++ b/src/SketchPlugin/SketchPlugin_Constraint.h @@ -79,9 +79,7 @@ class SketchPlugin_Constraint : public SketchPlugin_Feature protected: /// \brief Use plugin manager for features creation - SketchPlugin_Constraint() - { - } + SketchPlugin_Constraint(); }; typedef std::shared_ptr ConstraintPtr; diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt index 4da2ebeda..494759b76 100644 --- a/src/XGUI/CMakeLists.txt +++ b/src/XGUI/CMakeLists.txt @@ -42,6 +42,7 @@ SET(PROJECT_SOURCES XGUI_OperationMgr.cpp XGUI_PropertyPanel.cpp XGUI_QtEvents.cpp + XGUI_SalomeConnector.cpp XGUI_Selection.cpp XGUI_SelectionMgr.cpp XGUI_Tools.cpp diff --git a/src/XGUI/XGUI_OperationMgr.cpp b/src/XGUI/XGUI_OperationMgr.cpp index a18777890..4cf7f3b85 100644 --- a/src/XGUI/XGUI_OperationMgr.cpp +++ b/src/XGUI/XGUI_OperationMgr.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> -// File: XGUI_OperationMgr.h +// File: XGUI_OperationMgr.cpp // Created: 20 Apr 2014 // Author: Natalia ERMOLAEVA diff --git a/src/XGUI/XGUI_SalomeConnector.cpp b/src/XGUI/XGUI_SalomeConnector.cpp new file mode 100644 index 000000000..8ae4e3ea4 --- /dev/null +++ b/src/XGUI/XGUI_SalomeConnector.cpp @@ -0,0 +1,13 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> + +#include "XGUI_SalomeConnector.h" + +XGUI_SalomeConnector::XGUI_SalomeConnector() +{ + +} + +XGUI_SalomeConnector::~XGUI_SalomeConnector() +{ + +} diff --git a/src/XGUI/XGUI_SalomeConnector.h b/src/XGUI/XGUI_SalomeConnector.h index 312342e14..a7dd901c3 100644 --- a/src/XGUI/XGUI_SalomeConnector.h +++ b/src/XGUI/XGUI_SalomeConnector.h @@ -21,6 +21,11 @@ class ModuleBase_IViewer; class XGUI_EXPORT XGUI_SalomeConnector { public: + /// Default constructor + XGUI_SalomeConnector(); + /// Virtual destructor + virtual ~XGUI_SalomeConnector(); + //! Creates a feature (command) in SALOME desktop //! \param theWBName - a workbench name //! \param theId - an id of the feature