CopterExpress/clever-show
1
0
Fork 0
mirror of https://github.com/CopterExpress/clever-show.git synced 2026-06-02 18:19:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
artem30801@gmail.com
2019-03-29 17:12:59 +03:00
parent 94cc5fb322 8cb3558a27
commit 1f2c9386f9
5 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Server/server.py
View File

@@ -344,10 +344,10 @@ class Client:
return self._request_queue.pop(requested_value)
@requires_connect
def send_file(self, filepath, dest_filename):
def send_file(self, filepath, dest_filename, clever_restart = False):
print("Sending file ", dest_filename)
chunk_count = math.ceil(os.path.getsize(filepath) / Server.BUFFER_SIZE)
self.send(Client.form_message("writefile", {"filesize": chunk_count, "filename": dest_filename}))
self.send(Client.form_message("writefile", {"filesize": chunk_count, "filename": dest_filename, "clever_restart": clever_restart}))
with open(filepath, 'rb') as file:
chunk = file.read(Server.BUFFER_SIZE)
while chunk:

4
Server/server_qt.py
View File

@@ -181,7 +181,7 @@ class MainWindow(QtWidgets.QMainWindow):
item = model.item(row_num, 0)
if item.isCheckable() and item.checkState() == Qt.Checked:
copter = Client.get_by_id(item.text())
copter.send_file(path, "/home/pi/catkin_ws/src/clever/aruco_pose/map/animation_map.txt")
copter.send_file(path, "/home/pi/catkin_ws/src/clever/aruco_pose/map/animation_map.txt", clever_restart=True)
model = QStandardItemModel()
@@ -198,7 +198,7 @@ def client_connected(self: Client):
model.appendRow((copter_id_item, ))
Client.on_connect = client_connected
Client.on_first_connect = client_connected
if __name__ == "__main__":