Skip to content

Commit c26e54d

Browse files
committed
rename
1 parent 96762e6 commit c26e54d

File tree

207 files changed

+610
-610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+610
-610
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ temp-BICF-JG-LE4350.txt
288288
# Custom Ignore
289289
*.log
290290
*.icloud
291-
src/aslm/log_files/LOGS
291+
src/navigate/log_files/LOGS
292292
*.tiff
293293
*.ipynb
294294
*.tif

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<h1 align="center">
2-
<img src="./src/aslm/view/icon/mic.ico?raw=true" />
2+
<img src="./src/navigate/view/icon/mic.ico?raw=true" />
33

44
ASLM - Autonomous Software for Light Microscopy
55
</h1>
@@ -14,11 +14,11 @@ ASLM is an open source Python package for control of light-sheet microscopes. It
1414
Download and install [Miniconda](https://docs.conda.io/en/latest/miniconda.html#latest-miniconda-installer-links).
1515

1616
```
17-
conda create -n aslm python=3.9.7
17+
conda create -n navigate python=3.9.7
1818
pip install git+https://github.com/TheDeanLab/ASLM.git
1919
```
2020

21-
To test, run `conda activate aslm` and launch in synthetic hardware mode with `aslm
21+
To test, run `conda activate navigate` and launch in synthetic hardware mode with `navigate
2222
-sh`. Developers will have to install additional dependencies with
2323
`pip install -e '.[dev]'`.
2424
### Documentation

docs/source/api.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ API Reference
66
:template: custom_module.rst
77
:recursive:
88

9-
aslm.config
10-
aslm.controller
11-
aslm.log_files
12-
aslm.model
13-
aslm.tools
14-
aslm.view
9+
navigate.config
10+
navigate.controller
11+
navigate.log_files
12+
navigate.model
13+
navigate.tools
14+
navigate.view

docs/source/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@
9999
# so a file named "default.css" will overwrite the builtin "default.css".
100100
html_static_path = ["_static"]
101101

102-
html_logo = "../../src/aslm/view/icon/mic.png"
102+
html_logo = "../../src/navigate/view/icon/mic.png"

docs/source/contributing/contributing_guidelines.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ We leverage pre-commit workflows to enforce consistent code formatting. In some
5454
cases, Ruff may complain about a line of code that is actually fine. For example, in the example code below,
5555
Ruff complains that the start_stage class is imported but not used. However, it is actually used in as part of an `exec` statement::
5656

57-
from aslm.model.device_startup_functions import start_stage
57+
from navigate.model.device_startup_functions import start_stage
5858
device_name = stage
5959
exec(f"self.{device_name} = start_{device_name}(name, device_connection, configuration, i, is_synthetic)")
6060

6161
To avoid this error, you can add a `# noqa` comment to the end of the line to tell Ruff to ignore the error::
6262

63-
from aslm.model.device_startup_functions import start_stage # noqa
63+
from navigate.model.device_startup_functions import start_stage # noqa
6464

6565
Dictionary Parsing
6666
------------------

docs/source/feature_container/feature_container_home.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ will execute (for example, move the stage, then snap a picture). Following
1717
this, the next set of features in sequence will be executed.
1818

1919
Examples of some existing features include
20-
``aslm.model.features.common_features.ZStackAcquisition``, which acquires a
21-
z-stack, and ``aslm.model.features.autofocus.Autofocus``, which finds the
20+
``navigate.model.features.common_features.ZStackAcquisition``, which acquires a
21+
z-stack, and ``navigate.model.features.autofocus.Autofocus``, which finds the
2222
ideal plane of focus of a sample using a Discrete Cosine Transform.
2323

2424
Currently Implemented Features
@@ -45,7 +45,7 @@ Currently Implemented Features
4545
The Feature Object
4646
------------------
4747

48-
Each feature is an object that accepts a pointer to ``aslm.model.model`` in its
48+
Each feature is an object that accepts a pointer to ``navigate.model.model`` in its
4949
``__init__()`` arguments and contains a configuration dictionary that dictates
5050
feature behavior in its ``__init__()`` function. A complete configuration
5151
dictionary is shown below. As few or as many of these options can be specified
@@ -106,8 +106,8 @@ To create a customized feature, follow these steps:
106106

107107
.. code-block:: python
108108
109-
from aslm.tools.decorators import FeatureList
110-
from aslm.model.features.feature_related_functions import *
109+
from navigate.tools.decorators import FeatureList
110+
from navigate.model.features.feature_related_functions import *
111111
112112
@FeatureList
113113
def feature_example():

docs/source/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
.. _aslm-home:
2+
.. _navigate-home:
33

44
############################################
55
**Autonomous Software for Light Microscopy**

docs/source/software_configuration.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Mac/Linux.
1818

1919
To avoid confusion, we recommend launching the software in the synthetic hardware
2020
mode initially. Within your Terminal, or Anaconda Prompt, activate your ASLM Python
21-
environment and launch the software by typing: ``aslm -sh``. Thereafter, you should
21+
environment and launch the software by typing: ``navigate -sh``. Thereafter, you should
2222
only modify the ``configuration.yaml`` file in your local ``/.ASLM`` directory. The
2323
local copy avoids conflicts between different microscopes after pulling new
2424
changes on GitHub.

docs/source/software_installation.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -70,25 +70,25 @@ The last step requires you to change into the ASLM directory and the install the
7070

7171

7272
**Run the ASLM software**::
73-
(ASLM) MyComputer ASLM $ aslm
73+
(ASLM) MyComputer ASLM $ navigate
7474

7575
.. note::
7676

77-
If you are running the software on a computer that does not have the appropriate hardware you will need to add the flag -sh after aslm:
77+
If you are running the software on a computer that does not have the appropriate hardware you will need to add the flag -sh after navigate:
7878

79-
aslm -sh
79+
navigate -sh
8080

8181

8282
After completeting these steps you will only need to do the below to start the software upon opening the prompt:
8383

8484
.. code-block::
8585
8686
(base) MyComputer ~ $ conda activate ASLM
87-
(ASLM) MyComputer ~ $ aslm
87+
(ASLM) MyComputer ~ $ navigate
8888
8989
.. note::
9090

91-
If you are running Windows, you can create a desktop shortcut to ASLM by right-clicking the Desktop, navigating to New and then Shortcut and entering ``%windir%\system32\cmd.exe "/c" C:\path\to\miniconda\Scripts\activate.bat aslm && aslm`` into the location text box.
91+
If you are running Windows, you can create a desktop shortcut to ASLM by right-clicking the Desktop, navigating to New and then Shortcut and entering ``%windir%\system32\cmd.exe "/c" C:\path\to\miniconda\Scripts\activate.bat navigate && navigate`` into the location text box.
9292

9393
Troubleshooting
9494
---------------

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencies = [
4444
]
4545

4646
[project.scripts]
47-
aslm = "aslm.main:main"
47+
navigate = "navigate.main:main"
4848

4949
[project.optional-dependencies]
5050
dev = [

src/aslm/aslm_startup_windows.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set root=C:\Users\Dax\AppData\Local\Continuum\anaconda3
66

77
call %root%\Scripts\activate.bat %root%
88

9-
call conda activate aslm
9+
call conda activate navigate
1010

1111
call python main.py --synthetic_hardware
1212

src/aslm/config/config.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
# Local Imports
4747

4848

49-
def get_aslm_path():
49+
def get_navigate_path():
5050
"""Establish a program home directory in AppData/Local/.ASLM for Windows
5151
or ~/.ASLM for Mac and Linux.
5252
@@ -57,19 +57,19 @@ def get_aslm_path():
5757
5858
Examples
5959
--------
60-
>>> get_aslm_path()
60+
>>> get_navigate_path()
6161
'C:\\Users\\username\\AppData\\Local\\.ASLM'
6262
"""
6363
if platform.system() == "Windows":
6464
base_directory = os.getenv("LOCALAPPDATA")
6565
else:
6666
base_directory = os.getenv("HOME")
67-
aslm_path = os.path.join(base_directory, ".ASLM")
67+
navigate_path = os.path.join(base_directory, ".ASLM")
6868

69-
if not os.path.exists(aslm_path):
70-
os.mkdir(aslm_path)
69+
if not os.path.exists(navigate_path):
70+
os.mkdir(navigate_path)
7171

72-
return aslm_path
72+
return navigate_path
7373

7474

7575
def get_configuration_paths():
@@ -89,10 +89,10 @@ def get_configuration_paths():
8989
waveform_templates_path : str
9090
Path to file containing waveform templates
9191
"""
92-
aslm_directory = get_aslm_path()
93-
if not os.path.exists(aslm_directory):
94-
os.mkdir(aslm_directory)
95-
configuration_directory = Path(os.path.join(aslm_directory, "config"))
92+
navigate_directory = get_navigate_path()
93+
if not os.path.exists(navigate_directory):
94+
os.mkdir(navigate_directory)
95+
configuration_directory = Path(os.path.join(navigate_directory, "config"))
9696
if not os.path.exists(configuration_directory):
9797
os.mkdir(configuration_directory)
9898

@@ -360,8 +360,8 @@ def verify_experiment_config(manager, configuration):
360360

361361
# saving info
362362
saving_dict_sample = {
363-
"root_directory": get_aslm_path(),
364-
"save_directory": get_aslm_path(),
363+
"root_directory": get_navigate_path(),
364+
"save_directory": get_navigate_path(),
365365
"user": "Kevin",
366366
"tissue": "Lung",
367367
"celltype": "MV3",

src/aslm/controller/controller.py

+15-15
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
# Third Party Imports
4545

4646
# Local View Imports
47-
from aslm.view.main_application_window import MainApp as view
48-
from aslm.view.popups.camera_view_popup_window import CameraViewPopupWindow
49-
from aslm.view.popups.feature_list_popup import FeatureListPopup
47+
from navigate.view.main_application_window import MainApp as view
48+
from navigate.view.popups.camera_view_popup_window import CameraViewPopupWindow
49+
from navigate.view.popups.feature_list_popup import FeatureListPopup
5050

5151
# Local Sub-Controller Imports
52-
from aslm.controller.configuration_controller import ConfigurationController
53-
from aslm.controller.sub_controllers import (
52+
from navigate.controller.configuration_controller import ConfigurationController
53+
from navigate.controller.sub_controllers import (
5454
KeystrokeController,
5555
WaveformTabController,
5656
StageController,
@@ -65,24 +65,24 @@
6565
# AdaptiveOpticsPopupController,
6666
)
6767

68-
from aslm.controller.thread_pool import SynchronizedThreadPool
68+
from navigate.controller.thread_pool import SynchronizedThreadPool
6969

7070
# Local Model Imports
71-
from aslm.model.model import Model
72-
from aslm.model.concurrency.concurrency_tools import ObjectInSubprocess
71+
from navigate.model.model import Model
72+
from navigate.model.concurrency.concurrency_tools import ObjectInSubprocess
7373

7474
# Misc. Local Imports
75-
from aslm.config.config import (
75+
from navigate.config.config import (
7676
load_configs,
7777
update_config_dict,
7878
verify_experiment_config,
7979
verify_waveform_constants,
80-
get_aslm_path,
80+
get_navigate_path,
8181
)
82-
from aslm.tools.file_functions import create_save_path, save_yaml_file
83-
from aslm.tools.common_dict_tools import update_stage_dict
84-
from aslm.tools.multipos_table_tools import update_table
85-
from aslm.tools.common_functions import combine_funcs
82+
from navigate.tools.file_functions import create_save_path, save_yaml_file
83+
from navigate.tools.common_dict_tools import update_stage_dict
84+
from navigate.tools.multipos_table_tools import update_table
85+
from navigate.tools.common_functions import combine_funcs
8686

8787
# Logger Setup
8888
import logging
@@ -809,7 +809,7 @@ def execute(self, command, *args):
809809
# self.menu_controller.feature_id_val.set(0)
810810

811811
self.update_experiment_setting()
812-
file_directory = os.path.join(get_aslm_path(), "config")
812+
file_directory = os.path.join(get_navigate_path(), "config")
813813
save_yaml_file(
814814
file_directory=file_directory,
815815
content_dict=self.configuration["experiment"],

src/aslm/controller/sub_controllers/acquire_bar_controller.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
# Third Party Imports
3838

3939
# Local Imports
40-
from aslm.controller.sub_controllers.gui_controller import GUIController
41-
from aslm.view.popups.acquire_popup import AcquirePopUp
40+
from navigate.controller.sub_controllers.gui_controller import GUIController
41+
from navigate.view.popups.acquire_popup import AcquirePopUp
4242

4343
# Logger Setup
4444
p = __name__.split(".")[1]

src/aslm/controller/sub_controllers/adaptiveoptics_popup_controller.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
# from matplotlib.axes import Axes
4141

4242
# Local application imports
43-
from aslm.controller.sub_controllers.gui_controller import GUIController
43+
from navigate.controller.sub_controllers.gui_controller import GUIController
4444

4545
# Logger Setup
4646
p = __name__.split(".")[1]

src/aslm/controller/sub_controllers/autofocus_popup_controller.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import matplotlib.ticker as tck
3838

3939
# Local Imports
40-
from aslm.controller.sub_controllers.gui_controller import GUIController
41-
from aslm.tools.common_functions import combine_funcs
40+
from navigate.controller.sub_controllers.gui_controller import GUIController
41+
from navigate.tools.common_functions import combine_funcs
4242

4343

4444
import logging
@@ -55,9 +55,9 @@ def __init__(self, view, parent_controller):
5555
"""
5656
Parameters
5757
----------
58-
view : aslm.view.popups.autofocus_setting_popup.AutofocusPopup
58+
view : navigate.view.popups.autofocus_setting_popup.AutofocusPopup
5959
The view of the autofocus popup.
60-
parent_controller : aslm.controller.main_controller.MainController
60+
parent_controller : navigate.controller.main_controller.MainController
6161
The parent controller of the autofocus popup.
6262
"""
6363
super().__init__(view, parent_controller)

src/aslm/controller/sub_controllers/camera_map_setting_popup_controller.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
import tifffile
4040

4141
# Local application imports
42-
from aslm.controller.sub_controllers.gui_controller import GUIController
43-
from aslm.config import get_aslm_path
44-
from aslm.model.analysis.camera import compute_scmos_offset_and_variance_map
42+
from navigate.controller.sub_controllers.gui_controller import GUIController
43+
from navigate.config import get_navigate_path
44+
from navigate.model.analysis.camera import compute_scmos_offset_and_variance_map
4545

4646

4747
class CameraMapSettingPopupController(GUIController):
@@ -56,14 +56,14 @@ def __init__(self, view, parent_controller=None):
5656
5757
Parameters
5858
----------
59-
view : aslm.view.sub_views.camera_map_setting_popup.CameraMapSettingPopup
59+
view : navigate.view.sub_views.camera_map_setting_popup.CameraMapSettingPopup
6060
View for the camera map setting popup.
61-
parent_controller : aslm.controller.main_controller.MainController
61+
parent_controller : navigate.controller.main_controller.MainController
6262
Parent controller of this controller.
6363
"""
6464
super().__init__(view, parent_controller)
6565
#: str: Path to the camera maps directory.
66-
self.map_path = os.path.join(get_aslm_path(), "camera_maps")
66+
self.map_path = os.path.join(get_navigate_path(), "camera_maps")
6767
#: np.ndarray: Offset map.
6868
self.off = None
6969
#: np.ndarray: Variance map.

src/aslm/controller/sub_controllers/camera_setting_controller.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
# Third Party Imports
3737

3838
# Local Imports
39-
from aslm.controller.sub_controllers.gui_controller import GUIController
39+
from navigate.controller.sub_controllers.gui_controller import GUIController
4040

4141
# Logger Setup
4242
p = __name__.split(".")[1]
@@ -53,7 +53,7 @@ def __init__(self, view, parent_controller=None):
5353
----------
5454
view : tkinter.Frame
5555
The view for the camera settings.
56-
parent_controller : aslm.controller.main_controller.MainController
56+
parent_controller : navigate.controller.main_controller.MainController
5757
The parent controller.
5858
"""
5959
super().__init__(view, parent_controller)

src/aslm/controller/sub_controllers/camera_view_controller.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
import copy
4545

4646
# Local Imports
47-
from aslm.controller.sub_controllers.gui_controller import GUIController
48-
from aslm.model.analysis.camera import compute_signal_to_noise
49-
from aslm.tools.common_functions import VariableWithLock
47+
from navigate.controller.sub_controllers.gui_controller import GUIController
48+
from navigate.model.analysis.camera import compute_signal_to_noise
49+
from navigate.tools.common_functions import VariableWithLock
5050

5151
# Logger Setup
5252
p = __name__.split(".")[1]

0 commit comments

Comments
 (0)