fix launch
This commit is contained in:
parent
4e02ce83d3
commit
a95642daee
2
.gitignore
vendored
2
.gitignore
vendored
@ -3,6 +3,6 @@
|
|||||||
bak
|
bak
|
||||||
__pycache__
|
__pycache__
|
||||||
@DS
|
@DS
|
||||||
gui.toml
|
launch.toml
|
||||||
*.log
|
*.log
|
||||||
doc
|
doc
|
||||||
@ -23,11 +23,11 @@ def kde_pyqt6_mainui():
|
|||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
if '--dev' in sys.argv:
|
if '--dev' in sys.argv:
|
||||||
print('qt styles:',QtWidgets.QStyleFactory.keys())
|
print('qt styles:',QtWidgets.QStyleFactory.keys())
|
||||||
try:
|
try:
|
||||||
idx = sys.argv.index('--data_folder')
|
idx = sys.argv.index('--data_folder')
|
||||||
C.data_folder = Path(sys.argv[idx + 1])
|
C.data_folder = Path(sys.argv[idx + 1])
|
||||||
except ValueError:
|
except ValueError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
logging.basicConfig(level=logging.INFO)
|
logging.basicConfig(level=logging.INFO)
|
||||||
MainUI()()
|
MainUI()()
|
||||||
|
|||||||
@ -5,7 +5,7 @@ from pathlib import Path
|
|||||||
|
|
||||||
import zmq
|
import zmq
|
||||||
|
|
||||||
from flandre.config import C
|
from flandre.config import C, ISDEV
|
||||||
from flandre.nodes.Node import Node
|
from flandre.nodes.Node import Node
|
||||||
from flandre.utils.Msg import MoveAxisMsg, KillMsg, SetSeqMetaMsg, SeqIdMinMax, SetBaseMsg, SeqListMsg, SeqIdList, \
|
from flandre.utils.Msg import MoveAxisMsg, KillMsg, SetSeqMetaMsg, SeqIdMinMax, SetBaseMsg, SeqListMsg, SeqIdList, \
|
||||||
SetSidMsg, RfFrameWithMetaMsg
|
SetSidMsg, RfFrameWithMetaMsg
|
||||||
@ -49,7 +49,8 @@ class Loader(Node):
|
|||||||
logger.warning(f'No sequences found in {base}')
|
logger.warning(f'No sequences found in {base}')
|
||||||
else:
|
else:
|
||||||
C.data_folder = base
|
C.data_folder = base
|
||||||
C.write_config()
|
if not ISDEV:
|
||||||
|
C.write_config()
|
||||||
self.send(SeqListMsg(seq_list))
|
self.send(SeqListMsg(seq_list))
|
||||||
elif isinstance(msg, KillMsg):
|
elif isinstance(msg, KillMsg):
|
||||||
if msg.name == '':
|
if msg.name == '':
|
||||||
|
|||||||
@ -5,8 +5,6 @@ from pathlib import Path
|
|||||||
|
|
||||||
import click
|
import click
|
||||||
|
|
||||||
sys.argv.append('--dev')
|
|
||||||
|
|
||||||
import flandre
|
import flandre
|
||||||
from flandre.launcher import launch_from_file
|
from flandre.launcher import launch_from_file
|
||||||
from flandre.config import C
|
from flandre.config import C
|
||||||
@ -15,7 +13,7 @@ from flandre.config import C
|
|||||||
@click.command()
|
@click.command()
|
||||||
@click.option('--data_folder', default=None)
|
@click.option('--data_folder', default=None)
|
||||||
@click.option('--generate_pyqt', default=True)
|
@click.option('--generate_pyqt', default=True)
|
||||||
@click.option('--dev', default=True, is_flag=True)
|
@click.option('--dev/--no-dev', default=True)
|
||||||
def main(data_folder, generate_pyqt, dev):
|
def main(data_folder, generate_pyqt, dev):
|
||||||
if (pyuic6 := shutil.which('pyuic6')) is None:
|
if (pyuic6 := shutil.which('pyuic6')) is None:
|
||||||
print('pyuic6 is not installed')
|
print('pyuic6 is not installed')
|
||||||
@ -24,7 +22,9 @@ def main(data_folder, generate_pyqt, dev):
|
|||||||
subprocess.run([pyuic6, '-o', flandre.PYQT / 'Main.py', flandre.PYQT / 'Main.ui'])
|
subprocess.run([pyuic6, '-o', flandre.PYQT / 'Main.py', flandre.PYQT / 'Main.ui'])
|
||||||
if data_folder is not None:
|
if data_folder is not None:
|
||||||
C.data_folder = Path(data_folder)
|
C.data_folder = Path(data_folder)
|
||||||
launch_from_file(Path(__file__).parent / 'dev.toml')
|
if dev:
|
||||||
|
sys.argv.append('--dev')
|
||||||
|
launch_from_file(Path(__file__).parent / 'launch.toml')
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
Loading…
Reference in New Issue
Block a user