From 00aeb34df6e4b2c7c03dc07ba85a1596f0f9eb9e Mon Sep 17 00:00:00 2001
From: Valerio Mariani <mariva00@kb-mdmg1059-02.pz.unibas.ch>
Date: Wed, 13 Oct 2010 18:24:28 +0200
Subject: [PATCH] Ost script update/exported GetVerbosityLevel

Changed the behaviour of the ost command line executable.
Exported the GetVerbosityLevel function (formerly GetLogLevel)
---
 .gitignore                                     | 1 +
 modules/base/pymod/export_logger.cc            | 7 +++++++
 modules/base/src/log.hh                        | 4 ++--
 modules/io/src/img/map_io_mrc_handler.cc       | 4 ++--
 modules/io/src/img/map_io_nanoscope_handler.cc | 2 +-
 modules/io/src/img/map_io_tiff_handler.cc      | 4 ++--
 modules/mol/base/src/impl/entity_impl.cc       | 2 +-
 scripts/init_cl.py                             | 3 +--
 scripts/ost.in                                 | 4 +++-
 9 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 61a799332..39dc00e85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ CPackConfig.cmake
 CPackSourceConfig.cmake
 deployment/macos/DNG.app
 deployment/macos/standalone
+ChemLib
diff --git a/modules/base/pymod/export_logger.cc b/modules/base/pymod/export_logger.cc
index 4c2b79b20..d0b080022 100644
--- a/modules/base/pymod/export_logger.cc
+++ b/modules/base/pymod/export_logger.cc
@@ -60,6 +60,12 @@ void pop_verb()
   Logger::Instance().PopVerbosityLevel();
 }
 
