projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #940 by updating the div spin boxes when needed
[pulseview.git]
/
pv
/
view
/
ruler.hpp
diff --git
a/pv/view/ruler.hpp
b/pv/view/ruler.hpp
index cf63eaff7c7cb27ae0b2ec451801bda05b23677d..1efd8737c9c938fb568bdf0948a8b9f5c0bc62d8 100644
(file)
--- a/
pv/view/ruler.hpp
+++ b/
pv/view/ruler.hpp
@@
-14,12
+14,11
@@
* 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_VIEW_RULER_HPP
-#define PULSEVIEW_PV_VIEW_RULER_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_RULER_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_RULER_HPP
#include <functional>
#include <memory>
#include <functional>
#include <memory>
@@
-29,14
+28,20
@@
#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 {
namespace RulerTest {
-
class
tick_position_test_0;
-
class
tick_position_test_1;
-
class
tick_position_test_2;
+
struct
tick_position_test_0;
+
struct
tick_position_test_1;
+
struct
tick_position_test_2;
}
namespace pv {
}
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
class TimeItem;
class ViewItem;
class TimeItem;
class ViewItem;
@@
-45,12
+50,11
@@
class Ruler : public MarginWidget
{
Q_OBJECT
{
Q_OBJECT
- friend
class
RulerTest::tick_position_test_0;
- friend
class
RulerTest::tick_position_test_1;
- friend
class
RulerTest::tick_position_test_2;
+ friend
struct
RulerTest::tick_position_test_0;
+ friend
struct
RulerTest::tick_position_test_1;
+ friend
struct
RulerTest::tick_position_test_2;
private:
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;
@@
-63,14
+67,14
@@
public:
Ruler(View &parent);
public:
Ruler(View &parent);
public:
- QSize sizeHint() const;
+ QSize sizeHint() const
override
;
/**
* The extended area that the header widget would like to be sized to.
* @remarks This area is the area specified by sizeHint, extended by
* the area to overlap the viewport.
*/
/**
* The extended area that the header widget would like to be sized to.
* @remarks This area is the area specified by sizeHint, extended by
* the area to overlap the viewport.
*/
- QSize extended_size_hint() const;
+ QSize extended_size_hint() const
override
;
/**
* Formats a timestamp depending on its distance to another timestamp.
/**
* Formats a timestamp depending on its distance to another timestamp.
@@
-109,7
+113,7
@@
private:
/**
* Gets the time items.
*/
/**
* Gets the time items.
*/
-
std::vector< std::shared_ptr<pv::view::ViewItem> > items()
;
+
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 .
@@
-117,12
+121,11
@@
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<pv::view::ViewItem> get_mouse_over_item(
- const QPoint &pt);
+ shared_ptr<ViewItem> get_mouse_over_item(const QPoint &pt) override;
- void paintEvent(QPaintEvent *event);
+ void paintEvent(QPaintEvent *event)
override
;
- void mouseDoubleClickEvent(QMouseEvent *e
)
;
+ void mouseDoubleClickEvent(QMouseEvent *e
vent) override
;
/**
* Draw a hover arrow under the cursor position.
/**
* Draw a hover arrow under the cursor position.
@@
-135,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;
};
/**
};
/**
@@
-162,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;
@@
-174,7
+177,8
@@
private Q_SLOTS:
void invalidate_tick_position_cache();
};
void invalidate_tick_position_cache();
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_RULER_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_RULER_HPP