From d1cd55cfdda865c70844fc1da02e5d8013ab9490 Mon Sep 17 00:00:00 2001 From: Preetam-Das26 Date: Thu, 3 Oct 2024 18:59:19 +0530 Subject: [PATCH] cli_tool replaced by main and changes for merge done --- mslib/msui/linearview.py | 6 +----- mslib/msui/msui_mainwindow.py | 24 ++++++------------------ mslib/msui/sideview.py | 6 +----- mslib/msui/topview.py | 7 ++----- mslib/utils/mssautoplot.py | 5 ++++- mslib/version.py | 4 ---- 6 files changed, 14 insertions(+), 38 deletions(-) diff --git a/mslib/msui/linearview.py b/mslib/msui/linearview.py index 38f8103b0..f34eddfdd 100644 --- a/mslib/msui/linearview.py +++ b/mslib/msui/linearview.py @@ -81,17 +81,13 @@ class MSUILinearViewWindow(MSUIMplViewWindow, ui.Ui_LinearWindow): """ name = "Linear View" -<<<<<<< HEAD refresh_signal_send = QtCore.pyqtSignal() refresh_signal_emit = QtCore.pyqtSignal() item_selected = QtCore.pyqtSignal(str, str, str, str) vtime_vals = QtCore.pyqtSignal([list]) itemSecs_selected = QtCore.pyqtSignal(str) - def __init__(self, parent=None, model=None, _id=None, config_settings=None): -======= - def __init__(self, parent=None, model=None, _id=None, tutorial_mode=False): ->>>>>>> 54854e1c408b7dd47889a575b83015260275af87 + def __init__(self, parent=None, model=None, _id=None, config_settings=None, tutorial_mode=False): """ Set up user interface, connect signal/slots. """ diff --git a/mslib/msui/msui_mainwindow.py b/mslib/msui/msui_mainwindow.py index eddaf1a82..f00224bd8 100644 --- a/mslib/msui/msui_mainwindow.py +++ b/mslib/msui/msui_mainwindow.py @@ -50,12 +50,9 @@ from mslib.msui.icons import icons, python_powered from mslib.utils.qt import get_open_filenames, get_save_filename, show_popup from mslib.utils.config import read_config_file, config_loader -<<<<<<< HEAD from PyQt5 import QtGui, QtCore, QtWidgets, QtTest -======= from mslib.utils import release_info from PyQt5 import QtGui, QtCore, QtWidgets ->>>>>>> 54854e1c408b7dd47889a575b83015260275af87 from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas # Add config path to PYTHONPATH so plugins located there may be found @@ -1045,25 +1042,19 @@ def create_view(self, _type, model): view_window = topview.MSUITopViewWindow(parent=self, mainwindow=self, model=model, active_flighttrack=self.active_flight_track, mscolab_server_url=self.mscolab.mscolab_server_url, -<<<<<<< HEAD token=self.mscolab.token, - config_settings=self.config_for_gui) + config_settings=self.config_for_gui, + tutorial_mode=self.tutorial_mode) view_window.refresh_signal_emit.connect(self.refresh_signal_connect.emit) -======= - token=self.mscolab.token, tutorial_mode=self.tutorial_mode) ->>>>>>> 54854e1c408b7dd47889a575b83015260275af87 view_window.mpl.resize(layout['topview'][0], layout['topview'][1]) if layout["immutable"]: view_window.mpl.setFixedSize(layout['topview'][0], layout['topview'][1]) elif _type == "sideview": # Side view. -<<<<<<< HEAD view_window = sideview.MSUISideViewWindow(model=model, parent=self, - config_settings=self.config_for_gui) + config_settings=self.config_for_gui, + tutorial_mode=self.tutorial_mode) view_window.refresh_signal_emit.connect(self.refresh_signal_connect.emit) -======= - view_window = sideview.MSUISideViewWindow(model=model, tutorial_mode=self.tutorial_mode) ->>>>>>> 54854e1c408b7dd47889a575b83015260275af87 view_window.mpl.resize(layout['sideview'][0], layout['sideview'][1]) if layout["immutable"]: view_window.mpl.setFixedSize(layout['sideview'][0], layout['sideview'][1]) @@ -1073,13 +1064,10 @@ def create_view(self, _type, model): view_window.centralwidget.resize(layout['tableview'][0], layout['tableview'][1]) elif _type == "linearview": # Linear view. -<<<<<<< HEAD view_window = linearview.MSUILinearViewWindow(model=model, - parent=self, config_settings=self.config_for_gui) + parent=self, config_settings=self.config_for_gui, + tutorial_mode=self.tutorial_mode) view_window.refresh_signal_emit.connect(self.refresh_signal_connect.emit) -======= - view_window = linearview.MSUILinearViewWindow(model=model, tutorial_mode=self.tutorial_mode) ->>>>>>> 54854e1c408b7dd47889a575b83015260275af87 view_window.mpl.resize(layout['linearview'][0], layout['linearview'][1]) if layout["immutable"]: view_window.mpl.setFixedSize(layout['linearview'][0], layout['linearview'][1]) diff --git a/mslib/msui/sideview.py b/mslib/msui/sideview.py index 46bb7a5d1..d9f8c80b9 100644 --- a/mslib/msui/sideview.py +++ b/mslib/msui/sideview.py @@ -254,17 +254,13 @@ class MSUISideViewWindow(MSUIMplViewWindow, ui.Ui_SideViewWindow): """ name = "Side View" -<<<<<<< HEAD refresh_signal_send = QtCore.pyqtSignal() refresh_signal_emit = QtCore.pyqtSignal() item_selected = QtCore.pyqtSignal(str, str, str, str) vtime_vals = QtCore.pyqtSignal([list]) itemSecs_selected = QtCore.pyqtSignal(str) - def __init__(self, parent=None, model=None, _id=None, config_settings=None): -======= - def __init__(self, parent=None, model=None, _id=None, tutorial_mode=False): ->>>>>>> 54854e1c408b7dd47889a575b83015260275af87 + def __init__(self, parent=None, model=None, _id=None, config_settings=None, tutorial_mode=False): """ Set up user interface, connect signal/slots. """ diff --git a/mslib/msui/topview.py b/mslib/msui/topview.py index b15377bd5..b217306f3 100644 --- a/mslib/msui/topview.py +++ b/mslib/msui/topview.py @@ -195,11 +195,8 @@ class MSUITopViewWindow(MSUIMplViewWindow, ui.Ui_TopViewWindow): vtime_vals = QtCore.pyqtSignal([list]) def __init__(self, parent=None, mainwindow=None, model=None, _id=None, -<<<<<<< HEAD - active_flighttrack=None, mscolab_server_url=None, token=None, config_settings=None): -======= - active_flighttrack=None, mscolab_server_url=None, token=None, tutorial_mode=False): ->>>>>>> 54854e1c408b7dd47889a575b83015260275af87 + active_flighttrack=None, mscolab_server_url=None, token=None, config_settings=None, + tutorial_mode=False): """ Set up user interface, connect signal/slots. """ diff --git a/mslib/utils/mssautoplot.py b/mslib/utils/mssautoplot.py index 4e5d3f5be..9cb6ca096 100644 --- a/mslib/utils/mssautoplot.py +++ b/mslib/utils/mssautoplot.py @@ -548,5 +548,8 @@ def draw(no_of_plots): ) -if __name__ == '__main__': +def main(): cli_tool() + +if __name__ == '__main__': + main() diff --git a/mslib/version.py b/mslib/version.py index 4b3494584..9181d64ab 100644 --- a/mslib/version.py +++ b/mslib/version.py @@ -24,8 +24,4 @@ See the License for the specific language governing permissions and limitations under the License. """ -<<<<<<< HEAD -__version__ = u'9.1.0' -======= __version__ = u'9.2.0' ->>>>>>> 54854e1c408b7dd47889a575b83015260275af87