+int get_verb()
+{
+  return Logger::Instance().GetVerbosityLevel();
+}
+
+
 void push_log_sink(LogSinkPtr sink)
 {
   Logger::Instance().PushSink(sink);
@@ -105,6 +111,7 @@ void export_Logger()
 
   def("PushVerbosityLevel",push_verb);
   def("PopVerbosityLevel",pop_verb);
+  def("GetVerbosityLevel",get_verb);
   def("PushLogSink",push_log_sink);
   def("PopLogSink",pop_log_sink);
   def("LogError",log_error);
diff --git a/modules/base/src/log.hh b/modules/base/src/log.hh
index b535346f3..4b129767d 100644
--- a/modules/base/src/log.hh
+++ b/modules/base/src/log.hh
@@ -52,7 +52,7 @@ public:
 
   static Logger& Instance();
   LogSinkPtr GetCurrentSink() { return sink_stack_.top(); }
-  int GetLogLevel() const {return level_;}
+  int GetVerbosityLevel() const {return level_;}
   
   void ResetSinks() {
     while (sink_stack_.size()>1) {
@@ -71,7 +71,7 @@ private:
 };
 
 
-#define OST_DO_LOGGING_(m, l) if (::ost::Logger::Instance().GetLogLevel()>=l) {\
+#define OST_DO_LOGGING_(m, l) if (::ost::Logger::Instance().GetVerbosityLevel()>=l) {\
     std::stringstream tmp_s__;                                                 \
     tmp_s__ << m << std::endl;                                                 \
     ::ost::Logger::Instance().GetCurrentSink()->LogMessage(tmp_s__.str(), l);  \
diff --git a/modules/io/src/img/map_io_mrc_handler.cc b/modules/io/src/img/map_io_mrc_handler.cc
index aa4a1cf40..f5e5d1dc7 100644
--- a/modules/io/src/img/map_io_mrc_handler.cc
+++ b/modules/io/src/img/map_io_mrc_handler.cc
@@ -775,7 +775,7 @@ void import_helper(img::MapHandle& image, std::istream& in,const MRC& formatmrc)
   f >> header;
   if(header.mode==5) header.mode=0;
 
-  if(Logger::Instance().GetLogLevel()>=4) {
+  if(Logger::Instance().GetVerbosityLevel()>=4) {
     header.Print();
   }
   if(header.mode==3 || header.mode==4) {
@@ -864,7 +864,7 @@ void export_helper(const img::MapHandle& image,
       throw(IOException("MRC/CCP4 export: full complex export not supported."));
     }
   }
-  if(Logger::Instance().GetLogLevel()>=4) {
+  if(Logger::Instance().GetVerbosityLevel()>=4) {
     header.Print();
   }
 }
diff --git a/modules/io/src/img/map_io_nanoscope_handler.cc b/modules/io/src/img/map_io_nanoscope_handler.cc
index a18a25c56..1ade5a6f0 100644
--- a/modules/io/src/img/map_io_nanoscope_handler.cc
+++ b/modules/io/src/img/map_io_nanoscope_handler.cc
@@ -178,7 +178,7 @@ void header_filler(NHeader& h, std::istream& in, int inum)
 
 void print_header (const NHeader& header, int inum)
 {
-  if(Logger::Instance().GetLogLevel()>2) {
+  if(Logger::Instance().GetVerbosityLevel()>2) {
     LOG_INFO("io_nanoscope: header dump for image " << inum);
     LOG_INFO(" px      : " << header.px);
     LOG_INFO(" py      : " << header.py);
diff --git a/modules/io/src/img/map_io_tiff_handler.cc b/modules/io/src/img/map_io_tiff_handler.cc
index a4c3fd191..b80256d0f 100644
--- a/modules/io/src/img/map_io_tiff_handler.cc
+++ b/modules/io/src/img/map_io_tiff_handler.cc
@@ -450,7 +450,7 @@ TIFF* MapIOTiffHandler::open_subimage_file(const boost::filesystem::path& locati
   if(directory_number>0) {
     TIFFSetDirectory(tfile,directory_number);
   }
-  if(Logger::Instance().GetLogLevel()>=5) {
+  if(Logger::Instance().GetVerbosityLevel()>=5) {
     TIFFPrintDirectory(tfile,stderr,directory_number);
   }
   return tfile;
@@ -481,7 +481,7 @@ TIFF* MapIOTiffHandler::open_subimage_stream(std::istream& location,const TIF& f
   if(directory_number>0) {
     TIFFSetDirectory(tfile,directory_number);
   }
-  if(Logger::Instance().GetLogLevel()>=5) {
+  if(Logger::Instance().GetVerbosityLevel()>=5) {
     TIFFPrintDirectory(tfile,stderr,directory_number);
   }
   return tfile;
diff --git a/modules/mol/base/src/impl/entity_impl.cc b/modules/mol/base/src/impl/entity_impl.cc
index f2e4a3a00..7a3144aaa 100644
--- a/modules/mol/base/src/impl/entity_impl.cc
+++ b/modules/mol/base/src/impl/entity_impl.cc
@@ -707,7 +707,7 @@ void EntityImpl::UpdateFromXCS()
     TraceDirectionality();
   }
 
-  if(Logger::Instance().GetLogLevel()>Logger::DEBUG) {
+  if(Logger::Instance().GetVerbosityLevel()>Logger::DEBUG) {
     LOG_TRACE("dumping directionality");
     for(AtomImplMap::iterator it=atom_map_.begin();it!=atom_map_.end();++it) {
       LOG_TRACE(" " << it->second << ":");
diff --git a/scripts/init_cl.py b/scripts/init_cl.py
index 971b6ea1e..fba11d8ad 100644
--- a/scripts/init_cl.py
+++ b/scripts/init_cl.py
@@ -16,10 +16,9 @@ class OstOptionParser(optparse.OptionParser):
     optparse.OptionParser.__init__(self, **kwargs)
   def exit(self, status_code, error_message):
     print error_message,
-    QtGui.QApplication.instance().exit()
     sys.exit(-1)
 
-parser=OstOptionParser(usage=usage,conflict_handler="resolve")
+parser=OstOptionParser(usage=usage,conflict_handler="resolve", prog='ost''')
 parser.add_option("-i", "--interactive", action="callback", callback=interactive_flag, help="start interpreter interactively (must be first parameter, ignored otherwise)")
 parser.add_option("-h", "--help", action="callback", callback=show_help, help="show this help message and exit")
 parser.add_option("-v", "--verbosity_level", action="store", type="int", dest="vlevel", default=2, help="sets the verbosity level [default: %default]")
diff --git a/scripts/ost.in b/scripts/ost.in
index 17b9ba416..16dc67387 100755
--- a/scripts/ost.in
+++ b/scripts/ost.in
@@ -70,8 +70,10 @@ else
   if [ $1 == "-i" ] ;then
     interactive="-i"
   fi
+  if [ $1 == "-v" ] ;then
+    interactive="-i"
+  fi
 fi
-
 # finally pass control to python instance
 IFS="#"
 exec $pyexec $interactive "$DNG_ROOT/@LIBDIR@/openstructure/init_cl.py" $opts
-- 
GitLab