Skip to content

Commit

Permalink
Corrected spelling of the word stimulus (was spelled as "stimulas") i…
Browse files Browse the repository at this point in the history
…n a number of places. This was noticed during code review, see #29.
  • Loading branch information
jbphet committed Dec 3, 2014
1 parent ca01263 commit 01cf5b0
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion js/neuron/controlpanel/AxonCrossSectionControlPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ define( function( require ) {
lineWidth: 0
} );

neuronModel.stimulasLockoutProperty.link( function( stimulasLockout ) {
neuronModel.stimulusLockoutProperty.link( function( stimulusLockout ) {
// When stimulation is locked out, we also lock out the
// ability to change the "All Ions Simulated" state, since
// otherwise ions would have to disappear during an action potential,
Expand Down
24 changes: 12 additions & 12 deletions js/neuron/model/NeuronModel.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ define( function( require ) {
membranePotential: 0,
// Notification Property that the state of stimulation lockout, which prevents
// stimuli from being initiated too close together, has changed.
stimulasLockout: false,
stimulusLockout: false,
playbackParticlesVisible: false,
concentrationChanged: false,
stimulusPulseInitiated: false,// observed by Membrane potential chart
Expand Down Expand Up @@ -339,7 +339,7 @@ define( function( require ) {
}

// Update the stimulus lockout state.
this.updateStimulasLockoutState();
this.updateStimulusLockoutState();

// Step the channels.
this.membraneChannels.forEach( function( channel ) {
Expand Down Expand Up @@ -461,7 +461,7 @@ define( function( require ) {
// Listen to the record-and-playback model for events that affect the
// state of the sim model.
updateRecordPlayBack: function() {
this.updateStimulasLockoutState();
this.updateStimulusLockoutState();
this.updateSimAndPlaybackParticleVisibility();
},

Expand Down Expand Up @@ -510,7 +510,7 @@ define( function( require ) {
}

// Reset the stimulation lockout.
this.setStimulasLockout( false );
this.setStimulusLockout( false );

// Set the membrane chart to its initial state.
this.setPotentialChartVisible( DEFAULT_FOR_MEMBRANE_CHART_VISIBILITY );
Expand Down Expand Up @@ -733,7 +733,7 @@ define( function( require ) {
if ( !this.isStimulusInitiationLockedOut() ) {
this.stimulusPulseInitiated = true;
this.axonMembrane.initiateTravelingActionPotential();
this.updateStimulasLockoutState();
this.updateStimulusLockoutState();
}
},

Expand Down Expand Up @@ -821,11 +821,11 @@ define( function( require ) {
return new CaptureZoneScanResult( closestFreeParticle, totalNumberOfParticles );
},

updateStimulasLockoutState: function() {
if ( this.stimulasLockout ) {
updateStimulusLockoutState: function() {
if ( this.stimulusLockout ) {
// Currently locked out, see if that should change.
if ( !this.isPlayback() && !this.isActionPotentialInProgress() ) {
this.setStimulasLockout( false );
this.setStimulusLockout( false );
}
}
else {
Expand All @@ -834,7 +834,7 @@ define( function( require ) {


if ( this.isActionPotentialInProgress() || (this.isPlayback() && backwards) ) {
this.setStimulasLockout( true );
this.setStimulusLockout( true );
}
}
},
Expand Down Expand Up @@ -991,7 +991,7 @@ define( function( require ) {
* @return
*/
isStimulusInitiationLockedOut: function() {
return this.stimulasLockout;
return this.stimulusLockout;
},
setPotentialChartVisible: function( isVisible ) {
this.potentialChartVisibleProperty.set( isVisible );
Expand All @@ -1012,8 +1012,8 @@ define( function( require ) {
isPotentialChartVisible: function() {
return this.potentialChartVisible;
},
setStimulasLockout: function( lockout ) {
this.stimulasLockoutProperty.set( lockout );
setStimulusLockout: function( lockout ) {
this.stimulusLockoutProperty.set( lockout );
if ( !lockout ) {
this.stimulusPulseInitiated = false;
}
Expand Down
4 changes: 2 additions & 2 deletions js/neuron/view/NeuronScreenView.js
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ define( function( require ) {
} );
this.addChild( resetAllButton );

thisView.neuronModel.stimulasLockoutProperty.link( function( stimulasLockout ) {
stimulateNeuronButton.enabled = !stimulasLockout;
thisView.neuronModel.stimulusLockoutProperty.link( function( stimulusLockout ) {
stimulateNeuronButton.enabled = !stimulusLockout;
} );

// NeuronModel uses specialized real time constant clock simulation
Expand Down

0 comments on commit 01cf5b0

Please sign in to comment.