Skip to content

Commit 83fb427

Browse files
committed
Change conda environment name to pmv, removed .ps1 launch script as .bat is more reliable.
1 parent c1e0ddb commit 83fb427

5 files changed

+9
-13
lines changed

LAUNCH_GUI.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
call conda activate pyMultiCam_env
1+
call conda activate pmv
22
python pyMultiVideo_GUI.pyw
33
call conda deactivate

LAUNCH_GUI.ps1

-4
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# $env_path = "$env:USERPROFILE\anaconda3\envs\flir"
2-
$env_path = "$env:USERPROFILE\miniconda3\envs\pyMultiCam_env"
2+
$env_path = "$env:USERPROFILE\miniconda3\envs\pmv"
33
Write-Output "Checking if spinnaker-python is installed in $env_path "
44
$package = conda list -p $env_path spinnaker-python
55

66
if ($package -match "spinnaker-python") {
77
Write-Output "spinnaker-python is installed in the $env_path environment."
88
} else {
9-
# Write-Output "spinnaker_python is not installed in the pyMultiCam_env environment."
9+
# Write-Output "spinnaker_python is not installed in the pmv environment."
1010
Write-Output "spinnaker-python is not installed in the $env_path environment."
1111
exit
1212
}

_installation/INSTALL_MINICONDA_ADMIN.ps1

+5-5
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ if ($minicondaOutput) {
5454

5555
# Create a conda environment in the miniconda path that has been installe.
5656
try {
57-
Write-Output "Creating pyMultiCam_env for running the applications"
58-
# Create a new environment in Miniconda called pyMultiCam_env
59-
& "$minicondaPath\miniconda3\Scripts\conda.exe" create -n pyMultiCam_env python=3.10 -y
57+
Write-Output "Creating pmv for running the applications"
58+
# Create a new environment in Miniconda called pmv
59+
& "$minicondaPath\miniconda3\Scripts\conda.exe" create -n pmv python=3.10 -y
6060
}
6161
catch {
6262
Write-Error "An Error occured whilst trying to make the virtual environment for pyMulitCam."
6363
}
6464

6565
try {
66-
Write-Output "Installing the requirements.txt in the pyMultiCam_env"
67-
& "$minicondaPath\miniconda3\Scripts\conda.exe" run -n pyMultiCam_env pip install -r "../requirements.txt"
66+
Write-Output "Installing the requirements.txt in the pmv"
67+
& "$minicondaPath\miniconda3\Scripts\conda.exe" run -n pmv pip install -r "../requirements.txt"
6868
} catch {
6969
Write-Error "An error occurred while installing the requirements."
7070
}

_installation/INSTALL_PYSPIN.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Get-Process -Id $PID |
109109

110110
# Path to program files
111111
$systemPath = [System.Environment]::GetFolderPath('ProgramFiles')
112-
$envPath = "$systemPath\miniconda3\envs\pyMultiCam_env"
112+
$envPath = "$systemPath\miniconda3\envs\pmv"
113113

114114
# Install spinnaker SDK
115115
try {

0 commit comments

Comments
 (0)