juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 10:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to solve conflict with a3bd1b5 by adding id to PrintObject and using that as a hash key.

Browse Source
This commit is contained in:
Y. Sapir
2014-05-25 02:37:42 +03:00
parent 9247f21ff8
commit 19d18bdd84
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xs/src/Print.cpp
View File

@@ -73,9 +73,10 @@ REGISTER_CLASS(PrintRegion, "Print::Region");
#endif
PrintObject::PrintObject(Print* print, ModelObject* model_object,
PrintObject::PrintObject(Print* print, int id, ModelObject* model_object,
const BoundingBoxf3 &modobj_bbox)
: _print(print),
_id(id),
_model_object(model_object)
{
region_volumes.resize(this->_print->regions.size());
@@ -109,6 +110,12 @@ PrintObject::print()
return this->_print;
}
int
PrintObject::id()
{
return this->_id;
}
ModelObject*
PrintObject::model_object()
{
@@ -239,7 +246,8 @@ PrintObject*
Print::add_object(ModelObject *model_object,
const BoundingBoxf3 &modobj_bbox)
{
PrintObject *object = new PrintObject(this, model_object, modobj_bbox);
PrintObject *object = new PrintObject(this,
this->objects.size(), model_object, modobj_bbox);
objects.push_back(object);
return object;
}
@@ -253,7 +261,7 @@ Print::set_new_object(size_t idx, ModelObject *model_object,
PrintObjectPtrs::iterator old_it = this->objects.begin() + idx;
delete *old_it;
PrintObject *object = new PrintObject(this, model_object, modobj_bbox);
PrintObject *object = new PrintObject(this, idx, model_object, modobj_bbox);
this->objects[idx] = object;
return object;
}