electron
/
pulseview
mirror of git://sigrok.org/pulseview
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SelectableItem: Renamed to ViewItem

This commit is contained in:
Joel Holdsworth 2014-12-13 11:02:01 +00:00
parent 650e2e5fd4
commit 26e3af6b15
9 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -177,7 +177,6 @@ set(pulseview_SOURCES
pv/view/rowitemowner.cpp
pv/view/rowitempaintparams.cpp
pv/view/ruler.cpp
pv/view/selectableitem.cpp
pv/view/signal.cpp
pv/view/timeitem.cpp
pv/view/timemarker.cpp
@ -185,6 +184,7 @@ set(pulseview_SOURCES
pv/view/tracegroup.cpp
pv/view/tracepalette.cpp
pv/view/view.cpp
pv/view/viewitem.cpp
pv/view/viewport.cpp
pv/widgets/colourbutton.cpp
pv/widgets/colourpopup.cpp
@ -219,13 +219,13 @@ set(pulseview_HEADERS
pv/view/marginwidget.hpp
pv/view/rowitem.hpp
pv/view/ruler.hpp
pv/view/selectableitem.hpp
pv/view/signal.hpp
pv/view/timeitem.hpp
pv/view/timemarker.hpp
pv/view/trace.hpp
pv/view/tracegroup.hpp
pv/view/view.hpp
pv/view/viewitem.hpp
pv/view/viewport.hpp
pv/widgets/colourbutton.hpp
pv/widgets/colourpopup.hpp

2
pv/mainwindow.cpp
View File

@ -71,7 +71,7 @@ using sigrok::HardwareDevice;
namespace pv {
namespace view {
class SelectableItem;
class ViewItem;
}
const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory";

2
pv/view/cursorpair.cpp
View File

@ -135,7 +135,7 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect)
p.setPen(Cursor::FillColour.lighter());
p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
p.setPen(SelectableItem::select_text_colour(
p.setPen(ViewItem::select_text_colour(
Cursor::FillColour));
p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
pv::util::format_time(second_->time() - first_->time(), prefix, 2));

4
pv/view/rowitem.hpp
View File

@ -26,14 +26,14 @@
#include <QPropertyAnimation>
#include "rowitempaintparams.hpp"
#include "selectableitem.hpp"
#include "viewitem.hpp"
namespace pv {
namespace view {
class RowItemOwner;
class RowItem : public SelectableItem,
class RowItem : public ViewItem,
public std::enable_shared_from_this<pv::view::RowItem>
{
Q_OBJECT

4
pv/view/timeitem.hpp
View File

@ -21,14 +21,14 @@
#ifndef PULSEVIEW_PV_VIEW_TIMEITEM_H
#define PULSEVIEW_PV_VIEW_TIMEITEM_H
#include "selectableitem.hpp"
#include "viewitem.hpp"
namespace pv {
namespace view {
class View;
class TimeItem : public SelectableItem
class TimeItem : public ViewItem
{
Q_OBJECT

2
pv/view/trace.cpp
View File

@ -124,7 +124,7 @@ void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
QMenu* Trace::create_context_menu(QWidget *parent)
{
QMenu *const menu = SelectableItem::create_context_menu(parent);
QMenu *const menu = ViewItem::create_context_menu(parent);
return menu;
}

26
pv/view/selectableitem.cpp → pv/view/viewitem.cpp
View File

@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "selectableitem.hpp"
#include "viewitem.hpp"
#include <climits>
@ -29,63 +29,63 @@
namespace pv {
namespace view {
const int SelectableItem::HighlightRadius = 6;
const int ViewItem::HighlightRadius = 6;
SelectableItem::SelectableItem() :
ViewItem::ViewItem() :
context_parent_(NULL),
selected_(false),
drag_point_(INT_MIN, INT_MIN)
{
}
bool SelectableItem::selected() const
bool ViewItem::selected() const
{
return selected_;
}
void SelectableItem::select(bool select)
void ViewItem::select(bool select)
{
selected_ = select;
}
bool SelectableItem::dragging() const
bool ViewItem::dragging() const
{
return drag_point_.x() != INT_MIN && drag_point_.y() != INT_MIN;
}
QPoint SelectableItem::drag_point() const
QPoint ViewItem::drag_point() const
{
return drag_point_;
}
void SelectableItem::drag()
void ViewItem::drag()
{
drag_point_ = point();
}
void SelectableItem::drag_release()
void ViewItem::drag_release()
{
drag_point_ = QPoint(INT_MIN, INT_MIN);
}
QMenu* SelectableItem::create_context_menu(QWidget *parent)
QMenu* ViewItem::create_context_menu(QWidget *parent)
{
context_parent_ = parent;
return new QMenu(parent);
}
void SelectableItem::delete_pressed()
void ViewItem::delete_pressed()
{
}
QPen SelectableItem::highlight_pen()
QPen ViewItem::highlight_pen()
{
return QPen(QApplication::palette().brush(
QPalette::Highlight), HighlightRadius,
Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
}
QColor SelectableItem::select_text_colour(QColor background)
QColor ViewItem::select_text_colour(QColor background)
{
return (background.lightness() > 64) ? Qt::black : Qt::white;
}

10
pv/view/selectableitem.hpp → pv/view/viewitem.hpp
View File

@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef PULSEVIEW_PV_SELECTABLEITEM_H
#define PULSEVIEW_PV_SELECTABLEITEM_H
#ifndef PULSEVIEW_PV_VIEWITEM_H
#define PULSEVIEW_PV_VIEWITEM_H
#include <list>
@ -37,7 +37,7 @@ class Popup;
namespace view {
class SelectableItem : public QObject
class ViewItem : public QObject
{
Q_OBJECT
@ -45,7 +45,7 @@ private:
static const int HighlightRadius;
public:
SelectableItem();
ViewItem();
public:
/**
@ -125,4 +125,4 @@ private:
} // namespace view
} // namespace pv
#endif // PULSEVIEW_PV_SELECTABLEITEM_H
#endif // PULSEVIEW_PV_VIEWITEM_H

4
test/CMakeLists.txt
View File

@ -49,7 +49,6 @@ set(pulseview_TEST_SOURCES
${PROJECT_SOURCE_DIR}/pv/view/rowitemowner.cpp
${PROJECT_SOURCE_DIR}/pv/view/rowitempaintparams.cpp
${PROJECT_SOURCE_DIR}/pv/view/ruler.cpp
${PROJECT_SOURCE_DIR}/pv/view/selectableitem.cpp
${PROJECT_SOURCE_DIR}/pv/view/signal.cpp
${PROJECT_SOURCE_DIR}/pv/view/timeitem.cpp
${PROJECT_SOURCE_DIR}/pv/view/timemarker.cpp
@ -57,6 +56,7 @@ set(pulseview_TEST_SOURCES
${PROJECT_SOURCE_DIR}/pv/view/tracegroup.cpp
${PROJECT_SOURCE_DIR}/pv/view/tracepalette.cpp
${PROJECT_SOURCE_DIR}/pv/view/view.cpp
${PROJECT_SOURCE_DIR}/pv/view/viewitem.cpp
${PROJECT_SOURCE_DIR}/pv/view/viewport.cpp
${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.cpp
${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.cpp
@ -89,13 +89,13 @@ set(pulseview_TEST_HEADERS
${PROJECT_SOURCE_DIR}/pv/view/marginwidget.hpp
${PROJECT_SOURCE_DIR}/pv/view/rowitem.hpp
${PROJECT_SOURCE_DIR}/pv/view/ruler.hpp
${PROJECT_SOURCE_DIR}/pv/view/selectableitem.hpp
${PROJECT_SOURCE_DIR}/pv/view/signal.hpp
${PROJECT_SOURCE_DIR}/pv/view/timeitem.hpp
${PROJECT_SOURCE_DIR}/pv/view/timemarker.hpp
${PROJECT_SOURCE_DIR}/pv/view/trace.hpp
${PROJECT_SOURCE_DIR}/pv/view/tracegroup.hpp
${PROJECT_SOURCE_DIR}/pv/view/view.hpp
${PROJECT_SOURCE_DIR}/pv/view/viewitem.hpp
${PROJECT_SOURCE_DIR}/pv/view/viewport.hpp
${PROJECT_SOURCE_DIR}/pv/widgets/colourbutton.hpp
${PROJECT_SOURCE_DIR}/pv/widgets/colourpopup.hpp