zhangyiss/gm3d-gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update cmakelists and gm3d_gui

Browse Source
This commit is contained in:
张壹 2021-08-25 17:17:47 +08:00
parent c999ff968a
commit 0bba784acc
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/CMakeLists.txt
View File

@ -1,8 +1,7 @@
aux_source_directory(. DIR_SRC) aux_source_directory(. DIR_SRC)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -O2")
include_directories(/usr/local/include)
# NOTE: Don't include the path in MACOSX_BUNDLE_ICON_FILE -- this is # NOTE: Don't include the path in MACOSX_BUNDLE_ICON_FILE -- this is
# the property added to Info.plist # the property added to Info.plist
@ -32,8 +31,9 @@ endif()
#find_library(FLTK_LIBRARY libfltk.a /usr/local/Cellar/fltk/1.3.5/lib) #find_library(FLTK_LIBRARY libfltk.a /usr/local/Cellar/fltk/1.3.5/lib)
# 添加头文件地址 # 添加头文件地址
include_directories(/usr/include) include_directories(/opt/homebrew/include)
include_directories(/usr/local/include)
# 添加动态库地址 # 添加动态库地址
find_library(FLTK_LIBRARY fltk HINTS /usr/local/lib) find_library(FLTK_LIBRARY fltk HINTS /opt/homebrew/lib)
target_link_libraries(gm3d ${FLTK_LIBRARY} OpenMP::OpenMP_CXX) target_link_libraries(gm3d ${FLTK_LIBRARY} OpenMP::OpenMP_CXX)

25
src/gm3d_gui.cpp
View File

@ -82,8 +82,9 @@ void cb_mesh_file_btn(Fl_Widget*, void*){
std::stringstream temp_ss; std::stringstream temp_ss;
temp_ss << abs_filename.substr(pos+1); temp_ss << abs_filename.substr(pos+1);
const char* disp_filename = temp_ss.str().c_str(); //const char* disp_filename = temp_ss.str().c_str();
mesh_para_output->value(disp_filename); //mesh_para_output->value(disp_filename);
mesh_para_output->value(temp_ss.str().c_str());
} }
else else
{ {
@ -282,8 +283,9 @@ void cb_mod_file_out_btn(Fl_Widget*, void*){
std::stringstream temp_ss; std::stringstream temp_ss;
temp_ss << abs_filename.substr(pos+1); temp_ss << abs_filename.substr(pos+1);
const char* disp_filename = temp_ss.str().c_str(); //const char* disp_filename = temp_ss.str().c_str();
mod_out_file_output->value(disp_filename); //mod_out_file_output->value(disp_filename);
mod_out_file_output->value(temp_ss.str().c_str());
} }
else else
{ {
@ -377,8 +379,9 @@ void cb_mod_file_btn(Fl_Widget*, void*){
std::stringstream temp_ss; std::stringstream temp_ss;
temp_ss << abs_filename.substr(pos+1); temp_ss << abs_filename.substr(pos+1);
const char* disp_filename = temp_ss.str().c_str(); //const char* disp_filename = temp_ss.str().c_str();
mod_file_output->value(disp_filename); //mod_file_output->value(disp_filename);
mod_file_output->value(temp_ss.str().c_str());
} }
else else
{ {
@ -412,8 +415,9 @@ void cb_obs_file_btn(Fl_Widget*, void*){
std::stringstream temp_ss; std::stringstream temp_ss;
temp_ss << abs_filename.substr(pos+1); temp_ss << abs_filename.substr(pos+1);
const char* disp_filename = temp_ss.str().c_str(); //const char* disp_filename = temp_ss.str().c_str();
obs_file_output->value(disp_filename); //obs_file_output->value(disp_filename);
obs_file_output->value(temp_ss.str().c_str());
} }
else else
{ {
@ -447,8 +451,9 @@ void cb_res_file_btn(Fl_Widget*, void*){
std::stringstream temp_ss; std::stringstream temp_ss;
temp_ss << abs_filename.substr(pos+1); temp_ss << abs_filename.substr(pos+1);
const char* disp_filename = temp_ss.str().c_str(); //const char* disp_filename = temp_ss.str().c_str();
res_file_output->value(disp_filename); //res_file_output->value(disp_filename);
res_file_output->value(temp_ss.str().c_str());
} }
else else
{ {