From b3cb29dc1ac9e6f0ba1b00413332d76659d5f696 Mon Sep 17 00:00:00 2001
From: andreas <andreas@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Thu, 19 Aug 2010 16:15:23 +0000
Subject: [PATCH] cleanup of map io format ctors
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2660 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/io/src/img/map_io_df3_handler.cc | 4 ++--
modules/io/src/img/map_io_dx_handler.cc | 4 ++--
modules/io/src/img/map_io_mrc_handler.cc | 8 ++++----
modules/io/src/img/map_io_mrc_handler.hh | 1 -
modules/io/src/img/map_io_nanoscope_handler.cc | 4 ++--
modules/io/src/img/map_io_png_handler.cc | 4 ++--
modules/io/src/img/map_io_situs_handler.cc | 4 ++--
modules/io/src/img/map_io_spi_handler.cc | 6 +++---
8 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/modules/io/src/img/map_io_df3_handler.cc b/modules/io/src/img/map_io_df3_handler.cc
index e33e64f7a..b6f637eab 100644
--- a/modules/io/src/img/map_io_df3_handler.cc
+++ b/modules/io/src/img/map_io_df3_handler.cc
@@ -45,9 +45,9 @@ namespace ost { namespace io {
String DF3::FORMAT_STRING="defined_df3";
DF3::DF3(bool normalize_on_save):
- ImageFormatBase(FORMAT_STRING)
+ ImageFormatBase(FORMAT_STRING),
+ normalize_on_save_(normalize_on_save)
{
- normalize_on_save_ = normalize_on_save;
}
bool DF3::GetNormalizeOnSave() const
diff --git a/modules/io/src/img/map_io_dx_handler.cc b/modules/io/src/img/map_io_dx_handler.cc
index f8f38fad1..61b0a90e4 100644
--- a/modules/io/src/img/map_io_dx_handler.cc
+++ b/modules/io/src/img/map_io_dx_handler.cc
@@ -46,9 +46,9 @@ using boost::format;
String DX::FORMAT_STRING="defined_dx";
DX::DX (bool normalize_on_save):
- ImageFormatBase(FORMAT_STRING)
+ ImageFormatBase(FORMAT_STRING),
+ normalize_on_save_(normalize_on_save)
{
- normalize_on_save_ = normalize_on_save;
}
bool DX::GetNormalizeOnSave() const
diff --git a/modules/io/src/img/map_io_mrc_handler.cc b/modules/io/src/img/map_io_mrc_handler.cc
index d5ccdb9fd..d70a3b608 100644
--- a/modules/io/src/img/map_io_mrc_handler.cc
+++ b/modules/io/src/img/map_io_mrc_handler.cc
@@ -93,11 +93,11 @@ String MRC::FORMAT_STRING = "defined_mrc";
MRC::MRC(bool normalize_on_save, Subformat subformat,Endianess endianess_on_save):
- ImageFormatBase(FORMAT_STRING)
+ ImageFormatBase(FORMAT_STRING),
+ subformat_(subformat),
+ normalize_on_save_(normalize_on_save),
+ endianess_on_save_(endianess_on_save)
{
- normalize_on_save_ = normalize_on_save;
- subformat_ = subformat;
- endianess_on_save_ = endianess_on_save;
}
Endianess MRC::GetEndianessOnSave() const
diff --git a/modules/io/src/img/map_io_mrc_handler.hh b/modules/io/src/img/map_io_mrc_handler.hh
index 673fac913..b73aaf56e 100644
--- a/modules/io/src/img/map_io_mrc_handler.hh
+++ b/modules/io/src/img/map_io_mrc_handler.hh
@@ -46,7 +46,6 @@ class DLLEXPORT_OST_IO MRC: public ImageFormatBase
Subformat subformat_;
bool normalize_on_save_;
Endianess endianess_on_save_;
- Subformat subf_;
};
class DLLEXPORT_OST_IO CCP4: public MRC
diff --git a/modules/io/src/img/map_io_nanoscope_handler.cc b/modules/io/src/img/map_io_nanoscope_handler.cc
index 0019fa320..4571d7574 100644
--- a/modules/io/src/img/map_io_nanoscope_handler.cc
+++ b/modules/io/src/img/map_io_nanoscope_handler.cc
@@ -47,9 +47,9 @@ namespace ost { namespace io {
String Nanoscope::FORMAT_STRING = "defined_nanoscope";
Nanoscope::Nanoscope(int subimage):
- ImageFormatBase(FORMAT_STRING)
+ ImageFormatBase(FORMAT_STRING),
+ subimage_(subimage)
{
- subimage_ = subimage;
}
int Nanoscope::GetSubimage() const
diff --git a/modules/io/src/img/map_io_png_handler.cc b/modules/io/src/img/map_io_png_handler.cc
index 84b290d2e..9107953aa 100644
--- a/modules/io/src/img/map_io_png_handler.cc
+++ b/modules/io/src/img/map_io_png_handler.cc
@@ -46,9 +46,9 @@ namespace ost { namespace io {
String PNG::FORMAT_STRING="defined_png";
PNG::PNG(bool normalize_on_save):
- ImageFormatBase(FORMAT_STRING)
+ ImageFormatBase(FORMAT_STRING),
+ normalize_on_save_(normalize_on_save)
{
- normalize_on_save_ = normalize_on_save;
this->SetMinimum(0.0);
this->SetMaximum(255.0);
}
diff --git a/modules/io/src/img/map_io_situs_handler.cc b/modules/io/src/img/map_io_situs_handler.cc
index a7e12da30..2be72859b 100644
--- a/modules/io/src/img/map_io_situs_handler.cc
+++ b/modules/io/src/img/map_io_situs_handler.cc
@@ -46,9 +46,9 @@ namespace ost { namespace io {
String Situs::FORMAT_STRING="defined_situs";
Situs::Situs(bool normalize_on_save):
- ImageFormatBase(FORMAT_STRING)
+ ImageFormatBase(FORMAT_STRING),
+ normalize_on_save_(normalize_on_save)
{
- normalize_on_save_ = normalize_on_save;
}
bool Situs::GetNormalizeOnSave() const
diff --git a/modules/io/src/img/map_io_spi_handler.cc b/modules/io/src/img/map_io_spi_handler.cc
index 63b5e1e4c..9eaa89829 100644
--- a/modules/io/src/img/map_io_spi_handler.cc
+++ b/modules/io/src/img/map_io_spi_handler.cc
@@ -48,10 +48,10 @@ namespace ost { namespace io {
String Spider::FORMAT_STRING = "defined_spider";
Spider::Spider(bool normalize_on_save,Endianess endianness_on_save):
- ImageFormatBase(FORMAT_STRING)
+ ImageFormatBase(FORMAT_STRING),
+ normalize_on_save_(normalize_on_save),
+ endianness_on_save_(endianness_on_save)
{
- normalize_on_save_ = normalize_on_save;
- endianness_on_save_ = endianness_on_save;
}
Endianess Spider::GetEndianessOnSave() const
--
GitLab