Now works with OPTIMA35 from pip
This commit is contained in:
parent
449546bbe4
commit
dee192062a
2 changed files with 22 additions and 12 deletions
26
gui.py
26
gui.py
|
@ -2,10 +2,11 @@ import sys
|
|||
import os
|
||||
from datetime import datetime
|
||||
|
||||
from optima.optima35 import OPTIMA35
|
||||
from optima35.core import OptimaManager
|
||||
from utils.utility import Utilities
|
||||
from ui.main_window import Ui_MainWindow
|
||||
from ui.exif_handler_window import ExifEditor
|
||||
from ui.simple_dialog import SimpleDialog # Import the SimpleDialog class
|
||||
|
||||
from PySide6 import QtWidgets
|
||||
from PySide6.QtWidgets import (
|
||||
|
@ -23,22 +24,24 @@ from PySide6.QtWidgets import (
|
|||
QSpinBox,
|
||||
)
|
||||
|
||||
class Optima35GUI(QMainWindow, Ui_MainWindow):
|
||||
class OptimaLab35(QMainWindow, Ui_MainWindow):
|
||||
def __init__(self, exif_file):
|
||||
super(Optima35GUI, self).__init__()
|
||||
self.name = "GUI35"
|
||||
self.version = "0.1.0"
|
||||
super(OptimaLab35, self).__init__()
|
||||
self.name = "OptimaLab35"
|
||||
self.version = "0.0.1"
|
||||
self.ui = Ui_MainWindow()
|
||||
self.ui.setupUi(self)
|
||||
self.o = OPTIMA35()
|
||||
self.o = OptimaManager()
|
||||
self.u = Utilities()
|
||||
self.exif_file = exif_file
|
||||
self.available_exif_data = None
|
||||
self.settings = {}
|
||||
self.setWindowTitle(f"{self.name} v{self.version} for {self.o.name} {self.o.version}")
|
||||
self.setWindowTitle(f"{self.name} v{self.version}")
|
||||
self._default_ui_layout()
|
||||
self._define_gui_interaction()
|
||||
|
||||
self.sd = SimpleDialog()
|
||||
|
||||
if exif_file == "config/exif_example.yaml":
|
||||
self._change_statusbar("Using example exif...", 10000)
|
||||
|
||||
|
@ -57,6 +60,11 @@ class Optima35GUI(QMainWindow, Ui_MainWindow):
|
|||
self.ui.tabWidget.currentChanged.connect(self._on_tab_changed)
|
||||
self.ui.edit_exif_button.clicked.connect(self._open_exif_editor)
|
||||
|
||||
self.ui.actionInfo.triggered.connect(self._info_window)
|
||||
|
||||
def _info_window(self):
|
||||
self.sd.show_dialog(f"{self.name} v{self.version}", f"{self.name} is a GUI for {self.o.name} (v{self.o.version})")
|
||||
|
||||
def _process(self):
|
||||
self.ui.start_button.setEnabled(False)
|
||||
self._update_settings() # Get all user selected data
|
||||
|
@ -265,9 +273,11 @@ class Optima35GUI(QMainWindow, Ui_MainWindow):
|
|||
user_data["software"] = f"{self.o.name} {self.o.version}"
|
||||
return user_data
|
||||
|
||||
|
||||
|
||||
def main(exif_file):
|
||||
app = QtWidgets.QApplication(sys.argv)
|
||||
window = Optima35GUI(exif_file=exif_file)
|
||||
window = OptimaLab35(exif_file = exif_file)
|
||||
window.show()
|
||||
app.exec()
|
||||
|
||||
|
|
8
tui.py
8
tui.py
|
@ -1,15 +1,15 @@
|
|||
import os
|
||||
from datetime import datetime
|
||||
# my packages
|
||||
from optima.optima35 import OPTIMA35
|
||||
from optima35.core import OptimaManager
|
||||
from utils.utility import Utilities
|
||||
from ui.simple_tui import SimpleTUI
|
||||
|
||||
class Optima35TUI():
|
||||
def __init__(self, exif_file, settings_file):
|
||||
self.name = "TUI35"
|
||||
self.version = "0.1.0"
|
||||
self.o = OPTIMA35()
|
||||
self.name = "OptimaLab35-lite"
|
||||
self.version = "0.0.1"
|
||||
self.o = OptimaManager()
|
||||
self.u = Utilities()
|
||||
self.tui = SimpleTUI()
|
||||
self.exif_file = exif_file
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue