Slitmaskgui offline mode

.github/workflows/integration.yml

@@ -0,0 +1,48 @@
+
+name: Integration
+
+on:
+  pull_request
+
+permissions:
+  contents: read
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Cache pip
+      uses: actions/cache@v4
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+
+    - name: Install dependencies
+      run: |
+        python -m venv .venv
+        source .venv/bin/activate
+        python -m pip install --upgrade pip
+        pip install flake8 pytest Pyqt6 pytest-qt
+        sudo apt-get update
+        sudo apt-get install -y libegl1 xvfb
+        if [ -f slitmaskgui/requirements.txt ]; then pip install -r slitmaskgui/requirements.txt; fi
+
+    - name: Lint with flake8
+      run: |
+        source .venv/bin/activate
+        flake8 slitmaskgui/ --count --select=E9,F63,F7,F82 --show-source --statistics --exclude=.venv
+        flake8 slitmaskgui/ --count --exit-zero --max-complexity=10 --statistics #--max-line-length=120 --exclude=.venv
+
+    - name: Test
+      run: |
+        source .venv/bin/activate
+        export QT_QPA_PLATFORM=offscreen
+        xvfb-run -a python3 -m pytest slitmaskgui/tests/
+  #test:

.gitignore

@@ -176,8 +176,8 @@ notes.txt
 slitmaskgui/tests/problemchild.json
 allfonts.txt
 slitmaskgui/tests/testfiles/problemchild.json
-gaia_starlist.txt
 <<<<<<< HEAD
 slitmaskgui/tests/testfiles/look_at_later.json
 =======
 >>>>>>> c53fca9e73a6906023b2dc175c50be15bb18df13
+center_coord_starlist.txt

slitmaskgui/app.py

@@ -16,7 +16,6 @@
 
 #just importing everything for now. When on the final stages I will not import what I don't need
 import sys
