rename plot_layout.{h,cc} -> gridlines.{h,cc} (7d1d3c20) · Commits · github_fork / Clip

CMakeLists.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ add_executable(signaltk
		src/signaltk/core/layer.cc
		src/signaltk/core/text.cc
		src/signaltk/core/image_api.cc
		src/signaltk/plot/plot_layout.cc
		src/signaltk/plot/gridlines.cc
		src/signaltk/plot/axes.cc
		src/signaltk/plot/domain.cc
		src/signaltk/plot/domainprovider.cc

+2 −6

Original line number	Diff line number	Diff line
		/**
		* This file is part of the "libstx" project
		* Copyright (c) 2018 Paul Asmuth
		* Copyright (c) 2014 Paul Asmuth, Google Inc.
		*
		* libstx is free software: you can redistribute it and/or modify it under
		@@ -11,17 +12,12 @@
		#include "../core/layer.h"
		#include "../core/brush.h"
		#include "../core/text.h"
		#include "plot_layout.h"
		#include "gridlines.h"
		#include "domain.h"

		namespace signaltk {
		namespace chart {

		// FIXME
		int estimateTextLength(const std::string& str) {
		return str.size() * kCharWidth;
		}

		void renderGrid(
		const GridDefinition& grid,
		const Viewport& viewport,

+3 −5

Original line number	Diff line number	Diff line
		/**
		* This file is part of the "libstx" project
		* Copyright (c) 2018 Paul Asmuth
		* Copyright (c) 2011-2014 Paul Asmuth, Google Inc.
		*
		* libstx is free software: you can redistribute it and/or modify it under
		@@ -7,8 +8,7 @@
		* copy of the GNU General Public License along with this program. If not, see
		* <http://www.gnu.org/licenses/>.
		*/
		#ifndef _libstx_CANVAS_H
		#define _libstx_CANVAS_H
		#pragma once
		#include <memory>
		#include <vector>
		#include <string>
		@@ -22,8 +22,6 @@
		namespace signaltk {
		namespace chart {

		static const int kCharWidth = 6.0f; // FIXPAUL make configurable

		/**
		* Render the grid
		*/
		@@ -34,4 +32,4 @@ void renderGrid(

		}
		}
		#endif

+3 −2

Original line number	Diff line number	Diff line
		@@ -10,11 +10,12 @@
		*/
		#pragma once
		#include <stdlib.h>
		#include "plot_layout.h"
		#include "../core/layer.h"
		#include <signaltk/core/layer.h>
		#include <signaltk/core/viewport.h>
		#include "series.h"
		#include "continuousdomain.h"
		#include "domain.h"
		#include "domainprovider.h"
		#include "colorpalette.h"

		namespace signaltk {

+2 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,8 @@
		*/
		#include <iostream>
		#include <signaltk/core/layer.h>
		#include <signaltk/plot/plot_layout.h>
		#include <signaltk/plot/axes.h>
		#include <signaltk/plot/gridlines.h>
		#include <signaltk/util/flagparser.h>
		#include "plot_api.h"