Skip to content

Commit

Permalink
Fixed some typos in error/log messages (Christian Sachs)
Browse files Browse the repository at this point in the history
git-svn-id: https://valelab.ucsf.edu/svn/micromanager2/trunk@16306 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd
  • Loading branch information
mark committed Feb 11, 2017
1 parent b922190 commit 4f0b166
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion MMCore/LogManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ LogManager::SetPrimaryLogFilename(const std::string& filename, bool truncate)
{
if (primaryFileSink_)
{
LOG_INFO(internalLogger_) << "Disableing primary log file";
LOG_INFO(internalLogger_) << "Disabling primary log file";
loggingCore_->RemoveSink(primaryFileSink_, PrimarySinkMode);
primaryFileSink_.reset();
}
Expand Down
10 changes: 5 additions & 5 deletions MMCore/MMCore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6834,11 +6834,11 @@ void CMMCore::InitializeErrorMessages()
errorText_[MMERR_SetPropertyFailed] = "Property does not exist, or value not allowed.";
errorText_[MMERR_LoadLibraryFailed] = "Unable to load library: file not accessible or corrupted.";
errorText_[MMERR_LibraryFunctionNotFound] =
"Unable to identify expected interface: the library is not comaptible or corrupted.";
"Unable to identify expected interface: the library is not compatible or corrupted.";
errorText_[MMERR_CreateNotFound] =
"Unable to identify CreateDevice function: the library is not comaptible or corrupted.";
"Unable to identify CreateDevice function: the library is not compatible or corrupted.";
errorText_[MMERR_DeleteNotFound] =
"Unable to identify DeleteDevice function: the library is not comaptible or corrupted.";
"Unable to identify DeleteDevice function: the library is not compatible or corrupted.";
errorText_[MMERR_CreateFailed] = "DeviceCreate function failed.";
errorText_[MMERR_DeleteFailed] = "DeviceDelete function failed.";
errorText_[MMERR_UnknownModule] = "Current device can't be unloaded: using unknown library.";
Expand Down Expand Up @@ -6876,9 +6876,9 @@ void CMMCore::InitializeErrorMessages()
"Failed to initialize circular buffer - memory requirements not adequate.";
errorText_[MMERR_CircularBufferEmpty] = "Circular buffer is empty.";
errorText_[MMERR_ContFocusNotAvailable] = "Auto-focus focus device not defined.";
errorText_[MMERR_BadConfigName] = "Configuration name contains illegale characters (/\\*!')";
errorText_[MMERR_BadConfigName] = "Configuration name contains illegal characters (/\\*!')";
errorText_[MMERR_NotAllowedDuringSequenceAcquisition] =
"This operation can not be executed while sequence acquisition is runnning.";
"This operation can not be executed while sequence acquisition is running.";
errorText_[MMERR_OutOfMemory] = "Out of memory.";
errorText_[MMERR_InvalidImageSequence] = "Issue snapImage before getImage.";
errorText_[MMERR_NullPointerException] = "Null Pointer Exception.";
Expand Down

0 comments on commit 4f0b166

Please sign in to comment.