mirror of
https://github.com/SatDump/SatDump
synced 2026-08-13 17:47:30 -04:00
The Grand Pipeline Rework (part 1). What a load of work that was...
This commit is contained in:
parent
e8dfd642cf
commit
f651c3b2e3
410 changed files with 11401 additions and 15294 deletions
|
|
@ -1,6 +1,5 @@
|
|||
#define SATDUMP_DLL_EXPORT2 1
|
||||
#include "processing.h"
|
||||
#include "core/pipeline.h"
|
||||
#include "logger.h"
|
||||
#include <filesystem>
|
||||
|
||||
|
|
@ -20,17 +19,17 @@ namespace satdump
|
|||
void process(std::string downlink_pipeline, std::string input_level, std::string input_file, std::string output_file, nlohmann::json parameters)
|
||||
{
|
||||
// Get pipeline
|
||||
std::optional<Pipeline> pipeline = getPipelineFromName(downlink_pipeline);
|
||||
if (!pipeline.has_value())
|
||||
{
|
||||
logger->critical("Pipeline " + downlink_pipeline + " does not exist!");
|
||||
return;
|
||||
}
|
||||
pipeline::Pipeline pipeline = pipeline::getPipelineFromID(downlink_pipeline);
|
||||
// if (!pipeline.has_value())
|
||||
// {
|
||||
// logger->critical("Pipeline " + downlink_pipeline + " does not exist!");
|
||||
// return;
|
||||
// } TODOREWORK
|
||||
|
||||
process(pipeline.value(), input_level, input_file, output_file, parameters);
|
||||
process(pipeline, input_level, input_file, output_file, parameters);
|
||||
}
|
||||
|
||||
void process(Pipeline downlink_pipeline, std::string input_level, std::string input_file, std::string output_file, nlohmann::json parameters)
|
||||
void process(pipeline::Pipeline downlink_pipeline, std::string input_level, std::string input_file, std::string output_file, nlohmann::json parameters)
|
||||
{
|
||||
processing_mutex.lock();
|
||||
is_processing = true;
|
||||
|
|
@ -74,7 +73,7 @@ namespace satdump
|
|||
processing_mutex.unlock();
|
||||
}
|
||||
|
||||
SATDUMP_DLL2 std::shared_ptr<std::vector<std::shared_ptr<ProcessingModule>>> ui_call_list = std::make_shared<std::vector<std::shared_ptr<ProcessingModule>>>();
|
||||
SATDUMP_DLL2 std::shared_ptr<std::vector<std::shared_ptr<pipeline::ProcessingModule>>> ui_call_list = std::make_shared<std::vector<std::shared_ptr<pipeline::ProcessingModule>>>();
|
||||
SATDUMP_DLL2 std::shared_ptr<std::mutex> ui_call_list_mutex = std::make_shared<std::mutex>();
|
||||
SATDUMP_DLL2 bool is_processing = false;
|
||||
} // namespace processing
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue