projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mingw: Add the sigrok icon for pulseview.exe.
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index c2d97f070a83bb46c1d6b389bbd628048c5064b3..438f72ddae02e018ab7f55c42f6c1645f0a94160 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-18,7
+18,9
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifdef ENABLE_DECODE
#include <libsigrokdecode/libsigrokdecode.h>
#include <libsigrokdecode/libsigrokdecode.h>
+#endif
#include <assert.h>
#include <limits.h>
#include <assert.h>
#include <limits.h>
@@
-43,8
+45,14
@@
#include "pv/data/logic.h"
#include "pv/data/logicsnapshot.h"
#include "pv/data/logic.h"
#include "pv/data/logicsnapshot.h"
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using boost::weak_ptr;
+using std::deque;
+using std::list;
+using std::max;
+using std::min;
+using std::set;
+using std::vector;
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-52,8
+60,6
@@
namespace view {
const double View::MaxScale = 1e9;
const double View::MinScale = 1e-15;
const double View::MaxScale = 1e9;
const double View::MinScale = 1e-15;
-const int View::RulerHeight = 30;
-
const int View::MaxScrollValue = INT_MAX / 2;
const int View::SignalHeight = 30;
const int View::MaxScrollValue = INT_MAX / 2;
const int View::SignalHeight = 30;
@@
-238,14
+244,20
@@
vector< shared_ptr<Trace> > View::get_traces() const
{
const vector< shared_ptr<Signal> > sigs(
session().get_signals());
{
const vector< shared_ptr<Signal> > sigs(
session().get_signals());
+#ifdef ENABLE_DECODE
const vector< shared_ptr<DecodeTrace> > decode_sigs(
session().get_decode_signals());
vector< shared_ptr<Trace> > traces(
sigs.size() + decode_sigs.size());
const vector< shared_ptr<DecodeTrace> > decode_sigs(
session().get_decode_signals());
vector< shared_ptr<Trace> > traces(
sigs.size() + decode_sigs.size());
+#else
+ vector< shared_ptr<Trace> > traces(sigs.size());
+#endif
vector< shared_ptr<Trace> >::iterator i = traces.begin();
i = copy(sigs.begin(), sigs.end(), i);
vector< shared_ptr<Trace> >::iterator i = traces.begin();
i = copy(sigs.begin(), sigs.end(), i);
+#ifdef ENABLE_DECODE
i = copy(decode_sigs.begin(), decode_sigs.end(), i);
i = copy(decode_sigs.begin(), decode_sigs.end(), i);
+#endif
stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets);
return traces;
stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets);
return traces;
@@
-383,7
+395,8
@@
void View::update_scroll()
void View::update_layout()
{
void View::update_layout()
{
- setViewportMargins(_header->sizeHint().width(), RulerHeight, 0, 0);
+ setViewportMargins(_header->sizeHint().width(),
+ _ruler->sizeHint().height(), 0, 0);
_ruler->setGeometry(_viewport->x(), 0,
_viewport->width(), _viewport->y());
_header->setGeometry(0, _viewport->y(),
_ruler->setGeometry(_viewport->x(), 0,
_viewport->width(), _viewport->y());
_header->setGeometry(0, _viewport->y(),
@@
-480,7
+493,7
@@
void View::signals_changed()
offset += SignalHeight + 2 * SignalMargin;
}
offset += SignalHeight + 2 * SignalMargin;
}
-
setViewportMargins(_header->sizeHint().width(), RulerHeight, 0, 0
);
+
update_layout(
);
normalize_layout();
}
normalize_layout();
}