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

Calculate the cumulative exposure time for smartstack frames #101

Merged

timbeccue merged 2 commits into dev from feature/smartstack-exposure-calculation

Sep 28, 2023

Collaborator

timbeccue commented Sep 28, 2023

This PR adjusts the metadata displayed above images. Previously, smartstack frames would display the exposure time in the header, even if the frame was a combination of multiple exposures in the smartstack.

This changes the "exposure" value to display the cumulative exposure time. This is calculated smartstack frame exposure time * number of frames.

For example, a frame that registers as "stack 5 of 10" where each frame is 30 seconds previously displayed "exposure: 30s". WIth this change it will display "exposure: 150s".


          Calculate the cumulative exposure time for smartstack frames

d49e462

timbeccue requested a review from capetillo

September 28, 2023 16:17

github-actions bot reviewed

View reviewed changes

src/components/ImageDisplay/ImageInfoBar.vue Outdated

-                    style="display:flex"
-                  >
-                    ra:&nbsp;<ra-display
+                  <div class="image-info-bar-item site"> site:&nbsp;{{ site }} </div>

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/singleline-html-element-content-newline> _{reported by reviewdog 🐶}
Expected 1 line break after opening tag (<div>), but no line breaks found.

Suggested change

      
                <div class="image-info-bar-item site"> site:&nbsp;{{ site }} </div>
          
                <div class="image-info-bar-item site">
          
            site:&nbsp;{{ site }} </div>

Contributor

capetillo Sep 28, 2023

maybe it's just github, but the spacing (formatting) here seems a bit off

src/components/ImageDisplay/ImageInfoBar.vue Outdated

-                    style="display:flex"
-                  >
-                    ra:&nbsp;<ra-display
+                  <div class="image-info-bar-item site"> site:&nbsp;{{ site }} </div>

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/singleline-html-element-content-newline> _{reported by reviewdog 🐶}
Expected 1 line break before closing tag (</div>), but no line breaks found.

Suggested change

      
                <div class="image-info-bar-item site"> site:&nbsp;{{ site }} </div>
          
                <div class="image-info-bar-item site"> site:&nbsp;{{ site }}
          
            </div>

Contributor

capetillo Sep 28, 2023

spacing seems off here too

src/components/ImageDisplay/ImageInfoBar.vue Outdated

-                  >
-                    ra:&nbsp;<ra-display
+                  <div class="image-info-bar-item site"> site:&nbsp;{{ site }} </div>
+                  <div class="image-info-bar-item exptime">exposure:&nbsp;{{ exposure }}s </div>

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/singleline-html-element-content-newline> _{reported by reviewdog 🐶}
Expected 1 line break after opening tag (<div>), but no line breaks found.

Suggested change

      
                <div class="image-info-bar-item exptime">exposure:&nbsp;{{ exposure }}s </div>
          
                <div class="image-info-bar-item exptime">
          
            exposure:&nbsp;{{ exposure }}s </div>

Contributor

capetillo Sep 28, 2023

also here

src/components/ImageDisplay/ImageInfoBar.vue Outdated

-                  >
-                    ra:&nbsp;<ra-display
+                  <div class="image-info-bar-item site"> site:&nbsp;{{ site }} </div>
+                  <div class="image-info-bar-item exptime">exposure:&nbsp;{{ exposure }}s </div>

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/singleline-html-element-content-newline> _{reported by reviewdog 🐶}
Expected 1 line break before closing tag (</div>), but no line breaks found.

Suggested change

      
                <div class="image-info-bar-item exptime">exposure:&nbsp;{{ exposure }}s </div>
          
                <div class="image-info-bar-item exptime">exposure:&nbsp;{{ exposure }}s
          
            </div>

src/components/ImageDisplay/ImageInfoBar.vue Outdated

-                    ra:&nbsp;<ra-display
+                  <div class="image-info-bar-item site"> site:&nbsp;{{ site }} </div>
+                  <div class="image-info-bar-item exptime">exposure:&nbsp;{{ exposure }}s </div>
+                  <div class="image-info-bar-item filter-used"> filter:&nbsp;{{ filter }} </div>

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/singleline-html-element-content-newline> _{reported by reviewdog 🐶}
Expected 1 line break after opening tag (<div>), but no line breaks found.

Suggested change

      
                <div class="image-info-bar-item filter-used"> filter:&nbsp;{{ filter }} </div>
          
                <div class="image-info-bar-item filter-used">
          
            filter:&nbsp;{{ filter }} </div>

src/components/ImageDisplay/ImageInfoBar.vue Outdated

+                  <div class="image-info-bar-item airmass"> airmass:&nbsp;{{ airmass }} </div>
+                  <div class="image-info-bar-item altitude"> altitude:&nbsp;{{ altitude }}° </div>
+                  <div class="image-info-bar-item obstime"> {{ obstime }}</div>
+                  <div class="image-info-bar-item fwhm"> fwhm: {{ fwhm }}" </div>

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/singleline-html-element-content-newline> _{reported by reviewdog 🐶}
Expected 1 line break before closing tag (</div>), but no line breaks found.

Suggested change

      
                <div class="image-info-bar-item fwhm"> fwhm: {{ fwhm }}" </div>
          
                <div class="image-info-bar-item fwhm"> fwhm: {{ fwhm }}"
          
            </div>

src/components/ImageDisplay/ImageInfoBar.vue Outdated

+                  <div class="image-info-bar-item altitude"> altitude:&nbsp;{{ altitude }}° </div>
+                  <div class="image-info-bar-item obstime"> {{ obstime }}</div>
+                  <div class="image-info-bar-item fwhm"> fwhm: {{ fwhm }}" </div>
+                  <div class="image-info-bar-item sepsky"> sky: {{ sepsky }} adu </div>

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/singleline-html-element-content-newline> _{reported by reviewdog 🐶}
Expected 1 line break after opening tag (<div>), but no line breaks found.

Suggested change

      
                <div class="image-info-bar-item sepsky"> sky: {{ sepsky }} adu </div>
          
                <div class="image-info-bar-item sepsky">
          
            sky: {{ sepsky }} adu </div>

src/components/ImageDisplay/ImageInfoBar.vue Outdated

+                  <div class="image-info-bar-item altitude"> altitude:&nbsp;{{ altitude }}° </div>
+                  <div class="image-info-bar-item obstime"> {{ obstime }}</div>
+                  <div class="image-info-bar-item fwhm"> fwhm: {{ fwhm }}" </div>
+                  <div class="image-info-bar-item sepsky"> sky: {{ sepsky }} adu </div>

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/singleline-html-element-content-newline> _{reported by reviewdog 🐶}
Expected 1 line break before closing tag (</div>), but no line breaks found.

Suggested change

      
                <div class="image-info-bar-item sepsky"> sky: {{ sepsky }} adu </div>
          
                <div class="image-info-bar-item sepsky"> sky: {{ sepsky }} adu
          
            </div>

src/components/ImageDisplay/ImageInfoBar.vue Outdated

+                  <div class="image-info-bar-item obstime"> {{ obstime }}</div>
+                  <div class="image-info-bar-item fwhm"> fwhm: {{ fwhm }}" </div>
+                  <div class="image-info-bar-item sepsky"> sky: {{ sepsky }} adu </div>
+                  <div class="image-info-bar-item filename"> {{ filename }} </div>

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/singleline-html-element-content-newline> _{reported by reviewdog 🐶}
Expected 1 line break after opening tag (<div>), but no line breaks found.

Suggested change

      
                <div class="image-info-bar-item filename"> {{ filename }} </div>
          
                <div class="image-info-bar-item filename">
          
            {{ filename }} </div>

src/components/ImageDisplay/ImageInfoBar.vue Outdated

+                  <div class="image-info-bar-item obstime"> {{ obstime }}</div>
+                  <div class="image-info-bar-item fwhm"> fwhm: {{ fwhm }}" </div>
+                  <div class="image-info-bar-item sepsky"> sky: {{ sepsky }} adu </div>
+                  <div class="image-info-bar-item filename"> {{ filename }} </div>

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/singleline-html-element-content-newline> _{reported by reviewdog 🐶}
Expected 1 line break before closing tag (</div>), but no line breaks found.

Suggested change

      
                <div class="image-info-bar-item filename"> {{ filename }} </div>
          
                <div class="image-info-bar-item filename"> {{ filename }}
          
            </div>


          Apply lint fixes

9126c0a

Contributor

capetillo commented Sep 28, 2023

Good job, Tim and what a quick fix!

github-actions bot reviewed

View reviewed changes

src/components/ImageDisplay/ImageInfoBar.vue Outdated

-                  <div class="image-info-bar-item site">
-                    site:&nbsp;{{ current_image.site }}
+                  <div class="image-info-bar-item site"> site:&nbsp;{{ site }} </div>
+                  <div class="image-info-bar-item exptime"> exposure:&nbsp;{{ exposure }}s </div>

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/singleline-html-element-content-newline> _{reported by reviewdog 🐶}
Expected 1 line break after opening tag (<div>), but no line breaks found.

Suggested change

      
                <div class="image-info-bar-item exptime"> exposure:&nbsp;{{ exposure }}s </div>
          
                <div class="image-info-bar-item exptime">
          
            exposure:&nbsp;{{ exposure }}s </div>

src/components/ImageDisplay/ImageInfoBar.vue Outdated

-                  <div class="image-info-bar-item site">
-                    site:&nbsp;{{ current_image.site }}
+                  <div class="image-info-bar-item site"> site:&nbsp;{{ site }} </div>
+                  <div class="image-info-bar-item exptime"> exposure:&nbsp;{{ exposure }}s </div>

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/singleline-html-element-content-newline> _{reported by reviewdog 🐶}
Expected 1 line break before closing tag (</div>), but no line breaks found.

Suggested change

      
                <div class="image-info-bar-item exptime"> exposure:&nbsp;{{ exposure }}s </div>
          
                <div class="image-info-bar-item exptime"> exposure:&nbsp;{{ exposure }}s
          
            </div>

src/components/ImageDisplay/ImageInfoBar.vue Outdated

+                  <div class="image-info-bar-item filter-used"> filter:&nbsp;{{ filter }} </div>
+                  <div class="image-info-bar-item smartstack"> stack:&nbsp;{{ smartstackProgress }} </div>
+                  <div class="image-info-bar-item ra"> ra:&nbsp;
+                    <RaDisplay :ra_hours_decimal="raHours" :decimal_precision="3" />

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/max-attributes-per-line> _{reported by reviewdog 🐶}
':decimal_precision' should be on a new line.

Suggested change

      
                  <RaDisplay :ra_hours_decimal="raHours" :decimal_precision="3" />
          
                  <RaDisplay :ra_hours_decimal="raHours"
          
            :decimal_precision="3" />

src/components/ImageDisplay/ImageInfoBar.vue Outdated

-                  <div class="image-info-bar-item sepsky">
-                    sky: {{ sepsky }} adu
+                  <div class="image-info-bar-item dec"> dec:&nbsp;
+                    <DecDisplay :dec_deg_decimal="current_image.declination" :decimal_precision="3" />

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/max-attributes-per-line> _{reported by reviewdog 🐶}
':decimal_precision' should be on a new line.

Suggested change

      
                  <DecDisplay :dec_deg_decimal="current_image.declination" :decimal_precision="3" />
          
                  <DecDisplay :dec_deg_decimal="current_image.declination"
          
            :decimal_precision="3" />

src/components/ImageDisplay/ImageInfoBar.vue Outdated

                   </div>
+                  <div class="image-info-bar-item airmass"> airmass:&nbsp;{{ airmass }} </div>
+                  <div class="image-info-bar-item altitude"> altitude:&nbsp;{{ altitude }}° </div>
+                  <div class="image-info-bar-item obstime"> {{ obstime }} </div>

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/singleline-html-element-content-newline> _{reported by reviewdog 🐶}
Expected 1 line break after opening tag (<div>), but no line breaks found.

Suggested change

      
                <div class="image-info-bar-item obstime"> {{ obstime }} </div>
          
                <div class="image-info-bar-item obstime">
          
            {{ obstime }} </div>

src/components/ImageDisplay/ImageInfoBar.vue Outdated

                   </div>
+                  <div class="image-info-bar-item airmass"> airmass:&nbsp;{{ airmass }} </div>
+                  <div class="image-info-bar-item altitude"> altitude:&nbsp;{{ altitude }}° </div>
+                  <div class="image-info-bar-item obstime"> {{ obstime }} </div>

github-actions bot Sep 28, 2023

⚠️ [eslint] <vue/singleline-html-element-content-newline> _{reported by reviewdog 🐶}
Expected 1 line break before closing tag (</div>), but no line breaks found.

Suggested change

      
                <div class="image-info-bar-item obstime"> {{ obstime }} </div>
          
                <div class="image-info-bar-item obstime"> {{ obstime }}
          
            </div>

capetillo approved these changes

View reviewed changes

Contributor

capetillo left a comment

Great work, Tim!

timbeccue force-pushed the feature/smartstack-exposure-calculation branch from e64b87a to 9126c0a Compare

September 28, 2023 17:12

timbeccue merged commit 7035693 into dev

2 checks passed

timbeccue deleted the feature/smartstack-exposure-calculation branch

September 28, 2023 17:14

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet