projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use redundant void argument.
[pulseview.git]
/
pv
/
view
/
view.hpp
diff --git
a/pv/view/view.hpp
b/pv/view/view.hpp
index 0412c697ba1db0aea118760618fb1fd99c97c04d..c289cfcb00ce93060d42c5095ba18a689444972d 100644
(file)
--- a/
pv/view/view.hpp
+++ b/
pv/view/view.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_VIEW_HPP
*/
#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
@@
-90,7
+89,7
@@
private:
static const int ScaleUnits[3];
public:
static const int ScaleUnits[3];
public:
- explicit View(Session &session, QWidget *parent = 0);
+ explicit View(Session &session,
bool is_main_view=false,
QWidget *parent = 0);
Session& session();
const Session& session() const;
Session& session();
const Session& session() const;
@@
-206,6
+205,11
@@
public:
*/
void enable_sticky_scrolling(bool state);
*/
void enable_sticky_scrolling(bool state);
+ /**
+ * Toggle sticky scrolling.
+ */
+ void toggle_sticky_scrolling(void);
+
/**
* Enables or disables coloured trace backgrounds. If they're not
* coloured then they will use alternating colors.
/**
* Enables or disables coloured trace backgrounds. If they're not
* coloured then they will use alternating colors.
@@
-402,6
+406,7
@@
private:
bool updating_scroll_;
bool sticky_scrolling_;
bool updating_scroll_;
bool sticky_scrolling_;
+ bool coloured_bg_;
bool always_zoom_to_fit_;
QTimer delayed_view_updater_;
bool always_zoom_to_fit_;
QTimer delayed_view_updater_;
@@
-424,7
+429,12
@@
private:
QTimer lazy_event_handler_;
// This is true when the defaults couldn't be set due to insufficient info
QTimer lazy_event_handler_;
// This is true when the defaults couldn't be set due to insufficient info
- bool scroll_needs_defaults;
+ bool scroll_needs_defaults_;
+
+ // A nonzero value indicates the v offset to restore. See View::resizeEvent()
+ int saved_v_offset_;
+
+ bool size_finalized_;
};
} // namespace TraceView
};
} // namespace TraceView