Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Profile.h
diff --git
a/src/HYDROData/HYDROData_Profile.h
b/src/HYDROData/HYDROData_Profile.h
index 03339e1f52d851b229697bced5820d9612d6d526..198cb2411208435553bdcb8ad047f72cc0ddcb9e 100644
(file)
--- a/
src/HYDROData/HYDROData_Profile.h
+++ b/
src/HYDROData/HYDROData_Profile.h
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 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
// 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
@@
-24,14
+20,11
@@
#define HYDROData_Profile_HeaderFile
#include "HYDROData_Object.h"
#define HYDROData_Profile_HeaderFile
#include "HYDROData_Object.h"
-
#include "HYDROData_ProfileUZ.h"
#include "HYDROData_ProfileUZ.h"
-DEFINE_STANDARD_HANDLE(HYDROData_Profile, HYDROData_Object)
-
class gp_XYZ;
class OSD_File;
class gp_XYZ;
class OSD_File;
-class H
andle(HYDROData_Document)
;
+class H
YDROData_Document
;
/**\class HYDROData_Profile
* \brief Class that stores/retreives information about the profile.
/**\class HYDROData_Profile
* \brief Class that stores/retreives information about the profile.
@@
-57,7
+50,7
@@
protected:
};
public:
};
public:
- DEFINE_STANDARD_RTTI
(HYDROData_Profile
);
+ DEFINE_STANDARD_RTTI
EXT(HYDROData_Profile, HYDROData_Object
);
/**
* Returns the kind of this object. Must be redefined in all objects of known type.
/**
* Returns the kind of this object. Must be redefined in all objects of known type.
@@
-67,7
+60,8
@@
public:
/**
* Dump object to Python script representation.
*/
/**
* Dump object to Python script representation.
*/
- HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
+ HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath,
+ MapOfTreatedObjects& theTreatedObjects ) const;
/**
* Returns the top shape of the object.
/**
* Returns the top shape of the object.
@@
-91,12
+85,12
@@
public:
/**
* Returns default filling color for new profile.
*/
/**
* Returns default filling color for new profile.
*/
- HYDRODATA_EXPORT
static QColor DefaultFillingColor()
;
+ HYDRODATA_EXPORT
virtual QColor DefaultFillingColor() const
;
/**
* Returns default border color for new profile.
*/
/**
* Returns default border color for new profile.
*/
- HYDRODATA_EXPORT
static QColor DefaultBorderColor()
;
+ HYDRODATA_EXPORT
virtual QColor DefaultBorderColor() const
;
public:
public:
@@
-129,7
+123,8
@@
public:
* \param thePoint[out] profile first point
* \return true if point has been set
*/
* \param thePoint[out] profile first point
* \return true if point has been set
*/
- HYDRODATA_EXPORT bool GetLeftPoint( gp_XY& thePoint, bool IsConvertToGlobal = false ) const;
+ HYDRODATA_EXPORT bool GetLeftPoint( gp_XY& thePoint, bool IsConvertToGlobal = false,
+ bool CanUseDefault = false ) const;
/**
* Set last(right) point for profile.
/**
* Set last(right) point for profile.
@@
-142,8
+137,8
@@
public:
* \param thePoint[out] profile last point
* \return true if point has been set
*/
* \param thePoint[out] profile last point
* \return true if point has been set
*/
- HYDRODATA_EXPORT bool GetRightPoint( gp_XY& thePoint, bool IsConvertToGlobal = false
) const;
-
+ HYDRODATA_EXPORT bool GetRightPoint( gp_XY& thePoint, bool IsConvertToGlobal = false
,
+ bool CanUseDefault = false ) const;
/**
* Returns object which store parametric presentation of profile points.
/**
* Returns object which store parametric presentation of profile points.
@@
-189,7
+184,8
@@
public:
* Empty sequence is returned if first or last point was not set.
* \return profile points list
*/
* Empty sequence is returned if first or last point was not set.
* \return profile points list
*/
- HYDRODATA_EXPORT ProfilePoints GetProfilePoints( bool IsConvertToGlobal = false ) const;
+ HYDRODATA_EXPORT ProfilePoints GetProfilePoints( bool IsConvertToGlobal = false,
+ bool CanUseDefaultLeftRight = false ) const;
/**
/**
@@
-198,6
+194,12
@@
public:
*/
HYDRODATA_EXPORT ProfilePoint GetBottomPoint() const;
*/
HYDRODATA_EXPORT ProfilePoint GetBottomPoint() const;
+ /**
+ * Return profile middle point.
+ * \return non-parametric profile point
+ */
+ HYDRODATA_EXPORT ProfilePoint GetMiddlePoint( bool CanUseDefault ) const;
+
public:
// Public methods to work with files.
public:
// Public methods to work with files.
@@
-222,7
+224,8
@@
public:
*/
HYDRODATA_EXPORT static int ImportFromFile( const Handle(HYDROData_Document)& theDoc,
const TCollection_AsciiString& theFileName,
*/
HYDRODATA_EXPORT static int ImportFromFile( const Handle(HYDROData_Document)& theDoc,
const TCollection_AsciiString& theFileName,
- NCollection_Sequence<int>& theBadProfilesIds );
+ NCollection_Sequence<int>& theBadProfilesIds,
+ bool isToProject = true );
/**
* Imports Profile data from file.
/**
* Imports Profile data from file.
@@
-231,7
+234,8
@@
public:
* \return \c true if file has been successfully read
*/
HYDRODATA_EXPORT virtual bool ImportFromFile( const TCollection_AsciiString& theFileName,
* \return \c true if file has been successfully read
*/
HYDRODATA_EXPORT virtual bool ImportFromFile( const TCollection_AsciiString& theFileName,
- bool* theIsRead = 0 );
+ bool isToProject = true,
+ bool* isNotEmpty = 0 );
/**
* Imports Profile data from file.
/**
* Imports Profile data from file.
@@
-240,26
+244,19
@@
public:
* \return \c true if file has been successfully read
*/
HYDRODATA_EXPORT virtual bool ImportFromFile( OSD_File& theFile,
* \return \c true if file has been successfully read
*/
HYDRODATA_EXPORT virtual bool ImportFromFile( OSD_File& theFile,
- bool* theIsRead = 0 );
+ bool isToProject = true,
+ bool* isNotEmpty = 0 );
protected:
protected:
-
- /**
- * Returns default filling color for new object.
- */
- HYDRODATA_EXPORT virtual QColor getDefaultFillingColor() const;
-
- /**
- * Returns default border color for new object.
- */
- HYDRODATA_EXPORT virtual QColor getDefaultBorderColor() const;
-
/**
* Checks and if necessary create child 3D object.
* Reimplemented to prevent creation of 3D child object.
*/
HYDRODATA_EXPORT virtual void checkAndSetObject3D() {}
/**
* Checks and if necessary create child 3D object.
* Reimplemented to prevent creation of 3D child object.
*/
HYDRODATA_EXPORT virtual void checkAndSetObject3D() {}
+ TopoDS_Shape CreateProfileWire( bool canUseDefaultPoints ) const;
+
+ static void ProjectProfilePoints( ProfilePoints& thePoints );
protected:
protected: