Commit 2ab45d16 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

move Rectangle into geometry.{h,cc}

parent f19d591f
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ add_library(plotfxlib STATIC
    common/graphics/path.cc
    common/graphics/brush.cc
    common/graphics/colour.cc
    common/graphics/geometry.cc
    common/graphics/image.cc
    common/graphics/layer.cc
    common/graphics/layer_pixmap.cc
+66 −0
Original line number Diff line number Diff line
/**
 * This file is part of the "plotfx" project
 *   Copyright (c) 2018 Paul Asmuth
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 * 
 * * Redistributions of source code must retain the above copyright notice, this
 *   list of conditions and the following disclaimer.
 * 
 * * Redistributions in binary form must reproduce the above copyright notice,
 *   this list of conditions and the following disclaimer in the documentation
 *   and/or other materials provided with the distribution.
 * 
 * * Neither the name of the copyright holder nor the names of its
 *   contributors may be used to endorse or promote products derived from
 *   this software without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
#include <algorithm>
#include <iostream>
#include "layout.h"

namespace plotfx {

Rectangle::Rectangle() :
    x(0.0f),
    y(0.0f),
    w(0.0f),
    h(0.0f) {}

Rectangle::Rectangle(
    double _x,
    double _y,
    double _w,
    double _h) :
    x(_x),
    y(_y),
    w(_w),
    h(_h) {}

std::ostream& operator <<(std::ostream& os, const Rectangle& r) {
  os << "Rectangle(";
  os << r.x;
  os << ", ";
  os << r.y;
  os << ", ";
  os << r.w;
  os << ", ";
  os << r.h;
  os << ")";
  return os;
}

} // namespace plotfx
+49 −0
Original line number Diff line number Diff line
/**
 * This file is part of the "plotfx" project
 *   Copyright (c) 2018 Paul Asmuth
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 * 
 * * Redistributions of source code must retain the above copyright notice, this
 *   list of conditions and the following disclaimer.
 * 
 * * Redistributions in binary form must reproduce the above copyright notice,
 *   this list of conditions and the following disclaimer in the documentation
 *   and/or other materials provided with the distribution.
 * 
 * * Neither the name of the copyright holder nor the names of its
 *   contributors may be used to endorse or promote products derived from
 *   this software without specific prior written permission.
 * 
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
#pragma once
#include <assert.h>
#include <stdlib.h>
#include <stdint.h>

namespace plotfx {

struct Rectangle {
  Rectangle();
  Rectangle(double x, double y, double w, double h);
  double x;
  double y;
  double w;
  double h;
};

std::ostream& operator <<(std::ostream& os, const Rectangle& c);

} // namespace plotfx
+0 −29
Original line number Diff line number Diff line
@@ -33,22 +33,6 @@

namespace plotfx {

Rectangle::Rectangle() :
    x(0.0f),
    y(0.0f),
    w(0.0f),
    h(0.0f) {}

Rectangle::Rectangle(
    double _x,
    double _y,
    double _w,
    double _h) :
    x(_x),
    y(_y),
    w(_w),
    h(_h) {}

Rectangle layout_margin_box(
    const Rectangle& parent,
    double margin_top,
@@ -108,18 +92,5 @@ void layout_align(
  return layout_align(bbox, tx, ty, ox, oy);
}

std::ostream& operator <<(std::ostream& os, const Rectangle& r) {
  os << "Rectangle(";
  os << r.x;
  os << ", ";
  os << r.y;
  os << ", ";
  os << r.w;
  os << ", ";
  os << r.h;
  os << ")";
  return os;
}

} // namespace plotfx
+1 −11
Original line number Diff line number Diff line
@@ -31,20 +31,10 @@
#include <assert.h>
#include <stdlib.h>
#include <stdint.h>
#include "geometry.h"

namespace plotfx {

struct Rectangle {
  Rectangle();
  Rectangle(double x, double y, double w, double h);
  double x;
  double y;
  double w;
  double h;
};

std::ostream& operator <<(std::ostream& os, const Rectangle& c);

enum class HAlign {
  LEFT, CENTER, RIGHT
};