Changeset View
Changeset View
Standalone View
Standalone View
kstars/ekos/align/offlineastrometryparser.cpp
| Show First 20 Lines • Show All 293 Lines • ▼ Show 20 Line(s) | 287 | #endif | |||
|---|---|---|---|---|---|
| 294 | fitsFile = filename; | 294 | fitsFile = filename; | ||
| 295 | 295 | | |||
| 296 | solver.clear(); | 296 | solver.clear(); | ||
| 297 | solver = new QProcess(this); | 297 | solver = new QProcess(this); | ||
| 298 | 298 | | |||
| 299 | #ifdef Q_OS_OSX | 299 | #ifdef Q_OS_OSX | ||
| 300 | QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); | 300 | QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); | ||
| 301 | QString path = env.value("PATH", ""); | 301 | QString path = env.value("PATH", ""); | ||
| 302 | QString pythonExecPath = "/usr/local/opt/python/libexec/bin"; | ||||
| 303 | if(!Options::useDefaultPython()) | ||||
| 304 | pythonExecPath = Options::pythonExecPath(); | ||||
| 302 | if (Options::astrometrySolverIsInternal()) | 305 | if (Options::astrometrySolverIsInternal()) | ||
| 303 | { | 306 | { | ||
| 304 | env.insert("PATH", QCoreApplication::applicationDirPath() + "/netpbm/bin:/usr/local/opt/python/libexec/bin:/usr/local/bin:" + path); | 307 | env.insert("PATH", QCoreApplication::applicationDirPath() + ":" + pythonExecPath + ":/usr/local/bin:" + path); | ||
| 305 | } | 308 | } | ||
| 306 | else | 309 | else | ||
| 307 | { | 310 | { | ||
| 308 | env.insert("PATH", "/usr/local/opt/python/libexec/bin:/usr/local/bin:" + path); | 311 | env.insert("PATH", pythonExecPath + ":/usr/local/bin:" + path); | ||
| 309 | } | 312 | } | ||
| 310 | solver->setProcessEnvironment(env); | 313 | solver->setProcessEnvironment(env); | ||
| 311 | 314 | | |||
| 312 | if (Options::alignmentLogging()) | 315 | if (Options::alignmentLogging()) | ||
| 313 | { | 316 | { | ||
| 314 | align->appendLogText("export PATH=" + env.value("PATH", "")); | 317 | align->appendLogText("export PATH=" + env.value("PATH", "")); | ||
| 315 | } | 318 | } | ||
| 316 | 319 | | |||
| ▲ Show 20 Lines • Show All 194 Lines • Show Last 20 Lines | |||||