-
Notifications
You must be signed in to change notification settings - Fork 2
Fix Configuration File Reading, Add Simulated Camera with Adjustable Parameters #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
|
Hi @cccoolll Thanks! A general comment, I would remove any thing related to the web and hypha for now (you can move it to other repo, e.g. the reef imaging repo). For now it would be good to keep this repo clean, only contain code about the basic microscope control. |
|
@oeway I've updated the pull request to include a new feature for the simulated camera. The current PR now covers configuration file reading, bug fixes, simulated camera implementation, and Docker configurations. I created a new branch for the simulated camera and then merged it into my fork's main branch. Is that OK? Is that OK, or should I have kept my main branch only for stable changes? |
scripts/main_hcs.py
Outdated
| parser = argparse.ArgumentParser() | ||
| parser.add_argument( | ||
| "--simulation", help="Run the GUI with simulated hardware.", action="store_true" | ||
| "--nosimulation", help="Run the GUI with simulated hardware.", action="store_true" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why change to nosimulation? The default mode should not be simulation IMO
| STEPS_PER_REVOLUTION = 200 * 8 # Full steps per revolution times microstepping factor | ||
|
|
||
| # Edge positions in mm | ||
| edge_positions_mm = [ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These should not be hardcoded, can we put them in a file which generated during a calibration process?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a very old file. The current version of 'mm_to_usteps' is here: https://github.com/cccoolll/squid-control/blob/156f9e188df9007d5fd3d7ea42004a3bfdffbf4b/squid_control/control/utils/generate_software_limit.py#L19
So we should remove this file.
squid_control/control/config.py
Outdated
| # Ensure the .squid-control directory exists | ||
| config_dir.mkdir(exist_ok=True) | ||
| config_dir = os.path.abspath(__file__) | ||
| config_dir = Path(config_dir) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would merge the two lines into one, and why removing config_dir.mkdir(exist_ok=True)?
| #.idea/ | ||
|
|
||
| cache_config_file_path.txt | ||
| configuration_HCS_v2.ini |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why this is added?
Dockerfile
Outdated
| FROM python:3.9-slim | ||
|
|
||
| # Set the working directory in the container | ||
| WORKDIR /home/tao/workspace/reef-imaging/reef_imaging/control/squid_microscope/squid-control |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why add tao in the path?
scripts/main_hcs.py
Outdated
| import squid_control.control.gui_hcs as gui | ||
|
|
||
| from configparser import ConfigParser | ||
| from configparser import ConfigParsers |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be ConfigParsers
| from configparser import ConfigParsers | |
| from configparser import ConfigParser |
scripts/tools/hypha_storage.py
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would remove this file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be removed
| self.current_frame[901:1100, 901:1100] = 200 * 256 | ||
| blur_intensity = 6 | ||
|
|
||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove empty lines, keep 1 empty line
…creation, listing, removal, and setting active filesets
…ding creation, listing, activation, and removal of filesets.
…ve organization and clarity in Hypha service.
…ealth checks only proceed after initialization.
…n-GoogleMap-style Feature/video stream in google map style
…deo-stream-in-GoogleMap-style Revert "Feature/video stream in google map style"
…rvice health checks and initialization process.
…ove error handling and streamline initialization process.
…to 0.20.65 for improved functionality and compatibility.
…rr folders on startup
…ng and improving ZIP path handling.
…ds. Disable Zarr directory cleanup on startup for backward compatibility.
…er. Implement ZIP file validation and integrity checks in artifact management to ensure reliable uploads. Introduce ZIP64 support for large archives in ZarrCanvas export functionality.
update branch
…ate a .done file after processing
…quid-control into offline-stitching-uploading
…loading Offline stitching uploading
Update simulated sample
…port and during error handling
Update simulated sample
Changes
Configuration File Reading
Simulated Camera Implementation
Docker Configurations
Dockerfileanddocker-compose.yamlto simplify deployment and setup for development and testing environments.