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
Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_PriorityQueue.h
diff --git
a/src/HYDROData/HYDROData_PriorityQueue.h
b/src/HYDROData/HYDROData_PriorityQueue.h
index 3ca851b2791a4890935b0e5bc65f4f38439a364a..7983a1f783a0407a487d6f317dde205fbd5f92ab 100644
(file)
--- a/
src/HYDROData/HYDROData_PriorityQueue.h
+++ b/
src/HYDROData/HYDROData_PriorityQueue.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,7
+20,7
@@
#define HYDROData_PriorityQueue_HeaderFile
#include <QMap>
#define HYDROData_PriorityQueue_HeaderFile
#include <QMap>
-#include <HYDROData_
Object
.h>
+#include <HYDROData_
Entity
.h>
#include <HYDROData_Zone.h>
class HYDROData_CalculationCase;
#include <HYDROData_Zone.h>
class HYDROData_CalculationCase;
@@
-37,10
+33,10
@@
enum HYDROData_PriorityType
struct HYDROData_CustomRule
{
struct HYDROData_CustomRule
{
- Handle(HYDROData_
Object)
Object1;
- HYDROData_PriorityType
Priority;
- Handle(HYDROData_
Object)
Object2;
- HYDROData_Zone::Merge
Altitudes
Type MergeType;
+ Handle(HYDROData_
Entity)
Object1;
+ HYDROData_PriorityType Priority;
+ Handle(HYDROData_
Entity)
Object2;
+ HYDROData_Zone::MergeType MergeType;
};
typedef QList<HYDROData_CustomRule> HYDROData_ListOfRules;
};
typedef QList<HYDROData_CustomRule> HYDROData_ListOfRules;
@@
-48,22
+44,23
@@
typedef QList<HYDROData_CustomRule> HYDROData_ListOfRules;
class HYDROData_PriorityQueue
{
public:
class HYDROData_PriorityQueue
{
public:
- HYDROData_PriorityQueue( HYDROData_CalculationCase* );
+ HYDROData_PriorityQueue( HYDROData_CalculationCase* theCalcCase,
+ Standard_Integer aTag );
~HYDROData_PriorityQueue();
~HYDROData_PriorityQueue();
- Handle_HYDROData_
Object
GetMostPriorityObject( const QStringList& theZoneObjects,
- HYDROData_Zone::Merge
Altitudes
Type& theMergeType ) const;
+ Handle_HYDROData_
Entity
GetMostPriorityObject( const QStringList& theZoneObjects,
+ HYDROData_Zone::MergeType& theMergeType ) const;
- bool IsMorePriority( const Handle(HYDROData_
Object
)& theObj1,
- const Handle(HYDROData_
Object
)& theObj2,
- HYDROData_Zone::Merge
Altitudes
Type& theMergeType ) const;
+ bool IsMorePriority( const Handle(HYDROData_
Entity
)& theObj1,
+ const Handle(HYDROData_
Entity
)& theObj2,
+ HYDROData_Zone::MergeType& theMergeType ) const;
static void ClearRules( TDF_Label& theRulesLabel );
static void AddRule( TDF_Label& theRulesLabel,
static void ClearRules( TDF_Label& theRulesLabel );
static void AddRule( TDF_Label& theRulesLabel,
- const Handle(HYDROData_
Object
)& theObject1,
+ const Handle(HYDROData_
Entity
)& theObject1,
HYDROData_PriorityType thePriority,
HYDROData_PriorityType thePriority,
- const Handle(HYDROData_
Object
)& theObject2,
- HYDROData_Zone::Merge
Altitudes
Type theMergeType );
+ const Handle(HYDROData_
Entity
)& theObject2,
+ HYDROData_Zone::MergeType theMergeType );
static HYDROData_ListOfRules GetRules( const TDF_Label& theRulesLabel );
static QString DumpRules( const TDF_Label& theRulesLab );
static void DumpRulesToPython( const TDF_Label& theRulesLab,
static HYDROData_ListOfRules GetRules( const TDF_Label& theRulesLabel );
static QString DumpRules( const TDF_Label& theRulesLab );
static void DumpRulesToPython( const TDF_Label& theRulesLab,
@@
-71,16
+68,16
@@
public:
QStringList& theScript );
static bool GetRule( const TDF_Label& theRulesLab,
int theIndex,
QStringList& theScript );
static bool GetRule( const TDF_Label& theRulesLab,
int theIndex,
- Handle(HYDROData_
Object
)& theObject1,
+ Handle(HYDROData_
Entity
)& theObject1,
HYDROData_PriorityType& thePriority,
HYDROData_PriorityType& thePriority,
- Handle(HYDROData_
Object
)& theObject2,
- HYDROData_Zone::Merge
Altitudes
Type& theMergeType );
+ Handle(HYDROData_
Entity
)& theObject2,
+ HYDROData_Zone::MergeType& theMergeType );
private:
private:
- typedef QMap<QString, Handle(HYDROData_
Object
)> MapNameToObject;
+ typedef QMap<QString, Handle(HYDROData_
Entity
)> MapNameToObject;
- HYDROData_SequenceOfObjects my
Geom
Objects; ///< the ordered list of objects (default priority)
- MapNameToObject myNames;
///< the map of name to object
- HYDROData_ListOfRules myRules;
///< the list of rules
+ HYDROData_SequenceOfObjects myObjects; ///< the ordered list of objects (default priority)
+ MapNameToObject myNames; ///< the map of name to object
+ HYDROData_ListOfRules myRules; ///< the list of rules
};
#endif
};
#endif