Skip to content
This repository has been archived by the owner on Nov 26, 2023. It is now read-only.

Commit

Permalink
import mesmerize.common.configuration first to try and solve a weird …
Browse files Browse the repository at this point in the history
…Qt5 issue
  • Loading branch information
kushalkolar committed Apr 26, 2021
1 parent 8c5e6ba commit 77cbe37
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions mesmerize/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
import warnings
warnings.simplefilter(action='ignore', category=FutureWarning)
print('Loading, please wait... ')
from mesmerize import configuration
from PyQt5.QtWidgets import QApplication
from mesmerize.common.window_manager import WindowManager
from mesmerize.project_manager import ProjectManager
from mesmerize.common.welcome_window import MainWindow
from mesmerize.common.configuration import sys_cfg_dir
from mesmerize.scripts import *
from mesmerize import Transmission
from mesmerize.plotting import open_plot_file
Expand Down Expand Up @@ -92,7 +92,7 @@ def main(
open_plot
):
if log_file_dir is None:
log_file_dir = sys_cfg_dir
log_file_dir = configuration.sys_cfg_dir

if not os.path.exists(log_file_dir):
os.makedirs(log_file_dir, exist_ok=True)
Expand Down
2 changes: 1 addition & 1 deletion mesmerize/common/welcome_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
"""

from ..common import configuration, system_config_window, doc_pages, get_project_manager, set_project_manager
from ..pyqtgraphCore.console import ConsoleWidget
from .pytemplates.welcome_window_pytemplate import *
# from ..project_manager import ProjectManager
from ..common import configuration, system_config_window, doc_pages, get_project_manager, set_project_manager
from ..common import get_window_manager, is_mesmerize_project, get_session_id
# from viewer.modules import batch_manager
import os
Expand Down

0 comments on commit 77cbe37

Please sign in to comment.