Commit 38009a60 authored by Martin Heistermann's avatar Martin Heistermann

Merge branch 'status-hidden' into 'master'

Add "hidden" property to status.

See merge request !74
parents 3ff02f4e 5d4e76f9
Pipeline #11796 passed with stage
in 6 minutes and 7 seconds
...@@ -32,14 +32,6 @@ ...@@ -32,14 +32,6 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 36 $ *
* $Date: 2012-01-10 18:00:06 +0100 (Di, 10 Jan 2012) $ *
* $LastChangedBy: kremer $ *
* *
\*===========================================================================*/
#include <istream> #include <istream>
#include "OpenVolumeMeshStatus.hh" #include "OpenVolumeMeshStatus.hh"
...@@ -47,7 +39,11 @@ ...@@ -47,7 +39,11 @@
namespace OpenVolumeMesh { namespace OpenVolumeMesh {
std::ostream& operator<<(std::ostream& _ostr, const OpenVolumeMeshStatus& _status) { std::ostream& operator<<(std::ostream& _ostr, const OpenVolumeMeshStatus& _status) {
_ostr << _status.selected() << " " << _status.tagged() << " " << _status.deleted() << std::endl; _ostr << _status.selected()
<< " " << _status.tagged()
<< " " << _status.deleted()
<< " " << _status.hidden()
<< std::endl;
return _ostr; return _ostr;
} }
...@@ -59,7 +55,8 @@ std::istream& operator>>(std::istream& _istr, OpenVolumeMeshStatus& _status) { ...@@ -59,7 +55,8 @@ std::istream& operator>>(std::istream& _istr, OpenVolumeMeshStatus& _status) {
_status.set_tagged(b); _status.set_tagged(b);
_istr >> b; _istr >> b;
_status.set_deleted(b); _status.set_deleted(b);
_istr >> b;
_status.set_hidden(b);
return _istr; return _istr;
} }
} // Namespace OpenVolumeMesh } // Namespace OpenVolumeMesh
...@@ -32,14 +32,6 @@ ...@@ -32,14 +32,6 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* $LastChangedBy$ *
* *
\*===========================================================================*/
#ifndef STATUS_HH_ #ifndef STATUS_HH_
#define STATUS_HH_ #define STATUS_HH_
...@@ -49,14 +41,13 @@ namespace OpenVolumeMesh { ...@@ -49,14 +41,13 @@ namespace OpenVolumeMesh {
/** \class OpenVolumeMeshStatus /** \class OpenVolumeMeshStatus
* *
* \brief Stores statuses like selected, tagged, deleted, etc. * \brief Stores statuses like selected, tagged, deleted, hidden.
*/ */
class OpenVolumeMeshStatus { class OpenVolumeMeshStatus {
public: public:
// Default constructor OpenVolumeMeshStatus() = default;
OpenVolumeMeshStatus() : selected_(false), tagged_(false), deleted_(false) {}
bool selected() const { return selected_; } bool selected() const { return selected_; }
...@@ -64,19 +55,25 @@ public: ...@@ -64,19 +55,25 @@ public:
bool deleted() const { return deleted_; } bool deleted() const { return deleted_; }
bool hidden() const { return hidden_;}
void set_selected(bool _selected) { selected_ = _selected; } void set_selected(bool _selected) { selected_ = _selected; }
void set_tagged(bool _tagged) { tagged_ = _tagged; } void set_tagged(bool _tagged) { tagged_ = _tagged; }
void set_deleted(bool _deleted) { deleted_ = _deleted; } void set_deleted(bool _deleted) { deleted_ = _deleted; }
void set_hidden(bool _hidden) {hidden_ = _hidden;}
private: private:
bool selected_; bool selected_ = false;
bool tagged_ = false;
bool tagged_; bool deleted_ = false;
bool deleted_; bool hidden_ = false;
}; };
std::ostream& operator<<(std::ostream& _ostr, const OpenVolumeMeshStatus& _status); std::ostream& operator<<(std::ostream& _ostr, const OpenVolumeMeshStatus& _status);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment