-// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023 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
{
if(!ap) return;
_ap = ap;
- SALOMEDSImpl_SObject so = _ap->GetSObject();
- _study = so.GetStudy();
}
SALOMEDSImpl_IParameters::~SALOMEDSImpl_IParameters()
v = _ap->GetStrArray(listName);
v.push_back(value);
_ap->SetStrArray(listName, v);
- return (v.size()-1);
+ return (int)(v.size()-1); //!< TODO: conversion from size_t to int
}
int SALOMEDSImpl_IParameters::nbValues(const std::string& listName)
if(!_ap) return -1;
if(!_ap->IsSet(listName, PT_STRARRAY)) return 0;
std::vector<std::string> v = _ap->GetStrArray(listName);
- return v.size();
+ return (int)v.size(); //!< TODO: conversion from size_t to int
}
std::vector<std::string> SALOMEDSImpl_IParameters::getValues(const std::string& listName)
if(!_ap) return "";
if(!_ap->IsSet(listName, PT_STRARRAY)) return "";
std::vector<std::string> v = _ap->GetStrArray(listName);
- if(index >= v.size()) return "";
+ if(index >= (int)v.size()) return "";
return v[index];
}
if(!_ap) return "";
if(!_ap->IsSet(entry, PT_STRARRAY)) return "";
std::vector<std::string> v = _ap->GetStrArray(entry);
- int length = v.size();
- for(int i = 0; i<length; i+=1) {
+ size_t length = v.size();
+ for(int i = 0; i<(int)length; i+=1) {
if(v[i] == parameterName) return v[i+1];
}
return "";
if(!_ap) return "";
if(!_ap->IsSet(entry, PT_STRARRAY)) return "";
std::vector<std::string> v = _ap->GetStrArray(entry);
- int length = v.size();
- for(int i = 0; i<length; i+=1) {
+ size_t length = v.size();
+ for(int i = 0; i<(int)length; i+=1) {
if(v[i] == _PT_ID_) return v[i+1];
}
return "";
if(!_ap) return v;
if(!_ap->IsSet(entry, PT_STRARRAY)) return v;
v = _ap->GetStrArray(entry);
- int length = v.size();
- for(int i = 0; i<length; i+=2) {
+ size_t length = v.size();
+ for(int i = 0; i<(int)length; i+=2) {
names.push_back(v[i]);
}
return names;
if(!_ap) return v;
if(!_ap->IsSet(entry, PT_STRARRAY)) return v;
v = _ap->GetStrArray(entry);
- int length = v.size();
- for(int i = 1; i<length; i+=2) {
+ size_t length = v.size();
+ for(int i = 1; i<(int)length; i+=2) {
values.push_back(v[i]);
}
return values;
{
if(!_ap) return -1;
if(!_ap->IsSet(entry, PT_STRARRAY)) return -1;
- return _ap->GetStrArray(entry).size()/2;
+ return int(_ap->GetStrArray(entry).size()/2); //!< TODO: conversion from size_t to int
}
std::vector<std::string> SALOMEDSImpl_IParameters::getEntries()
std::string SALOMEDSImpl_IParameters::decodeEntry(const std::string& entry)
{
- if(!_study) return entry;
- int pos = entry.rfind("_");
- if(pos < 0 || pos >= entry.size()) return entry;
+ size_t pos = entry.rfind("_");
+ if(pos >= entry.size()) return entry;
std::string compName(entry, 0, pos), compID, tail(entry, pos+1, entry.length()-1);
if(_compNames.find(compName) == _compNames.end()) {
- SALOMEDSImpl_SObject so = _study->FindComponent(compName);
+ SALOMEDSImpl_SObject so = SALOMEDSImpl_Study::GetStudyImpl( _ap->GetSObject().GetLabel() )->FindComponent(compName);
if(!so) return entry;
compID = so.GetID();
_compNames[compName] = compID;
std::vector<std::string> v = ip.getProperties();
if(v.size() > 0) {
dump += "#Set up visual properties:\n";
- for(int i = 0; i<v.size(); i++) {
+ for(int i = 0; i<(int)v.size(); i++) {//TODO: mismatch signed/unsigned
std::string prp = ip.getProperty(v[i]);
dump += "ipar.setProperty(\""+v[i]+"\", \""+prp+"\")\n";
}
v = ip.getLists();
if(v.size() > 0) {
dump += "#Set up lists:\n";
- for(int i = 0; i<v.size(); i++) {
+ for(int i = 0; i<(int)v.size(); i++) { //TODO: mismatch signed/unsigned
std::vector<std::string> lst = ip.getValues(v[i]);
dump += "# fill list "+v[i]+"\n";
- for(int j = 0; j < lst.size(); j++) {
- if (lst[j].find('\"') == -1)
+ for(int j = 0; j < (int)lst.size(); j++) { //TODO: mismatch signed/unsigned
+ if (lst[j].find('\"') == std::string::npos)
dump += "ipar.append(\""+v[i]+"\", \""+lst[j]+"\")\n";
else
dump += "ipar.append(\""+v[i]+"\", \"\"\""+lst[j]+"\"\"\")\n";
dump += shift +"import iparameters\n";
- dump += shift + "ipar = iparameters.IParameters(theStudy.GetModuleParameters(\""+anID+"\", \""+moduleName+"\", 1))\n\n";
+ dump += shift + "ipar = iparameters.IParameters(salome.myStudy.GetModuleParameters(\""+anID+"\", \""+moduleName+"\", 1))\n\n";
std::vector<std::string> v = ip.getProperties();
if(v.size() > 0) {
dump += shift +"#Set up visual properties:\n";
- for(int i = 0; i<v.size(); i++) {
+ for(int i = 0; i<(int)v.size(); i++) { //TODO: mismtach signed/unsigned
std::string prp = ip.getProperty(v[i]);
dump += shift +"ipar.setProperty(\""+v[i]+"\", \""+prp+"\")\n";
}
v = ip.getLists();
if(v.size() > 0) {
dump += shift +"#Set up lists:\n";
- for(int i = 0; i<v.size(); i++) {
+ for(int i = 0; i<(int)v.size(); i++) { //TODO: mismatch signed/unsigned
std::vector<std::string> lst = ip.getValues(v[i]);
dump += shift +"# fill list "+v[i]+"\n";
- for(int j = 0; j < lst.size(); j++)
+ for(int j = 0; j < (int)lst.size(); j++) //TODO: mismatch signed/unsigned
dump += shift +"ipar.append(\""+v[i]+"\", \""+lst[j]+"\")\n";
}
}
v = ip.getEntries();
if(v.size() > 0) {
dump += shift + "#Set up entries:\n";
- for(int i = 0; i<v.size(); i++) {
+ for(int i = 0; i<(int)v.size(); i++) { //TODO: mismatch signed/unsigned
std::vector<std::string> names = ip.getAllParameterNames(v[i]);
std::vector<std::string> values = ip.getAllParameterValues(v[i]);
std::string decodedEntry = ip.decodeEntry(v[i]);
if(!onlyId) {
dump += shift + "# set up entry " + v[i] +" ("+so_name+")" + " parameters" + "\n";
if(hasId) {
- int idIndex = std::distance(names.begin(), it);
+ int idIndex = (int)std::distance(names.begin(), it); //!< TODO: conversion from __int64 to int
dump += shift + "objId = " + values[idIndex] + "\n";
}
- for(int j = 0; j < names.size() && j < values.size(); j++) {
+ for(int j = 0; j < (int)names.size() && j < (int)values.size(); j++) { //TODO: mismtach siged/unsigned
if(names[j] == _PT_ID_) continue;
if(hasId)
dump += shift + "ipar.setParameter(" + "objId" + ", \"" + names[j] + "\", \"" + values[j] + "\")\n";