Skip to content

Commit

Permalink
Merge pull request #21 from OverheadTransmissionLineSoftware/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@bretzel12
bretzel12 authored Mar 24, 2019
2 parents fa07a48 + d3fac52 commit 0504775
Show file tree
Hide file tree
Showing 99 changed files with 4,518 additions and 612 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ build-release/*
# doxygen generated files #
###########################
*.log
docs/html/*
docs/doxygen/html/*

# oclint generated files #
##########################
Expand All @@ -56,6 +56,7 @@ build/codeblocks/debug/res/*
build/codeblocks/release/res/*
build/msvc/Debug/res/*
build/msvc/Release/res/*
res/help/*.htb
res/resources.cc

# generated executables #
Expand Down
8 changes: 8 additions & 0 deletions build/cmake/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,16 @@ set (SPANANALYZER_SRC_FILES
${SPANANALYZER_SOURCE_DIR}/src/analysis_filter_editor_dialog.cc
${SPANANALYZER_SOURCE_DIR}/src/analysis_filter_manager_dialog.cc
${SPANANALYZER_SOURCE_DIR}/src/analysis_filter_xml_handler.cc
${SPANANALYZER_SOURCE_DIR}/src/cable_constraint_editor_dialog.cc
${SPANANALYZER_SOURCE_DIR}/src/cable_constraint_manager_dialog.cc
${SPANANALYZER_SOURCE_DIR}/src/cable_file_manager_dialog.cc
${SPANANALYZER_SOURCE_DIR}/src/cable_file_xml_handler.cc
${SPANANALYZER_SOURCE_DIR}/src/cable_plot_options_dialog.cc
${SPANANALYZER_SOURCE_DIR}/src/cable_plot_pane.cc
${SPANANALYZER_SOURCE_DIR}/src/edit_pane.cc
${SPANANALYZER_SOURCE_DIR}/src/file_handler.cc
${SPANANALYZER_SOURCE_DIR}/src/plan_plot_options_dialog.cc
${SPANANALYZER_SOURCE_DIR}/src/plan_plot_pane.cc
${SPANANALYZER_SOURCE_DIR}/src/preferences_dialog.cc
${SPANANALYZER_SOURCE_DIR}/src/profile_plot_options_dialog.cc
${SPANANALYZER_SOURCE_DIR}/src/profile_plot_pane.cc
Expand Down Expand Up @@ -90,9 +95,12 @@ set (SPANANALYZER_RESOURCE_FILES
${SPANANALYZER_SOURCE_DIR}/external/AppCommon/res/xrc/weather_load_case_editor_dialog.xrc
${SPANANALYZER_SOURCE_DIR}/res/xrc/analysis_filter_editor_dialog.xrc
${SPANANALYZER_SOURCE_DIR}/res/xrc/analysis_filter_manager_dialog.xrc
${SPANANALYZER_SOURCE_DIR}/res/xrc/cable_constraint_editor_dialog.xrc
${SPANANALYZER_SOURCE_DIR}/res/xrc/cable_constraint_manager_dialog.xrc
${SPANANALYZER_SOURCE_DIR}/res/xrc/cable_file_manager_dialog.xrc
${SPANANALYZER_SOURCE_DIR}/res/xrc/cable_plot_options_dialog.xrc
${SPANANALYZER_SOURCE_DIR}/res/xrc/edit_pane.xrc
${SPANANALYZER_SOURCE_DIR}/res/xrc/plan_plot_options_dialog.xrc
${SPANANALYZER_SOURCE_DIR}/res/xrc/preferences_dialog.xrc
${SPANANALYZER_SOURCE_DIR}/res/xrc/profile_plot_options_dialog.xrc
${SPANANALYZER_SOURCE_DIR}/res/xrc/results_pane.xrc
Expand Down
52 changes: 50 additions & 2 deletions build/codeblocks/SpanAnalyzer.cbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@
<Add library="libotlsmodels_based.a" />
</Linker>
<ExtraCommands>
<Add before="../../external/wxWidgets/build-debug/utils/wxrc/wxrc -v -c -o ../../res/resources.cc ../../external/AppCommon/res/xrc/cable_editor_dialog.xrc ../../external/AppCommon/res/xrc/error_message_dialog.xrc ../../external/AppCommon/res/xrc/weather_load_case_editor_dialog.xrc ../../res/xrc/analysis_filter_editor_dialog.xrc ../../res/xrc/analysis_filter_manager_dialog.xrc ../../res/xrc/cable_file_manager_dialog.xrc ../../res/xrc/cable_plot_options_dialog.xrc ../../res/xrc/edit_pane.xrc ../../res/xrc/preferences_dialog.xrc ../../res/xrc/profile_plot_options_dialog.xrc ../../res/xrc/results_pane.xrc ../../res/xrc/span_analyzer_menubar.xrc ../../res/xrc/span_editor_dialog.xrc ../../res/xrc/weather_load_case_manager_dialog.xrc" />
<Add before="../../external/wxWidgets/build-debug/utils/wxrc/wxrc -v -c -o ../../res/resources.cc ../../external/AppCommon/res/xrc/cable_editor_dialog.xrc ../../external/AppCommon/res/xrc/error_message_dialog.xrc ../../external/AppCommon/res/xrc/weather_load_case_editor_dialog.xrc ../../res/xrc/analysis_filter_editor_dialog.xrc ../../res/xrc/analysis_filter_manager_dialog.xrc ../../res/xrc/cable_constraint_editor_dialog.xrc ../../res/xrc/cable_constraint_manager_dialog.xrc ../../res/xrc/cable_file_manager_dialog.xrc ../../res/xrc/cable_plot_options_dialog.xrc ../../res/xrc/edit_pane.xrc ../../res/xrc/plan_plot_options_dialog.xrc ../../res/xrc/preferences_dialog.xrc ../../res/xrc/profile_plot_options_dialog.xrc ../../res/xrc/results_pane.xrc ../../res/xrc/span_analyzer_menubar.xrc ../../res/xrc/span_editor_dialog.xrc ../../res/xrc/weather_load_case_manager_dialog.xrc" />
<Add after="zip -j ../../res/help/calculations.htb ../../res/help/calculations/*" />
<Add after="zip -j ../../res/help/interface.htb ../../res/help/interface/*" />
<Add after="zip -j ../../res/help/overview.htb ../../res/help/overview/*" />
<Add after="mkdir -p debug/res" />
<Add after="cp ../../res/help/*.htb debug/res/" />
</ExtraCommands>
Expand All @@ -49,7 +52,10 @@
<Add library="libotlsmodels_base.a" />
</Linker>
<ExtraCommands>
<Add before="../../external/wxWidgets/build-release/utils/wxrc/wxrc -v -c -o ../../res/resources.cc ../../external/AppCommon/res/xrc/cable_editor_dialog.xrc ../../external/AppCommon/res/xrc/error_message_dialog.xrc ../../external/AppCommon/res/xrc/weather_load_case_editor_dialog.xrc ../../res/xrc/analysis_filter_editor_dialog.xrc ../../res/xrc/analysis_filter_manager_dialog.xrc ../../res/xrc/cable_file_manager_dialog.xrc ../../res/xrc/cable_plot_options_dialog.xrc ../../res/xrc/edit_pane.xrc ../../res/xrc/preferences_dialog.xrc ../../res/xrc/profile_plot_options_dialog.xrc ../../res/xrc/results_pane.xrc ../../res/xrc/span_analyzer_menubar.xrc ../../res/xrc/span_editor_dialog.xrc ../../res/xrc/weather_load_case_manager_dialog.xrc" />
<Add before="../../external/wxWidgets/build-release/utils/wxrc/wxrc -v -c -o ../../res/resources.cc ../../external/AppCommon/res/xrc/cable_editor_dialog.xrc ../../external/AppCommon/res/xrc/error_message_dialog.xrc ../../external/AppCommon/res/xrc/weather_load_case_editor_dialog.xrc ../../res/xrc/analysis_filter_editor_dialog.xrc ../../res/xrc/analysis_filter_manager_dialog.xrc ../../res/xrc/cable_constraint_editor_dialog.xrc ../../res/xrc/cable_constraint_manager_dialog.xrc ../../res/xrc/cable_file_manager_dialog.xrc ../../res/xrc/cable_plot_options_dialog.xrc ../../res/xrc/edit_pane.xrc ../../res/xrc/plan_plot_options_dialog.xrc ../../res/xrc/preferences_dialog.xrc ../../res/xrc/profile_plot_options_dialog.xrc ../../res/xrc/results_pane.xrc ../../res/xrc/span_analyzer_menubar.xrc ../../res/xrc/span_editor_dialog.xrc ../../res/xrc/weather_load_case_manager_dialog.xrc" />
<Add after="zip -j ../../res/help/calculations.htb ../../res/help/calculations/*" />
<Add after="zip -j ../../res/help/interface.htb ../../res/help/interface/*" />
<Add after="zip -j ../../res/help/overview.htb ../../res/help/overview/*" />
<Add after="mkdir -p release/res" />
<Add after="cp ../../res/help/*.htb release/res/" />
</ExtraCommands>
Expand Down Expand Up @@ -281,9 +287,18 @@
<Unit filename="../../include/spananalyzer/analysis_filter_xml_handler.h">
<Option virtualFolder="Header Files/" />
</Unit>
<Unit filename="../../include/spananalyzer/cable_constraint_editor_dialog.h">
<Option virtualFolder="Header Files/" />
</Unit>
<Unit filename="../../include/spananalyzer/cable_constraint_manager_dialog.h">
<Option virtualFolder="Header Files/" />
</Unit>
<Unit filename="../../include/spananalyzer/cable_file_manager_dialog.h">
<Option virtualFolder="Header Files/" />
</Unit>
<Unit filename="../../include/spananalyzer/cable_file_xml_handler.h">
<Option virtualFolder="Header Files/" />
</Unit>
<Unit filename="../../include/spananalyzer/cable_plot_options_dialog.h">
<Option virtualFolder="Header Files/" />
</Unit>
Expand All @@ -296,6 +311,12 @@
<Unit filename="../../include/spananalyzer/file_handler.h">
<Option virtualFolder="Header Files/" />
</Unit>
<Unit filename="../../include/spananalyzer/plan_plot_options_dialog.h">
<Option virtualFolder="Header Files/" />
</Unit>
<Unit filename="../../include/spananalyzer/plan_plot_pane.h">
<Option virtualFolder="Header Files/" />
</Unit>
<Unit filename="../../include/spananalyzer/preferences_dialog.h">
<Option virtualFolder="Header Files/" />
</Unit>
Expand Down Expand Up @@ -386,6 +407,9 @@
<Unit filename="../../res/help/interface/application_files.html">
<Option virtualFolder="Resource Files/Help/" />
</Unit>
<Unit filename="../../res/help/interface/constraints.html">
<Option virtualFolder="Resource Files/Help/" />
</Unit>
<Unit filename="../../res/help/interface/editing_cables.html">
<Option virtualFolder="Resource Files/Help/" />
</Unit>
Expand Down Expand Up @@ -472,6 +496,12 @@
<Unit filename="../../res/xrc/analysis_filter_manager_dialog.xrc">
<Option virtualFolder="Resource Files/XRC/" />
</Unit>
<Unit filename="../../res/xrc/cable_constraint_editor_dialog.xrc">
<Option virtualFolder="Resource Files/XRC/" />
</Unit>
<Unit filename="../../res/xrc/cable_constraint_manager_dialog.xrc">
<Option virtualFolder="Resource Files/XRC/" />
</Unit>
<Unit filename="../../res/xrc/cable_file_manager_dialog.xrc">
<Option virtualFolder="Resource Files/XRC/" />
</Unit>
Expand All @@ -481,6 +511,9 @@
<Unit filename="../../res/xrc/edit_pane.xrc">
<Option virtualFolder="Resource Files/XRC/" />
</Unit>
<Unit filename="../../res/xrc/plan_plot_options_dialog.xrc">
<Option virtualFolder="Resource Files/XRC/" />
</Unit>
<Unit filename="../../res/xrc/preferences_dialog.xrc">
<Option virtualFolder="Resource Files/XRC/" />
</Unit>
Expand Down Expand Up @@ -511,9 +544,18 @@
<Unit filename="../../src/analysis_filter_xml_handler.cc">
<Option virtualFolder="Source Files/" />
</Unit>
<Unit filename="../../src/cable_constraint_editor_dialog.cc">
<Option virtualFolder="Source Files/" />
</Unit>
<Unit filename="../../src/cable_constraint_manager_dialog.cc">
<Option virtualFolder="Source Files/" />
</Unit>
<Unit filename="../../src/cable_file_manager_dialog.cc">
<Option virtualFolder="Source Files/" />
</Unit>
<Unit filename="../../src/cable_file_xml_handler.cc">
<Option virtualFolder="Source Files/" />
</Unit>
<Unit filename="../../src/cable_plot_options_dialog.cc">
<Option virtualFolder="Source Files/" />
</Unit>
Expand All @@ -526,6 +568,12 @@
<Unit filename="../../src/file_handler.cc">
<Option virtualFolder="Source Files/" />
</Unit>
<Unit filename="../../src/plan_plot_options_dialog.cc">
<Option virtualFolder="Source Files/" />
</Unit>
<Unit filename="../../src/plan_plot_pane.cc">
<Option virtualFolder="Source Files/" />
</Unit>
<Unit filename="../../src/preferences_dialog.cc">
<Option virtualFolder="Source Files/" />
</Unit>
Expand Down
Loading

0 comments on commit 0504775

Please sign in to comment.