Skip to content

Commit 5e9f6cf

Browse files
committed
[fix] リセット処理修正, 色変更
1 parent 2293c37 commit 5e9f6cf

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

main.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ async def rtReset(e):
569569
if recordStatus:
570570
await openSnackbar("記録中のため、リセットできません。")
571571
return()
572-
global rawResponseData
572+
global rawResponseData, recordRawData, recordDataStatus
573573
realtimeRecordTable.rows.clear()
574574
# table.rows.clear() kx
575575
time.clear()
@@ -595,11 +595,15 @@ async def rtReset(e):
595595
realtimeData[i].value="-"
596596
rtNowData[i].on_click=lambda e: pyperclip.copy("-")
597597
rawResponseData=""
598+
recordRawData=""
598599
rawdata_tx.value=""
599600
rawRecorddata_tx.value=""
600-
601+
recordDeleteTitle.color=None
602+
recordDeleteText.color=None
603+
recordDeleteIcon.color=None
601604
recordStartTime=-1.0
602605
recordStatus=False
606+
recordDataStatus=False
603607
baloonSelecter.value=None
604608
recordStartButton.disabled=True
605609
recordSaveButton.disabled=True
@@ -608,6 +612,7 @@ async def rtReset(e):
608612
await realtimeGraphSystem.reset()
609613
await close_resetAlert(e)
610614
# await table.update_async() kx
615+
await rawRecorddata_tx.update_async()
611616
await table_column.update_async()
612617
await realtimeTable.update_async()
613618
await realtimeRecordTable.update_async()
@@ -1149,6 +1154,7 @@ async def recordDelete(e):
11491154
recordDeleteTitle.color=None
11501155
recordDeleteText.color=None
11511156
recordDeleteIcon.color=None
1157+
11521158
await recordDeleteTitle.update_async()
11531159
await recordDeleteText.update_async()
11541160
await recordDeleteIcon.update_async()
@@ -1203,8 +1209,8 @@ async def recordStop(e):
12031209
recordStartButton.disabled=True
12041210
recordSaveButton.disabled=False
12051211
recordDeleteButton.disabled=False
1206-
recordDeleteTitle.color="orange"
1207-
recordDeleteText.color="orange"
1212+
recordDeleteTitle.color="red"
1213+
recordDeleteText.color="red"
12081214
recordDeleteIcon.color="red"
12091215
else:
12101216
recordStartButton.disabled=False
@@ -1231,8 +1237,8 @@ async def recordStart(e):
12311237
recordStartButton.on_click=recordStop
12321238
recordStartTitle.value="記録ストップ"
12331239
recordStartText.value="着陸時にクリック"
1234-
recordStartTitle.color="orange"
1235-
recordStartText.color="orange"
1240+
recordStartTitle.color="red"
1241+
recordStartText.color="red"
12361242
recordStartIcon.name=ft.icons.STOP
12371243
await recordStartTitle.update_async()
12381244
await recordStartText.update_async()

0 commit comments

Comments
 (0)