projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Restructure add_view()
[pulseview.git]
/
pv
/
view
/
signal.hpp
diff --git
a/pv/view/signal.hpp
b/pv/view/signal.hpp
index 517bbf4a763da925e347f9add1cab83afc5b4bb3..8796660e175fd4ce84d779afbeb660889681ee0f 100644
(file)
--- a/
pv/view/signal.hpp
+++ b/
pv/view/signal.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_SIGNAL_HPP
-#define PULSEVIEW_PV_VIEW_SIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_SIGNAL_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_SIGNAL_HPP
#include <memory>
#include <memory>
@@
-32,19
+31,17
@@
#include "trace.hpp"
#include "viewitemowner.hpp"
#include "trace.hpp"
#include "viewitemowner.hpp"
-namespace sigrok {
- class Channel;
-}
-
namespace pv {
class Session;
namespace data {
namespace pv {
class Session;
namespace data {
+class SignalBase;
class SignalData;
}
class SignalData;
}
-namespace view {
+namespace views {
+namespace TraceView {
class Signal : public Trace, public ViewItemOwner
{
class Signal : public Trace, public ViewItemOwner
{
@@
-52,13
+49,13
@@
class Signal : public Trace, public ViewItemOwner
protected:
Signal(pv::Session &session,
protected:
Signal(pv::Session &session,
- std::shared_ptr<
sigrok::Channel
> channel);
+ std::shared_ptr<
data::SignalBase
> channel);
public:
/**
* Sets the name of the signal.
*/
public:
/**
* Sets the name of the signal.
*/
- void set_name(QString name);
+ v
irtual v
oid set_name(QString name);
virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
virtual std::shared_ptr<pv::data::SignalData> data() const = 0;
@@
-67,9
+64,11
@@
public:
*/
bool enabled() const;
*/
bool enabled() const;
- void enable(bool enable = true);
+ std::shared_ptr<data::SignalBase> base() const;
+
+ virtual void save_settings(QSettings &settings) const;
-
std::shared_ptr<sigrok::Channel> channel() const
;
+
virtual void restore_settings(QSettings &settings)
;
/**
* Returns a list of row items owned by this object.
/**
* Returns a list of row items owned by this object.
@@
-100,12
+99,15
@@
public:
*/
virtual void scale_handle_released() {};
*/
virtual void scale_handle_released() {};
-private Q_SLOTS:
+protected Q_SLOTS:
+ virtual void on_name_changed(const QString &text);
+
void on_disable();
void on_disable();
+ void on_enabled_changed(bool enabled);
+
protected:
pv::Session &session_;
protected:
pv::Session &session_;
- std::shared_ptr<sigrok::Channel> channel_;
const std::shared_ptr<SignalScaleHandle> scale_handle_;
const item_list items_;
const std::shared_ptr<SignalScaleHandle> scale_handle_;
const item_list items_;
@@
-113,7
+115,8
@@
protected:
QComboBox *name_widget_;
};
QComboBox *name_widget_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_SIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_SIGNAL_HPP