diff --git a/src/attributes/GeoJSonAttributes.cc b/src/attributes/GeoJSonAttributes.cc index 2c3672dd..ab58f95b 100644 --- a/src/attributes/GeoJSonAttributes.cc +++ b/src/attributes/GeoJSonAttributes.cc @@ -30,7 +30,7 @@ GeoJSonAttributes::GeoJSonAttributes(): input_(ParameterManager::getString("geojson_input")), binning_resolution_(ParameterManager::getDouble("geojson_binning_grid_resolution")), value_(ParameterManager::getString("geojson_value_property")) - + { } @@ -54,7 +54,6 @@ void GeoJSonAttributes::set(const std::map& params) setAttribute(prefix, "geojson_binning_grid_resolution", binning_resolution_, params); setAttribute(prefix, "geojson_value_property", value_, params); - cout << value_ << endl; } diff --git a/src/attributes/GribDecoderAttributes.cc b/src/attributes/GribDecoderAttributes.cc index 3c567c1d..23385a67 100644 --- a/src/attributes/GribDecoderAttributes.cc +++ b/src/attributes/GribDecoderAttributes.cc @@ -41,13 +41,9 @@ GribDecoderAttributes::GribDecoderAttributes(): expver_(ParameterManager::getBool("grib_text_experiment")), units_(ParameterManager::getBool("grib_text_units")), field_position_(ParameterManager::getInt("grib_field_position")), - large_field_position_(ParameterManager::getULong("grib_field_large_position")), position_1_(ParameterManager::getInt("grib_wind_position_1")), position_2_(ParameterManager::getInt("grib_wind_position_2")), colour_position_(ParameterManager::getInt("grib_wind_position_colour")), - large_position_1_(ParameterManager::getULong("grib_wind_large_position_1")), - large_position_2_(ParameterManager::getULong("grib_wind_large_position_2")), - large_colour_position_(ParameterManager::getULong("grib_wind_large_position_colour")), missing_value_(ParameterManager::getDouble("grib_missing_value_indicator")), wind_style_(ParameterManager::getBool("grib_wind_style")) , @@ -87,13 +83,9 @@ void GribDecoderAttributes::set(const std::map& params) setAttribute(prefix, "grib_text_experiment", expver_, params); setAttribute(prefix, "grib_text_units", units_, params); setAttribute(prefix, "grib_field_position", field_position_, params); - setAttribute(prefix, "grib_field_large_position", large_field_position_, params); setAttribute(prefix, "grib_wind_position_1", position_1_, params); setAttribute(prefix, "grib_wind_position_2", position_2_, params); setAttribute(prefix, "grib_wind_position_colour", colour_position_, params); - setAttribute(prefix, "grib_wind_large_position_1", large_position_1_, params); - setAttribute(prefix, "grib_wind_large_position_2", large_position_2_, params); - setAttribute(prefix, "grib_wind_large_position_colour", large_colour_position_, params); setAttribute(prefix, "grib_missing_value_indicator", missing_value_, params); setAttribute(prefix, "grib_wind_style", wind_style_, params); @@ -120,13 +112,9 @@ void GribDecoderAttributes::copy(const GribDecoderAttributes& other) expver_ = other.expver_; units_ = other.units_; field_position_ = other.field_position_; - large_field_position_ = other.large_field_position_; position_1_ = other.position_1_; position_2_ = other.position_2_; colour_position_ = other.colour_position_; - large_position_1_ = other.large_position_1_; - large_position_2_ = other.large_position_2_; - large_colour_position_ = other.large_colour_position_; missing_value_ = other.missing_value_; wind_style_ = other.wind_style_; address_mode_ = unique_ptr(other.address_mode_->clone()); @@ -193,13 +181,9 @@ void GribDecoderAttributes::print(ostream& out) const out << " expver = " << expver_; out << " units = " << units_; out << " field_position = " << field_position_; - out << " large_field_position = " << large_field_position_; out << " position_1 = " << position_1_; out << " position_2 = " << position_2_; out << " colour_position = " << colour_position_; - out << " large_position_1 = " << large_position_1_; - out << " large_position_2 = " << large_position_2_; - out << " large_colour_position = " << large_colour_position_; out << " missing_value = " << missing_value_; out << " wind_style = " << wind_style_; out << " address_mode = " << *address_mode_; @@ -243,20 +227,12 @@ void GribDecoderAttributes::toxml(ostream& out) const niceprint(out,units_); out << ", \"grib_field_position\":"; niceprint(out,field_position_); - out << ", \"grib_field_large_position\":"; - niceprint(out,large_field_position_); out << ", \"grib_wind_position_1\":"; niceprint(out,position_1_); out << ", \"grib_wind_position_2\":"; niceprint(out,position_2_); out << ", \"grib_wind_position_colour\":"; niceprint(out,colour_position_); - out << ", \"grib_wind_large_position_1\":"; - niceprint(out,large_position_1_); - out << ", \"grib_wind_large_position_2\":"; - niceprint(out,large_position_2_); - out << ", \"grib_wind_large_position_colour\":"; - niceprint(out,large_colour_position_); out << ", \"grib_missing_value_indicator\":"; niceprint(out,missing_value_); out << ", \"grib_wind_style\":"; @@ -284,7 +260,6 @@ static MagicsParameter grib_interpolation_method_missing_fill_count("grib_i static MagicsParameter grib_text_experiment("grib_text_experiment", "off"); static MagicsParameter grib_text_units("grib_text_units", "off"); static MagicsParameter grib_field_position("grib_field_position", 1); -static MagicsParameter grib_field_large_position("grib_field_large_position", 0); static MagicsParameter grib_wind_position_1("grib_wind_position_1", 1); static MagicsParameter grib_wind_position_2("grib_wind_position_2", -1); static MagicsParameter grib_wind_position_colour("grib_wind_position_colour", -1); diff --git a/src/attributes/GribDecoderAttributes.h b/src/attributes/GribDecoderAttributes.h index 090aa4ba..e096edea 100644 --- a/src/attributes/GribDecoderAttributes.h +++ b/src/attributes/GribDecoderAttributes.h @@ -68,13 +68,9 @@ class GribDecoderAttributes bool expver_; bool units_; int field_position_; - unsigned long long large_field_position_; int position_1_; int position_2_; int colour_position_; - unsigned long long large_position_1_; - unsigned long long large_position_2_; - unsigned long long large_colour_position_; double missing_value_; bool wind_style_; unique_ptr address_mode_; diff --git a/src/attributes/GribDecoderWrapper.cc b/src/attributes/GribDecoderWrapper.cc index 50e0c340..008b6cf5 100644 --- a/src/attributes/GribDecoderWrapper.cc +++ b/src/attributes/GribDecoderWrapper.cc @@ -129,10 +129,6 @@ void GribDecoderWrapper::set(const MagRequest& request) int field_position_value = request("GRIB_FIELD_POSITION"); gribdecoder_->field_position_ = field_position_value; } - if (request.countValues("GRIB_FIELD_LARGE_POSITION") ) { - // unsigned long long large_field_position_value = request("GRIB_FIELD_LARGE_POSITION"); - // gribdecoder_->large_field_position_ = large_field_position_value; - } if (request.countValues("GRIB_WIND_POSITION_1") ) { int position_1_value = request("GRIB_WIND_POSITION_1"); gribdecoder_->position_1_ = position_1_value; @@ -145,18 +141,6 @@ void GribDecoderWrapper::set(const MagRequest& request) int colour_position_value = request("GRIB_WIND_POSITION_COLOUR"); gribdecoder_->colour_position_ = colour_position_value; } - if (request.countValues("GRIB_WIND_LARGE_POSITION_1") ) { - // unsigned long long large_position_1_value = request("GRIB_WIND_LARGE_POSITION_1"); - // gribdecoder_->large_position_1_ = large_position_1_value; - } - if (request.countValues("GRIB_WIND_LARGE_POSITION_2") ) { - // unsigned long long large_position_2_value = request("GRIB_WIND_LARGE_POSITION_2"); - // gribdecoder_->large_position_2_ = large_position_2_value; - } - if (request.countValues("GRIB_WIND_LARGE_POSITION_COLOUR") ) { - // unsigned long long large_colour_position_value = request("GRIB_WIND_LARGE_POSITION_COLOUR"); - // gribdecoder_->large_colour_position_ = large_colour_position_value; - } if (request.countValues("GRIB_MISSING_VALUE_INDICATOR") ) { double missing_value_value = request("GRIB_MISSING_VALUE_INDICATOR"); gribdecoder_->missing_value_ = missing_value_value; diff --git a/src/attributes/NoBoxPlotBoxBorderAttributes.cc b/src/attributes/NoBoxPlotBoxBorderAttributes.cc new file mode 100644 index 00000000..fdfea170 --- /dev/null +++ b/src/attributes/NoBoxPlotBoxBorderAttributes.cc @@ -0,0 +1,100 @@ + +/****************************** LICENSE ******************************* + + * (C) Copyright 1996-2017 ECMWF. + * + * This software is licensed under the terms of the Apache Licence Version 2.0 + * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. + * In applying this licence, ECMWF does not waive the privileges and immunities + * granted to it by virtue of its status as an intergovernmental organisation nor + * does it submit to any jurisdiction. + + ******************************* LICENSE *******************************/ + +/*! \\file NoBoxPlotBoxBorderAttributes.h + \\brief Definition of NoBoxPlotBoxBorder Attributes class. + + This file is automatically generated. + Do Not Edit! +*/ + +#include "NoBoxPlotBoxBorderAttributes.h" +#include "MagicsParameter.h" +#include "ParameterSettings.h" + +using namespace magics; + +NoBoxPlotBoxBorderAttributes::NoBoxPlotBoxBorderAttributes() + + +{ +} + + +NoBoxPlotBoxBorderAttributes::~NoBoxPlotBoxBorderAttributes() +{ + +} + + +void NoBoxPlotBoxBorderAttributes::set(const std::map& params) +{ + vector prefix(2); + int i = 0; + prefix[i++] = "boxplot"; + prefix[i++] = "boxplot_median"; + + + +} + +void NoBoxPlotBoxBorderAttributes::copy(const NoBoxPlotBoxBorderAttributes& other) +{ + +} + + +bool NoBoxPlotBoxBorderAttributes::accept(const string& node) +{ + + if ( magCompare(node, "median") ) + return true; + + return false; +} + +void NoBoxPlotBoxBorderAttributes::set(const XmlNode& node) +{ + bool apply = false; + + if ( this->accept(node.name()) == false ) + return; + + if ( magCompare(node.name(), "median") ) + apply = true; + + + if ( apply ) + set(node.attributes()); + else { + + } + for (auto &elt : node.elements()) + { + + } +} + +void NoBoxPlotBoxBorderAttributes::print(ostream& out) const +{ + out << "Attributes["; + + out << "]" << "\n"; +} + +void NoBoxPlotBoxBorderAttributes::toxml(ostream& out) const +{ + out << "\"median\""; + +} + diff --git a/src/attributes/NoBoxPlotBoxBorderAttributes.h b/src/attributes/NoBoxPlotBoxBorderAttributes.h new file mode 100644 index 00000000..cd9e9104 --- /dev/null +++ b/src/attributes/NoBoxPlotBoxBorderAttributes.h @@ -0,0 +1,63 @@ + +/******************************* LICENSE ******************************* + + * (C) Copyright 1996-2016 ECMWF. + * + * This software is licensed under the terms of the Apache Licence Version 2.0 + * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. + * In applying this licence, ECMWF does not waive the privileges and immunities + * granted to it by virtue of its status as an intergovernmental organisation nor + * does it submit to any jurisdiction. + + ******************************* LICENSE *******************************/ + +/*! \fileNoBoxPlotBoxBorderAttributes.h + \brief Definition of NoBoxPlotBoxBorder Attributes class. + + This file is automatically generated. + Do Not Edit! + + Generated: +*/ + + +#ifndef NoBoxPlotBoxBorderAttributes_H +#define NoBoxPlotBoxBorderAttributes_H + +#include "magics.h" +namespace magics { + +class XmlNode; +class NoBoxPlotBoxBorderAttributes +{ +public: +// -- constructor + NoBoxPlotBoxBorderAttributes(); + +// -- destructor + virtual ~NoBoxPlotBoxBorderAttributes(); + + virtual void set(const std::map&); + virtual void set(const XmlNode&); + virtual void copy(const NoBoxPlotBoxBorderAttributes&); + virtual bool accept(const std::string&); + + void setTag(const std::string& tag) { tag_ = tag; } + +public: + // -- method + virtual void print(std::ostream&) const; + virtual void toxml(std::ostream& out) const; + // -- members: + string tag_; + + +private: + friend ostream& operator<<(ostream& s,const NoBoxPlotBoxBorderAttributes& p) + { p.print(s); return s; } +}; + +} // namespace magics + +#endif + diff --git a/src/attributes/NoBoxPlotBoxBorderWrapper.cc b/src/attributes/NoBoxPlotBoxBorderWrapper.cc new file mode 100644 index 00000000..14fb00eb --- /dev/null +++ b/src/attributes/NoBoxPlotBoxBorderWrapper.cc @@ -0,0 +1,67 @@ + +/****************************** LICENSE ******************************* + + * (C) Copyright 1996-2017 ECMWF. + * + * This software is licensed under the terms of the Apache Licence Version 2.0 + * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. + * In applying this licence, ECMWF does not waive the privileges and immunities + * granted to it by virtue of its status as an intergovernmental organisation nor + * does it submit to any jurisdiction. + + ******************************* LICENSE *******************************/ + +/*! \\file NoBoxPlotBoxBorderAttributes.h + \\brief Definition of NoBoxPlotBoxBorder Attributes class. + + This file is automatically generated. + Do Not Edit! + +*/ + +#include "MagRequest.h" +#include "NoBoxPlotBoxBorderWrapper.h" +#include "MagicsParameter.h" +#include "Factory.h" +#include "MagTranslator.h" +#include "MagicsGlobal.h" + +using namespace magics; + + + +NoBoxPlotBoxBorderWrapper::NoBoxPlotBoxBorderWrapper(): noboxplotboxborder_(new NoBoxPlotBoxBorder()) + + +{ + + + + +} +NoBoxPlotBoxBorderWrapper::NoBoxPlotBoxBorderWrapper(NoBoxPlotBoxBorder* noboxplotboxborder): noboxplotboxborder_(noboxplotboxborder) +{ + + +} + +NoBoxPlotBoxBorderWrapper::~NoBoxPlotBoxBorderWrapper() +{ + +} + +void NoBoxPlotBoxBorderWrapper::set(const MagRequest& request) +{ + + + + + +} + +void NoBoxPlotBoxBorderWrapper::print(ostream& out) const +{ + out << "NoBoxPlotBoxBorderWrapper[]"; +} + + diff --git a/src/attributes/NoBoxPlotBoxBorderWrapper.h b/src/attributes/NoBoxPlotBoxBorderWrapper.h new file mode 100644 index 00000000..bde7f82f --- /dev/null +++ b/src/attributes/NoBoxPlotBoxBorderWrapper.h @@ -0,0 +1,91 @@ + +/******************************* LICENSE ******************************* + + * (C) Copyright 1996-2016 ECMWF. + * + * This software is licensed under the terms of the Apache Licence Version 2.0 + * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. + * In applying this licence, ECMWF does not waive the privileges and immunities + * granted to it by virtue of its status as an intergovernmental organisation nor + * does it submit to any jurisdiction. + + ******************************* LICENSE *******************************/ + +/*! \fileNoBoxPlotBoxBorderAttributes.h + \brief Definition of NoBoxPlotBoxBorder Attributes class. + + This file is automatically generated. + Do Not Edit! + + Generated: +*/ + + +#ifndef NoBoxPlotBoxBorderWrapper_H +#define NoBoxPlotBoxBorderWrapper_H + +#include "magics.h" +#include "ParameterManager.h" +#include "Factory.h" + + + +#include "BoxPlotItem.h" + + + + + + + + + + +namespace magics { + +class MagRequest; + + + +class NoBoxPlotBoxBorderWrapper + +{ +public: +// -- constructor + NoBoxPlotBoxBorderWrapper(); + NoBoxPlotBoxBorderWrapper(NoBoxPlotBoxBorder*); +// -- destructor + virtual ~NoBoxPlotBoxBorderWrapper(); + virtual void set(const MagRequest&); + + NoBoxPlotBoxBorder* me() { return noboxplotboxborder_; } + + virtual NoBoxPlotBoxBorder* object() { return noboxplotboxborder_; } + + + virtual void object(NoBoxPlotBoxBorder* o) { + // Remember to delete the previous object + noboxplotboxborder_ = o; + + + } + + + +protected: + NoBoxPlotBoxBorder* noboxplotboxborder_; + + +// -- method + virtual void print(ostream&) const; + + +private: + string tag_; + friend ostream& operator<<(ostream& s,const NoBoxPlotBoxBorderWrapper& p) + { p.print(s); return s; } +}; + +} // namespace magics + +#endif \ No newline at end of file diff --git a/src/attributes/NoBoxPlotMedianAttributes.cc b/src/attributes/NoBoxPlotMedianAttributes.cc new file mode 100644 index 00000000..50dcf6f0 --- /dev/null +++ b/src/attributes/NoBoxPlotMedianAttributes.cc @@ -0,0 +1,100 @@ + +/****************************** LICENSE ******************************* + + * (C) Copyright 1996-2017 ECMWF. + * + * This software is licensed under the terms of the Apache Licence Version 2.0 + * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. + * In applying this licence, ECMWF does not waive the privileges and immunities + * granted to it by virtue of its status as an intergovernmental organisation nor + * does it submit to any jurisdiction. + + ******************************* LICENSE *******************************/ + +/*! \\file NoBoxPlotMedianAttributes.h + \\brief Definition of NoBoxPlotMedian Attributes class. + + This file is automatically generated. + Do Not Edit! +*/ + +#include "NoBoxPlotMedianAttributes.h" +#include "MagicsParameter.h" +#include "ParameterSettings.h" + +using namespace magics; + +NoBoxPlotMedianAttributes::NoBoxPlotMedianAttributes() + + +{ +} + + +NoBoxPlotMedianAttributes::~NoBoxPlotMedianAttributes() +{ + +} + + +void NoBoxPlotMedianAttributes::set(const std::map& params) +{ + vector prefix(2); + int i = 0; + prefix[i++] = "boxplot"; + prefix[i++] = "boxplot_median"; + + + +} + +void NoBoxPlotMedianAttributes::copy(const NoBoxPlotMedianAttributes& other) +{ + +} + + +bool NoBoxPlotMedianAttributes::accept(const string& node) +{ + + if ( magCompare(node, "median") ) + return true; + + return false; +} + +void NoBoxPlotMedianAttributes::set(const XmlNode& node) +{ + bool apply = false; + + if ( this->accept(node.name()) == false ) + return; + + if ( magCompare(node.name(), "median") ) + apply = true; + + + if ( apply ) + set(node.attributes()); + else { + + } + for (auto &elt : node.elements()) + { + + } +} + +void NoBoxPlotMedianAttributes::print(ostream& out) const +{ + out << "Attributes["; + + out << "]" << "\n"; +} + +void NoBoxPlotMedianAttributes::toxml(ostream& out) const +{ + out << "\"median\""; + +} + diff --git a/src/attributes/NoBoxPlotMedianAttributes.h b/src/attributes/NoBoxPlotMedianAttributes.h new file mode 100644 index 00000000..3a6b29a1 --- /dev/null +++ b/src/attributes/NoBoxPlotMedianAttributes.h @@ -0,0 +1,63 @@ + +/******************************* LICENSE ******************************* + + * (C) Copyright 1996-2016 ECMWF. + * + * This software is licensed under the terms of the Apache Licence Version 2.0 + * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. + * In applying this licence, ECMWF does not waive the privileges and immunities + * granted to it by virtue of its status as an intergovernmental organisation nor + * does it submit to any jurisdiction. + + ******************************* LICENSE *******************************/ + +/*! \fileNoBoxPlotMedianAttributes.h + \brief Definition of NoBoxPlotMedian Attributes class. + + This file is automatically generated. + Do Not Edit! + + Generated: +*/ + + +#ifndef NoBoxPlotMedianAttributes_H +#define NoBoxPlotMedianAttributes_H + +#include "magics.h" +namespace magics { + +class XmlNode; +class NoBoxPlotMedianAttributes +{ +public: +// -- constructor + NoBoxPlotMedianAttributes(); + +// -- destructor + virtual ~NoBoxPlotMedianAttributes(); + + virtual void set(const std::map&); + virtual void set(const XmlNode&); + virtual void copy(const NoBoxPlotMedianAttributes&); + virtual bool accept(const std::string&); + + void setTag(const std::string& tag) { tag_ = tag; } + +public: + // -- method + virtual void print(std::ostream&) const; + virtual void toxml(std::ostream& out) const; + // -- members: + string tag_; + + +private: + friend ostream& operator<<(ostream& s,const NoBoxPlotMedianAttributes& p) + { p.print(s); return s; } +}; + +} // namespace magics + +#endif + diff --git a/src/attributes/NoBoxPlotMedianWrapper.cc b/src/attributes/NoBoxPlotMedianWrapper.cc new file mode 100644 index 00000000..b3011118 --- /dev/null +++ b/src/attributes/NoBoxPlotMedianWrapper.cc @@ -0,0 +1,67 @@ + +/****************************** LICENSE ******************************* + + * (C) Copyright 1996-2017 ECMWF. + * + * This software is licensed under the terms of the Apache Licence Version 2.0 + * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. + * In applying this licence, ECMWF does not waive the privileges and immunities + * granted to it by virtue of its status as an intergovernmental organisation nor + * does it submit to any jurisdiction. + + ******************************* LICENSE *******************************/ + +/*! \\file NoBoxPlotMedianAttributes.h + \\brief Definition of NoBoxPlotMedian Attributes class. + + This file is automatically generated. + Do Not Edit! + +*/ + +#include "MagRequest.h" +#include "NoBoxPlotMedianWrapper.h" +#include "MagicsParameter.h" +#include "Factory.h" +#include "MagTranslator.h" +#include "MagicsGlobal.h" + +using namespace magics; + + + +NoBoxPlotMedianWrapper::NoBoxPlotMedianWrapper(): noboxplotmedian_(new NoBoxPlotMedian()) + + +{ + + + + +} +NoBoxPlotMedianWrapper::NoBoxPlotMedianWrapper(NoBoxPlotMedian* noboxplotmedian): noboxplotmedian_(noboxplotmedian) +{ + + +} + +NoBoxPlotMedianWrapper::~NoBoxPlotMedianWrapper() +{ + +} + +void NoBoxPlotMedianWrapper::set(const MagRequest& request) +{ + + + + + +} + +void NoBoxPlotMedianWrapper::print(ostream& out) const +{ + out << "NoBoxPlotMedianWrapper[]"; +} + + diff --git a/src/attributes/NoBoxPlotMedianWrapper.h b/src/attributes/NoBoxPlotMedianWrapper.h new file mode 100644 index 00000000..97b82f4b --- /dev/null +++ b/src/attributes/NoBoxPlotMedianWrapper.h @@ -0,0 +1,91 @@ + +/******************************* LICENSE ******************************* + + * (C) Copyright 1996-2016 ECMWF. + * + * This software is licensed under the terms of the Apache Licence Version 2.0 + * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. + * In applying this licence, ECMWF does not waive the privileges and immunities + * granted to it by virtue of its status as an intergovernmental organisation nor + * does it submit to any jurisdiction. + + ******************************* LICENSE *******************************/ + +/*! \fileNoBoxPlotMedianAttributes.h + \brief Definition of NoBoxPlotMedian Attributes class. + + This file is automatically generated. + Do Not Edit! + + Generated: +*/ + + +#ifndef NoBoxPlotMedianWrapper_H +#define NoBoxPlotMedianWrapper_H + +#include "magics.h" +#include "ParameterManager.h" +#include "Factory.h" + + + +#include "BoxPlotItem.h" + + + + + + + + + + +namespace magics { + +class MagRequest; + + + +class NoBoxPlotMedianWrapper + +{ +public: +// -- constructor + NoBoxPlotMedianWrapper(); + NoBoxPlotMedianWrapper(NoBoxPlotMedian*); +// -- destructor + virtual ~NoBoxPlotMedianWrapper(); + virtual void set(const MagRequest&); + + NoBoxPlotMedian* me() { return noboxplotmedian_; } + + virtual NoBoxPlotMedian* object() { return noboxplotmedian_; } + + + virtual void object(NoBoxPlotMedian* o) { + // Remember to delete the previous object + noboxplotmedian_ = o; + + + } + + + +protected: + NoBoxPlotMedian* noboxplotmedian_; + + +// -- method + virtual void print(ostream&) const; + + +private: + string tag_; + friend ostream& operator<<(ostream& s,const NoBoxPlotMedianWrapper& p) + { p.print(s); return s; } +}; + +} // namespace magics + +#endif \ No newline at end of file diff --git a/src/attributes/SymbolPlottingAttributes.h b/src/attributes/SymbolPlottingAttributes.h index 75239b93..2d46d6ff 100644 --- a/src/attributes/SymbolPlottingAttributes.h +++ b/src/attributes/SymbolPlottingAttributes.h @@ -54,7 +54,6 @@ class SymbolPlottingAttributes string tag_; bool legend_; string unit_method_; - string unit_method_; string type_; string marker_mode_; string format_; diff --git a/src/params/GribDecoder.xml b/src/params/GribDecoder.xml index 5f0b9efa..0ec1055b 100644 --- a/src/params/GribDecoder.xml +++ b/src/params/GribDecoder.xml @@ -47,30 +47,7 @@ does it submit to any jurisdiction. name="grib_second_component_file_name"> The name of the input file containing the v-component of wind - - - The name of the input file containing the u-component of wind - - - - The name of the input file containing the u-component of wind - - - - The name of the input file containing the v-component of wind - + Turn legend on or off (ON/OFF) : New Parameter! -