Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e618e38
)
SMESHGUI_HypothesesUtils.* : replace STL classes (map, list, ...) by Qt classes...
author
mkr
<mkr@opencascade.com>
Fri, 11 Apr 2008 15:50:30 +0000
(15:50 +0000)
committer
mkr
<mkr@opencascade.com>
Fri, 11 Apr 2008 15:50:30 +0000
(15:50 +0000)
src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
patch
|
blob
|
history
diff --git
a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
index af86ea9cbb3c3db30c8b0975827597be6083114f..627d34e1725b4b4ac39d50fc8979df41e965de48 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
+++ b/
src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
@@
-44,9
+44,12
@@
#include <utilities.h>
// STL includes
#include <utilities.h>
// STL includes
-#include <map>
#include <string>
#include <string>
+// Qt includes
+#include <QMap>
+//#include <QList>
+
// Other includes
#ifdef WNT
#include <windows.h>
// Other includes
#ifdef WNT
#include <windows.h>
@@
-74,14
+77,15
@@
static int MYDEBUG = 0;
namespace SMESH
{
namespace SMESH
{
- typedef
std::m
ap<std::string,HypothesisData*> THypothesisDataMap;
+ typedef
QM
ap<std::string,HypothesisData*> THypothesisDataMap;
THypothesisDataMap myHypothesesMap;
THypothesisDataMap myAlgorithmsMap;
THypothesisDataMap myHypothesesMap;
THypothesisDataMap myAlgorithmsMap;
- typedef
std::m
ap<std::string,SMESHGUI_GenericHypothesisCreator*> THypCreatorMap;
+ typedef
QM
ap<std::string,SMESHGUI_GenericHypothesisCreator*> THypCreatorMap;
THypCreatorMap myHypCreatorMap;
std::list<HypothesesSet*> myListOfHypothesesSets;
THypCreatorMap myHypCreatorMap;
std::list<HypothesesSet*> myListOfHypothesesSets;
+ //QList<HypothesesSet*> myListOfHypothesesSets;
void processHypothesisStatus(const int theHypStatus,
SMESH::SMESH_Hypothesis_ptr theHyp,
void processHypothesisStatus(const int theHypStatus,
SMESH::SMESH_Hypothesis_ptr theHyp,
@@
-169,10
+173,8
@@
namespace SMESH
bool ok = reader.parse(source);
file.close();
if (ok) {
bool ok = reader.parse(source);
file.close();
if (ok) {
- myHypothesesMap.insert( aXmlHandler->myHypothesesMap.begin(),
- aXmlHandler->myHypothesesMap.end() );
- myAlgorithmsMap.insert( aXmlHandler->myAlgorithmsMap.begin(),
- aXmlHandler->myAlgorithmsMap.end() );
+ myHypothesesMap = QMap<std::string,HypothesisData*>( aXmlHandler->myHypothesesMap );
+ myAlgorithmsMap = QMap<std::string,HypothesisData*>( aXmlHandler->myAlgorithmsMap );
myListOfHypothesesSets.splice( myListOfHypothesesSets.begin(),
aXmlHandler->myListOfHypothesesSets );
}
myListOfHypothesesSets.splice( myListOfHypothesesSets.begin(),
aXmlHandler->myListOfHypothesesSets );
}
@@
-219,14
+221,14
@@
namespace SMESH
THypothesisDataMap::iterator anIter;
for ( anIter = pMap->begin(); anIter != pMap->end(); anIter++ )
{
THypothesisDataMap::iterator anIter;
for ( anIter = pMap->begin(); anIter != pMap->end(); anIter++ )
{
- HypothesisData* aData =
(*anIter).second
;
+ HypothesisData* aData =
anIter.value()
;
if ( ( theDim < 0 || aData->Dim.contains( theDim ) ) && aData->IsAux == isAux)
if (checkGeometry){
if (aData->IsNeedGeometry == isNeedGeometry)
if ( ( theDim < 0 || aData->Dim.contains( theDim ) ) && aData->IsAux == isAux)
if (checkGeometry){
if (aData->IsNeedGeometry == isNeedGeometry)
- aHypList.append(
((*anIter).first
).c_str());
+ aHypList.append(
anIter.key(
).c_str());
}
else
}
else
- aHypList.append(
((*anIter).first
).c_str());
+ aHypList.append(
anIter.key(
).c_str());
}
return aHypList;
}
}
return aHypList;
}
@@
-240,6
+242,7
@@
namespace SMESH
InitAvailableHypotheses();
std::list<HypothesesSet*>::iterator hypoSet = myListOfHypothesesSets.begin();
InitAvailableHypotheses();
std::list<HypothesesSet*>::iterator hypoSet = myListOfHypothesesSets.begin();
+ //QList<HypothesesSet*>::iterator hypoSet = myListOfHypothesesSets.begin();
for ( ; hypoSet != myListOfHypothesesSets.end(); ++hypoSet )
{
HypothesesSet* aSet = *hypoSet;
for ( ; hypoSet != myListOfHypothesesSets.end(); ++hypoSet )
{
HypothesesSet* aSet = *hypoSet;
@@
-254,6
+257,7
@@
namespace SMESH
HypothesesSet* GetHypothesesSet(const QString& theSetName)
{
std::list<HypothesesSet*>::iterator hypoSet = myListOfHypothesesSets.begin();
HypothesesSet* GetHypothesesSet(const QString& theSetName)
{
std::list<HypothesesSet*>::iterator hypoSet = myListOfHypothesesSets.begin();
+ //QList<HypothesesSet*>::iterator hypoSet = myListOfHypothesesSets.begin();
for ( ; hypoSet != myListOfHypothesesSets.end(); ++hypoSet )
{
HypothesesSet* aSet = *hypoSet;
for ( ; hypoSet != myListOfHypothesesSets.end(); ++hypoSet )
{
HypothesesSet* aSet = *hypoSet;
@@
-272,12
+276,12
@@
namespace SMESH
THypothesisDataMap::iterator type_data = myHypothesesMap.find(aHypType.toLatin1().data());
if (type_data != myHypothesesMap.end()) {
THypothesisDataMap::iterator type_data = myHypothesesMap.find(aHypType.toLatin1().data());
if (type_data != myHypothesesMap.end()) {
- aHypData = type_data
->second
;
+ aHypData = type_data
.value()
;
}
else {
type_data = myAlgorithmsMap.find(aHypType.toLatin1().data());
if (type_data != myAlgorithmsMap.end())
}
else {
type_data = myAlgorithmsMap.find(aHypType.toLatin1().data());
if (type_data != myAlgorithmsMap.end())
-
aHypData = type_data->second
;
+
aHypData = type_data.value()
;
}
return aHypData;
}
}
return aHypData;
}