Przeglądaj źródła

BUG: fix program to use exceptions to match new ctkDICOM api

Steve Pieper 15 lat temu
rodzic
commit
5ca7a4fb92
1 zmienionych plików z 11 dodań i 8 usunięć
  1. 11 8
      Applications/ctkDICOM/ctkDICOM.cpp

+ 11 - 8
Applications/ctkDICOM/ctkDICOM.cpp

@@ -49,18 +49,21 @@ int main(int argc, char** argv)
     }
 
   ctkDICOM myCTK;
-  if (!myCTK.openDatabase( datbaseFileName ))
-    {
-    std::cerr << "Error when opening the data base file: " << datbaseFileName
-              << " error: " << myCTK.GetLastError().toStdString();
+  try { myCTK.openDatabase( datbaseFileName ); }
+  catch (std::exception e)
+  {
+    std::cerr << "Database error:" << qPrintable(myCTK.GetLastError());
+    myCTK.closeDatabase();
     return EXIT_FAILURE;
-    }
-  if (!myCTK.initializeDatabase(datbaseScriptFileName))
-    {
+  }
+
+  try { myCTK.initializeDatabase(datbaseScriptFileName); }
+  catch (std::exception e)
+  {
     std::cerr << "Error when initializing the data base: " << datbaseScriptFileName
               << " error: " << myCTK.GetLastError().toStdString();
     return EXIT_FAILURE;
-    }
+  }
 
   ctkDICOMModel model;
   model.setDatabase(myCTK.database());