-import random
 import logging
 logging.basicConfig(
     filename="main.log",
@@ -29,27 +28,27 @@
 from slitmaskgui.target_list_widget import TargetDisplayWidget
 from slitmaskgui.mask_gen_widget import MaskGenWidget
 from slitmaskgui.menu_bar import MenuBar
-from slitmaskgui.mask_viewer import interactiveSlitMask, WavelengthView
-from slitmaskgui.sky_viewer import SkyImageView
+from slitmaskgui.mask_widgets.slitmask_view import interactiveSlitMask
+from slitmaskgui.mask_widgets.waveband_view import WavelengthView
+from slitmaskgui.mask_widgets.sky_viewer import SkyImageView
 from slitmaskgui.mask_configurations import MaskConfigurationsWidget
 from slitmaskgui.slit_position_table import SlitDisplay
-from slitmaskgui.mask_view_tab_bar import TabBar
-from PyQt6.QtCore import Qt, QSize, pyqtSlot
-from PyQt6.QtGui import QFontDatabase
+from slitmaskgui.mask_widgets.mask_view_tab_bar import TabBar
+from slitmaskgui.configure_mode.mode_toggle_button import ShowControllerButton
+from slitmaskgui.configure_mode.mask_controller import MaskControllerWidget
+from slitmaskgui.configure_mode.csu_display_widget import CsuDisplauWidget
+from slitmaskgui.offline_mode import OfflineMode
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import (
     QApplication,
     QMainWindow,
     QVBoxLayout,
     QHBoxLayout,
     QWidget,
-    QLabel,
     QSizePolicy,
     QSplitter,
-    QLayout,
-    QTreeWidgetItem,
-    QTreeWidget,
     QTabWidget,
-    QComboBox
+    QStackedLayout
 
 
 )
@@ -58,21 +57,6 @@
 main_logger = logging.getLogger()
 main_logger.info("starting logging")
 
-"""
-currently use center of priority doesn't work (don't know the problem will diagnose it at some later point)
-need to make it so that it doesn't randomly generate a starlist with random priority
-add more logging to all the functions
-"""
-
-"""
-Things to do before launch
-photo display of the stars
-use center of priority should work
-ability to modulate slit width
-actually use a starlist instead of generating your own
-add logging to everything
-ability to state max slit length
-"""
 
 class MainWindow(QMainWindow):
     def __init__(self):
@@ -82,19 +66,31 @@ def __init__(self):
         self.setMenuBar(MenuBar()) #sets the menu bar
         self.update_theme()
 
+
         #----------------------------definitions---------------------------
         main_logger.info("app: doing definitions")
+
+        self.connection_status = OfflineMode()
+        self.start_checking_internet_connection()
 
         mask_config_widget = MaskConfigurationsWidget()
         mask_gen_widget = MaskGenWidget()
+        self.mode_toggle_button = ShowControllerButton()
+        mask_controller_widget = MaskControllerWidget()
+        csu_display_widget = CsuDisplauWidget()
 
         self.target_display = TargetDisplayWidget()
         self.interactive_slit_mask = interactiveSlitMask()
         self.slit_position_table = SlitDisplay()
         self.wavelength_view = WavelengthView()
         self.sky_view = SkyImageView()
-        self.mask_tab = TabBar(slitmask=self.interactive_slit_mask,waveview=self.wavelength_view,skyview=self.sky_view)
-
+
+        #------------- stacked layout in mask_tab --------------------
+        self.slitmask_and_csu_display = QStackedLayout()
+        self.slitmask_and_csu_display.addWidget(self.interactive_slit_mask)
+        self.slitmask_and_csu_display.addWidget(csu_display_widget)
+
+        self.mask_tab = TabBar(slitmask_layout=self.slitmask_and_csu_display,waveview=self.wavelength_view,skyview=self.sky_view)
 
         #---------------------------------connections-----------------------------
         main_logger.info("app: doing connections")
@@ -104,26 +100,33 @@ def __init__(self):
         self.target_display.selected_le_star.connect(self.interactive_slit_mask.get_row_from_star_name)
         self.interactive_slit_mask.select_star.connect(self.target_display.select_corresponding)
         self.wavelength_view.row_selected.connect(self.interactive_slit_mask.select_corresponding_row)
-        self.mask_tab.waveview_change.connect(self.wavelength_view.re_initialize_scene)
+        self.interactive_slit_mask.new_slit_positions.connect(self.mask_tab.initialize_spectral_view)
 
         mask_gen_widget.change_data.connect(self.target_display.change_data)
-        mask_gen_widget.change_slit_image.connect(self.interactive_slit_mask.change_slit_and_star)
+        mask_gen_widget.change_slit_image.connect(self.interactive_slit_mask.update_slit_and_star)
         mask_gen_widget.change_row_widget.connect(self.slit_position_table.change_data)
-        mask_gen_widget.send_mask_config.connect(mask_config_widget.update_table)
-        mask_gen_widget.change_wavelength_data.connect(self.wavelength_view.get_spectra_of_star)
+        mask_gen_widget.send_mask_config.connect(mask_config_widget.initialize_configuration)
 
         mask_config_widget.change_data.connect(self.target_display.change_data)
         mask_config_widget.change_row_widget.connect(self.slit_position_table.change_data)
-        mask_config_widget.change_slit_image.connect(self.interactive_slit_mask.change_slit_and_star)
+        mask_config_widget.change_slit_image.connect(self.interactive_slit_mask.update_slit_and_star)
         mask_config_widget.reset_scene.connect(self.reset_scene)
-        mask_config_widget.update_image.connect(self.sky_view.show_image)
+        mask_config_widget.update_image.connect(self.sky_view.update_image)
         mask_config_widget.change_name_above_slit_mask.connect(self.interactive_slit_mask.update_name_center_pa)
 
         #if the data is changed connections
-        self.slit_position_table.tell_unsaved.connect(mask_config_widget.update_table)
+        self.slit_position_table.tell_unsaved.connect(mask_config_widget.update_table_to_unsaved)
         mask_config_widget.data_to_save_request.connect(self.slit_position_table.data_saved)
         self.slit_position_table.data_changed.connect(mask_config_widget.save_data_to_mask)
 
+        #sending to csu connections
+        self.mode_toggle_button.connect_controller_with_config(mask_controller_widget,mask_config_widget)
+        mask_controller_widget.connect_controller_with_slitmask_display(csu_display_widget)
+        self.mode_toggle_button.button.clicked.connect(self.mode_toggle_button.on_button_clicked)
+        self.mode_toggle_button.button.clicked.connect(self.switch_modes)
+
+        self.connection_status.current_mode.connect(self.switch_internet_connection_mode)
+
 
         #-----------------------------------layout-----------------------------
         main_logger.info("app: setting up layout")
@@ -132,6 +135,12 @@ def __init__(self):
         main_splitter = QSplitter()
         self.splitterV2 = QSplitter()
         self.mask_viewer_main = QVBoxLayout()
+        self.stacked_layout = QStackedLayout()
+        switcher_widget = QWidget()
+
+        self.stacked_layout.addWidget(mask_gen_widget)
+        self.stacked_layout.addWidget(mask_controller_widget)
+        switcher_widget.setLayout(self.stacked_layout)
 
         self.interactive_slit_mask.setContentsMargins(0,0,0,0)
         self.slit_position_table.setContentsMargins(0,0,0,0)
@@ -140,28 +149,25 @@ def __init__(self):
         mask_config_widget.setMinimumSize(1,1)
         mask_gen_widget.setMinimumSize(1,1)
 
-
         self.splitterV2.addWidget(mask_config_widget)
-        self.splitterV2.addWidget(mask_gen_widget)
+        self.splitterV2.addWidget(switcher_widget)
+        self.splitterV2.addWidget(self.mode_toggle_button)
         self.splitterV2.setOrientation(Qt.Orientation.Vertical)
         self.splitterV2.setContentsMargins(0,0,0,0)
 
-        self.layoutH1.addWidget(self.slit_position_table)#temp_widget2)
+        self.layoutH1.addWidget(self.slit_position_table)
         self.layoutH1.addWidget(self.mask_tab)
-        # self.layoutH1.addWidget(self.combobox)
         self.layoutH1.setSpacing(0)
         self.layoutH1.setContentsMargins(9,9,9,9)
         widgetH1 = QWidget()
         widgetH1.setLayout(self.layoutH1)
 
         self.splitterV1.addWidget(widgetH1)
-        # self.splitterV1.setCollapsible(0,False)
         self.splitterV1.addWidget(self.target_display)
         self.splitterV1.setOrientation(Qt.Orientation.Vertical)
         self.splitterV1.setContentsMargins(0,0,0,0)
 
         main_splitter.addWidget(self.splitterV1)
-        # main_splitter.setCollapsible(0,False)
         main_splitter.addWidget(self.splitterV2)
 
         self.setCentralWidget(main_splitter)
@@ -218,6 +224,24 @@ def update_theme(self):
         else:
             with open("slitmaskgui/dark_mode.qss", "r") as f:
                 self.setStyleSheet(f.read())
+
+    def switch_modes(self):
+        index = abs(self.stacked_layout.currentIndex()-1)
+        self.stacked_layout.setCurrentIndex(index)
+        self.slitmask_and_csu_display.setCurrentIndex(index)
+        button_text = "Configuration Mode (ON)" if index == 1 else "Configuration Mode (OFF)"
+        self.mode_toggle_button.button.setText(button_text)
+
+    def start_checking_internet_connection(self):
+        self.connection_status.start_checking_internet_connection()
+        self.connection_status.start_timer()
+
+    def switch_internet_connection_mode(self):
+        self.sky_view.offline = self.connection_status.offline
+        self.setWindowTitle(f"LRIS-2 Slit Configuration Tool ({repr(self.connection_status)})")
+
+
+
 
 
 

slitmaskgui/backend/sample.py

@@ -2,6 +2,7 @@
 from astropy.coordinates import SkyCoord
 import astropy.units as u
 import random
+import numpy as np
 
 
 def query_gaia_starlist_rect(ra_center, dec_center, width_arcmin=5, height_arcmin=10, n_stars=100, output_file='gaia_starlist.txt'):
@@ -24,22 +25,31 @@ def query_gaia_starlist_rect(ra_center, dec_center, width_arcmin=5, height_arcmi
             sign, dec_d, dec_m, dec_s = coord.dec.signed_dms
             dec_d = sign * dec_d
 
+            # parallax = row['parallax']  # in mas
+            # app_mag = row['phot_g_mean_mag']
+
+            # if parallax > 0:
+            #     distance_pc = 1000.0 / parallax
+            #     abs_mag = app_mag - 5 * (np.log10(distance_pc) - 1)
+            # else:
+            #     abs_mag = float(0)
+
             line = f"{name:<15} {int(ra_h):02d} {int(ra_m):02d} {ra_s:05.2f} {int(dec_d):+03d} {int(dec_m):02d} {abs(dec_s):04.1f} 2000.0 vmag={row['phot_g_mean_mag']:.2f} priority={random.randint(1,2000)}\n"
             f.write(line)
     # Output center info
     print("Starlist Generated")
 
 
 # Example call — replace RA/Dec with your actual center
-run = False
+run = False 
 if run:
-    ra = "00 42 44.00"
-    dec = "+41 16 09.00"
+    ra = "10 20 10.00"
+    dec = "-10 04 00.10"
     query_gaia_starlist_rect(
         ra_center=ra,              # RA in degrees
         dec_center=dec,               # Dec in degrees
         width_arcmin=5,
         height_arcmin=10,
         n_stars=104,
-        output_file='andromeda_galaxy.txt'
+        output_file='gaia_starlist.txt'
     )

slitmaskgui/backend/star_list.py

@@ -46,7 +46,7 @@ class StarList:
     #with auto run you can select if the json is complete or not already
     #this means that if you have a complete list of all the stars as if it rand thorough this class, then you can select auto run as false
     #then you can use the send functions without doing a bunch of computation
-    def __init__(self,payload,ra,dec,slit_width=0,pa=0,auto_run=True,use_center_of_priority=False): 
+    def __init__(self,payload,ra=0,dec=0,slit_width=0,pa=0,auto_run=True,use_center_of_priority=False): 
         self.payload = json.loads(payload)
         ra_coord,dec_coord = ra, dec
         if use_center_of_priority:
@@ -61,50 +61,40 @@ def __init__(self,payload,ra,dec,slit_width=0,pa=0,auto_run=True,use_center_of_p
 
     def calc_mask(self,all_stars): 
         slit_mask = SlitMask(all_stars,center=self.center, slit_width= self.slit_width, pa= self.pa)
-
         return json.loads(slit_mask.return_mask())
 
     def export_mask_config(self,file_path):
-        # file_path = f'{os.getcwd()}/{mask_name}.json'
         with open(file_path,'w') as f:
             json.dump(self.payload,f,indent=4)
-        # return file_path
+
     def send_mask(self, mask_name="untitled"):
         return self.payload
 
-
     def send_target_list(self):
         return [[x["name"],x["priority"],x["vmag"],x["ra"],x["dec"],x["center distance"]] for x in self.payload]
 
-
     def send_interactive_slit_list(self):
-        #have to convert it to dict {bar_num:(position,star_name)}
-        #imma just act rn like all the stars are in sequential order
-        #I am going to have an optimize function that actually gets the right amount of stars with good positions
-        #its going to also order them by bar
-        total_pixels = 252 
-
         slit_dict = {
-            i: (obj["x_mm"], obj["bar_id"], obj["name"]) 
-            for i, obj in enumerate(self.payload[:72])
+            obj["bar_id"]: (obj["x_mm"], obj["name"]) 
+            for obj in self.payload[:72]
             if "bar_id" in obj
             }
-
         return slit_dict
+
     def send_list_for_wavelength(self):
         old_ra_dec_list = [[x["bar_id"],x["ra"],x["dec"]]for x in self.payload]
         ra_dec_list =[]
         [ra_dec_list.append(x) for x in old_ra_dec_list if x not in ra_dec_list]
         return ra_dec_list
 
     def send_row_widget_list(self):
-        #the reason why the bar id is plus 1 is to transl
         sorted_row_list = sorted(
             ([obj["bar_id"]+1, obj["x_mm"], obj["slit_width"]] 
             for obj in self.payload[:72] if "bar_id" in obj),
             key=lambda x: x[0]
             )
         return sorted_row_list
+
     def find_center_of_priority(self):
         """              ∑ coordinates * priority
         CoP coordinate = ------------------------
@@ -136,7 +126,7 @@ def generate_skyview(self):
         key = (hips, width, height, ra, dec, fov)
         if key in HIPS_CACHE:
             return HIPS_CACHE[key]
-
+    
         hdulist = hips2fits.query(
             hips=hips,
             width=width, #in pixels