Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mplot/CartGridVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
#define R_NSW(hi) (this->cg->d_nsw[hi])
#define R_HAS_NSW(hi) (this->cg->d_nsw[hi] == -1 ? false : true)

namespace mplot {

namespace mplot
{
enum class CartVisMode
{
Triangles, // Render triangles with a triangle vertex at the centre of each Rect.
Expand Down
4 changes: 2 additions & 2 deletions mplot/ColourBarVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include <mplot/graphing.h>
#include <mplot/graphstyles.h>

namespace mplot {

namespace mplot
{
// Should our colourbar be horizontal or vertical? Horizontal bars always have
// min->max from left to right. Vertical bars always have min->max from bottom to
// top. Make your own ColourBarVisual if you need reversed mappings!
Expand Down
4 changes: 2 additions & 2 deletions mplot/ColourMap.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#include <sm/flags>
#include <sm/crc32>

namespace mplot {

namespace mplot
{
//! Different colour maps types.
enum class ColourMapType : uint32_t
{
Expand Down
4 changes: 2 additions & 2 deletions mplot/ColourMap_Lists.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
/*!
* Listed colour maps, copied from _cm_listed.py
*/
namespace mplot {

namespace mplot
{
/*!
* Magma
*/
Expand Down
7 changes: 3 additions & 4 deletions mplot/ConeVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include <mplot/colour.h>
#include <mplot/VisualModel.h>

namespace mplot {

namespace mplot
{
//! A class to visualize a single vector
template <int glver = mplot::gl::version_4_1>
struct ConeVisual : public VisualModel<glver>
Expand All @@ -34,5 +34,4 @@ namespace mplot {
// compromise. You can set this before calling finalize().
int shapesides = 12;
};

} // namespace mplot
}
4 changes: 2 additions & 2 deletions mplot/CoordArrows.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include <mplot/VisualModel.h>
#include <mplot/colour.h>

namespace mplot {

namespace mplot
{
//! This class creates the vertices for a set of coordinate arrows to be rendered
//! in a 3-D scene.
template<int glver = mplot::gl::version_4_1>
Expand Down
4 changes: 2 additions & 2 deletions mplot/DatasetStyle.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include <mplot/ColourMap.h>
#include <mplot/colour.h>

namespace mplot {

namespace mplot
{
// Boolean flags relating to quiver plots that form part of a DatasetStyle
enum class quiver_flags : unsigned int
{
Expand Down
4 changes: 2 additions & 2 deletions mplot/GeodesicVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#include <mplot/VisualModel.h>
#include <mplot/ColourMap.h>

namespace mplot {

namespace mplot
{
/*!
* This class creates the vertices for an geodesic polyhedron in a 3D scene.
*
Expand Down
4 changes: 2 additions & 2 deletions mplot/GeodesicVisualCE.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include <mplot/VisualModel.h>
#include <mplot/ColourMap.h>

namespace mplot {

namespace mplot
{
/*!
* This class creates the vertices for an geodesic polyhedron in a 3D scene using
* the constexpr function.
Expand Down
4 changes: 2 additions & 2 deletions mplot/GraphVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
#include <mplot/DatasetStyle.h>
#include <mplot/VisualTextModel.h>

namespace mplot {

namespace mplot
{
/*!
* A VisualModel for showing a 2D graph.
*/
Expand Down
7 changes: 4 additions & 3 deletions mplot/GratingVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@
#include <mplot/colour.h>
#include <mplot/VisualModel.h>

namespace mplot {

enum class border_id {
namespace mplot
{
enum class border_id
{
top,
bottom,
left,
Expand Down
10 changes: 6 additions & 4 deletions mplot/GridFeatures.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@
*/
#pragma once

namespace mplot {

namespace mplot
{
//! The shape of the cartesian grid. Only used by CartGrid.h as Grid.h only specifies rectangular grids.
enum class GridDomainShape {
enum class GridDomainShape
{
Rectangle,
Boundary // The shape of the arbitrary boundary set with CartGrid::setBoundary
};

//! The wrapping employed for the Cartesian grid.
enum class GridDomainWrap {
enum class GridDomainWrap
{
None, // No wrapping
Horizontal, // The eastern neighbour of the most eastern element is the most western element on that row
Vertical, // The northern neighbour of the most northern element is the most southern element on that col
Expand Down
4 changes: 2 additions & 2 deletions mplot/GridVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include <mplot/ColourMap.h>
#include <mplot/VisualDataModel.h>

namespace mplot {

namespace mplot
{
/*!
* How to visualize a grid. You could draw a triangle map with vertices at the centres of the
* elements or you could draw a rectangular pixel for each element. Triangles is
Expand Down
4 changes: 2 additions & 2 deletions mplot/HSVWheelVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include <mplot/VisualModel.h>
#include <mplot/GraphVisual.h>

namespace mplot {

namespace mplot
{
template <typename F, int glver = mplot::gl::version_4_1>
class HSVWheelVisual : public VisualModel<glver>
{
Expand Down
3 changes: 2 additions & 1 deletion mplot/HealpixVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
#include <mplot/VisualModel.h>
#include <mplot/ColourMap.h>

namespace mplot {
namespace mplot
{
/*
* Type T for the data. A HEALPix VisualModel which visualizes the values in
* pixeldata, which should be indexed with the Healpix NEST index scheme.
Expand Down
4 changes: 2 additions & 2 deletions mplot/HexGridVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
#define IF_HAS_NSW(hi, yesval, noval) (HAS_NSW(hi) ? yesval : noval)
#define IF_HAS_NSE(hi, yesval, noval) (HAS_NSE(hi) ? yesval : noval)

namespace mplot {

namespace mplot
{
enum class HexVisMode
{
Triangles, // Render triangles with a triangle vertex at the centre of each Hex. Fast (x3.7 cf. HexInterp).
Expand Down
4 changes: 2 additions & 2 deletions mplot/IcosaVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include <sm/vec>
#include <mplot/VisualModel.h>

namespace mplot {

namespace mplot
{
//! This class creates the vertices for an icosahedron in a 3D scene.
template<int glver = mplot::gl::version_4_1>
class IcosaVisual : public VisualModel<glver>
Expand Down
4 changes: 2 additions & 2 deletions mplot/NormalsVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include <mplot/colour.h>
#include <mplot/VisualModel.h>

namespace mplot {

namespace mplot
{
//! A class to visualize normals for another model
template <int glver = mplot::gl::version_4_1>
class NormalsVisual : public VisualModel<glver>
Expand Down
4 changes: 2 additions & 2 deletions mplot/PointRowsMeshVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include <mplot/VisualDataModel.h>
#include <mplot/ColourMap.h>

namespace mplot {

namespace mplot
{
/*!
* The template argument Flt is the type of the data which this PointRowsMeshVisual
* will visualize.
Expand Down
4 changes: 2 additions & 2 deletions mplot/PointRowsVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include <mplot/tools.h>
#include <mplot/VisualDataModel.h>

namespace mplot {

namespace mplot
{
/*!
* The template argument Flt is the type of the data which this PointRowsVisual will visualize.
*
Expand Down
4 changes: 2 additions & 2 deletions mplot/PolygonVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <sm/vec>
#include <mplot/VisualModel.h>

namespace mplot {

namespace mplot
{
//! This class creates the vertices for a polygonal object in a 3D scene
template<int glver = mplot::gl::version_4_1>
class PolygonVisual : public VisualModel<glver>
Expand Down
4 changes: 2 additions & 2 deletions mplot/QuadsMeshVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include <mplot/tools.h>
#include <mplot/VisualDataModel.h>

namespace mplot {

namespace mplot
{
template <typename Flt, int glver = mplot::gl::version_4_1>
class QuadsMeshVisual : public VisualDataModel<Flt, glver>
{
Expand Down
4 changes: 2 additions & 2 deletions mplot/QuadsVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include <mplot/tools.h>
#include <mplot/VisualDataModel.h>

namespace mplot {

namespace mplot
{
template <typename Flt, int glver = mplot::gl::version_4_1>
class QuadsVisual : public VisualDataModel<Flt, glver>
{
Expand Down
4 changes: 2 additions & 2 deletions mplot/QuiverVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#include <mplot/colour.h>
#include <mplot/graphstyles.h>

namespace mplot {

namespace mplot
{
//! A class to make quiver plots
template <typename Flt, int glver = mplot::gl::version_4_1>
class QuiverVisual : public VisualDataModel<Flt, glver>
Expand Down
4 changes: 2 additions & 2 deletions mplot/RectangleVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <sm/mat22>
#include <mplot/VisualModel.h>

namespace mplot {

namespace mplot
{
//! This class creates the vertices for a simple flat rectangle in a 3D scene.
template<int glver = mplot::gl::version_4_1>
class RectangleVisual : public VisualModel<glver>
Expand Down
4 changes: 2 additions & 2 deletions mplot/RhomboVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include <mplot/VisualModel.h>
#include <mplot/ColourMap.h>

namespace mplot {

namespace mplot
{
//! This class creates the vertices for a rhombohedron
template<int glver = mplot::gl::version_4_1>
class RhomboVisual : public VisualModel<glver>
Expand Down
4 changes: 2 additions & 2 deletions mplot/RingVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <sm/vec>
#include <mplot/VisualModel.h>

namespace mplot {

namespace mplot
{
// A simple ring class that uses the primitive VisualModel::computeRing
template <int glver = mplot::gl::version_4_1>
struct RingVisual : public mplot::VisualModel<glver>
Expand Down
4 changes: 2 additions & 2 deletions mplot/RodVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include <mplot/VisualModel.h>
#include <array>

namespace mplot {

namespace mplot
{
//! This class creates the vertices for a cylindrical 'rod' in a 3D scene.
template<int glver = mplot::gl::version_4_1>
class RodVisual : public VisualModel<glver>
Expand Down
4 changes: 2 additions & 2 deletions mplot/ScatterVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include <mplot/VisualDataModel.h>
#include <mplot/graphstyles.h>

namespace mplot {

namespace mplot
{
//! The template argument Flt is the type of the data which this ScatterVisual
//! will visualize.
template <typename Flt, int glver = mplot::gl::version_4_1>
Expand Down
4 changes: 2 additions & 2 deletions mplot/TextFeatures.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <mplot/colour.h>
#include <mplot/VisualFont.h>

namespace mplot {

namespace mplot
{
// A way to bundle up font size, colour, etc into a single object. Constructors chosen for max convenience.
struct TextFeatures
{
Expand Down
3 changes: 2 additions & 1 deletion mplot/TextGeometry.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

namespace mplot {
namespace mplot
{
/*!
* A class containing information about a text string, as it would be displayed on
* the screen in some font, at a given size. The units should be the same as those
Expand Down
4 changes: 2 additions & 2 deletions mplot/TriFrameVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include <mplot/VisualDataModel.h>
#include <mplot/ColourMap.h>

namespace mplot {

namespace mplot
{
/*!
* The template argument Flt is the type of the data which this PointRowsMeshVisual
* will visualize.
Expand Down
4 changes: 2 additions & 2 deletions mplot/TriangleVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <sm/vec>
#include <mplot/VisualModel.h>

namespace mplot {

namespace mplot
{
//! This class creates the vertices for a simple triangle in a 3D scene.
template<int glver = mplot::gl::version_4_1>
class TriangleVisual : public VisualModel<glver>
Expand Down
4 changes: 2 additions & 2 deletions mplot/TriaxesVisual.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include <mplot/graphing.h>
#include <mplot/graphstyles.h> // Share tickstyle, axestyle

namespace mplot {

namespace mplot
{
template <typename Flt, int glver = mplot::gl::version_4_1>
class TriaxesVisual : public VisualModel<glver>
{
Expand Down
Loading
Loading