|
@@ -823,28 +823,16 @@ bool handlePool::result_readIgsFile(boostJsonObject *object_, QVTKRenderer *rend
|
|
*/
|
|
*/
|
|
bool handlePool::result_displayIgs(boostJsonObject *object_, QVTKRenderer *render_)
|
|
bool handlePool::result_displayIgs(boostJsonObject *object_, QVTKRenderer *render_)
|
|
{
|
|
{
|
|
- // GeometryManager *gm = NULL;
|
|
|
|
if(object_->rg_struct->filename.empty())return false;
|
|
if(object_->rg_struct->filename.empty())return false;
|
|
if(!qmapRender.contains(object_->proId)){
|
|
if(!qmapRender.contains(object_->proId)){
|
|
render_ = new QVTKRenderer();
|
|
render_ = new QVTKRenderer();
|
|
qmapRender.insert(object_->proId,render_);
|
|
qmapRender.insert(object_->proId,render_);
|
|
render_->init();
|
|
render_->init();
|
|
w->addTab(render_->GetWidget(),QString::fromStdString(object_->proId));
|
|
w->addTab(render_->GetWidget(),QString::fromStdString(object_->proId));
|
|
- //render_->widgetFlag = QVTKRenderer::WidgetModel::NoModel;
|
|
|
|
- //gm = new GeometryManager();
|
|
|
|
- // map_geomanager[object_->proId] = gm;
|
|
|
|
}else{
|
|
}else{
|
|
render_ = qmapRender[object_->proId];
|
|
render_ = qmapRender[object_->proId];
|
|
- //auto flag_ = render_->widgetFlag;
|
|
|
|
- //if(map_geomanager.contains(object_->proId)){
|
|
|
|
- // gm = map_geomanager.value(object_->proId);
|
|
|
|
- // delete gm;
|
|
|
|
- //gm = NULL;
|
|
|
|
- // }
|
|
|
|
render_->HideAllActors();
|
|
render_->HideAllActors();
|
|
render_->RemoveAllActors();
|
|
render_->RemoveAllActors();
|
|
- //gm = new GeometryManager();
|
|
|
|
- //map_geomanager[object_->proId] = gm;
|
|
|
|
}
|
|
}
|
|
GeometryManager *gm = new GeometryManager();
|
|
GeometryManager *gm = new GeometryManager();
|
|
bool f = gm->LoadData(QString::fromStdString(object_->rg_struct->filename));
|
|
bool f = gm->LoadData(QString::fromStdString(object_->rg_struct->filename));
|
|
@@ -854,7 +842,7 @@ bool handlePool::result_displayIgs(boostJsonObject *object_, QVTKRenderer *rende
|
|
}
|
|
}
|
|
|
|
|
|
send_picture(object_,render_);
|
|
send_picture(object_,render_);
|
|
- //delete gm;
|
|
|
|
|
|
+ delete gm;
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|