ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 01:10:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with XAO import

Browse Source
This commit is contained in:
fps 2013-11-14 14:11:03 +00:00
parent 753d4af721
commit 2bcfa2c510
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
View File

@ -1263,7 +1263,7 @@ bool GEOMImpl_IInsertOperations::ImportXAO(const char* fileName,
{ {
XAO::Field* xaoField = xaoObject->getField(i); XAO::Field* xaoField = xaoObject->getField(i);
Handle(TColStd_HArray1OfExtendedString) components = new TColStd_HArray1OfExtendedString(0, xaoField->countComponents()); Handle(TColStd_HArray1OfExtendedString) components = new TColStd_HArray1OfExtendedString(0, xaoField->countComponents()-1);
for (int j = 0; j < xaoField->countComponents(); ++j) for (int j = 0; j < xaoField->countComponents(); ++j)
{ {
components->SetValue(j, (TCollection_ExtendedString)xaoField->getComponentName(j).c_str()); components->SetValue(j, (TCollection_ExtendedString)xaoField->getComponentName(j).c_str());
@ -1285,11 +1285,11 @@ bool GEOMImpl_IInsertOperations::ImportXAO(const char* fileName,
XAO::BooleanStep* bstep = bfield->getStep(j); XAO::BooleanStep* bstep = bfield->getStep(j);
Handle(GEOM_FieldStep) step = field->AddStep(bstep->getStep(), bstep->getStamp()); Handle(GEOM_FieldStep) step = field->AddStep(bstep->getStep(), bstep->getStamp());
Handle(TColStd_HArray1OfInteger) values = new TColStd_HArray1OfInteger(0, bstep->countValues()); Handle(TColStd_HArray1OfInteger) values = new TColStd_HArray1OfInteger(0, bstep->countValues()-1);
std::vector<bool> bvalues = bstep->getValues(); std::vector<bool> bvalues = bstep->getValues();
for (int k = 0; k < bstep->countValues(); ++k) for (int k = 0; k < bstep->countValues(); ++k)
{ {
values->SetValue(0, bvalues[k] ? 1 : 0); values->SetValue(k, bvalues[k] ? 1 : 0);
} }
step->SetValues(values); step->SetValues(values);
} }
@ -1303,11 +1303,11 @@ bool GEOMImpl_IInsertOperations::ImportXAO(const char* fileName,
XAO::IntegerStep* istep = ifield->getStep(j); XAO::IntegerStep* istep = ifield->getStep(j);
Handle(GEOM_FieldStep) step = field->AddStep(istep->getStep(), istep->getStamp()); Handle(GEOM_FieldStep) step = field->AddStep(istep->getStep(), istep->getStamp());
Handle(TColStd_HArray1OfInteger) values = new TColStd_HArray1OfInteger(0, istep->countValues()); Handle(TColStd_HArray1OfInteger) values = new TColStd_HArray1OfInteger(0, istep->countValues()-1);
std::vector<int> ivalues = istep->getValues(); std::vector<int> ivalues = istep->getValues();
for (int k = 0; k < istep->countValues(); ++k) for (int k = 0; k < istep->countValues(); ++k)
{ {
values->SetValue(0, ivalues[k]); values->SetValue(k, ivalues[k]);
} }
step->SetValues(values); step->SetValues(values);
} }
@ -1321,11 +1321,11 @@ bool GEOMImpl_IInsertOperations::ImportXAO(const char* fileName,
XAO::DoubleStep* dstep = dfield->getStep(j); XAO::DoubleStep* dstep = dfield->getStep(j);
Handle(GEOM_FieldStep) step = field->AddStep(dstep->getStep(), dstep->getStamp()); Handle(GEOM_FieldStep) step = field->AddStep(dstep->getStep(), dstep->getStamp());
Handle(TColStd_HArray1OfReal) values = new TColStd_HArray1OfReal(0, dstep->countValues()); Handle(TColStd_HArray1OfReal) values = new TColStd_HArray1OfReal(0, dstep->countValues()-1);
std::vector<double> dvalues = dstep->getValues(); std::vector<double> dvalues = dstep->getValues();
for (int k = 0; k < dstep->countValues(); ++k) for (int k = 0; k < dstep->countValues(); ++k)
{ {
values->SetValue(0, dvalues[k]); values->SetValue(k, dvalues[k]);
} }
step->SetValues(values); step->SetValues(values);
} }
@ -1339,11 +1339,11 @@ bool GEOMImpl_IInsertOperations::ImportXAO(const char* fileName,
XAO::StringStep* sstep = sfield->getStep(j); XAO::StringStep* sstep = sfield->getStep(j);
Handle(GEOM_FieldStep) step = field->AddStep(sstep->getStep(), sstep->getStamp()); Handle(GEOM_FieldStep) step = field->AddStep(sstep->getStep(), sstep->getStamp());
Handle(TColStd_HArray1OfExtendedString) values = new TColStd_HArray1OfExtendedString(0, sstep->countValues()); Handle(TColStd_HArray1OfExtendedString) values = new TColStd_HArray1OfExtendedString(0, sstep->countValues()-1);
std::vector<std::string> svalues = sstep->getValues(); std::vector<std::string> svalues = sstep->getValues();
for (int k = 0; k < sstep->countValues(); ++k) for (int k = 0; k < sstep->countValues(); ++k)
{ {
values->SetValue(0, TCollection_ExtendedString(svalues[k].c_str())); values->SetValue(k, TCollection_ExtendedString(svalues[k].c_str()));
} }
step->SetValues(values); step->SetValues(values);
} }
@ -1361,7 +1361,6 @@ bool GEOMImpl_IInsertOperations::ImportXAO(const char* fileName,
// list of sub shapes // list of sub shapes
pd << "["; pd << "[";
int nbSubshapes = subShapes->Length(); int nbSubshapes = subShapes->Length();
std::cout << "Nb SubShapes = " << nbSubshapes << std::endl;
if (nbSubshapes > 0) if (nbSubshapes > 0)
{ {
for (int i = 1; i <= nbSubshapes; i++) for (int i = 1; i <= nbSubshapes; i++)