Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 14:18:00 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

start.py: properly use Popen to start paparazzi subprocess

Browse Source 
while here cleanup a bit according to pep8...
This commit is contained in:
Felix Ruess
2015-02-09 19:15:35 +01:00
parent c3abe89472
commit 605527b1fd
1 changed files with 32 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
start.py
+32 -45
View File
@@ -14,17 +14,15 @@ from fnmatch import fnmatch
import subprocess import subprocess
class ConfChooser: class ConfChooser:
# General Functions # General Functions
def update_combo(self, combo, list, active): def update_combo(self, combo, clist, active):
combo.set_sensitive(False) combo.set_sensitive(False)
combo.get_model().clear() combo.get_model().clear()
current_index = 0 current_index = 0
for (i, text) in enumerate(list): for (i, text) in enumerate(clist):
combo.append_text(text) combo.append_text(text)
if os.path.join(self.conf_dir, text) == os.path.realpath(active): if os.path.join(self.conf_dir, text) == os.path.realpath(active):
current_index = i current_index = i
@@ -34,7 +32,7 @@ class ConfChooser:
def update_conf_label(self): def update_conf_label(self):
desc = "Current conf: " desc = "Current conf: "
if not os.path.lexists(self.conf_xml): if not os.path.lexists(self.conf_xml):
desc += "does not exist" desc += "does not exist"
else: else:
if os.path.islink(self.conf_xml): if os.path.islink(self.conf_xml):
if os.path.exists(self.conf_xml): if os.path.exists(self.conf_xml):
@@ -48,7 +46,7 @@ class ConfChooser:
def update_controlpanel_label(self): def update_controlpanel_label(self):
desc = "Current control_panel: " desc = "Current control_panel: "
if not os.path.lexists(self.controlpanel_xml): if not os.path.lexists(self.controlpanel_xml):
desc += "does not exist" desc += "does not exist"
else: else:
if os.path.islink(self.controlpanel_xml): if os.path.islink(self.controlpanel_xml):
if os.path.exists(self.controlpanel_xml): if os.path.exists(self.controlpanel_xml):
@@ -61,11 +59,8 @@ class ConfChooser:
# CallBack Functions # CallBack Functions
def find_conf_files(self): def find_conf_files(self):
conf_files = [] conf_files = []
pattern = "*conf[._-]*xml" pattern = "*conf[._-]*xml"
backup_pattern = "*conf[._-]*xml.20[0-9][0-9]-[01][0-9]-[0-3][0-9]_*" backup_pattern = "*conf[._-]*xml.20[0-9][0-9]-[01][0-9]-[0-3][0-9]_*"
excludes = ["%gconf.xml"] excludes = ["%gconf.xml"]
@@ -83,11 +78,8 @@ class ConfChooser:
conf_files.sort() conf_files.sort()
self.update_combo(self.conf_file_combo, conf_files, self.conf_xml) self.update_combo(self.conf_file_combo, conf_files, self.conf_xml)
def find_controlpanel_files(self): def find_controlpanel_files(self):
controlpanel_files = [] controlpanel_files = []
pattern = "*control_panel[._-]*xml" pattern = "*control_panel[._-]*xml"
backup_pattern = "*control_panel[._-]*xml.20[0-9][0-9]-[01][0-9]-[0-3][0-9]_*" backup_pattern = "*control_panel[._-]*xml.20[0-9][0-9]-[01][0-9]-[0-3][0-9]_*"
excludes = [] excludes = []
@@ -105,7 +97,6 @@ class ConfChooser:
controlpanel_files.sort() controlpanel_files.sort()
self.update_combo(self.controlpanel_file_combo, controlpanel_files, self.controlpanel_xml) self.update_combo(self.controlpanel_file_combo, controlpanel_files, self.controlpanel_xml)
def about(self, widget): def about(self, widget):
about_d = gtk.AboutDialog() about_d = gtk.AboutDialog()
about_d.set_program_name("Paparazzi Configuration Selector") about_d.set_program_name("Paparazzi Configuration Selector")
@@ -134,14 +125,14 @@ class ConfChooser:
def launch(self, widget): def launch(self, widget):
self.accept(widget) self.accept(widget)
os.system("./paparazzi &"); self.pp = subprocess.Popen("./paparazzi")
gtk.main_quit() self.window.destroy()
def backupconf(self, use_personal=False): def backupconf(self, use_personal=False):
timestr = datetime.datetime.now().strftime("%Y-%m-%d_%H:%M") timestr = datetime.datetime.now().strftime("%Y-%m-%d_%H:%M")
if os.path.islink(self.conf_xml): if os.path.islink(self.conf_xml):
if self.verbose: if self.verbose:
print("Symlink does not need backup"); print("Symlink does not need backup")
else: else:
if os.path.exists(self.conf_xml): if os.path.exists(self.conf_xml):
newname = "conf.xml." + timestr newname = "conf.xml." + timestr
@@ -160,7 +151,7 @@ class ConfChooser:
timestr = datetime.datetime.now().strftime("%Y-%m-%d_%H:%M") timestr = datetime.datetime.now().strftime("%Y-%m-%d_%H:%M")
if os.path.islink(self.controlpanel_xml): if os.path.islink(self.controlpanel_xml):
if self.verbose: if self.verbose:
print("Symlink does not need backup"); print("Symlink does not need backup")
else: else:
if os.path.exists(self.controlpanel_xml): if os.path.exists(self.controlpanel_xml):
newname = "control_panel.xml." + timestr newname = "control_panel.xml." + timestr
@@ -195,7 +186,6 @@ class ConfChooser:
self.find_controlpanel_files() self.find_controlpanel_files()
print("Deleted: " + filename) print("Deleted: " + filename)
def accept(self, widget): def accept(self, widget):
selected = self.conf_file_combo.get_active_text() selected = self.conf_file_combo.get_active_text()
if selected == "conf.xml": if selected == "conf.xml":
@@ -221,8 +211,6 @@ class ConfChooser:
self.update_controlpanel_label() self.update_controlpanel_label()
self.find_controlpanel_files() self.find_controlpanel_files()
def personal_conf(self, widget): def personal_conf(self, widget):
if os.path.exists(self.conf_personal): if os.path.exists(self.conf_personal):
print("Your personal conf file already exists!") print("Your personal conf file already exists!")
@@ -248,11 +236,10 @@ class ConfChooser:
self.find_controlpanel_files() self.find_controlpanel_files()
# Constructor Functions # Constructor Functions
def destroy(self, widget, data=None):
gtk.main_quit()
def __init__(self): def __init__(self):
# paparazzi process
self.pp = None
self.window = gtk.Window(gtk.WINDOW_TOPLEVEL) self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
self.window.set_title("Paparazzi Configuration Chooser") self.window.set_title("Paparazzi Configuration Chooser")
@@ -307,12 +294,12 @@ class ConfChooser:
# Combo Bar # Combo Bar
self.conf_label = gtk.Label("Conf:") self.conf_label = gtk.Label("Conf:")
self.conf_label.set_size_request(100,30) self.conf_label.set_size_request(100, 30)
self.conf_file_combo = gtk.combo_box_new_text() self.conf_file_combo = gtk.combo_box_new_text()
self.find_conf_files() self.find_conf_files()
# self.firmwares_combo.connect("changed", self.parse_list_of_airframes) # self.firmwares_combo.connect("changed", self.parse_list_of_airframes)
self.conf_file_combo.set_size_request(550,30) self.conf_file_combo.set_size_request(550, 30)
self.btnDeleteConf = gtk.Button(None, gtk.STOCK_DELETE) self.btnDeleteConf = gtk.Button(None, gtk.STOCK_DELETE)
self.btnDeleteConf.connect("clicked", self.delete_conf) self.btnDeleteConf.connect("clicked", self.delete_conf)
@@ -329,11 +316,11 @@ class ConfChooser:
self.confbar.pack_start(self.btnPersonalConf) self.confbar.pack_start(self.btnPersonalConf)
self.my_vbox.pack_start(self.confbar, False) self.my_vbox.pack_start(self.confbar, False)
##### Explain current conf config # Explain current conf config
self.conf_explain = gtk.Label(""); self.conf_explain = gtk.Label("")
self.update_conf_label() self.update_conf_label()
self.conf_explain.set_size_request(0,45) self.conf_explain.set_size_request(0, 45)
self.cfexbar = gtk.HBox() self.cfexbar = gtk.HBox()
self.cfexbar.pack_start(self.conf_explain) self.cfexbar.pack_start(self.conf_explain)
@@ -342,13 +329,13 @@ class ConfChooser:
# Controlpanel # Controlpanel
self.controlpanel_label = gtk.Label("Controlpanel:") self.controlpanel_label = gtk.Label("Controlpanel:")
self.controlpanel_label.set_size_request(100,30) self.controlpanel_label.set_size_request(100, 30)
self.controlpanel_file_combo = gtk.combo_box_new_text() self.controlpanel_file_combo = gtk.combo_box_new_text()
self.find_controlpanel_files() self.find_controlpanel_files()
self.controlpanel_file_combo.set_size_request(550,30) self.controlpanel_file_combo.set_size_request(550, 30)
#window # window
self.btnDeleteControl = gtk.Button(None, gtk.STOCK_DELETE) self.btnDeleteControl = gtk.Button(None, gtk.STOCK_DELETE)
self.btnDeleteControl.connect("clicked", self.delete_controlpanel) self.btnDeleteControl.connect("clicked", self.delete_controlpanel)
@@ -365,24 +352,23 @@ class ConfChooser:
self.controlpanelbar.pack_start(self.btnPersonalControl) self.controlpanelbar.pack_start(self.btnPersonalControl)
self.my_vbox.pack_start(self.controlpanelbar, False) self.my_vbox.pack_start(self.controlpanelbar, False)
# Explain current controlpanel config
##### Explain current controlpanel config self.controlpanel_explain = gtk.Label("")
self.controlpanel_explain = gtk.Label("");
self.update_controlpanel_label() self.update_controlpanel_label()
self.controlpanel_explain.set_size_request(0,45) self.controlpanel_explain.set_size_request(0, 45)
self.ctexbar = gtk.HBox() self.ctexbar = gtk.HBox()
self.ctexbar.pack_start(self.controlpanel_explain) self.ctexbar.pack_start(self.controlpanel_explain)
self.my_vbox.pack_start(self.ctexbar, False) self.my_vbox.pack_start(self.ctexbar, False)
### show backups button # show backups button
self.btnBackups = gtk.CheckButton("show backups") self.btnBackups = gtk.CheckButton("show backups")
self.btnBackups.connect("toggled", self.set_backups) self.btnBackups.connect("toggled", self.set_backups)
self.my_vbox.pack_start(self.btnBackups, False) self.my_vbox.pack_start(self.btnBackups, False)
##### Buttons # Buttons
self.btnAccept = gtk.Button("Set Active") self.btnAccept = gtk.Button("Set Active")
self.btnAccept.connect("clicked", self.accept) self.btnAccept.connect("clicked", self.accept)
self.btnAccept.set_tooltip_text("Set selected Conf/Control_Panel as Active") self.btnAccept.set_tooltip_text("Set selected Conf/Control_Panel as Active")
@@ -392,31 +378,32 @@ class ConfChooser:
self.btnLaunch.set_tooltip_text("Launch Paparazzi with current conf.xml and control_panel.xml") self.btnLaunch.set_tooltip_text("Launch Paparazzi with current conf.xml and control_panel.xml")
self.btnExit = gtk.Button("Exit") self.btnExit = gtk.Button("Exit")
self.btnExit.connect("clicked", self.destroy) self.btnExit.connect("clicked", gtk.main_quit)
self.btnExit.set_tooltip_text("Close application") self.btnExit.set_tooltip_text("Close application")
self.toolbar = gtk.HBox() self.toolbar = gtk.HBox()
self.toolbar.set_size_request(0,60) self.toolbar.set_size_request(0, 60)
self.toolbar.pack_start(self.btnLaunch) self.toolbar.pack_start(self.btnLaunch)
self.toolbar.pack_start(self.btnAccept) self.toolbar.pack_start(self.btnAccept)
self.toolbar.pack_start(self.btnExit) self.toolbar.pack_start(self.btnExit)
self.my_vbox.pack_start(self.toolbar, False) self.my_vbox.pack_start(self.toolbar, False)
##### Bottom # Bottom
self.window.add(self.my_vbox) self.window.add(self.my_vbox)
self.window.show_all() self.window.show_all()
self.window.set_position(gtk.WIN_POS_CENTER_ALWAYS) self.window.set_position(gtk.WIN_POS_CENTER_ALWAYS)
self.window.connect("destroy", self.destroy) self.window.connect("destroy", gtk.main_quit)
def main(self): def main(self):
gtk.main() gtk.main()
if self.pp:
self.pp.wait()
if __name__ == "__main__": if __name__ == "__main__":
import sys import sys
if (len(sys.argv) > 1): if len(sys.argv) > 1:
airframe_file = sys.argv[1] airframe_file = sys.argv[1]
gui = ConfChooser() gui = ConfChooser()
gui.main() gui.main()