提交 34d77981 编写于 作者: G gineshidalgo99

Removed 'h for help' from GuiInfoAdder if no OpenPose GUI

上级 2cf991b2
......@@ -10,7 +10,7 @@ namespace op
class GuiInfoAdder
{
public:
GuiInfoAdder(const cv::Size& outputSize, const int numberGpus);
GuiInfoAdder(const cv::Size& outputSize, const int numberGpus, const bool guiEnabled = false);
void addInfo(cv::Mat& cvOutputData, const Array<float>& poseKeyPoints, const unsigned long long id, const std::string& elementRenderedName);
......@@ -19,6 +19,7 @@ namespace op
const cv::Size mOutputSize;
const int mBorderMargin;
const int mNumberGpus;
const bool mGuiEnabled;
// Other variables
std::queue<std::chrono::high_resolution_clock::time_point> mFpsQueue;
double mFps;
......
......@@ -703,7 +703,7 @@ namespace op
|| mThreadManagerMode == ThreadManagerMode::Asynchronous
|| mThreadManagerMode == ThreadManagerMode::AsynchronousOut))
{
const auto guiInfoAdder = std::make_shared<GuiInfoAdder>(finalOutputSize, wrapperStructPose.gpuNumber);
const auto guiInfoAdder = std::make_shared<GuiInfoAdder>(finalOutputSize, wrapperStructPose.gpuNumber, wrapperStructOutput.displayGui);
mOutputWs.emplace_back(std::make_shared<WGuiInfoAdder<TDatumsPtr>>(guiInfoAdder));
}
// Minimal graphical user interface (GUI)
......
......@@ -40,10 +40,11 @@ namespace op
}
}
GuiInfoAdder::GuiInfoAdder(const cv::Size& outputSize, const int numberGpus) :
GuiInfoAdder::GuiInfoAdder(const cv::Size& outputSize, const int numberGpus, const bool guiEnabled) :
mOutputSize{outputSize},
mBorderMargin{intRound(fastMax(mOutputSize.width, mOutputSize.height) * 0.025)},
mNumberGpus{numberGpus},
mGuiEnabled{guiEnabled},
mFpsCounter{0u},
mLastElementRenderedCounter{std::numeric_limits<int>::max()}
{
......@@ -78,8 +79,9 @@ namespace op
mLastElementRenderedCounter = fastMin(mLastElementRenderedCounter, std::numeric_limits<int>::max() - 5);
mLastElementRenderedCounter++;
// Display element to display or help
putTextOnCvMat(cvOutputData, (!mLastElementRenderedName.empty() ? mLastElementRenderedName : "'h' for help"),
{intRound(mOutputSize.width - mBorderMargin), mBorderMargin}, white, true);
std::string message = (!mLastElementRenderedName.empty() ? mLastElementRenderedName : (mGuiEnabled ? "'h' for help" : ""));
if (!message.empty())
putTextOnCvMat(cvOutputData, message, {intRound(mOutputSize.width - mBorderMargin), mBorderMargin}, white, true);
// Frame number
putTextOnCvMat(cvOutputData, "Frame " + std::to_string(id), {mBorderMargin, (int)(mOutputSize.height - mBorderMargin)}, white, false);
// Number people
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册