diff --git a/.gitignore b/.gitignore index 61a799332f832b9576f63dee29afc3fa3fc775c4..39dc00e851077898cd51a9efc2ad9c533355f325 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 4c2b79b20f3b95dcdf8f0576a3bd166c49916a37..d0b0800224b65da68a2082729e181e271d891389 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 b535346f3caeae6f56c2809d5453a0ca78ef3ff6..4b129767d7462b6c9e0ba5f8b3d4b5ca9e620a1b 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 aa4a1cf40be7817932edd7662357bb52722f6e73..f5e5d1dc7d7333db5acdf60678678bae507ac400 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 a18a25c56ee5d52050d3ae5637d0b978056836c6..1ade5a6f0e73f5b5103224d2ca63450bcab3797e 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 a4c3fd191312e5ec94caa4eb11a4dda00a97e2f4..b80256d0f7908ab9af8c23a04c5ce2253f222d91 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 f2e4a3a00134522347d4ea2928bac14c84f5eeaf..7a3144aaaf91a61ba7e8f640c9ba29e8a7cf2bc5 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 971b6ea1eff8ae1277a0e2fd93ddf1ac69d27407..fba11d8adb9fa5a6f6b9baca7905b9de55c028e5 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 17b9ba416ce2dbedad14dd288e48128ae1ec2ea9..16dc6738783ce6ef78dcf6c170feb30125a47261 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