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
+127
-131
@@ -1,158 +1,154 @@
|
||||
/* FrameRound.cpp
|
||||
*
|
||||
* Copyright (C) 2013-2016 Jaye Evins <evins@snaught.com>
|
||||
*
|
||||
* This file is part of gLabels-qt.
|
||||
*
|
||||
* gLabels-qt is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* gLabels-qt 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
// FrameRound.cpp
|
||||
//
|
||||
// Copyright (C) 2013-2016 Jaye Evins <evins@snaught.com>
|
||||
//
|
||||
// This file is part of gLabels-qt.
|
||||
//
|
||||
// gLabels-qt is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// gLabels-qt 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 General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with gLabels-qt. If not, see <http://www.gnu.org/licenses/>.
|
||||
//
|
||||
|
||||
|
||||
#include "FrameRound.h"
|
||||
#include "FrameRound.hpp"
|
||||
|
||||
#include "Constants.h"
|
||||
#include "StrUtil.h"
|
||||
#include "Constants.hpp"
|
||||
#include "StrUtil.hpp"
|
||||
|
||||
#include <QDebug>
|
||||
|
||||
|
||||
namespace glabels
|
||||
namespace glabels::model
|
||||
{
|
||||
namespace model
|
||||
{
|
||||
|
||||
FrameRound::FrameRound( Distance r,
|
||||
Distance waste,
|
||||
const QString& id )
|
||||
: Frame(id),
|
||||
mR(r),
|
||||
mWaste(waste)
|
||||
{
|
||||
mPath.addEllipse( 0, 0, 2*mR.pt(), 2*mR.pt() );
|
||||
mClipPath.addEllipse( -mWaste.pt(), -mWaste.pt(),
|
||||
2*(mR+mWaste).pt(), 2*(mR+mWaste).pt() );
|
||||
}
|
||||
|
||||
|
||||
std::unique_ptr<Frame> FrameRound::clone() const
|
||||
{
|
||||
return std::make_unique<FrameRound>( *this );
|
||||
}
|
||||
|
||||
|
||||
Distance FrameRound::w() const
|
||||
{
|
||||
return 2*mR;
|
||||
}
|
||||
|
||||
|
||||
Distance FrameRound::h() const
|
||||
{
|
||||
return 2*mR;
|
||||
}
|
||||
|
||||
|
||||
Distance FrameRound::r() const
|
||||
{
|
||||
return mR;
|
||||
}
|
||||
FrameRound::FrameRound( Distance r,
|
||||
Distance waste,
|
||||
const QString& id )
|
||||
: Frame(id),
|
||||
mR(r),
|
||||
mWaste(waste)
|
||||
{
|
||||
mPath.addEllipse( 0, 0, 2*mR.pt(), 2*mR.pt() );
|
||||
mClipPath.addEllipse( -mWaste.pt(), -mWaste.pt(),
|
||||
2*(mR+mWaste).pt(), 2*(mR+mWaste).pt() );
|
||||
}
|
||||
|
||||
|
||||
Distance FrameRound::waste() const
|
||||
{
|
||||
return mWaste;
|
||||
}
|
||||
std::unique_ptr<Frame> FrameRound::clone() const
|
||||
{
|
||||
return std::make_unique<FrameRound>( *this );
|
||||
}
|
||||
|
||||
|
||||
QString FrameRound::sizeDescription( Units units ) const
|
||||
{
|
||||
if ( units.toEnum() == Units::IN )
|
||||
{
|
||||
QString dStr = StrUtil::formatFraction( 2 * mR.in() );
|
||||
|
||||
return QString("%1 %2 %3").arg(dStr).arg(units.toTrName()).arg(tr("diameter"));
|
||||
}
|
||||
else
|
||||
{
|
||||
return QString("%1 %2 %3").arg(2 * mR.inUnits(units), 0, 'g', 5)
|
||||
.arg(units.toTrName()).arg(tr("diameter"));
|
||||
}
|
||||
}
|
||||
Distance FrameRound::w() const
|
||||
{
|
||||
return 2*mR;
|
||||
}
|
||||
|
||||
|
||||
bool FrameRound::isSimilarTo( const Frame& other ) const
|
||||
{
|
||||
if ( auto *otherRound = dynamic_cast<const FrameRound*>(&other) )
|
||||
{
|
||||
if ( fabs( mR - otherRound->mR ) <= EPSILON )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
Distance FrameRound::h() const
|
||||
{
|
||||
return 2*mR;
|
||||
}
|
||||
|
||||
|
||||
const QPainterPath& FrameRound::path() const
|
||||
{
|
||||
return mPath;
|
||||
}
|
||||
Distance FrameRound::r() const
|
||||
{
|
||||
return mR;
|
||||
}
|
||||
|
||||
|
||||
const QPainterPath& FrameRound::clipPath() const
|
||||
{
|
||||
return mClipPath;
|
||||
}
|
||||
Distance FrameRound::waste() const
|
||||
{
|
||||
return mWaste;
|
||||
}
|
||||
|
||||
|
||||
QPainterPath FrameRound::marginPath( Distance xSize, Distance ySize ) const
|
||||
{
|
||||
// Note: ignore ySize, assume xSize == ySize
|
||||
Distance size = xSize;
|
||||
QString FrameRound::sizeDescription( Units units ) const
|
||||
{
|
||||
if ( units.toEnum() == Units::IN )
|
||||
{
|
||||
QString dStr = StrUtil::formatFraction( 2 * mR.in() );
|
||||
|
||||
Distance r = mR - size;
|
||||
|
||||
QPainterPath path;
|
||||
path.addEllipse( size.pt(), size.pt(), 2*r.pt(), 2*r.pt() );
|
||||
|
||||
return path;
|
||||
}
|
||||
return QString("%1 %2 %3").arg(dStr).arg(units.toTrName()).arg(tr("diameter"));
|
||||
}
|
||||
else
|
||||
{
|
||||
return QString("%1 %2 %3").arg(2 * mR.inUnits(units), 0, 'g', 5)
|
||||
.arg(units.toTrName()).arg(tr("diameter"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Debugging support
|
||||
void FrameRound::print( QDebug& dbg ) const
|
||||
{
|
||||
dbg.nospace() << "FrameRound{ "
|
||||
<< id() << ","
|
||||
<< r() << ","
|
||||
<< waste() << ","
|
||||
<< "list{ ";
|
||||
for ( auto& layout : layouts() )
|
||||
{
|
||||
dbg.nospace() << layout << ",";
|
||||
}
|
||||
dbg.nospace() << " }"
|
||||
<< "list{ ";
|
||||
for ( auto& markup : markups() )
|
||||
{
|
||||
dbg.nospace() << *markup << ",";
|
||||
}
|
||||
dbg.nospace() << " }"
|
||||
<< " }";
|
||||
}
|
||||
bool FrameRound::isSimilarTo( const Frame& other ) const
|
||||
{
|
||||
if ( auto *otherRound = dynamic_cast<const FrameRound*>(&other) )
|
||||
{
|
||||
if ( fabs( mR - otherRound->mR ) <= EPSILON )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
const QPainterPath& FrameRound::path() const
|
||||
{
|
||||
return mPath;
|
||||
}
|
||||
|
||||
|
||||
const QPainterPath& FrameRound::clipPath() const
|
||||
{
|
||||
return mClipPath;
|
||||
}
|
||||
|
||||
|
||||
QPainterPath FrameRound::marginPath( Distance xSize, Distance ySize ) const
|
||||
{
|
||||
// Note: ignore ySize, assume xSize == ySize
|
||||
Distance size = xSize;
|
||||
|
||||
Distance r = mR - size;
|
||||
|
||||
QPainterPath path;
|
||||
path.addEllipse( size.pt(), size.pt(), 2*r.pt(), 2*r.pt() );
|
||||
|
||||
return path;
|
||||
}
|
||||
|
||||
|
||||
// Debugging support
|
||||
void FrameRound::print( QDebug& dbg ) const
|
||||
{
|
||||
dbg.nospace() << "FrameRound{ "
|
||||
<< id() << ","
|
||||
<< r() << ","
|
||||
<< waste() << ","
|
||||
<< "list{ ";
|
||||
for ( auto& layout : layouts() )
|
||||
{
|
||||
dbg.nospace() << layout << ",";
|
||||
}
|
||||
dbg.nospace() << " }"
|
||||
<< "list{ ";
|
||||
for ( auto& markup : markups() )
|
||||
{
|
||||
dbg.nospace() << *markup << ",";
|
||||
}
|
||||
dbg.nospace() << " }"
|
||||
<< " }";
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user