Merge pull request #3 from SSARCandy/macos-fix

Fix macOS build

Author: SSARCandy

include/gui.h

@@ -45,7 +45,7 @@ class MyFrame : public wxFrame {
 	wxStaticText *slider_sigma1_t;
 	wxStaticText *slider_sigma2_t;
 	wxStaticText *slider_t_t;
-	void addlog(wxString info, wxColour& color);
+	void addlog(wxString info, const wxColour& color);
 	void activateRenderLoop(bool on);
 
 protected:
@@ -120,4 +120,4 @@ enum {
 	SLIDER_SIGMA_M_T,
 	SLIDER_SIGMA_C_T,
 	SLIDER_ETF_KERNEL_T,
-};
+};

include/postProcessing.h

@@ -3,6 +3,8 @@
 
 using namespace std;
 
+#define M_PI 3.14159265358979323846
+
 class PP {
 public:
 	PP(cv::Size);

src/gui.cpp

@@ -44,9 +44,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #pragma endregion
 
 #pragma region ToolBar: Buttons(Start, Fill Ink, Clean), Combobox(processingBox)
-	wxToolBar *toolbar1 = new wxToolBar(this, wxID_ANY);
-	start = new wxButton(toolbar1, BUTTON_Start, _T("Start"), wxDefaultPosition, wxDefaultSize, 0);
-	clean = new wxButton(toolbar1, BUTTON_Clean, _T("Clean"), wxDefaultPosition, wxDefaultSize, 0);
+	wxToolBar *toolbar1 = CreateToolBar();
+	start = new wxButton(toolbar1, BUTTON_Start, _T("Start"), wxDefaultPosition, wxSize(100, 40), 0);
+	clean = new wxButton(toolbar1, BUTTON_Clean, _T("Clean"), wxDefaultPosition, wxSize(100, 40), 0);
 
 	processingBox = new wxComboBox(toolbar1, COMBOBOX_Processing, "Original Image", wxDefaultPosition, wxSize(200, 20), 0);
 	processingBox->Append("Original Image");
@@ -214,7 +214,8 @@ void MyFrame::OnOpenSrc(wxCommandEvent& event) {
 	dp->SetMinSize(img);
 	this->Layout();
 
-	drawPane->paintNow(true);
+	render_loop_on = true;
+	activateRenderLoop(render_loop_on);
 }
 
 void MyFrame::OnSaveResult(wxCommandEvent& event) {
@@ -288,7 +289,7 @@ void MyFrame::OnIterativeFDoG(wxCommandEvent& event) {
 
 //Comboboxes
 void MyFrame::OnProcessingBox(wxCommandEvent& event) {
-	string s = processingBox->GetValue();
+	wxString s = processingBox->GetValue();
 	drawPane->processingS = s;
 
 	if (s == "ETF" || s=="ETF-debug") {
@@ -359,7 +360,7 @@ void MyFrame::OnSliderTau(wxCommandEvent& event) {
 	drawPane->paintNow(true); //execute action
 }
 
-void MyFrame::addlog(wxString info, wxColour& color) {
+void MyFrame::addlog(wxString info, const wxColour& color) {
 	time_t currentTime;// for logging current time
 	struct tm *localTime;// for logging current time
 	time(&currentTime);                   // Get the current time
@@ -445,4 +446,4 @@ void BasicDrawPane::render(wxDC& dc, bool render_loop_on) {
 	wxBitmap bmp(img);
 	dc.DrawBitmap(bmp, 0, 0);
 }
-#pragma endregion 
+#pragma endregion 

src/postProcessing.cpp

@@ -7,7 +7,6 @@ PP::PP(Size s) {}
 
 // visualize the ETF
 void PP::ETF(Mat &flowfield, Mat &dis) {
-	const float M_PI = 3.14159265358979323846;
 	Mat noise = Mat::zeros(cv::Size(flowfield.cols / 2, flowfield.rows / 2), CV_32F);
 	dis = Mat::zeros(flowfield.size(), CV_32F);
 	randu(noise, 0, 1.0f);
@@ -72,4 +71,4 @@ void PP::AntiAlias(cv::Mat & src, cv::Mat & dst) {
 
 	normalize(src, dst, 60, 255, NORM_MINMAX);
 	GaussianBlur(dst, dst, Size(BLUR_SIZE, BLUR_SIZE), 0, 0);
-}
+}