Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public bool ProcessDetections(JsonData data, int deploymentId, string deployment
logger.Info(logImages.ToString());

// Add remaining detections
if (!recordsAdded & foundImage)
if (!recordsAdded && foundImage)
{
Common.ShowProgress(window, Constants.PROGRESS_UPDATING_ANNOTATIONS_IN_DB, progressCount);
db.BulkInsertAnnotations(sql);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ private void WindowClosing(object sender, System.ComponentModel.CancelEventArgs

private void TabSelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (Tab.SelectedIndex == 0 | Tab.SelectedIndex == 1)
if (Tab.SelectedIndex == 0 || Tab.SelectedIndex == 1)
{
TabResults.Visibility = Visibility.Hidden;
}
Expand Down
5 changes: 0 additions & 5 deletions megadetector/api/batch_processing/integration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ This folder contains information about ways to use MegaDetector output files in

<img src="../../../images/recognitionInTimelapse.jpg" width="500px;">


### eMammal

A [standalone application](https://github.com/agentmorris/MegaDetector/tree/main/megadetector/api/batch_processing/integration/eMammal) is available to transfer MegaDetector results from our .json results format into the [eMammal](https://emammal.si.edu/) desktop client. Many eMammal users also work with our results by splitting images into separate folders for animal/empty/vehicle/person using [this script](https://github.com/agentmorris/MegaDetector/blob/main/megadetector/postprocessing/separate_detections_into_folders.py), then either discarding the blanks or creating separate deployments for animal/empty/human.

### digiKam

[Python tools](digiKam/README.md) (which can be run with a GUI) to transfer MegaDetector results from our .json results format into XMP image metadata, specifically for use with [digiKam](https://www.digikam.org/).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ private bool GetOptions()
return false;
}

if(confidenceThreshold < 0 | confidenceThreshold > 1)
if(confidenceThreshold < 0 || confidenceThreshold > 1)
{
panelMain.CreateGraphics().DrawRectangle(Pens.Red,
textboxConfidenceThreshold.Left - 1,
Expand Down Expand Up @@ -489,11 +489,11 @@ private void buttonBrowseFolder_Click(object sender, EventArgs e)
{
if (folderBrowserDialog.ShowDialog() == DialogResult.OK)
textboxOutputFolderFile.Text = folderBrowserDialog.SelectedPath;
}
private void enableReplacement_checkedChanged(object sender, EventArgs e)
{
textboxReplacement.Enabled = checkBoxEnableReplacement.Checked;
}
}

private void enableReplacement_checkedChanged(object sender, EventArgs e)
{
textboxReplacement.Enabled = checkBoxEnableReplacement.Checked;
}
}
}
Loading