diff --git a/ed_lrr_gui/__main__.py b/ed_lrr_gui/__main__.py index c03221f..153f408 100644 --- a/ed_lrr_gui/__main__.py +++ b/ed_lrr_gui/__main__.py @@ -141,11 +141,11 @@ class DownloadThread(QThread): self.running = False def run(self): - jobs = [ + dl_jobs = [ (self.systems_url, self.systems_file), (self.bodies_url, self.bodies_file), ] - for url, dest in jobs: + for url, dest in dl_jobs: outfile = url.split("/")[-1] size = RQ.head(url, headers={"Accept-Encoding": "None"}) size.raise_for_status() diff --git a/ed_lrr_gui/gui/ed_lrr.py b/ed_lrr_gui/gui/ed_lrr.py index 721546f..c33b639 100644 --- a/ed_lrr_gui/gui/ed_lrr.py +++ b/ed_lrr_gui/gui/ed_lrr.py @@ -26,14 +26,11 @@ class Ui_ED_LRR(object): ED_LRR.setDocumentMode(False) ED_LRR.setTabShape(QtWidgets.QTabWidget.Rounded) self.centralwidget = QtWidgets.QWidget(ED_LRR) -<<<<<<< Updated upstream -======= sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.centralwidget.sizePolicy().hasHeightForWidth()) self.centralwidget.setSizePolicy(sizePolicy) ->>>>>>> Stashed changes self.centralwidget.setObjectName("centralwidget") self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget) self.verticalLayout.setObjectName("verticalLayout") @@ -222,12 +219,6 @@ class Ui_ED_LRR(object): self.rd_precomp.setObjectName("rd_precomp") self.gr_mode.addWidget(self.rd_precomp, 0, 2, 1, 1) self.formLayout_2.setLayout(3, QtWidgets.QFormLayout.FieldRole, self.gr_mode) -<<<<<<< Updated upstream - self.btn_permute = QtWidgets.QPushButton(self.tab_route) - self.btn_permute.setObjectName("btn_permute") - self.formLayout_2.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.btn_permute) -======= ->>>>>>> Stashed changes self.lst_sys = QtWidgets.QTreeWidget(self.tab_route) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) @@ -242,18 +233,6 @@ class Ui_ED_LRR(object): self.lst_sys.setAlternatingRowColors(True) self.lst_sys.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection) self.lst_sys.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows) -<<<<<<< Updated upstream - self.lst_sys.setHeaderHidden(True) - self.lst_sys.setObjectName("lst_sys") - self.lst_sys.headerItem().setText(0, "1") - self.formLayout_2.setWidget(7, QtWidgets.QFormLayout.SpanningRole, self.lst_sys) - self.sb_range = QtWidgets.QDoubleSpinBox(self.tab_route) - self.sb_range.setObjectName("sb_range") - self.formLayout_2.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.sb_range) - self.lbl_range = QtWidgets.QLabel(self.tab_route) - self.lbl_range.setObjectName("lbl_range") - self.formLayout_2.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.lbl_range) -======= self.lst_sys.setHeaderHidden(False) self.lst_sys.setObjectName("lst_sys") self.lst_sys.headerItem().setText(0, "Name") @@ -265,7 +244,6 @@ class Ui_ED_LRR(object): self.lbl_range = QtWidgets.QLabel(self.tab_route) self.lbl_range.setObjectName("lbl_range") self.formLayout_2.setWidget(9, QtWidgets.QFormLayout.LabelRole, self.lbl_range) ->>>>>>> Stashed changes self.gr_opts = QtWidgets.QGridLayout() self.gr_opts.setObjectName("gr_opts") self.cmb_mode = QtWidgets.QComboBox(self.tab_route) @@ -293,28 +271,16 @@ class Ui_ED_LRR(object): self.lbl_mode = QtWidgets.QLabel(self.tab_route) self.lbl_mode.setObjectName("lbl_mode") self.gr_opts.addWidget(self.lbl_mode, 0, 1, 1, 1) -<<<<<<< Updated upstream - self.formLayout_2.setLayout(9, QtWidgets.QFormLayout.SpanningRole, self.gr_opts) - self.btn_go = QtWidgets.QPushButton(self.tab_route) - self.btn_go.setFlat(False) - self.btn_go.setObjectName("btn_go") - self.formLayout_2.setWidget(10, QtWidgets.QFormLayout.LabelRole, self.btn_go) -======= self.formLayout_2.setLayout(10, QtWidgets.QFormLayout.SpanningRole, self.gr_opts) self.btn_go = QtWidgets.QPushButton(self.tab_route) self.btn_go.setFlat(False) self.btn_go.setObjectName("btn_go") self.formLayout_2.setWidget(11, QtWidgets.QFormLayout.LabelRole, self.btn_go) ->>>>>>> Stashed changes self.gridLayout_4 = QtWidgets.QGridLayout() self.gridLayout_4.setObjectName("gridLayout_4") self.chk_permute_keep_last = QtWidgets.QCheckBox(self.tab_route) self.chk_permute_keep_last.setObjectName("chk_permute_keep_last") -<<<<<<< Updated upstream - self.gridLayout_4.addWidget(self.chk_permute_keep_last, 0, 2, 1, 1) -======= self.gridLayout_4.addWidget(self.chk_permute_keep_last, 0, 3, 1, 1) ->>>>>>> Stashed changes self.chk_permute_keep_first = QtWidgets.QCheckBox(self.tab_route) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -323,11 +289,7 @@ class Ui_ED_LRR(object): self.chk_permute_keep_first.setSizePolicy(sizePolicy) self.chk_permute_keep_first.setTristate(False) self.chk_permute_keep_first.setObjectName("chk_permute_keep_first") -<<<<<<< Updated upstream - self.gridLayout_4.addWidget(self.chk_permute_keep_first, 0, 1, 1, 1) -======= self.gridLayout_4.addWidget(self.chk_permute_keep_first, 0, 2, 1, 1) ->>>>>>> Stashed changes self.lbl_keep = QtWidgets.QLabel(self.tab_route) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) @@ -335,10 +297,6 @@ class Ui_ED_LRR(object): sizePolicy.setHeightForWidth(self.lbl_keep.sizePolicy().hasHeightForWidth()) self.lbl_keep.setSizePolicy(sizePolicy) self.lbl_keep.setObjectName("lbl_keep") -<<<<<<< Updated upstream - self.gridLayout_4.addWidget(self.lbl_keep, 0, 0, 1, 1) - self.formLayout_2.setLayout(4, QtWidgets.QFormLayout.FieldRole, self.gridLayout_4) -======= self.gridLayout_4.addWidget(self.lbl_keep, 0, 1, 1, 1) self.formLayout_2.setLayout(4, QtWidgets.QFormLayout.FieldRole, self.gridLayout_4) self.chk_permute = QtWidgets.QCheckBox(self.tab_route) @@ -347,7 +305,6 @@ class Ui_ED_LRR(object): self.btn_search = QtWidgets.QPushButton(self.tab_route) self.btn_search.setObjectName("btn_search") self.formLayout_2.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.btn_search) ->>>>>>> Stashed changes self.tabs.addTab(self.tab_route, "") self.tab_log = QtWidgets.QWidget() self.tab_log.setObjectName("tab_log") @@ -369,23 +326,16 @@ class Ui_ED_LRR(object): self.menu.setObjectName("menu") self.menu_file = QtWidgets.QMenu(self.menu) self.menu_file.setObjectName("menu_file") -<<<<<<< Updated upstream -======= self.menuWindow = QtWidgets.QMenu(self.menu) self.menuWindow.setObjectName("menuWindow") self.menuStyle = QtWidgets.QMenu(self.menuWindow) self.menuStyle.setObjectName("menuStyle") ->>>>>>> Stashed changes ED_LRR.setMenuBar(self.menu) self.bar_status = QtWidgets.QStatusBar(ED_LRR) self.bar_status.setObjectName("bar_status") ED_LRR.setStatusBar(self.bar_status) self.menu_act_quit = QtWidgets.QAction(ED_LRR) self.menu_act_quit.setObjectName("menu_act_quit") -<<<<<<< Updated upstream - self.menu_file.addAction(self.menu_act_quit) - self.menu.addAction(self.menu_file.menuAction()) -======= self.actionA = QtWidgets.QAction(ED_LRR) self.actionA.setObjectName("actionA") self.actionB = QtWidgets.QAction(ED_LRR) @@ -394,7 +344,6 @@ class Ui_ED_LRR(object): self.menuWindow.addAction(self.menuStyle.menuAction()) self.menu.addAction(self.menu_file.menuAction()) self.menu.addAction(self.menuWindow.menuAction()) ->>>>>>> Stashed changes self.retranslateUi(ED_LRR) self.tabs.setCurrentIndex(2) @@ -428,20 +377,12 @@ class Ui_ED_LRR(object): self.tabs.setTabText(self.tabs.indexOf(self.tab_preprocess), _translate("ED_LRR", "Preprocess")) self.lbl_sys_lst.setText(_translate("ED_LRR", "System List")) self.btn_sys_lst_browse.setText(_translate("ED_LRR", "...")) -<<<<<<< Updated upstream - self.btn_add.setText(_translate("ED_LRR", "Search+Add")) -======= self.btn_add.setText(_translate("ED_LRR", "Add")) ->>>>>>> Stashed changes self.inp_sys.setPlaceholderText(_translate("ED_LRR", "System Name")) self.btn_rm.setText(_translate("ED_LRR", "Remove")) self.rd_comp.setText(_translate("ED_LRR", "Compute Route")) self.rd_precomp.setText(_translate("ED_LRR", "Precompute Graph")) -<<<<<<< Updated upstream - self.btn_permute.setText(_translate("ED_LRR", "Permute")) -======= self.lst_sys.headerItem().setText(1, _translate("ED_LRR", "Type")) ->>>>>>> Stashed changes self.lbl_range.setText(_translate("ED_LRR", "Jump Range (Ly)")) self.cmb_mode.setCurrentText(_translate("ED_LRR", "Breadth-First Search")) self.cmb_mode.setItemText(0, _translate("ED_LRR", "Breadth-First Search")) @@ -454,13 +395,6 @@ class Ui_ED_LRR(object): self.chk_permute_keep_last.setText(_translate("ED_LRR", "Last")) self.chk_permute_keep_first.setText(_translate("ED_LRR", "First")) self.lbl_keep.setText(_translate("ED_LRR", "Keep Endpoints:")) -<<<<<<< Updated upstream - self.tabs.setTabText(self.tabs.indexOf(self.tab_route), _translate("ED_LRR", "Route")) - self.tabs.setTabText(self.tabs.indexOf(self.tab_log), _translate("ED_LRR", "Log")) - self.menu_file.setTitle(_translate("ED_LRR", "File")) - self.menu_act_quit.setText(_translate("ED_LRR", "Quit")) - self.menu_act_quit.setShortcut(_translate("ED_LRR", "Ctrl+Q")) -======= self.chk_permute.setText(_translate("ED_LRR", "Permute")) self.btn_search.setText(_translate("ED_LRR", "Search All")) self.tabs.setTabText(self.tabs.indexOf(self.tab_route), _translate("ED_LRR", "Route")) @@ -472,4 +406,3 @@ class Ui_ED_LRR(object): self.menu_act_quit.setShortcut(_translate("ED_LRR", "Ctrl+Q")) self.actionA.setText(_translate("ED_LRR", "A")) self.actionB.setText(_translate("ED_LRR", "B")) ->>>>>>> Stashed changes diff --git a/ed_lrr_gui/gui/ed_lrr.ui b/ed_lrr_gui/gui/ed_lrr.ui index 4685221..9872cd0 100644 --- a/ed_lrr_gui/gui/ed_lrr.ui +++ b/ed_lrr_gui/gui/ed_lrr.ui @@ -44,15 +44,12 @@ QTabWidget::Rounded -<<<<<<< Updated upstream -======= 0 0 ->>>>>>> Stashed changes @@ -372,11 +369,7 @@ -<<<<<<< Updated upstream - Search+Add -======= Add ->>>>>>> Stashed changes @@ -415,16 +408,6 @@ -<<<<<<< Updated upstream - - - - Permute - - - -======= ->>>>>>> Stashed changes @@ -461,13 +444,6 @@ QAbstractItemView::SelectRows -<<<<<<< Updated upstream - true - - - - 1 -======= false @@ -481,33 +457,21 @@ Type ->>>>>>> Stashed changes -<<<<<<< Updated upstream - - - - -======= ->>>>>>> Stashed changes Jump Range (Ly) -<<<<<<< Updated upstream - -======= ->>>>>>> Stashed changes @@ -579,11 +543,7 @@ -<<<<<<< Updated upstream - -======= ->>>>>>> Stashed changes GO! @@ -595,22 +555,14 @@ -<<<<<<< Updated upstream - -======= ->>>>>>> Stashed changes Last -<<<<<<< Updated upstream - -======= ->>>>>>> Stashed changes @@ -626,11 +578,7 @@ -<<<<<<< Updated upstream - -======= ->>>>>>> Stashed changes @@ -645,8 +593,6 @@ -<<<<<<< Updated upstream -======= @@ -661,7 +607,6 @@ ->>>>>>> Stashed changes @@ -709,9 +654,6 @@ -<<<<<<< Updated upstream - -======= Window @@ -725,7 +667,6 @@ ->>>>>>> Stashed changes @@ -736,8 +677,6 @@ Ctrl+Q -<<<<<<< Updated upstream -======= A @@ -748,7 +687,6 @@ B ->>>>>>> Stashed changes rd_comp diff --git a/rust/.vscode/arduino.json b/rust/.vscode/arduino.json new file mode 100644 index 0000000..21580ea --- /dev/null +++ b/rust/.vscode/arduino.json @@ -0,0 +1,5 @@ +{ + "board": "esp8266:esp8266:huzzah", + "configuration": "CpuFrequency=80,FlashSize=4M1M,LwIPVariant=v2mss536,Debug=Disabled,DebugLevel=None____,UploadSpeed=115200", + "port": "COM3" +} \ No newline at end of file diff --git a/rust/src/lib.rs b/rust/src/lib.rs index 9b82f91..43bf006 100644 --- a/rust/src/lib.rs +++ b/rust/src/lib.rs @@ -100,9 +100,7 @@ pub fn _ed_lrr(_py: Python, m: &PyModule) -> PyResult<()> { } Ok(ret.to_object(py)) } - Err(e) => { - Err(PyErr::new::(e)) - } + Err(e) => Err(PyErr::new::(e)), } } diff --git a/test_gui.bat b/test_gui.bat index 74e1f6e..5051fac 100644 --- a/test_gui.bat +++ b/test_gui.bat @@ -1 +1 @@ -python build_gui.py && ed_lrr_gui \ No newline at end of file +python build_gui.py && python ed_lrr_gui/__main__.py \ No newline at end of file