projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Segment: Rework append_samples() so it can handle large input
[pulseview.git]
/
pv
/
view
/
ruler.hpp
diff --git
a/pv/view/ruler.hpp
b/pv/view/ruler.hpp
index f6ce99dc833985b2175a13a55078128e6d2f96ff..1efd8737c9c938fb568bdf0948a8b9f5c0bc62d8 100644
(file)
--- a/
pv/view/ruler.hpp
+++ b/
pv/view/ruler.hpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
*/
#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_RULER_HPP
@@
-29,6
+28,11
@@
#include "marginwidget.hpp"
#include <pv/util.hpp>
#include "marginwidget.hpp"
#include <pv/util.hpp>
+using std::function;
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
namespace RulerTest {
struct tick_position_test_0;
struct tick_position_test_1;
namespace RulerTest {
struct tick_position_test_0;
struct tick_position_test_1;
@@
-51,7
+55,6
@@
class Ruler : public MarginWidget
friend struct RulerTest::tick_position_test_2;
private:
friend struct RulerTest::tick_position_test_2;
private:
-
/// Height of the ruler in multipes of the text height
static const float RulerHeight;
/// Height of the ruler in multipes of the text height
static const float RulerHeight;
@@
-110,7
+113,7
@@
private:
/**
* Gets the time items.
*/
/**
* Gets the time items.
*/
-
std::vector< std::
shared_ptr<ViewItem> > items() override;
+
vector<
shared_ptr<ViewItem> > items() override;
/**
* Gets the first view item which has a label that contains @c pt .
/**
* Gets the first view item which has a label that contains @c pt .
@@
-118,8
+121,7
@@
private:
* @return the view item that has been found, or and empty
* @c shared_ptr if no item was found.
*/
* @return the view item that has been found, or and empty
* @c shared_ptr if no item was found.
*/
- std::shared_ptr<ViewItem> get_mouse_over_item(
- const QPoint &pt) override;
+ shared_ptr<ViewItem> get_mouse_over_item(const QPoint &pt) override;
void paintEvent(QPaintEvent *event) override;
void paintEvent(QPaintEvent *event) override;
@@
-136,8
+138,8
@@
private:
struct TickPositions
{
struct TickPositions
{
-
std::vector<std::
pair<double, QString>> major;
-
std::
vector<double> minor;
+
vector<
pair<double, QString>> major;
+ vector<double> minor;
};
/**
};
/**
@@
-163,7
+165,7
@@
private:
const pv::util::Timestamp& offset,
const double scale,
const int width,
const pv::util::Timestamp& offset,
const double scale,
const int width,
-
std::
function<QString(const pv::util::Timestamp&)> format_function);
+ function<QString(const pv::util::Timestamp&)> format_function);
protected:
void resizeEvent(QResizeEvent*) override;
protected:
void resizeEvent(QResizeEvent*) override;