Big-Ugly Style Update (#278)
* Bulk replaced tabs with spaces * Bulk removed trailing whitespace from lines * Replaced c-style comments with c++-style comments in file banners * Replace nested namespace definitions with single concise definitions (C++17), this keeps the indentation more manageable * Cleanup ordering and spacing of include directives * Bulk renaming of header file extensions from '.h' to '.hpp'. * Update CODING-STYLE.md * Update target_compile_features from cxx_std_11 to cxx_std_20. * Refresh .clang-format file. Still needs a lot of tweaking.
This commit is contained in:
Jaye Evins
GitHub
@@ -1,139 +1,140 @@
|
||||
/* DrawingPrimitives.cpp
|
||||
*
|
||||
* Copyright (C) 2013 Jaye Evins <evins@snaught.com>
|
||||
*
|
||||
* This file is part of glbarcode++.
|
||||
*
|
||||
* glbarcode++ is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* glbarcode++ is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with glbarcode++. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
// DrawingPrimitives.cpp
|
||||
//
|
||||
// Copyright (C) 2013 Jaye Evins <evins@snaught.com>
|
||||
//
|
||||
// This file is part of glbarcode++.
|
||||
//
|
||||
// glbarcode++ is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Lesser General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// glbarcode++ is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public License
|
||||
// along with glbarcode++. If not, see <http://www.gnu.org/licenses/>.
|
||||
//
|
||||
|
||||
#include "DrawingPrimitives.h"
|
||||
|
||||
#include "DrawingPrimitives.hpp"
|
||||
|
||||
|
||||
namespace glbarcode
|
||||
{
|
||||
|
||||
DrawingPrimitive::DrawingPrimitive( double x, double y )
|
||||
: mX(x), mY(y)
|
||||
{
|
||||
}
|
||||
DrawingPrimitive::DrawingPrimitive( double x, double y )
|
||||
: mX(x), mY(y)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
double DrawingPrimitive::x() const
|
||||
{
|
||||
return mX;
|
||||
}
|
||||
double DrawingPrimitive::x() const
|
||||
{
|
||||
return mX;
|
||||
}
|
||||
|
||||
|
||||
double DrawingPrimitive::y() const
|
||||
{
|
||||
return mY;
|
||||
}
|
||||
double DrawingPrimitive::y() const
|
||||
{
|
||||
return mY;
|
||||
}
|
||||
|
||||
|
||||
|
||||
DrawingPrimitiveLine::DrawingPrimitiveLine( double x, double y, double w, double h )
|
||||
: DrawingPrimitive( x, y ), mW(w), mH(h)
|
||||
{
|
||||
}
|
||||
DrawingPrimitiveLine::DrawingPrimitiveLine( double x, double y, double w, double h )
|
||||
: DrawingPrimitive( x, y ), mW(w), mH(h)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
double DrawingPrimitiveLine::w() const
|
||||
{
|
||||
return mW;
|
||||
}
|
||||
double DrawingPrimitiveLine::w() const
|
||||
{
|
||||
return mW;
|
||||
}
|
||||
|
||||
|
||||
double DrawingPrimitiveLine::h() const
|
||||
{
|
||||
return mH;
|
||||
}
|
||||
double DrawingPrimitiveLine::h() const
|
||||
{
|
||||
return mH;
|
||||
}
|
||||
|
||||
|
||||
|
||||
DrawingPrimitiveBox::DrawingPrimitiveBox( double x, double y, double w, double h )
|
||||
: DrawingPrimitive( x, y ), mW(w), mH(h)
|
||||
{
|
||||
}
|
||||
DrawingPrimitiveBox::DrawingPrimitiveBox( double x, double y, double w, double h )
|
||||
: DrawingPrimitive( x, y ), mW(w), mH(h)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
double DrawingPrimitiveBox::w() const
|
||||
{
|
||||
return mW;
|
||||
}
|
||||
double DrawingPrimitiveBox::w() const
|
||||
{
|
||||
return mW;
|
||||
}
|
||||
|
||||
|
||||
double DrawingPrimitiveBox::h() const
|
||||
{
|
||||
return mH;
|
||||
}
|
||||
double DrawingPrimitiveBox::h() const
|
||||
{
|
||||
return mH;
|
||||
}
|
||||
|
||||
|
||||
|
||||
DrawingPrimitiveText::DrawingPrimitiveText( double x, double y, double size, const std::string& text, HAlign halign )
|
||||
: DrawingPrimitive( x, y ), mSize(size), mText(text), mHalign(halign)
|
||||
{
|
||||
}
|
||||
DrawingPrimitiveText::DrawingPrimitiveText( double x, double y, double size, const std::string& text, HAlign halign )
|
||||
: DrawingPrimitive( x, y ), mSize(size), mText(text), mHalign(halign)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
double DrawingPrimitiveText::size() const
|
||||
{
|
||||
return mSize;
|
||||
}
|
||||
double DrawingPrimitiveText::size() const
|
||||
{
|
||||
return mSize;
|
||||
}
|
||||
|
||||
|
||||
const std::string& DrawingPrimitiveText::text() const
|
||||
{
|
||||
return mText;
|
||||
}
|
||||
const std::string& DrawingPrimitiveText::text() const
|
||||
{
|
||||
return mText;
|
||||
}
|
||||
|
||||
|
||||
HAlign DrawingPrimitiveText::halign() const
|
||||
{
|
||||
return mHalign;
|
||||
}
|
||||
HAlign DrawingPrimitiveText::halign() const
|
||||
{
|
||||
return mHalign;
|
||||
}
|
||||
|
||||
|
||||
|
||||
DrawingPrimitiveRing::DrawingPrimitiveRing( double x, double y, double r, double w )
|
||||
: DrawingPrimitive( x, y ), mR(r), mW(w)
|
||||
{
|
||||
}
|
||||
DrawingPrimitiveRing::DrawingPrimitiveRing( double x, double y, double r, double w )
|
||||
: DrawingPrimitive( x, y ), mR(r), mW(w)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
double DrawingPrimitiveRing::r() const
|
||||
{
|
||||
return mR;
|
||||
}
|
||||
double DrawingPrimitiveRing::r() const
|
||||
{
|
||||
return mR;
|
||||
}
|
||||
|
||||
|
||||
double DrawingPrimitiveRing::w() const
|
||||
{
|
||||
return mW;
|
||||
}
|
||||
double DrawingPrimitiveRing::w() const
|
||||
{
|
||||
return mW;
|
||||
}
|
||||
|
||||
|
||||
|
||||
DrawingPrimitiveHexagon::DrawingPrimitiveHexagon( double x, double y, double h )
|
||||
: DrawingPrimitive( x, y ), mH(h)
|
||||
{
|
||||
}
|
||||
DrawingPrimitiveHexagon::DrawingPrimitiveHexagon( double x, double y, double h )
|
||||
: DrawingPrimitive( x, y ), mH(h)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
double DrawingPrimitiveHexagon::h() const
|
||||
{
|
||||
return mH;
|
||||
}
|
||||
double DrawingPrimitiveHexagon::h() const
|
||||
{
|
||||
return mH;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user