projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trace: Removed coloured_bg state
[pulseview.git]
/
pv
/
view
/
trace.hpp
diff --git
a/pv/view/trace.hpp
b/pv/view/trace.hpp
index 9f0ecd44c2a54ca82706775887db0e453792c6fa..882c2d7089d7ea90f59c752a24e8b75a7d919705 100644
(file)
--- a/
pv/view/trace.hpp
+++ b/
pv/view/trace.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_TRACE_HPP
*/
#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
@@
-27,12
+26,14
@@
#include <QRect>
#include <QString>
#include <QRect>
#include <QString>
-#include <
stdint.h
>
+#include <
cstdint
>
#include "tracetreeitem.hpp"
#include "pv/data/signalbase.hpp"
#include "tracetreeitem.hpp"
#include "pv/data/signalbase.hpp"
+using std::shared_ptr;
+
class QFormLayout;
namespace pv {
class QFormLayout;
namespace pv {
@@
-56,7
+57,7
@@
private:
static const QColor DarkGrayBGColour;
protected:
static const QColor DarkGrayBGColour;
protected:
- Trace(s
td::s
hared_ptr<data::SignalBase> channel);
+ Trace(shared_ptr<data::SignalBase> channel);
public:
/**
public:
/**
@@
-69,11
+70,6
@@
public:
*/
virtual void set_colour(QColor colour);
*/
virtual void set_colour(QColor colour);
- /**
- * Enables or disables the coloured background for this trace.
- */
- void set_coloured_bg(bool state);
-
/**
* Paints the signal label.
* @param p the QPainter to paint into.
/**
* Paints the signal label.
* @param p the QPainter to paint into.
@@
-128,8
+124,8
@@
private Q_SLOTS:
void on_colouredit_changed(const QColor &colour);
protected:
void on_colouredit_changed(const QColor &colour);
protected:
- s
td::s
hared_ptr<data::SignalBase> base_;
- bool coloured_bg_
, coloured_bg_
state_;
+ shared_ptr<data::SignalBase> base_;
+ bool coloured_bg_state_;
private:
pv::widgets::Popup *popup_;
private:
pv::widgets::Popup *popup_;