bugui/score-addon-hardware
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

[widgets] WIP on recursive_change

Browse source
This commit is contained in:
thibaud keller 2025-01-21 00:10:21 +00:00
parent a6c770c4f8
commit 6375cb1558
10 changed files with 149 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Hardware/Widgets/EventWidget.cpp
View file

@ -16,7 +16,7 @@ EventWidget::EventWidget(Scenario::EventModel& event,
Scenario::ProcessModel* scen{scenario->get_model()};
scen->states.mutable_added.connect<&EventWidget::on_state_added>(this);
scen->states.removed.connect<&EventWidget::on_state_removed>(this);
scen->states.removing.connect<&EventWidget::on_state_removed>(this);
for(Scenario::StateModel& s : scen->states)
if (s.eventId() == model.id())
@ -56,7 +56,7 @@ void EventWidget::set_span_recursive()
void EventWidget::paint(bugui::painter& painter) const
{
if (!press) return;
if (!press && m_height == 0) return;
const auto col = model.metadata().getColor().getBrush().color();
// const auto col = skin.StateSelected().color();

13
Hardware/Widgets/EventWidget.hpp
View file

@ -5,9 +5,10 @@
namespace Hardware
{
struct EventWidget final : Nano::Observer
, ScenarioComponentSpec<Scenario::EventModel,
bugui::container_widget>
struct EventWidget final : ScenarioComponentSpec<
Scenario::EventModel,
bugui::container_widget>
, Nano::Observer
{
explicit EventWidget(Scenario::EventModel& event,
ScenarioWidget* scenario,
@ -21,15 +22,15 @@ struct EventWidget final : Nano::Observer
void set_span_recursive();
private:
void on_state_added(Scenario::StateModel& state);
void on_state_removed(const Scenario::StateModel& state);
bool contains(int px, int py) const override;
void paint(bugui::painter& painter) const override;
void on_press(int x, int y, bool pressed) override;
void on_state_added(Scenario::StateModel& state);
void on_state_removed(const Scenario::StateModel& state);
bool press{false};
int m_absolute_y{0};

10
Hardware/Widgets/IntervalWidget.cpp
View file

@ -26,6 +26,16 @@ int IntervalWidget::width() const
return model.duration.defaultDuration().sec();
}
void IntervalWidget::change_previous(const Scenario::StateModel& state)
{
}
void IntervalWidget::change_next(const Scenario::StateModel& state)
{
model.setHeightPercentage(state.heightPercentage());
}
bool IntervalWidget::contains(int px, int py) const
{
// ignore first and last cell

3
Hardware/Widgets/IntervalWidget.hpp
View file

@ -17,6 +17,9 @@ struct IntervalWidget final : ScenarioComponentSpec<Scenario::IntervalModel>
int y() const override;
int width() const override;
void change_previous(const Scenario::StateModel& state);
void change_next(const Scenario::StateModel& state);
private:
bool contains(int px, int py) const override;

42
Hardware/Widgets/ScenarioWidget.cpp
View file

@ -12,18 +12,29 @@ ScenarioWidget::ScenarioWidget(Scenario::ProcessModel* scenario,
, skin{Process::Style::instance()}
{
model->intervals.mutable_added.connect<&ScenarioWidget::on_interval_added>(this);
model->intervals.removed.connect<&ScenarioWidget::on_interval_removed>(this);
model->intervals.removing.connect<&ScenarioWidget::on_interval_removed>(this);
for(Scenario::IntervalModel& i : model->intervals)
add_widget<IntervalWidget>(i, this);
model->timeSyncs.mutable_added.connect<&ScenarioWidget::on_time_sync_added>(this);
model->timeSyncs.removed.connect<&ScenarioWidget::on_time_sync_removed>(this);
model->timeSyncs.removing.connect<&ScenarioWidget::on_time_sync_removed>(this);
for(Scenario::TimeSyncModel& t : model->timeSyncs)
add_widget<TimeSyncWidget>(t, this);
}
void ScenarioWidget::add_proxy(StateWidget* sw)
{
states_proxy.push_back(sw);
}
void ScenarioWidget::remove_proxy(StateWidget* sw)
{
std::erase_if(states_proxy,
[sw] (StateWidget* w) { return w == sw; });
}
void ScenarioWidget::on_interval_added(Scenario::IntervalModel& interval)
{
add_widget<IntervalWidget>(interval, this);
@ -54,4 +65,31 @@ void ScenarioWidget::on_time_sync_removed(const Scenario::TimeSyncModel& timeSyn
update();
}
void ScenarioWidget::recursive_change(const Scenario::StateModel& state)
{
auto& ni{state.nextInterval()};
if (ni)
{
auto& v{ni.value()};
for (const auto& c : children)
{
ScenarioComponent<>* s{static_cast<ScenarioComponent<>*>(c.get())};
if (s->this_model(v))
{
static_cast<IntervalWidget*>(s)->change_next(state);
break;
}
}
}
update();
}
void ScenarioWidget::recursive_change(const Scenario::IntervalModel& interval)
{
}
} // namespace Hardware

17
Hardware/Widgets/ScenarioWidget.hpp
View file

@ -6,9 +6,11 @@
namespace Hardware
{
struct StateWidget;
class ScenarioWidget final : public bugui::container_widget
, public Nano::Observer
{
{
public:
explicit ScenarioWidget(Scenario::ProcessModel* scenario,
bugui::container_widget* parent);
@ -23,6 +25,12 @@ public:
Scenario::ProcessModel* get_model() const { return model; }
void add_proxy(StateWidget* sw);
void remove_proxy(StateWidget* sw);
void recursive_change(const Scenario::StateModel& state);
void recursive_change(const Scenario::IntervalModel& interval);
private:
void on_interval_added(Scenario::IntervalModel& interval);
void on_interval_removed(const Scenario::IntervalModel& interval);
@ -30,6 +38,13 @@ private:
void on_time_sync_added(Scenario::TimeSyncModel& timeSync);
void on_time_sync_removed(const Scenario::TimeSyncModel& timeSync);
void move_previous(const Scenario::IntervalModel& interval);
void move_previous(const Scenario::StateModel& interval);
void move_next(const Scenario::IntervalModel& interval);
void move_next(const Scenario::StateModel& interval);
std::vector<StateWidget*> states_proxy;
Scenario::ProcessModel* model{nullptr};
const Process::Style& skin;
};

41
Hardware/Widgets/StateWidget.cpp
View file

@ -13,15 +13,32 @@ StateWidget::StateWidget(Scenario::StateModel& state,
{
set_absolute_y();
con = connect(&model,
&Scenario::StateModel::heightPercentageChanged,
this,
[scenario, this]
{
set_absolute_y();
set_span_recursive();
scenario->update();
});
// con = connect(&model,
// &Scenario::StateModel::heightPercentageChanged,
// this,
// [scenario, this]
// {
// set_absolute_y();
// set_span_recursive();
// scenario->update();
// });
scenario->add_proxy(this);
}
StateWidget::~StateWidget()
{
disconnect(con);
scenario->remove_proxy(this);
}
void StateWidget::change_previous(const Scenario::IntervalModel& interval)
{
}
void StateWidget::change_next(const Scenario::IntervalModel& interval)
{
}
void StateWidget::paint(bugui::painter& painter) const
@ -43,7 +60,7 @@ bool StateWidget::contains(int px, int py) const
void StateWidget::on_press(int x, int y, bool pressed)
{
update();
// update();
}
void StateWidget::on_double_press(int x, int y)
@ -58,8 +75,10 @@ void StateWidget::on_drag(int from_x, int from_y, int to_x, int to_y)
// prevent dragging out of scenario
if (new_height >= 0 && new_height <= 1)
{
model.setHeightPercentage(new_height);
scenario->recursive_change(model);
}
}
void StateWidget::set_absolute_y()

8
Hardware/Widgets/StateWidget.hpp
View file

@ -5,18 +5,20 @@
namespace Hardware
{
struct StateWidget final : QObject
, ScenarioComponentSpec<Scenario::StateModel>
struct StateWidget final : ScenarioComponentSpec<Scenario::StateModel>
, QObject
{
explicit StateWidget(Scenario::StateModel& state,
ScenarioWidget* scenario,
bugui::container_widget* parent);
~StateWidget() override { disconnect(con); }
~StateWidget() override;
int y() const override { return m_y; }
int get_absolute_y() { return m_absolute_y; };
void set_y();
void change_previous(const Scenario::IntervalModel& interval);
void change_next(const Scenario::IntervalModel& interval);
private:
W_OBJECT(StateWidget)

63
Hardware/Widgets/TimeSyncWidget.cpp
View file

@ -12,37 +12,19 @@ TimeSyncWidget::TimeSyncWidget(Scenario::TimeSyncModel& timeSync,
: ScenarioComponentSpec<Scenario::TimeSyncModel,
bugui::container_widget>{timeSync, scenario, parent}
{
connect(&model,
&Scenario::TimeSyncModel::dateChanged,
this,
[scenario] (const TimeVal&) { scenario->update(); });
connect(&model,
&Scenario::TimeSyncModel::newEvent,
this,
[scenario, this] (const Id<Scenario::EventModel>& eventId)
{
add_widget<EventWidget>(scenario->get_model()->events.at(eventId), scenario);
});
connect(&model,
&Scenario::TimeSyncModel::eventRemoved,
this,
[scenario, this] (const Id<Scenario::EventModel>& eventId)
{
remove_widget([&eventId]
(const auto& w)
{ return static_cast<ScenarioComponent<>*>(w.get())->this_model(eventId); });
set_span();
update();
});
Scenario::ProcessModel* scen{scenario->get_model()};
scen->events.mutable_added.connect<&TimeSyncWidget::on_state_added>(this);
scen->events.removing.connect<&TimeSyncWidget::on_state_removed>(this);
for(Scenario::EventModel& e : scen->events)
if (e.timeSync() == model.id())
add_widget<EventWidget>(e, scenario);
connect(&model,
&Scenario::TimeSyncModel::dateChanged,
this,
[scenario] (const TimeVal&) { scenario->update(); });
}
TimeSyncWidget::~TimeSyncWidget()
@ -50,14 +32,6 @@ TimeSyncWidget::~TimeSyncWidget()
disconnect(&model,
&Scenario::TimeSyncModel::dateChanged,
this, 0);
disconnect(&model,
&Scenario::TimeSyncModel::newEvent,
this, 0);
disconnect(&model,
&Scenario::TimeSyncModel::eventRemoved,
this, 0);
}
void TimeSyncWidget::set_span()
@ -84,9 +58,28 @@ void TimeSyncWidget::set_span()
static_cast<EventWidget*>(e.get())->set_y();
}
void TimeSyncWidget::on_state_added(Scenario::EventModel& event)
{
if (event.timeSync() != model.id()) return;
add_widget<EventWidget>(event, scenario);
}
void TimeSyncWidget::on_state_removed(const Scenario::EventModel& event)
{
if (event.timeSync() != model.id()) return;
remove_widget([&event]
(const auto& w)
{ return static_cast<ScenarioComponent<>*>(w.get())->this_model(event); });
set_span();
update();
}
void TimeSyncWidget::paint(bugui::painter& painter) const
{
if (!press) return;
if (!press && m_height == 0) return;
const auto col = model.metadata().getColor().getBrush().color();
// const auto col = skin.StateSelected().color();

11
Hardware/Widgets/TimeSyncWidget.hpp
View file

@ -6,9 +6,11 @@
namespace Hardware
{
struct TimeSyncWidget final : QObject
, ScenarioComponentSpec<Scenario::TimeSyncModel,
bugui::container_widget>
struct TimeSyncWidget final : ScenarioComponentSpec<
Scenario::TimeSyncModel,
bugui::container_widget>
, Nano::Observer
, QObject
{
explicit TimeSyncWidget(Scenario::TimeSyncModel& timeSync,
ScenarioWidget* scenario,
@ -25,6 +27,9 @@ struct TimeSyncWidget final : QObject
private:
W_OBJECT(TimeSyncWidget)
void on_state_added(Scenario::EventModel& event);
void on_state_removed(const Scenario::EventModel& event);
bool contains(int px, int py) const override;
void paint(bugui::painter& painter) const override;