#177 Use trend index for active-trend command, not trend id. (#179)

open-simulation-platform · Jun 3, 2020 · 69b45fd · 69b45fd
1 parent 4863563
commit 69b45fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/libcosim/trending.go b/libcosim/trending.go
@@ -131,8 +131,8 @@ func activeTrend(status *structs.SimulationStatus, trendIndex string) (bool, str
 }
 
 func generatePlotData(sim *Simulation, status *structs.SimulationStatus) {
-	for _, trend := range status.Trends {
-		if status.ActiveTrend != trend.Id {
+	for idx, trend := range status.Trends {
+		if status.ActiveTrend != idx {
 			for i, _ := range trend.TrendSignals {
 				trend.TrendSignals[i].TrendXValues = nil
 				trend.TrendSignals[i].TrendYValues = nil

diff --git a/src/client/controller.cljs b/src/client/controller.cljs
@@ -153,9 +153,8 @@
 
 (k/reg-event-fx ::trend-enter
                 (fn [{:keys [db]} [{:keys [index]}]]
-                  (let [trend-id (-> db :state :trends (get (int index)) :id)]
-                    (merge {:db (assoc db :active-trend-index index)}
-                           (socket-command ["active-trend" (str trend-id)])))))
+                  (merge {:db (assoc db :active-trend-index index)}
+                         (socket-command ["active-trend" (str index)]))))
 
 (k/reg-event-fx ::trend-leave
                 (fn [{:keys [db]} _]