Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Manual zoom level #517

Merged
merged 15 commits into from
Oct 31, 2023
Merged

Manual zoom level #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ee4e3f3
add the input box
Rdornier Sep 13, 2023
81238b7
retracts back the Cyan LUT color
Rdornier Sep 13, 2023
5deb683
try to add listener ==> fail for now
Rdornier Sep 15, 2023
6431dc6
Mimic channel slider view events
Rdornier Sep 15, 2023
4f99b4c
Remove dockerfile changes
Rdornier Sep 15, 2023
5f621d2
Delete .vscode directory
Rdornier Sep 15, 2023
f394fe1
Fix event handling of manual-zoom-level
will-moore Sep 18, 2023
fa6cb40
Merge pull request #1 from will-moore/manual-zoom-level
Rdornier Sep 19, 2023
ceecb87
update the figure view
Rdornier Sep 19, 2023
e39e71e
add comments
Rdornier Sep 19, 2023
f646799
Fix bug due to wrong copy-paste
Rdornier Sep 19, 2023
cfa8ab1
Remove console log
Rdornier Sep 19, 2023
a8fea46
fix bug on value type ; convert string to int
Rdornier Sep 27, 2023
472aa0e
remove parseInt from slide and stop functions
Rdornier Sep 28, 2023
01cffd0
Handle look and feel
Rdornier Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ RUN npm install -g grunt-cli && npm install grunt --save-dev
RUN $(npm bin)/grunt build
RUN /opt/omero/web/venv3/bin/pip install -e .


RUN echo "config set omero.web.application_server development" >> /opt/omero/web/config/01-default-webapps.omero
RUN echo "config set omero.web.debug true" >> /opt/omero/web/config/01-default-webapps.omero
USER omero-web
5 changes: 5 additions & 0 deletions omero_figure/static/figure/css/figure.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,11 @@
height: 14px;
border-radius: 5px;
}
#vp_zoom_value {
float: right;
width: 50px;
margin-top: 5px;
}
.toggle_channel {
border-radius: 6px 6px 6px 6px;
margin: 2px;
Expand Down
6 changes: 4 additions & 2 deletions omero_figure/templates/figure/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,12 +1070,14 @@ <h5>Example Label</h5>
<div class='clearfix'></div>
<div class='tab-footer'>
<div class="col-sm-2 no-padding">
<h5>Zoom</h5>
<h5>Zoom %</h5>
</div>
<div class="col-sm-8 no-padding">
<div id="vp_zoom_slider"></div>
</div>
<div id="vp_zoom_value" class="col-sm-2" style="padding: 8px 0 0; text-align:right"></div>

<input id="vp_zoom_value" type="number" size="4"/>

<div class='clearfix'></div>
<div id="reset-zoom-view">
<!-- button added by ZoomView render() -->
Expand Down
Loading