From 1ee2f18d6571984c366f28eef106f9a6b1c42ee1 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Thu, 27 Feb 2020 21:42:40 +0100 Subject: [PATCH] Relative-Hook: remove obsolete direct manipulation (test) code the marked pars are diagnostics code anyway, however, the first attempt used direct manipulation of the child offsets from "outside". Now, after switching to the ViewHook-mechanism, such direct manipulation of view innards is no longer neccessary, as can be verified by removing that test code now. --- src/stage/timeline/body-canvas-widget.cpp | 20 -------------------- src/stage/timeline/body-canvas-widget.hpp | 3 --- src/stage/timeline/timeline-controller.cpp | 8 +------- src/stage/timeline/timeline-controller.hpp | 4 ---- src/stage/timeline/timeline-layout.hpp | 3 --- src/stage/timeline/track-body.cpp | 3 --- src/stage/timeline/track-body.hpp | 3 --- src/stage/timeline/track-presenter.cpp | 10 ++-------- src/stage/timeline/track-presenter.hpp | 5 +---- wiki/thinkPad.ichthyo.mm | 19 ++++++++++++------- 10 files changed, 16 insertions(+), 62 deletions(-) diff --git a/src/stage/timeline/body-canvas-widget.cpp b/src/stage/timeline/body-canvas-widget.cpp index 3711f3d39..9d0f5e79b 100644 --- a/src/stage/timeline/body-canvas-widget.cpp +++ b/src/stage/timeline/body-canvas-widget.cpp @@ -42,9 +42,6 @@ #include "common/advice.hpp" #include "lib/util.hpp" -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this -#include "lib/format-cout.hpp" -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this //#include //#include @@ -521,23 +518,6 @@ namespace timeline { adjust (rulerCanvas_, canvasWidth, rulerHeight); adjust (mainCanvas_, canvasWidth, max(0, totalHeight-rulerHeight)); } -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this -/// -/// - void - BodyCanvasWidget::DEBUG_injectTrackLabel (cuString const& trackName, int startLine) - { - NOTREACHED ("debug code obsoleted by the new ViewHook concept"); - ///////////////////////////TODO TOD-oh -// Gtk::Button* butt = Gtk::manage (new Gtk::Button{trackName}); -// butt->signal_clicked().connect( -// [butt]{ cout << "|=="<get_label()<show(); - } -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this TimelineCanvas& BodyCanvasWidget::getCanvas (int yPos) diff --git a/src/stage/timeline/body-canvas-widget.hpp b/src/stage/timeline/body-canvas-widget.hpp index f3a0183fe..f7099213e 100644 --- a/src/stage/timeline/body-canvas-widget.hpp +++ b/src/stage/timeline/body-canvas-widget.hpp @@ -134,9 +134,6 @@ namespace timeline { /** a way to get and possibly (re)compute the current TrackProfile */ using ProfileGetter = std::function; ProfileGetter getProfile; -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this - void DEBUG_injectTrackLabel(cuString const& trackName, int startLine); -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this protected: /* ==== Interface: ViewHook ===== */ diff --git a/src/stage/timeline/timeline-controller.cpp b/src/stage/timeline/timeline-controller.cpp index f0699d987..78f519dde 100644 --- a/src/stage/timeline/timeline-controller.cpp +++ b/src/stage/timeline/timeline-controller.cpp @@ -44,9 +44,6 @@ #include "stage/timeline/timeline-controller.hpp" #include "stage/timeline/track-presenter.hpp" #include "stage/timeline/marker-widget.hpp" -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this -#include "stage/timeline/body-canvas-widget.hpp" -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this //#include "stage/workspace/workspace-window.hpp" //#include "stage/ui-bus.hpp" @@ -90,9 +87,6 @@ namespace timeline { , name_{identity.getSym()} // fallback initialise name from human-readable ID symbol , markers_{} , fork_{new TrackPresenter{trackID, nexus, layoutManager}} -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this - , DEBUG_canvas_{layoutManager.exposeCanvasForDebug()} -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this { } @@ -107,7 +101,7 @@ namespace timeline { { if (mark.idi.getSym() == "test" && this->fork_) { - this->fork_->injectDebugTrackLabels(DEBUG_canvas_); + this->fork_->injectDebugTrackLabels(); } else // forward to default handler model::Controller::doMark (mark); diff --git a/src/stage/timeline/timeline-controller.hpp b/src/stage/timeline/timeline-controller.hpp index 809e276f4..5a0f0fa81 100644 --- a/src/stage/timeline/timeline-controller.hpp +++ b/src/stage/timeline/timeline-controller.hpp @@ -74,9 +74,6 @@ namespace timeline { class TrackPresenter; class TimelineLayout; class MarkerWidget; -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this - class BodyCanvasWidget; -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this /** @@ -124,7 +121,6 @@ namespace timeline { private:/* ===== Events ===== */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this virtual void doMark (GenNode const& mark) override; - BodyCanvasWidget& DEBUG_canvas_; /////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this private:/* ===== Internals ===== */ diff --git a/src/stage/timeline/timeline-layout.hpp b/src/stage/timeline/timeline-layout.hpp index e061ee3fd..aed802a13 100644 --- a/src/stage/timeline/timeline-layout.hpp +++ b/src/stage/timeline/timeline-layout.hpp @@ -128,9 +128,6 @@ namespace timeline { void installRootTrack (TrackHeadWidget&,TrackBody&); Gtk::WidgetPath getBodyWidgetPath() const; -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this - BodyCanvasWidget& exposeCanvasForDebug() { return bodyCanvas_; } -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this protected: /* ==== Interface: LayoutManager===== */ diff --git a/src/stage/timeline/track-body.cpp b/src/stage/timeline/track-body.cpp index 1907eea0b..e7fba2cc6 100644 --- a/src/stage/timeline/track-body.cpp +++ b/src/stage/timeline/track-body.cpp @@ -89,9 +89,6 @@ namespace timeline { TrackBody::setTrackName (cuString& trackName) { TODO ("is the track name of any relevance for the TrackBody widget?"); -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this - this->TODO_trackName_ = trackName;; -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this } diff --git a/src/stage/timeline/track-body.hpp b/src/stage/timeline/track-body.hpp index 05a97fa62..d7843d2f2 100644 --- a/src/stage/timeline/track-body.hpp +++ b/src/stage/timeline/track-body.hpp @@ -146,9 +146,6 @@ namespace timeline { return rulers_; } -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this - uString TODO_trackName_; -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this }; diff --git a/src/stage/timeline/track-presenter.cpp b/src/stage/timeline/track-presenter.cpp index 764381404..20b889a3e 100644 --- a/src/stage/timeline/track-presenter.cpp +++ b/src/stage/timeline/track-presenter.cpp @@ -38,9 +38,6 @@ #include "include/ui-protocol.hpp" #include "stage/timeline/track-presenter.hpp" /////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this -#include "stage/timeline/body-canvas-widget.hpp" -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this #include "lib/format-cout.hpp" /////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this @@ -86,11 +83,8 @@ namespace timeline { /////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this void - TrackPresenter::injectDebugTrackLabels(BodyCanvasWidget& bodyCanvas) + TrackPresenter::injectDebugTrackLabels() { - ///////////////////////////TODO TOD-oh -// bodyCanvas.DEBUG_injectTrackLabel (display_.body_.TODO_trackName_, display_.body_.startLine_ + display_.body_.contentOffset_); - ///////////////////////////TODO TOD-oh uint x = rand() % 50; uint y = 0; Gtk::Button* butt = Gtk::manage (new ViewHooked{display_.hookedAt(x,y), TODO_trackName_}); @@ -99,7 +93,7 @@ namespace timeline { butt->show(); for (auto& subTrack : subFork_) - subTrack->injectDebugTrackLabels (bodyCanvas); + subTrack->injectDebugTrackLabels(); } /////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this /** diff --git a/src/stage/timeline/track-presenter.hpp b/src/stage/timeline/track-presenter.hpp index 0d99e8e62..3c59f3514 100644 --- a/src/stage/timeline/track-presenter.hpp +++ b/src/stage/timeline/track-presenter.hpp @@ -66,9 +66,6 @@ namespace stage { namespace timeline { -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this - class BodyCanvasWidget; -/////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this using std::vector; using std::unique_ptr; @@ -204,7 +201,7 @@ namespace timeline { /** set up a binding to respond to mutation messages via UiBus */ virtual void buildMutator (lib::diff::TreeMutator::Handle) override; /////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this - void injectDebugTrackLabels(BodyCanvasWidget&); + void injectDebugTrackLabels(); /////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this /////////////////////////////////////////////////////////////////////////////////////////////////////////////TICKET #1201 : test/code... remove this uString TODO_trackName_; diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index f49dcc027..74ac7a2bc 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -19428,7 +19428,7 @@ - + @@ -19518,8 +19518,8 @@ - - + + @@ -22119,8 +22119,8 @@ - - + + @@ -22152,7 +22152,11 @@ - + + + + + @@ -26522,7 +26526,8 @@ - + +