From 2629161e642c78b86bc6ad55f6837c994d525601 Mon Sep 17 00:00:00 2001
From: Andreas Schenk <andreas_schenk@hms.harvard.edu>
Date: Mon, 18 Jun 2012 13:11:28 -0400
Subject: [PATCH] added python export for df3 io fixed default parameter for
mrc io
---
modules/io/pymod/export_map_io.cc | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/modules/io/pymod/export_map_io.cc b/modules/io/pymod/export_map_io.cc
index 641b99b42..4d49dad7f 100644
--- a/modules/io/pymod/export_map_io.cc
+++ b/modules/io/pymod/export_map_io.cc
@@ -17,6 +17,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//------------------------------------------------------------------------------
#include <boost/python.hpp>
+#include <ost/io/img/map_io_df3_handler.hh>
#include <ost/io/img/map_io_dx_handler.hh>
#include <ost/io/img/map_io_spi_handler.hh>
#include <ost/io/img/map_io_mrc_handler.hh>
@@ -92,6 +93,11 @@ void export_map_io()
.def("GetMaximum", &ImageFormatBase::GetMaximum)
.def("GetMinimum", &ImageFormatBase::GetMinimum)
;
+
+ class_<DF3, bases<ImageFormatBase> >("DF3", init<bool>(arg("normalize_on_save") = false))
+ .def("SetNormalizeOnSave", &DF3::SetNormalizeOnSave)
+ .def("GetNormalizeOnSave", &DF3::GetNormalizeOnSave)
+ ;
class_<DX, bases<ImageFormatBase> >("DX", init<bool>(arg("normalize_on_save") = false))
.def("SetNormalizeOnSave", &DX::SetNormalizeOnSave)
@@ -107,7 +113,7 @@ void export_map_io()
;
class_<MRC, bases<ImageFormatBase> >("MRC", init<bool,Subformat,Endianess>
- ((arg("normalize_on_save") = false,arg("subformat")=MRC_NEW_FORMAT,arg("endianess_on_save")=OST_LOCAL_ENDIAN)))
+ ((arg("normalize_on_save") = false,arg("subformat")=MRC_AUTO_FORMAT,arg("endianess_on_save")=OST_LOCAL_ENDIAN)))
.def("SetNormalizeOnSave", &MRC::SetNormalizeOnSave)
.def("GetNormalizeOnSave", &MRC::GetNormalizeOnSave)
.def("SetSubformat", &MRC::SetSubformat)
--
GitLab