From b51035eb51dab3c977c89f7218045acd67f65281 Mon Sep 17 00:00:00 2001
From: marco <marco@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Wed, 11 Aug 2010 11:27:28 +0000
Subject: [PATCH] catch exceptions thrown during PDB import
Fixes BZDNG-145
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2640 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/gui/src/file_loader.cc | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/modules/gui/src/file_loader.cc b/modules/gui/src/file_loader.cc
index c5d709d5d..40c819310 100644
--- a/modules/gui/src/file_loader.cc
+++ b/modules/gui/src/file_loader.cc
@@ -374,15 +374,19 @@ void FileLoader::LoadPDB(const QString& filename, const QString& selection)
conop::BuilderP builder=conop::Conopology::Instance().GetBuilder("DEFAULT");
while (reader.HasNext()){
mol::EntityHandle ent=mol::CreateEntity();
- reader.Import(ent);
+ try {
+ reader.Import(ent);
+ } catch (io::IOException &e) {
+ LOGN_ERROR(e.what());
+ continue;
+ }
conop::Conopology::Instance().ConnectAll(builder,ent,0);
entities.append(ent);
}
QFileInfo file_info(filename);
if(entities.empty()){
FileLoader::HandleError(Message(QString("No entities found in file: "+ filename).toStdString()),INFO,filename);
- }
- else if(entities.size()==1){
+ }else if (entities.size()==1){
gfx::EntityP gfx_ent(new gfx::Entity(file_info.baseName().toStdString(),entities.first(),mol::Query(selection.toStdString())));
try{
gfx::Scene::Instance().Add(gfx_ent);
@@ -393,9 +397,8 @@ void FileLoader::LoadPDB(const QString& filename, const QString& selection)
if (gfx::Scene::Instance().GetRootNode()->GetChildCount()==1) {
gfx::Scene::Instance().SetCenter(gfx_ent->GetCenter());
}
- }
- else{
- try{
+ } else {
+ try {
for(int i = 0 ; i<entities.size(); i++){
gfx::EntityP gfx_ent(new gfx::Entity(QString(file_info.baseName()+" ("+QString::number(i)+")").toStdString(),entities[i],mol::Query(selection.toStdString())));
gfx::Scene::Instance().Add(gfx_ent);
--
GitLab