Skip to content
Snippets Groups Projects
Commit b7690740 authored by Marco Biasini's avatar Marco Biasini
Browse files

make GUI compile

parent 87da4377
No related branches found
No related tags found
No related merge requests found
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <ost/io/io_manager.hh> #include <ost/io/io_manager.hh>
#include <ost/io/mol/pdb_reader.hh> #include <ost/io/mol/pdb_reader.hh>
#include <ost/io/mol/io_profile.hh>
#include <ost/io/mol/load_entity.hh> #include <ost/io/mol/load_entity.hh>
#include <ost/io/mol/load_surface.hh> #include <ost/io/mol/load_surface.hh>
#include <ost/io/mol/entity_io_pdb_handler.hh> #include <ost/io/mol/entity_io_pdb_handler.hh>
...@@ -252,8 +253,10 @@ gfx::GfxObjP FileLoader::TryLoadEntity(const QString& filename, io::EntityIOHand ...@@ -252,8 +253,10 @@ gfx::GfxObjP FileLoader::TryLoadEntity(const QString& filename, io::EntityIOHand
mol::XCSEditor xcs_lock=eh.EditXCS(mol::BUFFERED_EDIT); mol::XCSEditor xcs_lock=eh.EditXCS(mol::BUFFERED_EDIT);
handler->Import(eh,filename.toStdString()); handler->Import(eh,filename.toStdString());
if(handler->RequiresBuilder()) { if(handler->RequiresBuilder()) {
conop::BuilderP builder = conop::Conopology::Instance().GetBuilder(); io::IOProfile& prof = io::IOProfileRegistry::Instance().GetDefault();
conop::Conopology::Instance().ConnectAll(builder,eh,0); if (prof.processor) {
prof.processor->Process(eh);
}
} }
gfx::GfxObjP obj(new gfx::Entity(file_info.baseName().toStdString(), gfx::GfxObjP obj(new gfx::Entity(file_info.baseName().toStdString(),
eh, mol::Query(selection.toStdString()))); eh, mol::Query(selection.toStdString())));
...@@ -384,7 +387,6 @@ void FileLoader::LoadPDB(const QString& filename, const QString& selection) ...@@ -384,7 +387,6 @@ void FileLoader::LoadPDB(const QString& filename, const QString& selection)
{ {
io::PDBReader reader(filename.toStdString(), io::IOProfile()); io::PDBReader reader(filename.toStdString(), io::IOProfile());
QList<mol::EntityHandle> entities; QList<mol::EntityHandle> entities;
conop::BuilderP builder=conop::Conopology::Instance().GetBuilder("DEFAULT");
while (reader.HasNext()){ while (reader.HasNext()){
mol::EntityHandle ent=mol::CreateEntity(); mol::EntityHandle ent=mol::CreateEntity();
try { try {
...@@ -393,7 +395,10 @@ void FileLoader::LoadPDB(const QString& filename, const QString& selection) ...@@ -393,7 +395,10 @@ void FileLoader::LoadPDB(const QString& filename, const QString& selection)
LOG_ERROR(e.what()); LOG_ERROR(e.what());
continue; continue;
} }
conop::Conopology::Instance().ConnectAll(builder,ent,0); io::IOProfile& prof = io::IOProfileRegistry::Instance().GetDefault();
if (prof.processor) {
prof.processor->Process(ent);
}
entities.append(ent); entities.append(ent);
} }
QFileInfo file_info(filename); QFileInfo file_info(filename);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment