From 4fd1f7cc4c7b1d7c02d878f2e99125a3b11fb878 Mon Sep 17 00:00:00 2001 From: Andrew Stephens Date: Mon, 18 Mar 2019 05:29:58 -1000 Subject: [PATCH] REL-2897: update default options (#1646) --- .../qv/plugin/selector/OptionsSelector.scala | 6 ++-- .../qv/plugin/selector/RefreshDialog.scala | 2 +- .../plugin/table/ObservationTableModel.scala | 28 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bundle/edu.gemini.qv.plugin/src/main/scala/edu/gemini/qv/plugin/selector/OptionsSelector.scala b/bundle/edu.gemini.qv.plugin/src/main/scala/edu/gemini/qv/plugin/selector/OptionsSelector.scala index ea47168f7d..c6aa1f6180 100644 --- a/bundle/edu.gemini.qv.plugin/src/main/scala/edu/gemini/qv/plugin/selector/OptionsSelector.scala +++ b/bundle/edu.gemini.qv.plugin/src/main/scala/edu/gemini/qv/plugin/selector/OptionsSelector.scala @@ -98,8 +98,8 @@ object OptionsSelector { } case class Marker(label: String, tip: String, selected: Boolean = false) extends ChartOption - object Now extends Marker("Now", """Show a marker for "now" in the plot.""") - object Twilights extends Marker("Twilights", "Show markers for sunrise and sunset and nautical twilights.") + object Now extends Marker("Now", """Show a marker for "now" in the plot.""", selected = true) + object Twilights extends Marker("Twilights", "Show markers for sunrise and sunset and nautical twilights.", selected = true) object MoonPhases extends Marker("Moon Phases", "Show moon phases.") object IgnoreDaytime extends Marker("Ignore Daytime", "Fold segmented solutions for the same night into a single solution that covers the whole night.") object MoonElevation extends Marker("Moon Elevation", "Show the moon elevation.") @@ -108,7 +108,7 @@ object OptionsSelector { object AirmassRuler extends Marker("Airmass", "Indicate airmass instead of elevation in degrees.") object InsideMarkers extends Marker("Highlight Observable", "Hightlight areas where the observation (or any observation) is observable in green.") object OutsideMarkers extends Marker("Highlight Not Observable", "Highlight areas where the observation (or none of the observations) is not observable in red.") - object Schedule extends Marker("Schedule", "Show the schedule constraints.") + object Schedule extends Marker("Schedule", "Show the schedule constraints.", selected = true) object DarkHours extends Marker("Dark Hours", "Show the dark hours.") object AvailableHours extends Marker("Available Hours", "Show available hours.") object EmptyCategories extends Marker("Show Empty Categories", "Show or hide categories for which there are no values.") diff --git a/bundle/edu.gemini.qv.plugin/src/main/scala/edu/gemini/qv/plugin/selector/RefreshDialog.scala b/bundle/edu.gemini.qv.plugin/src/main/scala/edu/gemini/qv/plugin/selector/RefreshDialog.scala index 9042a4bd7c..b1656aa028 100644 --- a/bundle/edu.gemini.qv.plugin/src/main/scala/edu/gemini/qv/plugin/selector/RefreshDialog.scala +++ b/bundle/edu.gemini.qv.plugin/src/main/scala/edu/gemini/qv/plugin/selector/RefreshDialog.scala @@ -22,7 +22,7 @@ import scala.swing._ class RefreshDialog(owner: Window, ctx: QvContext) extends Dialog(owner) { title = "QV Data Selection and Reload" - preferredSize = new Dimension(800, 400) + preferredSize = new Dimension(900, 400) modal = true diff --git a/bundle/edu.gemini.qv.plugin/src/main/scala/edu/gemini/qv/plugin/table/ObservationTableModel.scala b/bundle/edu.gemini.qv.plugin/src/main/scala/edu/gemini/qv/plugin/table/ObservationTableModel.scala index 64ce9d9f81..44d3cfa5f1 100644 --- a/bundle/edu.gemini.qv.plugin/src/main/scala/edu/gemini/qv/plugin/table/ObservationTableModel.scala +++ b/bundle/edu.gemini.qv.plugin/src/main/scala/edu/gemini/qv/plugin/table/ObservationTableModel.scala @@ -48,7 +48,7 @@ object ObservationTableModel { "Partner", "Partner country", o => asString(o.getProg.getPartner), - visibleAtStart = false + visibleAtStart = true ), Column[String]( "Band", @@ -104,32 +104,32 @@ object ObservationTableModel { "NonSid", "Has Non sidereal target?", o => asString(o.hasNonSidereal), - visibleAtStart = false + visibleAtStart = true ), // conditions Column[String]( "IQ", "Image quality", o => asString(o.getImageQuality), - visibleAtStart = false + visibleAtStart = true ), Column[String]( "CC", "Cloud coverage", o => asString(o.getCloudCover), - visibleAtStart = false + visibleAtStart = true ), Column[String]( "WV", "Water vapor", o => asString(o.getWaterVapor), - visibleAtStart = false + visibleAtStart = true ), Column[String]( "SB", "Sky brightness", o => asString(o.getSkyBackground), - visibleAtStart = false + visibleAtStart = true ), // general instrument stuff @@ -172,7 +172,7 @@ object ObservationTableModel { "Prog Remaining Time", "Remaining time for program", o => TimeValue(o.getProg.getRemainingProgramTime), - visibleAtStart = false + visibleAtStart = true ), Column[String]( "Prog PI", @@ -213,7 +213,7 @@ object ObservationTableModel { "Obs Remaining Time", "Remaining time for observation", o => TimeValue(o.getRemainingTime), - visibleAtStart = false + visibleAtStart = true ), // ==== Remaining time @@ -221,19 +221,19 @@ object ObservationTableModel { "Sem. Nts", "Remaining nights from today until the end of current semester.", o => SolutionProvider(ctx).remainingNights(ctx, o, thisSemester = true, nextSemester = false), - visibleAtStart = false + visibleAtStart = true ), Column[TimeValue]( "Sem. Hrs", "Remaining hours from today until the end of current semester.", o => TimeValue(SolutionProvider(ctx).remainingTime(ctx, o, thisSemester = true, nextSemester = false)), - visibleAtStart = false + visibleAtStart = true ), Column[java.lang.Double]( "Sem. Frac", "Fraction of remaining observable hours divided by observation remaining hours until the end of current semester.", o => semesterHrsFraction(ctx, o, thisSem = true, nextSem = false), - visibleAtStart = false + visibleAtStart = true ), Column[java.lang.Integer]( "+Sem. Nts", @@ -259,13 +259,13 @@ object ObservationTableModel { "Timing Windows (UTC)", "Timing window restrictions", timingWindowsAsString, - visibleAtStart = false + visibleAtStart = true ), Column[String]( "Elevation Constraints", "Elevation restrictions", elevationConstraintsAsString, - visibleAtStart = false + visibleAtStart = true ), // ==== instrument specific columns, they will be empty except for the instrument the field is specific to @@ -288,7 +288,7 @@ object ObservationTableModel { "PreImg", "", o => asString(o.getPreImaging.getOrElse(false)), - visibleAtStart = false + visibleAtStart = true ), // GNIRS - Cross Dispersed Column[String](