SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

Merge pull request #75 from teyssieuman/master

Browse Source 
Remove some compilation warnings on linux and 	Supress the "QT" error message at run time
This commit is contained in:
DreamSourceLab
2016-01-11 23:10:29 +08:00
parent c7c6dd697a 73cbab6f43
commit aad5257fd2
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DSView/pv/data/dsosnapshot.cpp
View File

@@ -237,9 +237,8 @@ void DsoSnapshot::append_payload_to_envelope_levels(bool header)
_envelope_done = true; _envelope_done = true;
} }
double DsoSnapshot::cal_vrms(double zero_off, int index) const double DsoSnapshot::cal_vrms(double zero_off, unsigned int index) const
{ {
assert(index >= 0);
assert(index < _channel_num); assert(index < _channel_num);
// root-meam-squart value // root-meam-squart value
@@ -272,9 +271,8 @@ double DsoSnapshot::cal_vrms(double zero_off, int index) const
return vrms; return vrms;
} }
double DsoSnapshot::cal_vmean(int index) const double DsoSnapshot::cal_vmean(unsigned int index) const
{ {
assert(index >= 0);
assert(index < _channel_num); assert(index < _channel_num);
// mean value // mean value

4
DSView/pv/data/dsosnapshot.h
View File

@@ -84,8 +84,8 @@ public:
void enable_envelope(bool enable); void enable_envelope(bool enable);
double cal_vrms(double zero_off, int index) const; double cal_vrms(double zero_off, unsigned int index) const;
double cal_vmean(int index) const; double cal_vmean(unsigned int index) const;
private: private:
void reallocate_envelope(Envelope &l); void reallocate_envelope(Envelope &l);

2
DSView/pv/dock/protocoldock.cpp
View File

@@ -105,7 +105,7 @@ void ProtocolDock::paintEvent(QPaintEvent *)
{ {
QStyleOption opt; QStyleOption opt;
opt.init(this); opt.init(this);
QPainter p(this); QPainter p(this->viewport());
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
} }