From 12cb28f90bd9293f9b6c6d33281093505ce68adf Mon Sep 17 00:00:00 2001 From: Sam Reid Date: Wed, 27 Nov 2024 12:08:22 -0700 Subject: [PATCH] Sort imports and run grunt modulify, see https://github.com/phetsims/chipper/issues/1462 --- eslint.config.mjs | 2 +- js/common/FMWConstants.ts | 4 ++-- js/common/FMWDerivedStrings.ts | 6 +++--- js/common/model/DomainChart.ts | 2 +- js/common/model/EmphasizedHarmonics.ts | 2 +- js/common/model/HarmonicsChart.ts | 2 +- js/common/model/InteractiveAmplitudesChart.ts | 2 +- js/common/model/SumChart.ts | 2 +- js/common/view/AmplitudeKeypadDialog.ts | 14 +++++++------- js/common/view/AmplitudeNumberDisplay.ts | 10 +++++----- js/common/view/AmplitudeSlider.ts | 8 ++++---- js/common/view/CalipersNode.ts | 4 ++-- js/common/view/DomainChartNode.ts | 16 ++++++++-------- js/common/view/DomainComboBox.ts | 6 +++--- js/common/view/EquationMarkup.ts | 2 +- js/common/view/FMWComboBox.ts | 6 +++--- js/common/view/FMWIconFactory.ts | 4 ++-- js/common/view/HarmonicsChartNode.ts | 2 +- js/common/view/InteractiveAmplitudesChartNode.ts | 6 +++--- js/common/view/LabeledExpandCollapseButton.ts | 12 ++++++------ js/common/view/SecondaryWaveformCheckbox.ts | 8 ++++---- js/common/view/SeriesTypeRadioButtonGroup.ts | 4 ++-- js/common/view/SumChartNode.ts | 6 +++--- js/common/view/SumSymbolNode.ts | 6 +++--- js/common/view/TickLabelUtils.ts | 4 ++-- js/common/view/ZoomLevelProperty.ts | 4 ++-- js/discrete/model/DiscreteAmplitudesChart.ts | 4 ++-- js/discrete/model/DiscreteHarmonicsChart.ts | 10 +++++----- js/discrete/model/DiscreteMeasurementTool.ts | 2 +- js/discrete/model/DiscreteModel.ts | 2 +- js/discrete/model/DiscreteSumChart.ts | 10 +++++----- js/discrete/view/DiscreteAmplitudesChartNode.ts | 6 +++--- js/discrete/view/DiscreteCalipersNode.ts | 6 +++--- js/discrete/view/DiscreteControlPanel.ts | 10 +++++----- js/discrete/view/DiscreteHarmonicsChartNode.ts | 2 +- js/discrete/view/DiscreteInfoDialog.ts | 4 ++-- js/discrete/view/DiscreteMeasurementToolNode.ts | 12 ++++++------ js/discrete/view/DiscreteScreenView.ts | 2 +- js/discrete/view/DiscreteSumChartNode.ts | 2 +- js/discrete/view/DiscreteSumEquationNode.ts | 14 +++++++------- js/discrete/view/EquationComboBox.ts | 4 ++-- js/discrete/view/ExpandedFormButton.ts | 2 +- js/discrete/view/ExpandedFormDialog.ts | 10 +++++----- js/discrete/view/FourierSoundEnabledCheckbox.ts | 6 +++--- js/discrete/view/FourierSoundGenerator.ts | 2 +- js/discrete/view/HarmonicPlot.ts | 4 ++-- js/discrete/view/HarmonicsEquationNode.ts | 8 ++++---- js/discrete/view/HarmonicsSpinner.ts | 2 +- js/discrete/view/InfiniteHarmonicsCheckbox.ts | 4 ++-- js/discrete/view/InfiniteHarmonicsPlot.ts | 6 +++--- js/discrete/view/OrderSpinner.ts | 6 +++--- js/discrete/view/PeriodCalipersNode.ts | 4 ++-- js/discrete/view/PeriodCheckbox.ts | 10 +++++----- js/discrete/view/PeriodClockNode.ts | 10 +++++----- js/discrete/view/WaveformComboBox.ts | 4 ++-- js/discrete/view/WavelengthCalipersNode.ts | 4 ++-- js/discrete/view/WavelengthCheckbox.ts | 10 +++++----- js/waveGame/model/WaveGameAmplitudesChart.ts | 4 ++-- js/waveGame/model/WaveGameHarmonicsChart.ts | 8 ++++---- js/waveGame/model/WaveGameLevel.ts | 4 ++-- js/waveGame/model/WaveGameSumChart.ts | 6 +++--- js/waveGame/view/AmplitudeControlsSpinner.ts | 6 +++--- js/waveGame/view/PointsAwardedNode.ts | 6 +++--- js/waveGame/view/WaveGameAmplitudesChartNode.ts | 6 +++--- js/waveGame/view/WaveGameHarmonicsChartNode.ts | 2 +- js/waveGame/view/WaveGameLevelNode.ts | 6 +++--- .../view/WaveGameLevelSelectionButtonGroup.ts | 2 +- js/waveGame/view/WaveGameLevelSelectionNode.ts | 4 ++-- js/waveGame/view/WaveGameRewardDialog.ts | 2 +- js/waveGame/view/WaveGameRewardNode.ts | 4 ++-- js/waveGame/view/WaveGameSumChartNode.ts | 2 +- js/wavepacket/model/WavePacket.ts | 2 +- js/wavepacket/model/WavePacketAmplitudesChart.ts | 2 +- js/wavepacket/model/WavePacketComponentsChart.ts | 2 +- js/wavepacket/model/WavePacketModel.ts | 2 +- js/wavepacket/model/WavePacketSumChart.ts | 4 ++-- js/wavepacket/view/CaliperCheckbox.ts | 8 ++++---- .../view/ComponentSpacingToolCheckbox.ts | 8 ++++---- js/wavepacket/view/ComponentSpacingToolNode.ts | 14 +++++++------- js/wavepacket/view/ComponentsEquationText.ts | 4 ++-- js/wavepacket/view/ContinuousWaveformCheckbox.ts | 4 ++-- js/wavepacket/view/GaussianAreaPlot.ts | 6 +++--- js/wavepacket/view/LengthToolCheckbox.ts | 10 +++++----- .../view/WavePacketAmplitudesChartNode.ts | 4 ++-- js/wavepacket/view/WavePacketControlPanel.ts | 8 ++++---- js/wavepacket/view/WavePacketInfoDialog.ts | 4 ++-- js/wavepacket/view/WavePacketLengthToolNode.ts | 16 ++++++++-------- .../view/WavePacketMeasurementToolNode.ts | 8 ++++---- js/wavepacket/view/WavePacketNumberControl.ts | 10 +++++----- js/wavepacket/view/WavePacketScreenView.ts | 2 +- js/wavepacket/view/WavePacketSumEquationNode.ts | 6 +++--- js/wavepacket/view/WaveformEnvelopeCheckbox.ts | 4 ++-- js/wavepacket/view/WidthIndicatorPlot.ts | 6 +++--- js/wavepacket/view/WidthIndicatorsCheckbox.ts | 4 ++-- 94 files changed, 263 insertions(+), 263 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index d2551af0..5b37836d 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -7,8 +7,8 @@ * @author Michael Kauzmann (PhET Interactive Simulations) */ -import banTSCommentConfig from '../perennial-alias/js/eslint/config/util/banTSCommentConfig.mjs'; import simEslintConfig from '../perennial-alias/js/eslint/config/sim.eslint.config.mjs'; +import banTSCommentConfig from '../perennial-alias/js/eslint/config/util/banTSCommentConfig.mjs'; export default [ ...simEslintConfig, diff --git a/js/common/FMWConstants.ts b/js/common/FMWConstants.ts index cc39b1b7..cca0c1a4 100644 --- a/js/common/FMWConstants.ts +++ b/js/common/FMWConstants.ts @@ -11,12 +11,12 @@ import Utils from '../../../dot/js/Utils.js'; import { EraserButtonOptions } from '../../../scenery-phet/js/buttons/EraserButton.js'; import { NumberControlOptions } from '../../../scenery-phet/js/NumberControl.js'; import NumberDisplay from '../../../scenery-phet/js/NumberDisplay.js'; +import PhetFont from '../../../scenery-phet/js/PhetFont.js'; +import { Node, VBox } from '../../../scenery/js/imports.js'; import ArrowButton from '../../../sun/js/buttons/ArrowButton.js'; import { CheckboxOptions } from '../../../sun/js/Checkbox.js'; import { PanelOptions } from '../../../sun/js/Panel.js'; import Slider from '../../../sun/js/Slider.js'; -import PhetFont from '../../../scenery-phet/js/PhetFont.js'; -import { Node, VBox } from '../../../scenery/js/imports.js'; import fourierMakingWaves from '../fourierMakingWaves.js'; import FMWColors from './FMWColors.js'; diff --git a/js/common/FMWDerivedStrings.ts b/js/common/FMWDerivedStrings.ts index 9a94bd0e..b95534f4 100644 --- a/js/common/FMWDerivedStrings.ts +++ b/js/common/FMWDerivedStrings.ts @@ -6,12 +6,12 @@ * @author Chris Malley (PixelZoom, Inc.) */ -import fourierMakingWaves from '../fourierMakingWaves.js'; -import FMWSymbols from './FMWSymbols.js'; import PatternStringProperty from '../../../axon/js/PatternStringProperty.js'; -import FourierMakingWavesStrings from '../FourierMakingWavesStrings.js'; import StringProperty from '../../../axon/js/StringProperty.js'; import Tandem from '../../../tandem/js/Tandem.js'; +import fourierMakingWaves from '../fourierMakingWaves.js'; +import FourierMakingWavesStrings from '../FourierMakingWavesStrings.js'; +import FMWSymbols from './FMWSymbols.js'; const DERIVED_STRINGS_TANDEM = Tandem.getDerivedStringsTandem(); diff --git a/js/common/model/DomainChart.ts b/js/common/model/DomainChart.ts index b6e7d532..7c3c61e0 100644 --- a/js/common/model/DomainChart.ts +++ b/js/common/model/DomainChart.ts @@ -7,8 +7,8 @@ * @author Chris Malley (PixelZoom, Inc.) */ -import Disposable from '../../../../axon/js/Disposable.js'; import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; +import Disposable from '../../../../axon/js/Disposable.js'; import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import Property from '../../../../axon/js/Property.js'; import Tandem from '../../../../tandem/js/Tandem.js'; diff --git a/js/common/model/EmphasizedHarmonics.ts b/js/common/model/EmphasizedHarmonics.ts index b583171e..9c3d8b75 100644 --- a/js/common/model/EmphasizedHarmonics.ts +++ b/js/common/model/EmphasizedHarmonics.ts @@ -15,8 +15,8 @@ * @author Chris Malley (PixelZoom, Inc.) */ -import Disposable from '../../../../axon/js/Disposable.js'; import createObservableArray, { ObservableArray } from '../../../../axon/js/createObservableArray.js'; +import Disposable from '../../../../axon/js/Disposable.js'; import { Node } from '../../../../scenery/js/imports.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import Harmonic from './Harmonic.js'; diff --git a/js/common/model/HarmonicsChart.ts b/js/common/model/HarmonicsChart.ts index 0b4fcb07..44d8ba41 100644 --- a/js/common/model/HarmonicsChart.ts +++ b/js/common/model/HarmonicsChart.ts @@ -16,10 +16,10 @@ import DiscreteAxisDescriptions from '../../discrete/model/DiscreteAxisDescripti import fourierMakingWaves from '../../fourierMakingWaves.js'; import FMWConstants from '../FMWConstants.js'; import AxisDescription from './AxisDescription.js'; +import Domain from './Domain.js'; import DomainChart from './DomainChart.js'; import EmphasizedHarmonics from './EmphasizedHarmonics.js'; import FourierSeries from './FourierSeries.js'; -import Domain from './Domain.js'; import SeriesType from './SeriesType.js'; export default class HarmonicsChart extends DomainChart { diff --git a/js/common/model/InteractiveAmplitudesChart.ts b/js/common/model/InteractiveAmplitudesChart.ts index 5ec02a5e..035cb47c 100644 --- a/js/common/model/InteractiveAmplitudesChart.ts +++ b/js/common/model/InteractiveAmplitudesChart.ts @@ -14,8 +14,8 @@ import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; import Property from '../../../../axon/js/Property.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import FourierSeries from './FourierSeries.js'; import EmphasizedHarmonics from './EmphasizedHarmonics.js'; +import FourierSeries from './FourierSeries.js'; export default class InteractiveAmplitudesChart { diff --git a/js/common/model/SumChart.ts b/js/common/model/SumChart.ts index 368746e8..6d4798e3 100644 --- a/js/common/model/SumChart.ts +++ b/js/common/model/SumChart.ts @@ -16,9 +16,9 @@ import Tandem from '../../../../tandem/js/Tandem.js'; import DiscreteAxisDescriptions from '../../discrete/model/DiscreteAxisDescriptions.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import AxisDescription from './AxisDescription.js'; +import Domain from './Domain.js'; import DomainChart from './DomainChart.js'; import FourierSeries from './FourierSeries.js'; -import Domain from './Domain.js'; import SeriesType from './SeriesType.js'; export default class SumChart extends DomainChart { diff --git a/js/common/view/AmplitudeKeypadDialog.ts b/js/common/view/AmplitudeKeypadDialog.ts index 594ac093..5fe44994 100644 --- a/js/common/view/AmplitudeKeypadDialog.ts +++ b/js/common/view/AmplitudeKeypadDialog.ts @@ -7,27 +7,27 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; import NumberProperty from '../../../../axon/js/NumberProperty.js'; import PatternStringProperty from '../../../../axon/js/PatternStringProperty.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import Bounds2 from '../../../../dot/js/Bounds2.js'; import Range from '../../../../dot/js/Range.js'; import Utils from '../../../../dot/js/Utils.js'; +import optionize, { combineOptions } from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; +import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; import Keypad from '../../../../scenery-phet/js/keypad/Keypad.js'; import PhetColorScheme from '../../../../scenery-phet/js/PhetColorScheme.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import { Node, NodeOptions, Rectangle, RectangleOptions, RichText, RichTextOptions, Text, TPaint, VBox } from '../../../../scenery/js/imports.js'; import RectangularPushButton from '../../../../sun/js/buttons/RectangularPushButton.js'; import Dialog, { DialogOptions } from '../../../../sun/js/Dialog.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; import FMWConstants from '../FMWConstants.js'; import FMWSymbols from '../FMWSymbols.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import optionize, { combineOptions } from '../../../../phet-core/js/optionize.js'; -import Bounds2 from '../../../../dot/js/Bounds2.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; -import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; // constants const TITLE_FONT = new PhetFont( 18 ); diff --git a/js/common/view/AmplitudeNumberDisplay.ts b/js/common/view/AmplitudeNumberDisplay.ts index 243ad511..2b4b0ab0 100644 --- a/js/common/view/AmplitudeNumberDisplay.ts +++ b/js/common/view/AmplitudeNumberDisplay.ts @@ -8,10 +8,15 @@ */ import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; +import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; +import optionize from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; +import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; import NumberDisplay, { NumberDisplayOptions } from '../../../../scenery-phet/js/NumberDisplay.js'; import PhetColorScheme from '../../../../scenery-phet/js/PhetColorScheme.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import { InteractiveHighlighting, NodeTranslationOptions, PressListener, RichText, VBox, VBoxOptions } from '../../../../scenery/js/imports.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FMWConstants from '../FMWConstants.js'; import FMWQueryParameters from '../FMWQueryParameters.js'; @@ -19,11 +24,6 @@ import FMWSymbols from '../FMWSymbols.js'; import EmphasizedHarmonics from '../model/EmphasizedHarmonics.js'; import Harmonic from '../model/Harmonic.js'; import AmplitudeKeypadDialog from './AmplitudeKeypadDialog.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import optionize from '../../../../phet-core/js/optionize.js'; -import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; -import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; // constants const DEFAULT_FONT = new PhetFont( 14 ); diff --git a/js/common/view/AmplitudeSlider.ts b/js/common/view/AmplitudeSlider.ts index e46e5fc8..bdb74c4f 100644 --- a/js/common/view/AmplitudeSlider.ts +++ b/js/common/view/AmplitudeSlider.ts @@ -9,11 +9,15 @@ import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import Dimension2 from '../../../../dot/js/Dimension2.js'; import Range from '../../../../dot/js/Range.js'; import Utils from '../../../../dot/js/Utils.js'; import { Shape } from '../../../../kite/js/imports.js'; +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; import Orientation from '../../../../phet-core/js/Orientation.js'; +import PickOptional from '../../../../phet-core/js/types/PickOptional.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import { Color, Node, NodeTranslationOptions, Path, PressListener, Rectangle } from '../../../../scenery/js/imports.js'; import Slider, { SliderOptions } from '../../../../sun/js/Slider.js'; import SliderTrack, { SliderTrackOptions } from '../../../../sun/js/SliderTrack.js'; @@ -22,10 +26,6 @@ import fourierMakingWaves from '../../fourierMakingWaves.js'; import FMWConstants from '../FMWConstants.js'; import EmphasizedHarmonics from '../model/EmphasizedHarmonics.js'; import Harmonic from '../model/Harmonic.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import PickOptional from '../../../../phet-core/js/types/PickOptional.js'; // constants const TRACK_WIDTH = 40; // track height is specified in constructor options diff --git a/js/common/view/CalipersNode.ts b/js/common/view/CalipersNode.ts index 383278c8..12ed5aec 100644 --- a/js/common/view/CalipersNode.ts +++ b/js/common/view/CalipersNode.ts @@ -9,12 +9,12 @@ */ import { Shape } from '../../../../kite/js/imports.js'; +import optionize from '../../../../phet-core/js/optionize.js'; +import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; import BackgroundNode, { BackgroundNodeOptions } from '../../../../scenery-phet/js/BackgroundNode.js'; import { Node, NodeOptions, Path, PathOptions, Rectangle, RichText, RichTextOptions, TPaint } from '../../../../scenery/js/imports.js'; import FMWConstants from '../../common/FMWConstants.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; -import optionize from '../../../../phet-core/js/optionize.js'; // These constants determine the shape of the beam and jaws. const BEAM_THICKNESS = 5; diff --git a/js/common/view/DomainChartNode.ts b/js/common/view/DomainChartNode.ts index 0a162426..c2a5a979 100644 --- a/js/common/view/DomainChartNode.ts +++ b/js/common/view/DomainChartNode.ts @@ -12,7 +12,10 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; import Multilink from '../../../../axon/js/Multilink.js'; +import NumberProperty from '../../../../axon/js/NumberProperty.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import AxisLine, { AxisLineOptions } from '../../../../bamboo/js/AxisLine.js'; import ChartRectangle, { ChartRectangleOptions } from '../../../../bamboo/js/ChartRectangle.js'; import ChartTransform, { ChartTransformOptions } from '../../../../bamboo/js/ChartTransform.js'; @@ -22,23 +25,20 @@ import TickMarkSet, { TickMarkSetOptions } from '../../../../bamboo/js/TickMarkS import Bounds2 from '../../../../dot/js/Bounds2.js'; import Range from '../../../../dot/js/Range.js'; import { Shape } from '../../../../kite/js/imports.js'; +import optionize from '../../../../phet-core/js/optionize.js'; import Orientation from '../../../../phet-core/js/Orientation.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; +import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; import PlusMinusZoomButtonGroup from '../../../../scenery-phet/js/PlusMinusZoomButtonGroup.js'; import { Node, NodeOptions, RichText, RichTextOptions } from '../../../../scenery/js/imports.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; import FMWColors from '../FMWColors.js'; import FMWConstants from '../FMWConstants.js'; +import FMWDerivedStrings from '../FMWDerivedStrings.js'; import Domain from '../model/Domain.js'; import DomainChart from '../model/DomainChart.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import NumberProperty from '../../../../axon/js/NumberProperty.js'; -import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; -import optionize from '../../../../phet-core/js/optionize.js'; -import FMWDerivedStrings from '../FMWDerivedStrings.js'; -import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; const DEFAULT_EDGE = 'min'; diff --git a/js/common/view/DomainComboBox.ts b/js/common/view/DomainComboBox.ts index 15ab368f..5eeafc80 100644 --- a/js/common/view/DomainComboBox.ts +++ b/js/common/view/DomainComboBox.ts @@ -7,13 +7,13 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import Property from '../../../../axon/js/Property.js'; import { Node } from '../../../../scenery/js/imports.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; +import FMWDerivedStrings from '../FMWDerivedStrings.js'; import Domain from '../model/Domain.js'; import FMWComboBox, { FMWComboBoxChoice } from './FMWComboBox.js'; -import Property from '../../../../axon/js/Property.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; -import FMWDerivedStrings from '../FMWDerivedStrings.js'; // This format is specific to FMWComboBox. const CHOICES: FMWComboBoxChoice[] = [ diff --git a/js/common/view/EquationMarkup.ts b/js/common/view/EquationMarkup.ts index f932cb5b..c1a774c5 100644 --- a/js/common/view/EquationMarkup.ts +++ b/js/common/view/EquationMarkup.ts @@ -7,13 +7,13 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; import MathSymbols from '../../../../scenery-phet/js/MathSymbols.js'; import EquationForm from '../../discrete/model/EquationForm.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FMWSymbols from '../FMWSymbols.js'; import Domain from '../model/Domain.js'; import SeriesType from '../model/SeriesType.js'; -import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; // constants const HIDDEN_STRING = ''; // string for EquationForm.HIDDEN diff --git a/js/common/view/FMWComboBox.ts b/js/common/view/FMWComboBox.ts index a2cc9171..26244f0c 100644 --- a/js/common/view/FMWComboBox.ts +++ b/js/common/view/FMWComboBox.ts @@ -9,13 +9,13 @@ */ import Property from '../../../../axon/js/Property.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import optionize from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import { Node, RichText, RichTextOptions } from '../../../../scenery/js/imports.js'; import ComboBox, { ComboBoxItem, ComboBoxOptions } from '../../../../sun/js/ComboBox.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FMWConstants from '../FMWConstants.js'; -import optionize from '../../../../phet-core/js/optionize.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; type SelfOptions = { textOptions?: RichTextOptions; diff --git a/js/common/view/FMWIconFactory.ts b/js/common/view/FMWIconFactory.ts index 562d38e0..b119475e 100644 --- a/js/common/view/FMWIconFactory.ts +++ b/js/common/view/FMWIconFactory.ts @@ -8,6 +8,8 @@ import Range from '../../../../dot/js/Range.js'; import ScreenIcon from '../../../../joist/js/ScreenIcon.js'; +import { combineOptions } from '../../../../phet-core/js/optionize.js'; +import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import { HBox, Image, Line, Node, NodeOptions, Rectangle, Text } from '../../../../scenery/js/imports.js'; import Tandem from '../../../../tandem/js/Tandem.js'; @@ -20,8 +22,6 @@ import FMWConstants from '../FMWConstants.js'; import EmphasizedHarmonics from '../model/EmphasizedHarmonics.js'; import Harmonic from '../model/Harmonic.js'; import AmplitudeSlider from './AmplitudeSlider.js'; -import { combineOptions } from '../../../../phet-core/js/optionize.js'; -import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; const FMWIconFactory = { diff --git a/js/common/view/HarmonicsChartNode.ts b/js/common/view/HarmonicsChartNode.ts index 13b90626..3a5baa06 100644 --- a/js/common/view/HarmonicsChartNode.ts +++ b/js/common/view/HarmonicsChartNode.ts @@ -9,12 +9,12 @@ import ChartCanvasNode from '../../../../bamboo/js/ChartCanvasNode.js'; import { Shape } from '../../../../kite/js/imports.js'; +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; import { Color } from '../../../../scenery/js/imports.js'; import HarmonicPlot from '../../discrete/view/HarmonicPlot.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import HarmonicsChart from '../model/HarmonicsChart.js'; import DomainChartNode, { DomainChartNodeOptions } from './DomainChartNode.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; // constants const NORMAL_LINE_WIDTH = 1; diff --git a/js/common/view/InteractiveAmplitudesChartNode.ts b/js/common/view/InteractiveAmplitudesChartNode.ts index e845d59a..3e7dab88 100644 --- a/js/common/view/InteractiveAmplitudesChartNode.ts +++ b/js/common/view/InteractiveAmplitudesChartNode.ts @@ -18,7 +18,10 @@ import GridLineSet from '../../../../bamboo/js/GridLineSet.js'; import TickLabelSet from '../../../../bamboo/js/TickLabelSet.js'; import Range from '../../../../dot/js/Range.js'; import Utils from '../../../../dot/js/Utils.js'; +import optionize, { combineOptions } from '../../../../phet-core/js/optionize.js'; import Orientation from '../../../../phet-core/js/Orientation.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; +import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; import { Node, NodeOptions, RichText, Text } from '../../../../scenery/js/imports.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; @@ -29,9 +32,6 @@ import InteractiveAmplitudesChart from '../model/InteractiveAmplitudesChart.js'; import AmplitudeKeypadDialog from './AmplitudeKeypadDialog.js'; import AmplitudeNumberDisplay, { AmplitudeNumberDisplayOptions } from './AmplitudeNumberDisplay.js'; import AmplitudeSlider, { AmplitudeSliderOptions } from './AmplitudeSlider.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; -import optionize, { combineOptions } from '../../../../phet-core/js/optionize.js'; // constants const X_MARGIN = 0.5; // x-axis margins, in model coordinates diff --git a/js/common/view/LabeledExpandCollapseButton.ts b/js/common/view/LabeledExpandCollapseButton.ts index 3bf03998..3e6a7653 100644 --- a/js/common/view/LabeledExpandCollapseButton.ts +++ b/js/common/view/LabeledExpandCollapseButton.ts @@ -6,16 +6,16 @@ * @author Chris Malley (PixelZoom, Inc.) */ -import { FireListener, HBox, HBoxOptions, Text, TextOptions } from '../../../../scenery/js/imports.js'; -import ExpandCollapseButton from '../../../../sun/js/ExpandCollapseButton.js'; -import fourierMakingWaves from '../../fourierMakingWaves.js'; -import FMWConstants from '../FMWConstants.js'; +import Property from '../../../../axon/js/Property.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import optionize, { combineOptions } from '../../../../phet-core/js/optionize.js'; import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import Property from '../../../../axon/js/Property.js'; import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; +import { FireListener, HBox, HBoxOptions, Text, TextOptions } from '../../../../scenery/js/imports.js'; +import ExpandCollapseButton from '../../../../sun/js/ExpandCollapseButton.js'; import Tandem from '../../../../tandem/js/Tandem.js'; +import fourierMakingWaves from '../../fourierMakingWaves.js'; +import FMWConstants from '../FMWConstants.js'; type SelfOptions = { textOptions?: StrictOmit; diff --git a/js/common/view/SecondaryWaveformCheckbox.ts b/js/common/view/SecondaryWaveformCheckbox.ts index 2c3d4734..7caf4af1 100644 --- a/js/common/view/SecondaryWaveformCheckbox.ts +++ b/js/common/view/SecondaryWaveformCheckbox.ts @@ -6,15 +6,15 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import Property from '../../../../axon/js/Property.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import { combineOptions } from '../../../../phet-core/js/optionize.js'; import { HBox, Line, Text } from '../../../../scenery/js/imports.js'; import Checkbox, { CheckboxOptions } from '../../../../sun/js/Checkbox.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import FMWColors from '../../common/FMWColors.js'; import FMWConstants from '../../common/FMWConstants.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import Property from '../../../../axon/js/Property.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import { combineOptions } from '../../../../phet-core/js/optionize.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; export default class SecondaryWaveformCheckbox extends Checkbox { diff --git a/js/common/view/SeriesTypeRadioButtonGroup.ts b/js/common/view/SeriesTypeRadioButtonGroup.ts index d92cf129..f7e5be3e 100644 --- a/js/common/view/SeriesTypeRadioButtonGroup.ts +++ b/js/common/view/SeriesTypeRadioButtonGroup.ts @@ -9,13 +9,13 @@ import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import { RichText } from '../../../../scenery/js/imports.js'; +import { AquaRadioButtonGroupItem } from '../../../../sun/js/AquaRadioButtonGroup.js'; import HorizontalAquaRadioButtonGroup from '../../../../sun/js/HorizontalAquaRadioButtonGroup.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FMWConstants from '../FMWConstants.js'; import FMWSymbols from '../FMWSymbols.js'; import SeriesType from '../model/SeriesType.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; -import { AquaRadioButtonGroupItem } from '../../../../sun/js/AquaRadioButtonGroup.js'; export default class SeriesTypeRadioButtonGroup extends HorizontalAquaRadioButtonGroup { diff --git a/js/common/view/SumChartNode.ts b/js/common/view/SumChartNode.ts index 402a6c10..bf44ee82 100644 --- a/js/common/view/SumChartNode.ts +++ b/js/common/view/SumChartNode.ts @@ -10,13 +10,13 @@ import CanvasLinePlot from '../../../../bamboo/js/CanvasLinePlot.js'; import ChartCanvasNode from '../../../../bamboo/js/ChartCanvasNode.js'; import { Shape } from '../../../../kite/js/imports.js'; +import optionize from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; +import { ProfileColorProperty } from '../../../../scenery/js/imports.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FMWColors from '../FMWColors.js'; import SumChart from '../model/SumChart.js'; import DomainChartNode, { DomainChartNodeOptions } from './DomainChartNode.js'; -import { ProfileColorProperty } from '../../../../scenery/js/imports.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import optionize from '../../../../phet-core/js/optionize.js'; type SelfOptions = { diff --git a/js/common/view/SumSymbolNode.ts b/js/common/view/SumSymbolNode.ts index f232686a..241f2ff7 100644 --- a/js/common/view/SumSymbolNode.ts +++ b/js/common/view/SumSymbolNode.ts @@ -10,14 +10,14 @@ import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import Multilink from '../../../../axon/js/Multilink.js'; +import Property from '../../../../axon/js/Property.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import optionize from '../../../../phet-core/js/optionize.js'; import MathSymbols from '../../../../scenery-phet/js/MathSymbols.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import { HBox, Node, NodeOptions, RichText, Text } from '../../../../scenery/js/imports.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FMWSymbols from '../FMWSymbols.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import Property from '../../../../axon/js/Property.js'; -import optionize from '../../../../phet-core/js/optionize.js'; // constants const DEFAULT_SYMBOL_FONT = new PhetFont( 30 ); diff --git a/js/common/view/TickLabelUtils.ts b/js/common/view/TickLabelUtils.ts index a30bdc63..c3c213b5 100644 --- a/js/common/view/TickLabelUtils.ts +++ b/js/common/view/TickLabelUtils.ts @@ -8,7 +8,9 @@ import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import StringProperty from '../../../../axon/js/StringProperty.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import Utils from '../../../../dot/js/Utils.js'; +import { combineOptions } from '../../../../phet-core/js/optionize.js'; import Fraction from '../../../../phetcommon/js/model/Fraction.js'; import MathSymbols from '../../../../scenery-phet/js/MathSymbols.js'; import { Node, RichText, RichTextOptions, Text, TextOptions } from '../../../../scenery/js/imports.js'; @@ -17,8 +19,6 @@ import FMWConstants from '../FMWConstants.js'; import FMWSymbols from '../FMWSymbols.js'; import Domain from '../model/Domain.js'; import TickLabelFormat from '../model/TickLabelFormat.js'; -import { combineOptions } from '../../../../phet-core/js/optionize.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; const TickLabelUtils = { diff --git a/js/common/view/ZoomLevelProperty.ts b/js/common/view/ZoomLevelProperty.ts index d1756486..44a4332c 100644 --- a/js/common/view/ZoomLevelProperty.ts +++ b/js/common/view/ZoomLevelProperty.ts @@ -12,11 +12,11 @@ */ import NumberProperty from '../../../../axon/js/NumberProperty.js'; +import Property from '../../../../axon/js/Property.js'; import Range from '../../../../dot/js/Range.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import AxisDescription from '../model/AxisDescription.js'; -import Property from '../../../../axon/js/Property.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; export default class ZoomLevelProperty extends NumberProperty { diff --git a/js/discrete/model/DiscreteAmplitudesChart.ts b/js/discrete/model/DiscreteAmplitudesChart.ts index bccd0d44..a26272df 100644 --- a/js/discrete/model/DiscreteAmplitudesChart.ts +++ b/js/discrete/model/DiscreteAmplitudesChart.ts @@ -8,12 +8,12 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import Tandem from '../../../../tandem/js/Tandem.js'; +import EmphasizedHarmonics from '../../common/model/EmphasizedHarmonics.js'; import InteractiveAmplitudesChart from '../../common/model/InteractiveAmplitudesChart.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import EmphasizedHarmonics from '../../common/model/EmphasizedHarmonics.js'; import DiscreteFourierSeries from './DiscreteFourierSeries.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; export default class DiscreteAmplitudesChart extends InteractiveAmplitudesChart { diff --git a/js/discrete/model/DiscreteHarmonicsChart.ts b/js/discrete/model/DiscreteHarmonicsChart.ts index 375e57a7..c741d0dd 100644 --- a/js/discrete/model/DiscreteHarmonicsChart.ts +++ b/js/discrete/model/DiscreteHarmonicsChart.ts @@ -11,14 +11,14 @@ import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import Property from '../../../../axon/js/Property.js'; import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import Tandem from '../../../../tandem/js/Tandem.js'; -import HarmonicsChart from '../../common/model/HarmonicsChart.js'; -import fourierMakingWaves from '../../fourierMakingWaves.js'; -import FourierSeries from '../../common/model/FourierSeries.js'; -import EmphasizedHarmonics from '../../common/model/EmphasizedHarmonics.js'; +import AxisDescription from '../../common/model/AxisDescription.js'; import Domain from '../../common/model/Domain.js'; +import EmphasizedHarmonics from '../../common/model/EmphasizedHarmonics.js'; +import FourierSeries from '../../common/model/FourierSeries.js'; +import HarmonicsChart from '../../common/model/HarmonicsChart.js'; import SeriesType from '../../common/model/SeriesType.js'; -import AxisDescription from '../../common/model/AxisDescription.js'; import TickLabelFormat from '../../common/model/TickLabelFormat.js'; +import fourierMakingWaves from '../../fourierMakingWaves.js'; export default class DiscreteHarmonicsChart extends HarmonicsChart { diff --git a/js/discrete/model/DiscreteMeasurementTool.ts b/js/discrete/model/DiscreteMeasurementTool.ts index dd0ee1f3..056e69a5 100644 --- a/js/discrete/model/DiscreteMeasurementTool.ts +++ b/js/discrete/model/DiscreteMeasurementTool.ts @@ -6,8 +6,8 @@ * @author Chris Malley (PixelZoom, Inc.) */ -import Disposable from '../../../../axon/js/Disposable.js'; import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; +import Disposable from '../../../../axon/js/Disposable.js'; import NumberProperty from '../../../../axon/js/NumberProperty.js'; import Property from '../../../../axon/js/Property.js'; import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; diff --git a/js/discrete/model/DiscreteModel.ts b/js/discrete/model/DiscreteModel.ts index 462e9b57..b94ac142 100644 --- a/js/discrete/model/DiscreteModel.ts +++ b/js/discrete/model/DiscreteModel.ts @@ -6,10 +6,10 @@ * @author Chris Malley (PixelZoom, Inc. */ -import Disposable from '../../../../axon/js/Disposable.js'; import animationFrameTimer from '../../../../axon/js/animationFrameTimer.js'; import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; +import Disposable from '../../../../axon/js/Disposable.js'; import Emitter from '../../../../axon/js/Emitter.js'; import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import Multilink from '../../../../axon/js/Multilink.js'; diff --git a/js/discrete/model/DiscreteSumChart.ts b/js/discrete/model/DiscreteSumChart.ts index e5d65cee..d55efaf7 100644 --- a/js/discrete/model/DiscreteSumChart.ts +++ b/js/discrete/model/DiscreteSumChart.ts @@ -18,14 +18,14 @@ import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; -import SumChart from '../../common/model/SumChart.js'; -import fourierMakingWaves from '../../fourierMakingWaves.js'; -import Waveform from './Waveform.js'; -import FourierSeries from '../../common/model/FourierSeries.js'; +import AxisDescription from '../../common/model/AxisDescription.js'; import Domain from '../../common/model/Domain.js'; +import FourierSeries from '../../common/model/FourierSeries.js'; import SeriesType from '../../common/model/SeriesType.js'; +import SumChart from '../../common/model/SumChart.js'; import TickLabelFormat from '../../common/model/TickLabelFormat.js'; -import AxisDescription from '../../common/model/AxisDescription.js'; +import fourierMakingWaves from '../../fourierMakingWaves.js'; +import Waveform from './Waveform.js'; // constants const EMPTY_DATA_SET = FMWConstants.EMPTY_DATA_SET; diff --git a/js/discrete/view/DiscreteAmplitudesChartNode.ts b/js/discrete/view/DiscreteAmplitudesChartNode.ts index f4e83f20..68fd130a 100644 --- a/js/discrete/view/DiscreteAmplitudesChartNode.ts +++ b/js/discrete/view/DiscreteAmplitudesChartNode.ts @@ -7,13 +7,13 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import Property from '../../../../axon/js/Property.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; +import AmplitudeKeypadDialog from '../../common/view/AmplitudeKeypadDialog.js'; import InteractiveAmplitudesChartNode from '../../common/view/InteractiveAmplitudesChartNode.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import DiscreteAmplitudesChart from '../model/DiscreteAmplitudesChart.js'; -import AmplitudeKeypadDialog from '../../common/view/AmplitudeKeypadDialog.js'; import Waveform from '../model/Waveform.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; -import Property from '../../../../axon/js/Property.js'; export default class DiscreteAmplitudesChartNode extends InteractiveAmplitudesChartNode { diff --git a/js/discrete/view/DiscreteCalipersNode.ts b/js/discrete/view/DiscreteCalipersNode.ts index 41769045..3cd2a2dd 100644 --- a/js/discrete/view/DiscreteCalipersNode.ts +++ b/js/discrete/view/DiscreteCalipersNode.ts @@ -11,14 +11,14 @@ import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import Multilink from '../../../../axon/js/Multilink.js'; import ChartTransform from '../../../../bamboo/js/ChartTransform.js'; +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import Domain from '../../common/model/Domain.js'; import EmphasizedHarmonics from '../../common/model/EmphasizedHarmonics.js'; +import Harmonic from '../../common/model/Harmonic.js'; import CalipersNode from '../../common/view/CalipersNode.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import DiscreteMeasurementTool from '../model/DiscreteMeasurementTool.js'; import DiscreteMeasurementToolNode, { DiscreteMeasurementToolNodeOptions } from './DiscreteMeasurementToolNode.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import Domain from '../../common/model/Domain.js'; -import Harmonic from '../../common/model/Harmonic.js'; type SelfOptions = EmptySelfOptions; diff --git a/js/discrete/view/DiscreteControlPanel.ts b/js/discrete/view/DiscreteControlPanel.ts index 8b9403ee..1d53e108 100644 --- a/js/discrete/view/DiscreteControlPanel.ts +++ b/js/discrete/view/DiscreteControlPanel.ts @@ -9,8 +9,10 @@ import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import NumberProperty from '../../../../axon/js/NumberProperty.js'; +import Property from '../../../../axon/js/Property.js'; import Dimension2 from '../../../../dot/js/Dimension2.js'; import audioManager from '../../../../joist/js/audioManager.js'; +import { combineOptions } from '../../../../phet-core/js/optionize.js'; import InfoButton from '../../../../scenery-phet/js/buttons/InfoButton.js'; import { AlignBox, AlignBoxOptions, AlignGroup, Color, HBox, HBoxOptions, HSeparator, Node, Path, SceneryConstants, Text, VBox } from '../../../../scenery/js/imports.js'; import volumeDownSolidShape from '../../../../sherpa/js/fontawesome-5/volumeDownSolidShape.js'; @@ -23,12 +25,15 @@ import FMWColors from '../../common/FMWColors.js'; import FMWConstants from '../../common/FMWConstants.js'; import FMWSymbols from '../../common/FMWSymbols.js'; import Domain from '../../common/model/Domain.js'; +import SeriesType from '../../common/model/SeriesType.js'; import DomainComboBox from '../../common/view/DomainComboBox.js'; import SeriesTypeRadioButtonGroup from '../../common/view/SeriesTypeRadioButtonGroup.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; +import DiscreteFourierSeries from '../model/DiscreteFourierSeries.js'; import DiscreteMeasurementTool from '../model/DiscreteMeasurementTool.js'; import DiscreteModel from '../model/DiscreteModel.js'; +import EquationForm from '../model/EquationForm.js'; import Waveform from '../model/Waveform.js'; import DiscreteInfoDialog from './DiscreteInfoDialog.js'; import EquationComboBox from './EquationComboBox.js'; @@ -38,11 +43,6 @@ import OrderSpinner from './OrderSpinner.js'; import PeriodCheckbox from './PeriodCheckbox.js'; import WaveformComboBox from './WaveformComboBox.js'; import WavelengthCheckbox from './WavelengthCheckbox.js'; -import DiscreteFourierSeries from '../model/DiscreteFourierSeries.js'; -import Property from '../../../../axon/js/Property.js'; -import SeriesType from '../../common/model/SeriesType.js'; -import EquationForm from '../model/EquationForm.js'; -import { combineOptions } from '../../../../phet-core/js/optionize.js'; export default class DiscreteControlPanel extends Panel { diff --git a/js/discrete/view/DiscreteHarmonicsChartNode.ts b/js/discrete/view/DiscreteHarmonicsChartNode.ts index ed0e0079..6a550dcb 100644 --- a/js/discrete/view/DiscreteHarmonicsChartNode.ts +++ b/js/discrete/view/DiscreteHarmonicsChartNode.ts @@ -8,12 +8,12 @@ */ import Multilink from '../../../../axon/js/Multilink.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import HarmonicsChartNode from '../../common/view/HarmonicsChartNode.js'; import TickLabelUtils from '../../common/view/TickLabelUtils.js'; import ZoomLevelProperty from '../../common/view/ZoomLevelProperty.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import DiscreteHarmonicsChart from '../model/DiscreteHarmonicsChart.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; // constants const X_TICK_LABEL_DECIMALS = 2; diff --git a/js/discrete/view/DiscreteInfoDialog.ts b/js/discrete/view/DiscreteInfoDialog.ts index 4d637b60..c9102bea 100644 --- a/js/discrete/view/DiscreteInfoDialog.ts +++ b/js/discrete/view/DiscreteInfoDialog.ts @@ -8,11 +8,11 @@ import { RichText, Text, VBox } from '../../../../scenery/js/imports.js'; import Dialog from '../../../../sun/js/Dialog.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; +import FMWDerivedStrings from '../../common/FMWDerivedStrings.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; -import FMWDerivedStrings from '../../common/FMWDerivedStrings.js'; // constants const MAX_WIDTH = 800; // determined empirically diff --git a/js/discrete/view/DiscreteMeasurementToolNode.ts b/js/discrete/view/DiscreteMeasurementToolNode.ts index 6fe2eab2..9df2e4a8 100644 --- a/js/discrete/view/DiscreteMeasurementToolNode.ts +++ b/js/discrete/view/DiscreteMeasurementToolNode.ts @@ -18,21 +18,21 @@ import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import Property from '../../../../axon/js/Property.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import Bounds2 from '../../../../dot/js/Bounds2.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import Vector2Property from '../../../../dot/js/Vector2Property.js'; +import optionize from '../../../../phet-core/js/optionize.js'; +import PickOptional from '../../../../phet-core/js/types/PickOptional.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import { Circle, DragListener, KeyboardDragListener, Node, NodeOptions } from '../../../../scenery/js/imports.js'; import BooleanIO from '../../../../tandem/js/types/BooleanIO.js'; import FMWQueryParameters from '../../common/FMWQueryParameters.js'; +import Domain from '../../common/model/Domain.js'; import EmphasizedHarmonics from '../../common/model/EmphasizedHarmonics.js'; import Harmonic from '../../common/model/Harmonic.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import DiscreteMeasurementTool from '../model/DiscreteMeasurementTool.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import Domain from '../../common/model/Domain.js'; -import Bounds2 from '../../../../dot/js/Bounds2.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import optionize from '../../../../phet-core/js/optionize.js'; -import PickOptional from '../../../../phet-core/js/types/PickOptional.js'; type SelfOptions = { position?: Vector2; diff --git a/js/discrete/view/DiscreteScreenView.ts b/js/discrete/view/DiscreteScreenView.ts index 94b2e6fa..944348e9 100644 --- a/js/discrete/view/DiscreteScreenView.ts +++ b/js/discrete/view/DiscreteScreenView.ts @@ -10,6 +10,7 @@ import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import ScreenView from '../../../../joist/js/ScreenView.js'; +import { combineOptions } from '../../../../phet-core/js/optionize.js'; import EraserButton, { EraserButtonOptions } from '../../../../scenery-phet/js/buttons/EraserButton.js'; import ResetAllButton from '../../../../scenery-phet/js/buttons/ResetAllButton.js'; import OopsDialog from '../../../../scenery-phet/js/OopsDialog.js'; @@ -40,7 +41,6 @@ import InfiniteHarmonicsCheckbox from './InfiniteHarmonicsCheckbox.js'; import PeriodCalipersNode from './PeriodCalipersNode.js'; import PeriodClockNode from './PeriodClockNode.js'; import WavelengthCalipersNode from './WavelengthCalipersNode.js'; -import { combineOptions } from '../../../../phet-core/js/optionize.js'; export default class DiscreteScreenView extends ScreenView { diff --git a/js/discrete/view/DiscreteSumChartNode.ts b/js/discrete/view/DiscreteSumChartNode.ts index e03ef058..992b7225 100644 --- a/js/discrete/view/DiscreteSumChartNode.ts +++ b/js/discrete/view/DiscreteSumChartNode.ts @@ -8,13 +8,13 @@ */ import Multilink from '../../../../axon/js/Multilink.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import SumChartNode from '../../common/view/SumChartNode.js'; import TickLabelUtils from '../../common/view/TickLabelUtils.js'; import ZoomLevelProperty from '../../common/view/ZoomLevelProperty.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import DiscreteSumChart from '../model/DiscreteSumChart.js'; import InfiniteHarmonicsPlot from './InfiniteHarmonicsPlot.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; // constants const X_TICK_LABEL_DECIMALS = 2; diff --git a/js/discrete/view/DiscreteSumEquationNode.ts b/js/discrete/view/DiscreteSumEquationNode.ts index a7e4eabc..ad5d8b70 100644 --- a/js/discrete/view/DiscreteSumEquationNode.ts +++ b/js/discrete/view/DiscreteSumEquationNode.ts @@ -8,21 +8,21 @@ import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import Multilink from '../../../../axon/js/Multilink.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import optionize from '../../../../phet-core/js/optionize.js'; +import PickOptional from '../../../../phet-core/js/types/PickOptional.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import MathSymbols from '../../../../scenery-phet/js/MathSymbols.js'; +import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import { Node, NodeOptions, RichText } from '../../../../scenery/js/imports.js'; import FMWConstants from '../../common/FMWConstants.js'; import FMWSymbols from '../../common/FMWSymbols.js'; +import Domain from '../../common/model/Domain.js'; +import SeriesType from '../../common/model/SeriesType.js'; import EquationMarkup from '../../common/view/EquationMarkup.js'; import SumSymbolNode from '../../common/view/SumSymbolNode.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import Domain from '../../common/model/Domain.js'; -import SeriesType from '../../common/model/SeriesType.js'; import EquationForm from '../model/EquationForm.js'; -import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; -import PickOptional from '../../../../phet-core/js/types/PickOptional.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import optionize from '../../../../phet-core/js/optionize.js'; // To improve readability of markup creation. Each of these is a string than may also include markup. const EQUAL_TO = MathSymbols.EQUAL_TO; diff --git a/js/discrete/view/EquationComboBox.ts b/js/discrete/view/EquationComboBox.ts index 0fadc7de..6f9158ce 100644 --- a/js/discrete/view/EquationComboBox.ts +++ b/js/discrete/view/EquationComboBox.ts @@ -9,15 +9,15 @@ import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import { Node } from '../../../../scenery/js/imports.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; +import FMWDerivedStrings from '../../common/FMWDerivedStrings.js'; import FMWSymbols from '../../common/FMWSymbols.js'; import Domain from '../../common/model/Domain.js'; import FMWComboBox, { FMWComboBoxChoice } from '../../common/view/FMWComboBox.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; import EquationForm from '../model/EquationForm.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; -import FMWDerivedStrings from '../../common/FMWDerivedStrings.js'; const TEXT_MAX_WIDTH = 70; diff --git a/js/discrete/view/ExpandedFormButton.ts b/js/discrete/view/ExpandedFormButton.ts index 3c084ce6..493156ab 100644 --- a/js/discrete/view/ExpandedFormButton.ts +++ b/js/discrete/view/ExpandedFormButton.ts @@ -10,9 +10,9 @@ import { Color, Path } from '../../../../scenery/js/imports.js'; import eyeSolidShape from '../../../../sherpa/js/fontawesome-5/eyeSolidShape.js'; import RoundPushButton from '../../../../sun/js/buttons/RoundPushButton.js'; -import fourierMakingWaves from '../../fourierMakingWaves.js'; import Dialog from '../../../../sun/js/Dialog.js'; import Tandem from '../../../../tandem/js/Tandem.js'; +import fourierMakingWaves from '../../fourierMakingWaves.js'; export default class ExpandedFormButton extends RoundPushButton { diff --git a/js/discrete/view/ExpandedFormDialog.ts b/js/discrete/view/ExpandedFormDialog.ts index 58b1ea1a..d111a71a 100644 --- a/js/discrete/view/ExpandedFormDialog.ts +++ b/js/discrete/view/ExpandedFormDialog.ts @@ -8,22 +8,22 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import Utils from '../../../../dot/js/Utils.js'; import MathSymbols from '../../../../scenery-phet/js/MathSymbols.js'; import { HBox, RichText, Text, VBox } from '../../../../scenery/js/imports.js'; import Dialog from '../../../../sun/js/Dialog.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; +import Domain from '../../common/model/Domain.js'; +import SeriesType from '../../common/model/SeriesType.js'; import EquationMarkup from '../../common/view/EquationMarkup.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; import DiscreteFourierSeries from '../model/DiscreteFourierSeries.js'; -import DiscreteSumEquationNode from './DiscreteSumEquationNode.js'; -import SeriesType from '../../common/model/SeriesType.js'; import EquationForm from '../model/EquationForm.js'; -import Domain from '../../common/model/Domain.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; -import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; +import DiscreteSumEquationNode from './DiscreteSumEquationNode.js'; // Maximum number of terms per line in the expanded form const TERMS_PER_LINE = 3; diff --git a/js/discrete/view/FourierSoundEnabledCheckbox.ts b/js/discrete/view/FourierSoundEnabledCheckbox.ts index c6bbdf83..213dfcac 100644 --- a/js/discrete/view/FourierSoundEnabledCheckbox.ts +++ b/js/discrete/view/FourierSoundEnabledCheckbox.ts @@ -6,14 +6,14 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import Property from '../../../../axon/js/Property.js'; +import { combineOptions } from '../../../../phet-core/js/optionize.js'; import { Path } from '../../../../scenery/js/imports.js'; import musicSolidShape from '../../../../sherpa/js/fontawesome-5/musicSolidShape.js'; import Checkbox, { CheckboxOptions } from '../../../../sun/js/Checkbox.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import Property from '../../../../axon/js/Property.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; -import { combineOptions } from '../../../../phet-core/js/optionize.js'; export default class FourierSoundEnabledCheckbox extends Checkbox { diff --git a/js/discrete/view/FourierSoundGenerator.ts b/js/discrete/view/FourierSoundGenerator.ts index c7e0b08d..cb4b59c1 100644 --- a/js/discrete/view/FourierSoundGenerator.ts +++ b/js/discrete/view/FourierSoundGenerator.ts @@ -10,13 +10,13 @@ import Disposable from '../../../../axon/js/Disposable.js'; import Multilink from '../../../../axon/js/Multilink.js'; import LinearFunction from '../../../../dot/js/LinearFunction.js'; import Range from '../../../../dot/js/Range.js'; +import { Node } from '../../../../scenery/js/imports.js'; import OscillatorSoundGenerator from '../../../../tambo/js/sound-generators/OscillatorSoundGenerator.js'; import SoundGenerator from '../../../../tambo/js/sound-generators/SoundGenerator.js'; import soundManager from '../../../../tambo/js/soundManager.js'; import FMWConstants from '../../common/FMWConstants.js'; import FourierSeries from '../../common/model/FourierSeries.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import { Node } from '../../../../scenery/js/imports.js'; // Output level range of each harmonic. These have a reduced range because harmonics are summed. // See https://github.com/phetsims/fourier-making-waves/issues/45 diff --git a/js/discrete/view/HarmonicPlot.ts b/js/discrete/view/HarmonicPlot.ts index 4aec04b1..972d3530 100644 --- a/js/discrete/view/HarmonicPlot.ts +++ b/js/discrete/view/HarmonicPlot.ts @@ -7,12 +7,12 @@ */ import Emitter from '../../../../axon/js/Emitter.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import CanvasLinePlot from '../../../../bamboo/js/CanvasLinePlot.js'; import ChartTransform from '../../../../bamboo/js/ChartTransform.js'; +import Vector2 from '../../../../dot/js/Vector2.js'; import Harmonic from '../../common/model/Harmonic.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import Vector2 from '../../../../dot/js/Vector2.js'; export default class HarmonicPlot extends CanvasLinePlot { diff --git a/js/discrete/view/HarmonicsEquationNode.ts b/js/discrete/view/HarmonicsEquationNode.ts index c003b68e..c44f4c3e 100644 --- a/js/discrete/view/HarmonicsEquationNode.ts +++ b/js/discrete/view/HarmonicsEquationNode.ts @@ -6,16 +6,16 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import { Node, RichText } from '../../../../scenery/js/imports.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; -import EquationMarkup from '../../common/view/EquationMarkup.js'; -import fourierMakingWaves from '../../fourierMakingWaves.js'; import Domain from '../../common/model/Domain.js'; import SeriesType from '../../common/model/SeriesType.js'; +import EquationMarkup from '../../common/view/EquationMarkup.js'; +import fourierMakingWaves from '../../fourierMakingWaves.js'; import EquationForm from '../model/EquationForm.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; -import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; export default class HarmonicsEquationNode extends Node { diff --git a/js/discrete/view/HarmonicsSpinner.ts b/js/discrete/view/HarmonicsSpinner.ts index 7c64a391..f2f96789 100644 --- a/js/discrete/view/HarmonicsSpinner.ts +++ b/js/discrete/view/HarmonicsSpinner.ts @@ -10,8 +10,8 @@ import NumberProperty from '../../../../axon/js/NumberProperty.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import NumberSpinner from '../../../../sun/js/NumberSpinner.js'; -import fourierMakingWaves from '../../fourierMakingWaves.js'; import Tandem from '../../../../tandem/js/Tandem.js'; +import fourierMakingWaves from '../../fourierMakingWaves.js'; export default class HarmonicsSpinner extends NumberSpinner { diff --git a/js/discrete/view/InfiniteHarmonicsCheckbox.ts b/js/discrete/view/InfiniteHarmonicsCheckbox.ts index f0006f5a..98d29fdb 100644 --- a/js/discrete/view/InfiniteHarmonicsCheckbox.ts +++ b/js/discrete/view/InfiniteHarmonicsCheckbox.ts @@ -6,11 +6,11 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import Property from '../../../../axon/js/Property.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import SecondaryWaveformCheckbox from '../../common/view/SecondaryWaveformCheckbox.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; -import Property from '../../../../axon/js/Property.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; export default class InfiniteHarmonicsCheckbox extends SecondaryWaveformCheckbox { diff --git a/js/discrete/view/InfiniteHarmonicsPlot.ts b/js/discrete/view/InfiniteHarmonicsPlot.ts index f37cd5d6..61edd4f5 100644 --- a/js/discrete/view/InfiniteHarmonicsPlot.ts +++ b/js/discrete/view/InfiniteHarmonicsPlot.ts @@ -9,13 +9,13 @@ */ import Emitter from '../../../../axon/js/Emitter.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import CanvasLinePlot from '../../../../bamboo/js/CanvasLinePlot.js'; +import ChartTransform from '../../../../bamboo/js/ChartTransform.js'; +import Vector2 from '../../../../dot/js/Vector2.js'; import FMWColors from '../../common/FMWColors.js'; import FMWConstants from '../../common/FMWConstants.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import ChartTransform from '../../../../bamboo/js/ChartTransform.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import Vector2 from '../../../../dot/js/Vector2.js'; export default class InfiniteHarmonicsPlot extends CanvasLinePlot { diff --git a/js/discrete/view/OrderSpinner.ts b/js/discrete/view/OrderSpinner.ts index 3b537ef4..9f7bd41e 100644 --- a/js/discrete/view/OrderSpinner.ts +++ b/js/discrete/view/OrderSpinner.ts @@ -8,12 +8,12 @@ */ import NumberProperty from '../../../../axon/js/NumberProperty.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import NumberSpinner, { NumberSpinnerOptions } from '../../../../sun/js/NumberSpinner.js'; import FMWConstants from '../../common/FMWConstants.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; type SelfOptions = EmptySelfOptions; diff --git a/js/discrete/view/PeriodCalipersNode.ts b/js/discrete/view/PeriodCalipersNode.ts index 52aabebb..b47ac3ce 100644 --- a/js/discrete/view/PeriodCalipersNode.ts +++ b/js/discrete/view/PeriodCalipersNode.ts @@ -8,12 +8,12 @@ */ import ChartTransform from '../../../../bamboo/js/ChartTransform.js'; +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import Domain from '../../common/model/Domain.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import DiscreteModel from '../model/DiscreteModel.js'; import DiscreteCalipersNode, { DiscreteCalipersNodeOptions } from './DiscreteCalipersNode.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; type SelfOptions = EmptySelfOptions; diff --git a/js/discrete/view/PeriodCheckbox.ts b/js/discrete/view/PeriodCheckbox.ts index 5f824e42..02784fe5 100644 --- a/js/discrete/view/PeriodCheckbox.ts +++ b/js/discrete/view/PeriodCheckbox.ts @@ -6,17 +6,17 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; +import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; +import Property from '../../../../axon/js/Property.js'; +import { combineOptions } from '../../../../phet-core/js/optionize.js'; import { Text } from '../../../../scenery/js/imports.js'; import Checkbox, { CheckboxOptions } from '../../../../sun/js/Checkbox.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; +import Domain from '../../common/model/Domain.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; -import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; -import Domain from '../../common/model/Domain.js'; -import Property from '../../../../axon/js/Property.js'; -import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; -import { combineOptions } from '../../../../phet-core/js/optionize.js'; export default class PeriodCheckbox extends Checkbox { diff --git a/js/discrete/view/PeriodClockNode.ts b/js/discrete/view/PeriodClockNode.ts index fa40c211..0065510a 100644 --- a/js/discrete/view/PeriodClockNode.ts +++ b/js/discrete/view/PeriodClockNode.ts @@ -9,8 +9,13 @@ */ import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; +import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import { Shape } from '../../../../kite/js/imports.js'; +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import { Circle, Color, Node, Path, Rectangle, RichText } from '../../../../scenery/js/imports.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; import FMWSymbols from '../../common/FMWSymbols.js'; import Domain from '../../common/model/Domain.js'; @@ -18,11 +23,6 @@ import Harmonic from '../../common/model/Harmonic.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import DiscreteModel from '../model/DiscreteModel.js'; import DiscreteMeasurementToolNode, { DiscreteMeasurementToolNodeOptions } from './DiscreteMeasurementToolNode.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; // Margins for the translucent background behind the label const BACKGROUND_X_MARGIN = 2; diff --git a/js/discrete/view/WaveformComboBox.ts b/js/discrete/view/WaveformComboBox.ts index f164ad07..64f3ef83 100644 --- a/js/discrete/view/WaveformComboBox.ts +++ b/js/discrete/view/WaveformComboBox.ts @@ -6,13 +6,13 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import Property from '../../../../axon/js/Property.js'; import { Node } from '../../../../scenery/js/imports.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import FMWComboBox, { FMWComboBoxChoice } from '../../common/view/FMWComboBox.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; import Waveform from '../model/Waveform.js'; -import Property from '../../../../axon/js/Property.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; // This format is specific to FMWComboBox. const CHOICES: FMWComboBoxChoice[] = [ diff --git a/js/discrete/view/WavelengthCalipersNode.ts b/js/discrete/view/WavelengthCalipersNode.ts index 6d4c0dc6..d187ad5d 100644 --- a/js/discrete/view/WavelengthCalipersNode.ts +++ b/js/discrete/view/WavelengthCalipersNode.ts @@ -8,12 +8,12 @@ */ import ChartTransform from '../../../../bamboo/js/ChartTransform.js'; +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import Domain from '../../common/model/Domain.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import DiscreteModel from '../model/DiscreteModel.js'; import DiscreteCalipersNode, { DiscreteCalipersNodeOptions } from './DiscreteCalipersNode.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; type SelfOptions = EmptySelfOptions; diff --git a/js/discrete/view/WavelengthCheckbox.ts b/js/discrete/view/WavelengthCheckbox.ts index 1580c4ab..0f0ca97c 100644 --- a/js/discrete/view/WavelengthCheckbox.ts +++ b/js/discrete/view/WavelengthCheckbox.ts @@ -6,17 +6,17 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; +import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; +import Property from '../../../../axon/js/Property.js'; +import { combineOptions } from '../../../../phet-core/js/optionize.js'; import { Text } from '../../../../scenery/js/imports.js'; import Checkbox, { CheckboxOptions } from '../../../../sun/js/Checkbox.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; +import Domain from '../../common/model/Domain.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; -import Property from '../../../../axon/js/Property.js'; -import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; -import Domain from '../../common/model/Domain.js'; -import { combineOptions } from '../../../../phet-core/js/optionize.js'; -import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; export default class WavelengthCheckbox extends Checkbox { diff --git a/js/waveGame/model/WaveGameAmplitudesChart.ts b/js/waveGame/model/WaveGameAmplitudesChart.ts index 93bc9729..4009eb81 100644 --- a/js/waveGame/model/WaveGameAmplitudesChart.ts +++ b/js/waveGame/model/WaveGameAmplitudesChart.ts @@ -12,10 +12,10 @@ import NumberProperty from '../../../../axon/js/NumberProperty.js'; import Tandem from '../../../../tandem/js/Tandem.js'; +import EmphasizedHarmonics from '../../common/model/EmphasizedHarmonics.js'; +import FourierSeries from '../../common/model/FourierSeries.js'; import InteractiveAmplitudesChart from '../../common/model/InteractiveAmplitudesChart.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import FourierSeries from '../../common/model/FourierSeries.js'; -import EmphasizedHarmonics from '../../common/model/EmphasizedHarmonics.js'; export default class WaveGameAmplitudesChart extends InteractiveAmplitudesChart { diff --git a/js/waveGame/model/WaveGameHarmonicsChart.ts b/js/waveGame/model/WaveGameHarmonicsChart.ts index ea491353..316a1582 100644 --- a/js/waveGame/model/WaveGameHarmonicsChart.ts +++ b/js/waveGame/model/WaveGameHarmonicsChart.ts @@ -11,12 +11,12 @@ import NumberProperty from '../../../../axon/js/NumberProperty.js'; import Property from '../../../../axon/js/Property.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import AxisDescription from '../../common/model/AxisDescription.js'; -import HarmonicsChart from '../../common/model/HarmonicsChart.js'; -import fourierMakingWaves from '../../fourierMakingWaves.js'; -import FourierSeries from '../../common/model/FourierSeries.js'; +import Domain from '../../common/model/Domain.js'; import EmphasizedHarmonics from '../../common/model/EmphasizedHarmonics.js'; +import FourierSeries from '../../common/model/FourierSeries.js'; +import HarmonicsChart from '../../common/model/HarmonicsChart.js'; import SeriesType from '../../common/model/SeriesType.js'; -import Domain from '../../common/model/Domain.js'; +import fourierMakingWaves from '../../fourierMakingWaves.js'; export default class WaveGameHarmonicsChart extends HarmonicsChart { diff --git a/js/waveGame/model/WaveGameLevel.ts b/js/waveGame/model/WaveGameLevel.ts index ebe0a013..697f9717 100644 --- a/js/waveGame/model/WaveGameLevel.ts +++ b/js/waveGame/model/WaveGameLevel.ts @@ -16,6 +16,8 @@ import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import Range from '../../../../dot/js/Range.js'; import optionize from '../../../../phet-core/js/optionize.js'; import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; +import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; +import isSettingPhetioStateProperty from '../../../../tandem/js/isSettingPhetioStateProperty.js'; import PhetioObject, { PhetioObjectOptions } from '../../../../tandem/js/PhetioObject.js'; import IOType from '../../../../tandem/js/types/IOType.js'; import NumberIO from '../../../../tandem/js/types/NumberIO.js'; @@ -33,8 +35,6 @@ import AmplitudesGenerator from './AmplitudesGenerator.js'; import WaveGameAmplitudesChart from './WaveGameAmplitudesChart.js'; import WaveGameHarmonicsChart from './WaveGameHarmonicsChart.js'; import WaveGameSumChart from './WaveGameSumChart.js'; -import isSettingPhetioStateProperty from '../../../../tandem/js/isSettingPhetioStateProperty.js'; -import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; // constants diff --git a/js/waveGame/model/WaveGameSumChart.ts b/js/waveGame/model/WaveGameSumChart.ts index d3be260c..247c4029 100644 --- a/js/waveGame/model/WaveGameSumChart.ts +++ b/js/waveGame/model/WaveGameSumChart.ts @@ -14,11 +14,11 @@ import Property from '../../../../axon/js/Property.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import AxisDescription from '../../common/model/AxisDescription.js'; -import SumChart from '../../common/model/SumChart.js'; -import fourierMakingWaves from '../../fourierMakingWaves.js'; import Domain from '../../common/model/Domain.js'; -import SeriesType from '../../common/model/SeriesType.js'; import FourierSeries from '../../common/model/FourierSeries.js'; +import SeriesType from '../../common/model/SeriesType.js'; +import SumChart from '../../common/model/SumChart.js'; +import fourierMakingWaves from '../../fourierMakingWaves.js'; export default class WaveGameSumChart extends SumChart { diff --git a/js/waveGame/view/AmplitudeControlsSpinner.ts b/js/waveGame/view/AmplitudeControlsSpinner.ts index 555c7fc6..3d39ea6e 100644 --- a/js/waveGame/view/AmplitudeControlsSpinner.ts +++ b/js/waveGame/view/AmplitudeControlsSpinner.ts @@ -7,14 +7,14 @@ */ import NumberProperty from '../../../../axon/js/NumberProperty.js'; +import optionize from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; +import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import { Text, TextOptions, VBox, VBoxOptions } from '../../../../scenery/js/imports.js'; import NumberSpinner from '../../../../sun/js/NumberSpinner.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; -import optionize from '../../../../phet-core/js/optionize.js'; type SelfOptions = { textOptions?: StrictOmit; diff --git a/js/waveGame/view/PointsAwardedNode.ts b/js/waveGame/view/PointsAwardedNode.ts index ed17d2f8..a5a6b79f 100644 --- a/js/waveGame/view/PointsAwardedNode.ts +++ b/js/waveGame/view/PointsAwardedNode.ts @@ -6,13 +6,13 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import optionize from '../../../../phet-core/js/optionize.js'; +import PickOptional from '../../../../phet-core/js/types/PickOptional.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import StarNode from '../../../../scenery-phet/js/StarNode.js'; import { HBox, HBoxOptions, Text } from '../../../../scenery/js/imports.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import optionize from '../../../../phet-core/js/optionize.js'; -import PickOptional from '../../../../phet-core/js/types/PickOptional.js'; type SelfOptions = { points?: number; diff --git a/js/waveGame/view/WaveGameAmplitudesChartNode.ts b/js/waveGame/view/WaveGameAmplitudesChartNode.ts index 5e3f695a..b2ccd41d 100644 --- a/js/waveGame/view/WaveGameAmplitudesChartNode.ts +++ b/js/waveGame/view/WaveGameAmplitudesChartNode.ts @@ -8,13 +8,13 @@ */ import dotRandom from '../../../../dot/js/dotRandom.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; +import Harmonic from '../../common/model/Harmonic.js'; +import AmplitudeKeypadDialog from '../../common/view/AmplitudeKeypadDialog.js'; import InteractiveAmplitudesChartNode from '../../common/view/InteractiveAmplitudesChartNode.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import WaveGameAmplitudesChart from '../model/WaveGameAmplitudesChart.js'; -import AmplitudeKeypadDialog from '../../common/view/AmplitudeKeypadDialog.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; -import Harmonic from '../../common/model/Harmonic.js'; export default class WaveGameAmplitudesChartNode extends InteractiveAmplitudesChartNode { diff --git a/js/waveGame/view/WaveGameHarmonicsChartNode.ts b/js/waveGame/view/WaveGameHarmonicsChartNode.ts index 7f994813..77801017 100644 --- a/js/waveGame/view/WaveGameHarmonicsChartNode.ts +++ b/js/waveGame/view/WaveGameHarmonicsChartNode.ts @@ -8,10 +8,10 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import Tandem from '../../../../tandem/js/Tandem.js'; import HarmonicsChartNode from '../../common/view/HarmonicsChartNode.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import WaveGameHarmonicsChart from '../model/WaveGameHarmonicsChart.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; export default class WaveGameHarmonicsChartNode extends HarmonicsChartNode { diff --git a/js/waveGame/view/WaveGameLevelNode.ts b/js/waveGame/view/WaveGameLevelNode.ts index 0ea2ac16..748c22be 100644 --- a/js/waveGame/view/WaveGameLevelNode.ts +++ b/js/waveGame/view/WaveGameLevelNode.ts @@ -10,12 +10,14 @@ import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import NumberProperty from '../../../../axon/js/NumberProperty.js'; import Property from '../../../../axon/js/Property.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; +import { combineOptions } from '../../../../phet-core/js/optionize.js'; import EraserButton, { EraserButtonOptions } from '../../../../scenery-phet/js/buttons/EraserButton.js'; import FaceNode from '../../../../scenery-phet/js/FaceNode.js'; import PhetColorScheme from '../../../../scenery-phet/js/PhetColorScheme.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; -import { KeyboardListener, Node, RichText, Text, VBox, HotkeyData } from '../../../../scenery/js/imports.js'; +import { HotkeyData, KeyboardListener, Node, RichText, Text, VBox } from '../../../../scenery/js/imports.js'; import RectangularPushButton from '../../../../sun/js/buttons/RectangularPushButton.js'; import nullSoundPlayer from '../../../../tambo/js/nullSoundPlayer.js'; import Tandem from '../../../../tandem/js/Tandem.js'; @@ -38,8 +40,6 @@ import WaveGameAmplitudesChartNode from './WaveGameAmplitudesChartNode.js'; import WaveGameHarmonicsChartNode from './WaveGameHarmonicsChartNode.js'; import WaveGameRewardNode from './WaveGameRewardNode.js'; import WaveGameSumChartNode from './WaveGameSumChartNode.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import { combineOptions } from '../../../../phet-core/js/optionize.js'; // constants const DEFAULT_FONT = new PhetFont( 16 ); diff --git a/js/waveGame/view/WaveGameLevelSelectionButtonGroup.ts b/js/waveGame/view/WaveGameLevelSelectionButtonGroup.ts index 560de901..a359aaf1 100644 --- a/js/waveGame/view/WaveGameLevelSelectionButtonGroup.ts +++ b/js/waveGame/view/WaveGameLevelSelectionButtonGroup.ts @@ -6,6 +6,7 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import Property from '../../../../axon/js/Property.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import LevelSelectionButtonGroup from '../../../../vegas/js/LevelSelectionButtonGroup.js'; import ScoreDisplayNumberAndStar from '../../../../vegas/js/ScoreDisplayNumberAndStar.js'; @@ -14,7 +15,6 @@ import FMWQueryParameters from '../../common/FMWQueryParameters.js'; import FMWIconFactory from '../../common/view/FMWIconFactory.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import WaveGameLevel from '../model/WaveGameLevel.js'; -import Property from '../../../../axon/js/Property.js'; const BUTTON_WIDTH = 150; const BUTTON_HEIGHT = 150; diff --git a/js/waveGame/view/WaveGameLevelSelectionNode.ts b/js/waveGame/view/WaveGameLevelSelectionNode.ts index 7df0adfd..a4cb3a33 100644 --- a/js/waveGame/view/WaveGameLevelSelectionNode.ts +++ b/js/waveGame/view/WaveGameLevelSelectionNode.ts @@ -9,6 +9,7 @@ */ import Multilink from '../../../../axon/js/Multilink.js'; +import Bounds2 from '../../../../dot/js/Bounds2.js'; import InfoButton from '../../../../scenery-phet/js/buttons/InfoButton.js'; import ResetAllButton from '../../../../scenery-phet/js/buttons/ResetAllButton.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; @@ -18,10 +19,9 @@ import FMWConstants from '../../common/FMWConstants.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; import WaveGameLevel from '../model/WaveGameLevel.js'; +import WaveGameModel from '../model/WaveGameModel.js'; import WaveGameInfoDialog from './WaveGameInfoDialog.js'; import WaveGameLevelSelectionButtonGroup from './WaveGameLevelSelectionButtonGroup.js'; -import Bounds2 from '../../../../dot/js/Bounds2.js'; -import WaveGameModel from '../model/WaveGameModel.js'; export default class WaveGameLevelSelectionNode extends Node { diff --git a/js/waveGame/view/WaveGameRewardDialog.ts b/js/waveGame/view/WaveGameRewardDialog.ts index 39721514..58678866 100644 --- a/js/waveGame/view/WaveGameRewardDialog.ts +++ b/js/waveGame/view/WaveGameRewardDialog.ts @@ -10,8 +10,8 @@ import Property from '../../../../axon/js/Property.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import RewardDialog from '../../../../vegas/js/RewardDialog.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import WaveGameRewardNode from './WaveGameRewardNode.js'; import WaveGameLevel from '../model/WaveGameLevel.js'; +import WaveGameRewardNode from './WaveGameRewardNode.js'; export default class WaveGameRewardDialog extends RewardDialog { diff --git a/js/waveGame/view/WaveGameRewardNode.ts b/js/waveGame/view/WaveGameRewardNode.ts index 180ba802..b92a6035 100644 --- a/js/waveGame/view/WaveGameRewardNode.ts +++ b/js/waveGame/view/WaveGameRewardNode.ts @@ -8,12 +8,12 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import FaceNode from '../../../../scenery-phet/js/FaceNode.js'; import StarNode from '../../../../scenery-phet/js/StarNode.js'; import RewardNode, { RewardNodeOptions } from '../../../../vegas/js/RewardNode.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; // constants const NUMBER_OF_NODES = 100; diff --git a/js/waveGame/view/WaveGameSumChartNode.ts b/js/waveGame/view/WaveGameSumChartNode.ts index 4d665528..3dae0522 100644 --- a/js/waveGame/view/WaveGameSumChartNode.ts +++ b/js/waveGame/view/WaveGameSumChartNode.ts @@ -9,11 +9,11 @@ */ import CanvasLinePlot from '../../../../bamboo/js/CanvasLinePlot.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import FMWColors from '../../common/FMWColors.js'; import SumChartNode from '../../common/view/SumChartNode.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import WaveGameSumChart from '../model/WaveGameSumChart.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; export default class WaveGameSumChartNode extends SumChartNode { diff --git a/js/wavepacket/model/WavePacket.ts b/js/wavepacket/model/WavePacket.ts index e5fa98f6..3ef0376c 100644 --- a/js/wavepacket/model/WavePacket.ts +++ b/js/wavepacket/model/WavePacket.ts @@ -13,8 +13,8 @@ * @author Chris Malley (PixelZoom, Inc.) */ -import Disposable from '../../../../axon/js/Disposable.js'; import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; +import Disposable from '../../../../axon/js/Disposable.js'; import NumberProperty from '../../../../axon/js/NumberProperty.js'; import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import Range from '../../../../dot/js/Range.js'; diff --git a/js/wavepacket/model/WavePacketAmplitudesChart.ts b/js/wavepacket/model/WavePacketAmplitudesChart.ts index 05a22bd0..8df61ff0 100644 --- a/js/wavepacket/model/WavePacketAmplitudesChart.ts +++ b/js/wavepacket/model/WavePacketAmplitudesChart.ts @@ -17,11 +17,11 @@ import Vector2 from '../../../../dot/js/Vector2.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; import AxisDescription from '../../common/model/AxisDescription.js'; +import Domain from '../../common/model/Domain.js'; import DomainChart from '../../common/model/DomainChart.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import WavePacket from './WavePacket.js'; import WavePacketAxisDescriptions from './WavePacketAxisDescriptions.js'; -import Domain from '../../common/model/Domain.js'; // constants const EMPTY_DATA_SET = FMWConstants.EMPTY_DATA_SET; diff --git a/js/wavepacket/model/WavePacketComponentsChart.ts b/js/wavepacket/model/WavePacketComponentsChart.ts index 95af2694..627abd64 100644 --- a/js/wavepacket/model/WavePacketComponentsChart.ts +++ b/js/wavepacket/model/WavePacketComponentsChart.ts @@ -14,6 +14,7 @@ import Range from '../../../../dot/js/Range.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; +import AxisDescription from '../../common/model/AxisDescription.js'; import Domain from '../../common/model/Domain.js'; import DomainChart from '../../common/model/DomainChart.js'; import Harmonic from '../../common/model/Harmonic.js'; @@ -21,7 +22,6 @@ import SeriesType from '../../common/model/SeriesType.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierComponent from './FourierComponent.js'; import WavePacket from './WavePacket.js'; -import AxisDescription from '../../common/model/AxisDescription.js'; // We could use different numbers of points for different Fourier components, because lower-order components have a // longer period, and therefore require fewer points to make them look smooth. But computing the same number of points diff --git a/js/wavepacket/model/WavePacketModel.ts b/js/wavepacket/model/WavePacketModel.ts index 21242efb..f02f2dbc 100644 --- a/js/wavepacket/model/WavePacketModel.ts +++ b/js/wavepacket/model/WavePacketModel.ts @@ -7,6 +7,7 @@ */ import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; +import Disposable from '../../../../axon/js/Disposable.js'; import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import Property from '../../../../axon/js/Property.js'; import TModel from '../../../../joist/js/TModel.js'; @@ -19,7 +20,6 @@ import WavePacketAmplitudesChart from './WavePacketAmplitudesChart.js'; import WavePacketAxisDescriptions from './WavePacketAxisDescriptions.js'; import WavePacketComponentsChart from './WavePacketComponentsChart.js'; import WavePacketSumChart from './WavePacketSumChart.js'; -import Disposable from '../../../../axon/js/Disposable.js'; export default class WavePacketModel implements TModel { diff --git a/js/wavepacket/model/WavePacketSumChart.ts b/js/wavepacket/model/WavePacketSumChart.ts index a42fc614..f7169515 100644 --- a/js/wavepacket/model/WavePacketSumChart.ts +++ b/js/wavepacket/model/WavePacketSumChart.ts @@ -16,14 +16,14 @@ import Vector2 from '../../../../dot/js/Vector2.js'; import Vector2Property from '../../../../dot/js/Vector2Property.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; +import AxisDescription from '../../common/model/AxisDescription.js'; +import Domain from '../../common/model/Domain.js'; import DomainChart from '../../common/model/DomainChart.js'; import SeriesType from '../../common/model/SeriesType.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import WavePacket from './WavePacket.js'; import WavePacketAxisDescriptions from './WavePacketAxisDescriptions.js'; import WavePacketComponentsChart from './WavePacketComponentsChart.js'; -import Domain from '../../common/model/Domain.js'; -import AxisDescription from '../../common/model/AxisDescription.js'; // constants const EMPTY_DATA_SET = FMWConstants.EMPTY_DATA_SET; diff --git a/js/wavepacket/view/CaliperCheckbox.ts b/js/wavepacket/view/CaliperCheckbox.ts index a35815f0..590aad89 100644 --- a/js/wavepacket/view/CaliperCheckbox.ts +++ b/js/wavepacket/view/CaliperCheckbox.ts @@ -9,16 +9,16 @@ import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import Multilink from '../../../../axon/js/Multilink.js'; +import Property from '../../../../axon/js/Property.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import { optionize4 } from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import Checkbox, { CheckboxOptions } from '../../../../sun/js/Checkbox.js'; import FMWConstants from '../../common/FMWConstants.js'; import Domain from '../../common/model/Domain.js'; import CalipersNode, { CalipersNodeOptions } from '../../common/view/CalipersNode.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import Property from '../../../../axon/js/Property.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import { optionize4 } from '../../../../phet-core/js/optionize.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; type SelfOptions = { calipersNodeOptions?: CalipersNodeOptions; diff --git a/js/wavepacket/view/ComponentSpacingToolCheckbox.ts b/js/wavepacket/view/ComponentSpacingToolCheckbox.ts index 23bdb16e..ba13fe3d 100644 --- a/js/wavepacket/view/ComponentSpacingToolCheckbox.ts +++ b/js/wavepacket/view/ComponentSpacingToolCheckbox.ts @@ -7,14 +7,14 @@ * @author Chris Malley (PixelZoom, Inc.) */ -import FMWColors from '../../common/FMWColors.js'; -import fourierMakingWaves from '../../fourierMakingWaves.js'; -import CaliperCheckbox from './CaliperCheckbox.js'; import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; -import Domain from '../../common/model/Domain.js'; import Property from '../../../../axon/js/Property.js'; import Tandem from '../../../../tandem/js/Tandem.js'; +import FMWColors from '../../common/FMWColors.js'; import FMWDerivedStrings from '../../common/FMWDerivedStrings.js'; +import Domain from '../../common/model/Domain.js'; +import fourierMakingWaves from '../../fourierMakingWaves.js'; +import CaliperCheckbox from './CaliperCheckbox.js'; export default class ComponentSpacingToolCheckbox extends CaliperCheckbox { diff --git a/js/wavepacket/view/ComponentSpacingToolNode.ts b/js/wavepacket/view/ComponentSpacingToolNode.ts index 41fd9c86..681e1fa0 100644 --- a/js/wavepacket/view/ComponentSpacingToolNode.ts +++ b/js/wavepacket/view/ComponentSpacingToolNode.ts @@ -7,16 +7,16 @@ * @author Chris Malley (PixelZoom, Inc.) */ -import FMWColors from '../../common/FMWColors.js'; -import fourierMakingWaves from '../../fourierMakingWaves.js'; -import WavePacketMeasurementToolNode, { WavePacketMeasurementToolNodeOptions } from './WavePacketMeasurementToolNode.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; +import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import ChartTransform from '../../../../bamboo/js/ChartTransform.js'; -import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; -import Domain from '../../common/model/Domain.js'; +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; +import FMWColors from '../../common/FMWColors.js'; import FMWDerivedStrings from '../../common/FMWDerivedStrings.js'; +import Domain from '../../common/model/Domain.js'; +import fourierMakingWaves from '../../fourierMakingWaves.js'; +import WavePacketMeasurementToolNode, { WavePacketMeasurementToolNodeOptions } from './WavePacketMeasurementToolNode.js'; type SelfOptions = EmptySelfOptions; diff --git a/js/wavepacket/view/ComponentsEquationText.ts b/js/wavepacket/view/ComponentsEquationText.ts index 541a1220..4e7a9abc 100644 --- a/js/wavepacket/view/ComponentsEquationText.ts +++ b/js/wavepacket/view/ComponentsEquationText.ts @@ -11,10 +11,10 @@ import Multilink from '../../../../axon/js/Multilink.js'; import { RichText } from '../../../../scenery/js/imports.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; +import Domain from '../../common/model/Domain.js'; +import SeriesType from '../../common/model/SeriesType.js'; import EquationMarkup from '../../common/view/EquationMarkup.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import SeriesType from '../../common/model/SeriesType.js'; -import Domain from '../../common/model/Domain.js'; export default class ComponentsEquationText extends RichText { diff --git a/js/wavepacket/view/ContinuousWaveformCheckbox.ts b/js/wavepacket/view/ContinuousWaveformCheckbox.ts index c314dcae..679ccd9c 100644 --- a/js/wavepacket/view/ContinuousWaveformCheckbox.ts +++ b/js/wavepacket/view/ContinuousWaveformCheckbox.ts @@ -6,11 +6,11 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import Property from '../../../../axon/js/Property.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import SecondaryWaveformCheckbox from '../../common/view/SecondaryWaveformCheckbox.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; -import Property from '../../../../axon/js/Property.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; export default class ContinuousWaveformCheckbox extends SecondaryWaveformCheckbox { diff --git a/js/wavepacket/view/GaussianAreaPlot.ts b/js/wavepacket/view/GaussianAreaPlot.ts index a0994d76..511b43d4 100644 --- a/js/wavepacket/view/GaussianAreaPlot.ts +++ b/js/wavepacket/view/GaussianAreaPlot.ts @@ -12,13 +12,13 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import ChartTransform from '../../../../bamboo/js/ChartTransform.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import { Shape } from '../../../../kite/js/imports.js'; -import { Path, PathOptions } from '../../../../scenery/js/imports.js'; -import fourierMakingWaves from '../../fourierMakingWaves.js'; import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; import PickOptional from '../../../../phet-core/js/types/PickOptional.js'; -import ChartTransform from '../../../../bamboo/js/ChartTransform.js'; +import { Path, PathOptions } from '../../../../scenery/js/imports.js'; +import fourierMakingWaves from '../../fourierMakingWaves.js'; type SelfOptions = EmptySelfOptions; diff --git a/js/wavepacket/view/LengthToolCheckbox.ts b/js/wavepacket/view/LengthToolCheckbox.ts index ce2c477e..651a8191 100644 --- a/js/wavepacket/view/LengthToolCheckbox.ts +++ b/js/wavepacket/view/LengthToolCheckbox.ts @@ -7,15 +7,15 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; +import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; +import Property from '../../../../axon/js/Property.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import FMWColors from '../../common/FMWColors.js'; import FMWSymbols from '../../common/FMWSymbols.js'; +import Domain from '../../common/model/Domain.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import CaliperCheckbox from './CaliperCheckbox.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; -import Property from '../../../../axon/js/Property.js'; -import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; -import Domain from '../../common/model/Domain.js'; -import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; export default class LengthToolCheckbox extends CaliperCheckbox { diff --git a/js/wavepacket/view/WavePacketAmplitudesChartNode.ts b/js/wavepacket/view/WavePacketAmplitudesChartNode.ts index ae5a04d4..d80fb8fa 100644 --- a/js/wavepacket/view/WavePacketAmplitudesChartNode.ts +++ b/js/wavepacket/view/WavePacketAmplitudesChartNode.ts @@ -13,6 +13,8 @@ import CanvasLinePlot from '../../../../bamboo/js/CanvasLinePlot.js'; import ChartCanvasNode from '../../../../bamboo/js/ChartCanvasNode.js'; import Range from '../../../../dot/js/Range.js'; import { Shape } from '../../../../kite/js/imports.js'; +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import { Color, LinearGradient, Node } from '../../../../scenery/js/imports.js'; import FMWColors from '../../common/FMWColors.js'; import FMWConstants from '../../common/FMWConstants.js'; @@ -23,8 +25,6 @@ import fourierMakingWaves from '../../fourierMakingWaves.js'; import WavePacketAmplitudesChart from '../model/WavePacketAmplitudesChart.js'; import GaussianAreaPlot from './GaussianAreaPlot.js'; import WidthIndicatorPlot from './WidthIndicatorPlot.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; // constants const X_TICK_LABEL_DECIMALS = 0; diff --git a/js/wavepacket/view/WavePacketControlPanel.ts b/js/wavepacket/view/WavePacketControlPanel.ts index 0185f6e9..4c3c28b3 100644 --- a/js/wavepacket/view/WavePacketControlPanel.ts +++ b/js/wavepacket/view/WavePacketControlPanel.ts @@ -8,12 +8,16 @@ import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import NumberProperty from '../../../../axon/js/NumberProperty.js'; +import Property from '../../../../axon/js/Property.js'; +import { combineOptions } from '../../../../phet-core/js/optionize.js'; import InfoButton from '../../../../scenery-phet/js/buttons/InfoButton.js'; import { HBox, HSeparator, Node, Text, VBox } from '../../../../scenery/js/imports.js'; import Panel, { PanelOptions } from '../../../../sun/js/Panel.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import FMWColors from '../../common/FMWColors.js'; import FMWConstants from '../../common/FMWConstants.js'; +import Domain from '../../common/model/Domain.js'; +import SeriesType from '../../common/model/SeriesType.js'; import DomainComboBox from '../../common/view/DomainComboBox.js'; import SeriesTypeRadioButtonGroup from '../../common/view/SeriesTypeRadioButtonGroup.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; @@ -27,10 +31,6 @@ import LengthToolCheckbox from './LengthToolCheckbox.js'; import StandardDeviationControl from './StandardDeviationControl.js'; import WavePacketInfoDialog from './WavePacketInfoDialog.js'; import WidthIndicatorsCheckbox from './WidthIndicatorsCheckbox.js'; -import Property from '../../../../axon/js/Property.js'; -import Domain from '../../common/model/Domain.js'; -import SeriesType from '../../common/model/SeriesType.js'; -import { combineOptions } from '../../../../phet-core/js/optionize.js'; // constants const VERTICAL_SPACING = 7; diff --git a/js/wavepacket/view/WavePacketInfoDialog.ts b/js/wavepacket/view/WavePacketInfoDialog.ts index a65a8e8d..5c841a46 100644 --- a/js/wavepacket/view/WavePacketInfoDialog.ts +++ b/js/wavepacket/view/WavePacketInfoDialog.ts @@ -8,11 +8,11 @@ import { RichText, Text, VBox } from '../../../../scenery/js/imports.js'; import Dialog from '../../../../sun/js/Dialog.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; +import FMWDerivedStrings from '../../common/FMWDerivedStrings.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; -import FMWDerivedStrings from '../../common/FMWDerivedStrings.js'; // constants const MAX_WIDTH = 800; // determined empirically diff --git a/js/wavepacket/view/WavePacketLengthToolNode.ts b/js/wavepacket/view/WavePacketLengthToolNode.ts index 4b4356bf..c9d3f8db 100644 --- a/js/wavepacket/view/WavePacketLengthToolNode.ts +++ b/js/wavepacket/view/WavePacketLengthToolNode.ts @@ -7,18 +7,18 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; +import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import ChartTransform from '../../../../bamboo/js/ChartTransform.js'; +import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import FMWColors from '../../common/FMWColors.js'; import FMWSymbols from '../../common/FMWSymbols.js'; +import Domain from '../../common/model/Domain.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import WavePacketMeasurementToolNode, { WavePacketMeasurementToolNodeOptions } from './WavePacketMeasurementToolNode.js'; -import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import ChartTransform from '../../../../bamboo/js/ChartTransform.js'; -import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; -import Domain from '../../common/model/Domain.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; type SelfOptions = EmptySelfOptions; diff --git a/js/wavepacket/view/WavePacketMeasurementToolNode.ts b/js/wavepacket/view/WavePacketMeasurementToolNode.ts index 9766254c..897383ea 100644 --- a/js/wavepacket/view/WavePacketMeasurementToolNode.ts +++ b/js/wavepacket/view/WavePacketMeasurementToolNode.ts @@ -10,9 +10,13 @@ import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import Multilink from '../../../../axon/js/Multilink.js'; import Property from '../../../../axon/js/Property.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import ChartTransform from '../../../../bamboo/js/ChartTransform.js'; +import Bounds2 from '../../../../dot/js/Bounds2.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import Vector2Property from '../../../../dot/js/Vector2Property.js'; +import optionize from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import BackgroundNode from '../../../../scenery-phet/js/BackgroundNode.js'; import { Circle, DragListener, KeyboardDragListener, Node, NodeOptions, RichText, TPaint } from '../../../../scenery/js/imports.js'; import FMWConstants from '../../common/FMWConstants.js'; @@ -21,10 +25,6 @@ import FMWSymbols from '../../common/FMWSymbols.js'; import Domain from '../../common/model/Domain.js'; import CalipersNode from '../../common/view/CalipersNode.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import Bounds2 from '../../../../dot/js/Bounds2.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import optionize from '../../../../phet-core/js/optionize.js'; const RICH_TEXT_OPTIONS = { font: FMWConstants.TOOL_LABEL_FONT, diff --git a/js/wavepacket/view/WavePacketNumberControl.ts b/js/wavepacket/view/WavePacketNumberControl.ts index 61de90b9..0df04af5 100644 --- a/js/wavepacket/view/WavePacketNumberControl.ts +++ b/js/wavepacket/view/WavePacketNumberControl.ts @@ -10,15 +10,15 @@ import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import NumberProperty from '../../../../axon/js/NumberProperty.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; +import { EmptySelfOptions, optionize3 } from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import NumberControl, { NumberControlOptions } from '../../../../scenery-phet/js/NumberControl.js'; import { FireListener } from '../../../../scenery/js/imports.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; -import fourierMakingWaves from '../../fourierMakingWaves.js'; import Domain from '../../common/model/Domain.js'; -import { EmptySelfOptions, optionize3 } from '../../../../phet-core/js/optionize.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; +import fourierMakingWaves from '../../fourierMakingWaves.js'; type SelfOptions = EmptySelfOptions; diff --git a/js/wavepacket/view/WavePacketScreenView.ts b/js/wavepacket/view/WavePacketScreenView.ts index caec691d..0becafb8 100644 --- a/js/wavepacket/view/WavePacketScreenView.ts +++ b/js/wavepacket/view/WavePacketScreenView.ts @@ -7,6 +7,7 @@ */ import BooleanProperty from '../../../../axon/js/BooleanProperty.js'; +import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; import Bounds2 from '../../../../dot/js/Bounds2.js'; import Vector2 from '../../../../dot/js/Vector2.js'; import ScreenView from '../../../../joist/js/ScreenView.js'; @@ -30,7 +31,6 @@ import WavePacketControlPanel from './WavePacketControlPanel.js'; import WavePacketLengthToolNode from './WavePacketLengthToolNode.js'; import WavePacketSumChartNode from './WavePacketSumChartNode.js'; import WavePacketSumEquationNode from './WavePacketSumEquationNode.js'; -import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; export default class WavePacketScreenView extends ScreenView { diff --git a/js/wavepacket/view/WavePacketSumEquationNode.ts b/js/wavepacket/view/WavePacketSumEquationNode.ts index 64296349..195b704c 100644 --- a/js/wavepacket/view/WavePacketSumEquationNode.ts +++ b/js/wavepacket/view/WavePacketSumEquationNode.ts @@ -6,12 +6,15 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; import Multilink from '../../../../axon/js/Multilink.js'; import NumberProperty from '../../../../axon/js/NumberProperty.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import MathSymbols from '../../../../scenery-phet/js/MathSymbols.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import { Node, RichText } from '../../../../scenery/js/imports.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import FMWConstants from '../../common/FMWConstants.js'; import FMWSymbols from '../../common/FMWSymbols.js'; import Domain from '../../common/model/Domain.js'; @@ -19,9 +22,6 @@ import SeriesType from '../../common/model/SeriesType.js'; import EquationMarkup from '../../common/view/EquationMarkup.js'; import SumSymbolNode from '../../common/view/SumSymbolNode.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; -import DerivedStringProperty from '../../../../axon/js/DerivedStringProperty.js'; export default class WavePacketSumEquationNode extends Node { diff --git a/js/wavepacket/view/WaveformEnvelopeCheckbox.ts b/js/wavepacket/view/WaveformEnvelopeCheckbox.ts index c6050ce7..7698c505 100644 --- a/js/wavepacket/view/WaveformEnvelopeCheckbox.ts +++ b/js/wavepacket/view/WaveformEnvelopeCheckbox.ts @@ -6,11 +6,11 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import Property from '../../../../axon/js/Property.js'; +import Tandem from '../../../../tandem/js/Tandem.js'; import SecondaryWaveformCheckbox from '../../common/view/SecondaryWaveformCheckbox.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; -import Property from '../../../../axon/js/Property.js'; -import Tandem from '../../../../tandem/js/Tandem.js'; export default class WaveformEnvelopeCheckbox extends SecondaryWaveformCheckbox { diff --git a/js/wavepacket/view/WidthIndicatorPlot.ts b/js/wavepacket/view/WidthIndicatorPlot.ts index 98146292..cf929d12 100644 --- a/js/wavepacket/view/WidthIndicatorPlot.ts +++ b/js/wavepacket/view/WidthIndicatorPlot.ts @@ -8,8 +8,11 @@ import DerivedProperty from '../../../../axon/js/DerivedProperty.js'; import EnumerationProperty from '../../../../axon/js/EnumerationProperty.js'; +import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; import ChartTransform from '../../../../bamboo/js/ChartTransform.js'; import Vector2 from '../../../../dot/js/Vector2.js'; +import optionize from '../../../../phet-core/js/optionize.js'; +import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import BackgroundNode from '../../../../scenery-phet/js/BackgroundNode.js'; import PhetFont from '../../../../scenery-phet/js/PhetFont.js'; import { Node, NodeOptions, RichText } from '../../../../scenery/js/imports.js'; @@ -18,9 +21,6 @@ import FMWSymbols from '../../common/FMWSymbols.js'; import Domain from '../../common/model/Domain.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import HorizontalDimensionalArrowsNode from './HorizontalDimensionalArrowsNode.js'; -import TReadOnlyProperty from '../../../../axon/js/TReadOnlyProperty.js'; -import optionize from '../../../../phet-core/js/optionize.js'; -import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; type SelfOptions = { spaceSymbolStringProperty: TReadOnlyProperty; // symbol for the space Domain diff --git a/js/wavepacket/view/WidthIndicatorsCheckbox.ts b/js/wavepacket/view/WidthIndicatorsCheckbox.ts index bc3f42f4..1bd24124 100644 --- a/js/wavepacket/view/WidthIndicatorsCheckbox.ts +++ b/js/wavepacket/view/WidthIndicatorsCheckbox.ts @@ -6,6 +6,8 @@ * @author Chris Malley (PixelZoom, Inc.) */ +import Property from '../../../../axon/js/Property.js'; +import { combineOptions } from '../../../../phet-core/js/optionize.js'; import { HBox, Text } from '../../../../scenery/js/imports.js'; import Checkbox, { CheckboxOptions } from '../../../../sun/js/Checkbox.js'; import Tandem from '../../../../tandem/js/Tandem.js'; @@ -13,8 +15,6 @@ import FMWConstants from '../../common/FMWConstants.js'; import FMWIconFactory from '../../common/view/FMWIconFactory.js'; import fourierMakingWaves from '../../fourierMakingWaves.js'; import FourierMakingWavesStrings from '../../FourierMakingWavesStrings.js'; -import Property from '../../../../axon/js/Property.js'; -import { combineOptions } from '../../../../phet-core/js/optionize.js'; export default class WidthIndicatorsCheckbox extends Checkbox {