Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge multi-study removal branch.
[modules/smesh.git]
/
src
/
PluginUtils
/
GeomSelectionTools.h
diff --git
a/src/PluginUtils/GeomSelectionTools.h
b/src/PluginUtils/GeomSelectionTools.h
index d153a73adb5dbe94afd8bb4216eaca10f2ac9141..0fc4cbaf36910424fd7e9e40e1e8ee30aeda9898 100644
(file)
--- a/
src/PluginUtils/GeomSelectionTools.h
+++ b/
src/PluginUtils/GeomSelectionTools.h
@@
-1,9
+1,9
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// 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
//
// 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.
+// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-25,18
+25,10
@@
#ifndef _GEOMSELECTIONTOOLS_H_
#define _GEOMSELECTIONTOOLS_H_
#ifndef _GEOMSELECTIONTOOLS_H_
#define _GEOMSELECTIONTOOLS_H_
-#ifdef WIN32
-# ifdef GeomSelectionTools_EXPORTS
-# define GEOMSELECTIONTOOLS_EXPORT __declspec( dllexport )
-# else
-# define GEOMSELECTIONTOOLS_EXPORT __declspec( dllimport )
-# endif
-#else
-# define GEOMSELECTIONTOOLS_EXPORT
-#endif
+#include "SMESH_PluginUtils.h"
-#include
"SALOMEDSClient.hxx"
-#include
"SALOME_InteractiveObject.hxx"
+#include
<SALOMEDSClient.hxx>
+#include
<SALOME_InteractiveObject.hxx>
#include <SALOME_ListIO.hxx>
#include <SalomeApp_Application.h>
#include <SALOME_ListIO.hxx>
#include <SalomeApp_Application.h>
@@
-54,16
+46,12
@@
class LightApp_SelectionMgr;
*
*/
*
*/
-class
GEOMSELECTIONTOO
LS_EXPORT GeomSelectionTools
+class
PLUGINUTI
LS_EXPORT GeomSelectionTools
{
{
-private:
-
- _PTR(Study) myStudy;
-
public:
public:
- GeomSelectionTools(
_PTR(Study)
);
+ GeomSelectionTools();
static SalomeApp_Application* GetSalomeApplication();
static LightApp_SelectionMgr* selectionMgr();
SALOME_ListIO* getSelectedSalomeObjects();
static SalomeApp_Application* GetSalomeApplication();
static LightApp_SelectionMgr* selectionMgr();
SALOME_ListIO* getSelectedSalomeObjects();
@@
-75,7
+63,6
@@
public:
TopAbs_ShapeEnum getFirstSelectedShapeType();
TopAbs_ShapeEnum entryToShapeType(std::string );
GeomAbs_SurfaceType getFaceInformation(TopoDS_Shape);
TopAbs_ShapeEnum getFirstSelectedShapeType();
TopAbs_ShapeEnum entryToShapeType(std::string );
GeomAbs_SurfaceType getFaceInformation(TopoDS_Shape);
- _PTR(Study) getMyStudy();
};
//////////////////////////////////////////
};
//////////////////////////////////////////
@@
-84,7
+71,7
@@
public:
namespace PluginUtils
{
namespace PluginUtils
{
-
GEOMSELECTIONTOO
LS_EXPORT QString PrintDoubleValue( double, int = 16 );
+
PLUGINUTI
LS_EXPORT QString PrintDoubleValue( double, int = 16 );
};
#endif // _GEOMSELECTIONTOOLS_H_
};
#endif // _GEOMSELECTIONTOOLS_H_