Skip to content

fix | sprint2 | FRB-171 | 시뮬레이터 아이콘 추가 | 정민석 #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gwangbu-desu merged 2 commits into from
May 26, 2025
Merged

fix | sprint2 | FRB-171 | 시뮬레이터 아이콘 추가 | 정민석 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1524887
fix | sprint2 | FRB-171 | 시뮬레이터 아이콘 추가 | 정민석
minnnseokk May 26, 2025
9553cc0
fix | sprint2 | FRB-171 | 시뮬레이터 중지 버튼 삭제 | 정민석
minnnseokk May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions simulation_cconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
"devices": [
{
"count": 5,
"interval": 3,
"interval": 5,
"equip_id": "20250507165750-827",
"zone_id": "20250507165750-827",
"simulator": "real_sensor",
"sensor_num": 1
},
{
"count": 5,
"interval": 3,
"interval": 5,
"equip_id": "20250507171316-389",
"zone_id": "20250507165750-827",
"simulator": "vibration",
"sensor_num": 1
}
}
]
}
28 changes: 17 additions & 11 deletions streamlit_app/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,20 @@ def main():

# 디바이스 타입에 따라 아이콘 선택
simulator_type = device["simulator"]
icon = "🌡️" if simulator_type == "temp" else "💧" if simulator_type == "humidity" else "📊"

icon = ("🌡️" if simulator_type == "temp" else
"💧" if simulator_type == "humidity" else
"📳" if simulator_type == "vibration" else
"⚡" if simulator_type == "current" else
"💨" if simulator_type == "dust" else
"🌫️" if simulator_type == "voc" else
"🔌" if simulator_type == "real_sensor" else
"📊")
# 상태에 따른 색상 및 프로그레스 바
if is_running:
st.markdown(f"**{icon} Device {i+1}**: 🟢 Running")
st.markdown(f"**{icon} Device {i+1} ({simulator_type})**: 🟢 Running")
st.progress(100) # 실행 중인 경우 100% 표시
else:
st.markdown(f"**{icon} Device {i+1}**: ⚪ Idle")
st.markdown(f"**{icon} Device {i+1} ({simulator_type})**: ⚪ Idle")
st.progress(0) # 유휴 상태인 경우 0% 표시
# Display devices in blocks
st.header("Devices")
Expand Down Expand Up @@ -219,13 +225,13 @@ def main():
st.warning(f"Simulation for Device {i + 1} is already running.")

# Stop Simulation Button
if st.button(f"Stop Simulation for Device {i + 1}", key=f"stop_{i}"):
if i in stop_events:
stop_events[i].set() # Stop 이벤트 설정
st.write(f"Stopping simulation for Device {i + 1} with stop_event: {stop_events[i]}") # 디버깅 출력
st.success(f"Simulation for Device {i + 1} stopped.")
else:
st.warning(f"No simulation is running for Device {i + 1}.")
# if st.button(f"Stop Simulation for Device {i + 1}", key=f"stop_{i}"):
# if i in stop_events:
# stop_events[i].set() # Stop 이벤트 설정
# st.write(f"Stopping simulation for Device {i + 1} with stop_event: {stop_events[i]}") # 디버깅 출력
# st.success(f"Simulation for Device {i + 1} stopped.")
# else:
# st.warning(f"No simulation is running for Device {i + 1}.")

# Delete Device Button
if st.button(f"Delete Device {i + 1}", key=f"delete_{i}"):
Expand Down
Loading