Skip to content

Commit

Permalink
Rebuilt with nmfSharedUtilities changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@rklasky
rklasky committed Oct 17, 2020
1 parent 75f3be6 commit 74ae40b
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 41 deletions.
2 changes: 1 addition & 1 deletion MSSPM_Main/nmfMainWindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2080,7 +2080,7 @@ void
nmfMainWindow::menu_about()
{
QString name = "Multi-Species Surplus Production Model";
QString version = "MSSPM v0.9.5 (beta)";
QString version = "MSSPM v0.9.6 (beta)";
QString specialAcknowledgement = "";
QString cppVersion = "C++??";
QString mysqlVersion = "?";
Expand Down
Binary file modified docs/QuickStart_Guide_MSSPM.pdf
View file
Binary file not shown.
4 changes: 0 additions & 4 deletions docs/html/class_r_e_m_o_r_a.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,11 @@
Inheritance diagram for REMORA:</div>
<div class="dyncontent">
<div class="center"><img src="class_r_e_m_o_r_a__inherit__graph.png" border="0" usemap="#_r_e_m_o_r_a_inherit__map" alt="Inheritance graph"/></div>
<map name="_r_e_m_o_r_a_inherit__map" id="_r_e_m_o_r_a_inherit__map">
</map>
<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
<div class="dynheader">
Collaboration diagram for REMORA:</div>
<div class="dyncontent">
<div class="center"><img src="class_r_e_m_o_r_a__coll__graph.png" border="0" usemap="#_r_e_m_o_r_a_coll__map" alt="Collaboration graph"/></div>
<map name="_r_e_m_o_r_a_coll__map" id="_r_e_m_o_r_a_coll__map">
</map>
<center><span class="legend">[<a target="top" href="graph_legend.html">legend</a>]</span></center></div>
<table class="memberdecls">
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-slots"></a>
Expand Down
33 changes: 16 additions & 17 deletions docs/html/nmf_main_window_8h.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,33 +157,32 @@
<code>#include &lt;QOpenGLWidget&gt;</code><br />
<code>#include &lt;QPixmap&gt;</code><br />
<code>#include &lt;QUiLoader&gt;</code><br />
<code>#include &quot;REMORA.h&quot;</code><br />
<code>#include &quot;REMORA_UI.h&quot;</code><br />
</div><div class="textblock"><div class="dynheader">
Include dependency graph for nmfMainWindow.h:</div>
<div class="dyncontent">
<div class="center"><img src="nmf_main_window_8h__incl.png" border="0" usemap="#_m_s_s_p_m___main_2nmf_main_window_8h" alt=""/></div>
<map name="_m_s_s_p_m___main_2nmf_main_window_8h" id="_m_s_s_p_m___main_2nmf_main_window_8h">
<area shape="rect" id="node14" href="_clear_output_dialog_8h.html" title="GUI definition for the Algorithm&#45;Specific ClearOutputDialog widget. " alt="" coords="99,80,239,107"/>
<area shape="rect" id="node20" href="_bees___estimator_8h.html" title="Class definition for the Bees_Estimator API. " alt="" coords="3532,80,3659,107"/>
<area shape="rect" id="node22" href="_n_lopt___estimator_8h.html" title="Class definition for the NLopt_Estimator API. " alt="" coords="1483,155,1614,181"/>
<area shape="rect" id="node27" href="nmf_setup_tab01_8h.html" title="GUI definition for the Setup Getting Started page class nmfSetup_Tab1. " alt="" coords="3683,80,3809,107"/>
<area shape="rect" id="node28" href="nmf_setup_tab02_8h.html" title="GUI definition for the Setup Project page class nmfSetup_Tab2. " alt="" coords="3833,80,3958,107"/>
<area shape="rect" id="node29" href="nmf_setup_tab04_8h.html" title="GUI definition for the Setup Model page class nmfSetup_Tab4. " alt="" coords="3982,80,4107,107"/>
<area shape="rect" id="node30" href="nmf_setup_tab03_8h.html" title="GUI definition for the Setup Species page class nmfSetup_Tab3. " alt="" coords="4131,80,4257,107"/>
<area shape="rect" id="node20" href="_bees___estimator_8h.html" title="Class definition for the Bees_Estimator API. " alt="" coords="3500,80,3627,107"/>
<area shape="rect" id="node22" href="_n_lopt___estimator_8h.html" title="Class definition for the NLopt_Estimator API. " alt="" coords="1318,155,1449,181"/>
<area shape="rect" id="node27" href="nmf_setup_tab01_8h.html" title="GUI definition for the Setup Getting Started page class nmfSetup_Tab1. " alt="" coords="3651,80,3777,107"/>
<area shape="rect" id="node28" href="nmf_setup_tab02_8h.html" title="GUI definition for the Setup Project page class nmfSetup_Tab2. " alt="" coords="3801,80,3926,107"/>
<area shape="rect" id="node29" href="nmf_setup_tab04_8h.html" title="GUI definition for the Setup Model page class nmfSetup_Tab4. " alt="" coords="3950,80,4075,107"/>
<area shape="rect" id="node30" href="nmf_setup_tab03_8h.html" title="GUI definition for the Setup Species page class nmfSetup_Tab3. " alt="" coords="4099,80,4225,107"/>
<area shape="rect" id="node31" href="nmf_estimation_tab01_8h.html" title="GUI definition for the nmfEstimation_Tab1 Population Parameters Data class. " alt="" coords="784,80,937,107"/>
<area shape="rect" id="node32" href="nmf_estimation_tab02_8h.html" title="GUI definition for the nmfEstimation_Tab2 Harvest Data class. " alt="" coords="4281,80,4435,107"/>
<area shape="rect" id="node33" href="nmf_estimation_tab03_8h.html" title="GUI definition for the nmfEstimation_Tab3 Competition Data class. " alt="" coords="4459,80,4612,107"/>
<area shape="rect" id="node34" href="nmf_estimation_tab04_8h.html" title="GUI definition for the nmfEstimation_Tab4 Predation Data class. " alt="" coords="4636,80,4789,107"/>
<area shape="rect" id="node35" href="nmf_estimation_tab05_8h.html" title="GUI definition for the nmfEstimation_Tab5 Observation Data class. " alt="" coords="4813,80,4967,107"/>
<area shape="rect" id="node32" href="nmf_estimation_tab02_8h.html" title="GUI definition for the nmfEstimation_Tab2 Harvest Data class. " alt="" coords="4249,80,4403,107"/>
<area shape="rect" id="node33" href="nmf_estimation_tab03_8h.html" title="GUI definition for the nmfEstimation_Tab3 Competition Data class. " alt="" coords="4427,80,4580,107"/>
<area shape="rect" id="node34" href="nmf_estimation_tab04_8h.html" title="GUI definition for the nmfEstimation_Tab4 Predation Data class. " alt="" coords="4604,80,4757,107"/>
<area shape="rect" id="node35" href="nmf_estimation_tab05_8h.html" title="GUI definition for the nmfEstimation_Tab5 Observation Data class. " alt="" coords="4781,80,4935,107"/>
<area shape="rect" id="node36" href="nmf_estimation_tab06_8h.html" title="GUI definition for the nmfEstimation_Tab6 Estimation Run class. " alt="" coords="263,80,416,107"/>
<area shape="rect" id="node37" href="nmf_diagnostic_tab01_8h.html" title="GUI definition for the nmfDiagnostic_Tab1 Parameter Profiles Diagnostics Data class. " alt="" coords="1473,80,1627,107"/>
<area shape="rect" id="node37" href="nmf_diagnostic_tab01_8h.html" title="GUI definition for the nmfDiagnostic_Tab1 Parameter Profiles Diagnostics Data class. " alt="" coords="1307,80,1460,107"/>
<area shape="rect" id="node38" href="nmf_diagnostic_tab02_8h.html" title="GUI definition for the nmfDiagnostic_Tab2 Retrospective Analysis Diagnostics Data class..." alt="" coords="440,80,593,107"/>
<area shape="rect" id="node39" href="nmf_forecast_tab01_8h.html" title="GUI definition for the nmfForecast_Tab1 Forecast Setup Data class. " alt="" coords="4991,80,5133,107"/>
<area shape="rect" id="node40" href="nmf_forecast_tab02_8h.html" title="GUI definition for the nmfForecast_Tab2 Forecast Harvest Data class. " alt="" coords="5157,80,5300,107"/>
<area shape="rect" id="node41" href="nmf_forecast_tab03_8h.html" title="GUI definition for the nmfForecast_Tab3 Forecast Uncertainty Parameter Data class. " alt="" coords="5324,80,5467,107"/>
<area shape="rect" id="node42" href="nmf_forecast_tab04_8h.html" title="GUI definition for the nmfForecast_Tab4 Forecast Run class. " alt="" coords="5491,80,5633,107"/>
<area shape="rect" id="node39" href="nmf_forecast_tab01_8h.html" title="GUI definition for the nmfForecast_Tab1 Forecast Setup Data class. " alt="" coords="4959,80,5101,107"/>
<area shape="rect" id="node40" href="nmf_forecast_tab02_8h.html" title="GUI definition for the nmfForecast_Tab2 Forecast Harvest Data class. " alt="" coords="5125,80,5268,107"/>
<area shape="rect" id="node41" href="nmf_forecast_tab03_8h.html" title="GUI definition for the nmfForecast_Tab3 Forecast Uncertainty Parameter Data class. " alt="" coords="5292,80,5435,107"/>
<area shape="rect" id="node42" href="nmf_forecast_tab04_8h.html" title="GUI definition for the nmfForecast_Tab4 Forecast Run class. " alt="" coords="5459,80,5601,107"/>
<area shape="rect" id="node43" href="nmf_output_controls_8h.html" title="GUI definition for the Control widgets class MSSPM_GuiOutputControls in the Output area..." alt="" coords="617,80,760,107"/>
<area shape="rect" id="node50" href="_r_e_m_o_r_a_8h_source.html" title="REMORA.h" alt="" coords="961,80,1053,107"/>
</map>
</div>
</div>
Expand Down
31 changes: 15 additions & 16 deletions docs/html/nmf_main_window_8h__incl.map
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
<map id="MSSPM_Main/nmfMainWindow.h" name="MSSPM_Main/nmfMainWindow.h">
<area shape="rect" id="node14" href="$_clear_output_dialog_8h.html" title="GUI definition for the Algorithm&#45;Specific ClearOutputDialog widget. " alt="" coords="99,80,239,107"/>
<area shape="rect" id="node20" href="$_bees___estimator_8h.html" title="Class definition for the Bees_Estimator API. " alt="" coords="3532,80,3659,107"/>
<area shape="rect" id="node22" href="$_n_lopt___estimator_8h.html" title="Class definition for the NLopt_Estimator API. " alt="" coords="1483,155,1614,181"/>
<area shape="rect" id="node27" href="$nmf_setup_tab01_8h.html" title="GUI definition for the Setup Getting Started page class nmfSetup_Tab1. " alt="" coords="3683,80,3809,107"/>
<area shape="rect" id="node28" href="$nmf_setup_tab02_8h.html" title="GUI definition for the Setup Project page class nmfSetup_Tab2. " alt="" coords="3833,80,3958,107"/>
<area shape="rect" id="node29" href="$nmf_setup_tab04_8h.html" title="GUI definition for the Setup Model page class nmfSetup_Tab4. " alt="" coords="3982,80,4107,107"/>
<area shape="rect" id="node30" href="$nmf_setup_tab03_8h.html" title="GUI definition for the Setup Species page class nmfSetup_Tab3. " alt="" coords="4131,80,4257,107"/>
<area shape="rect" id="node20" href="$_bees___estimator_8h.html" title="Class definition for the Bees_Estimator API. " alt="" coords="3500,80,3627,107"/>
<area shape="rect" id="node22" href="$_n_lopt___estimator_8h.html" title="Class definition for the NLopt_Estimator API. " alt="" coords="1318,155,1449,181"/>
<area shape="rect" id="node27" href="$nmf_setup_tab01_8h.html" title="GUI definition for the Setup Getting Started page class nmfSetup_Tab1. " alt="" coords="3651,80,3777,107"/>
<area shape="rect" id="node28" href="$nmf_setup_tab02_8h.html" title="GUI definition for the Setup Project page class nmfSetup_Tab2. " alt="" coords="3801,80,3926,107"/>
<area shape="rect" id="node29" href="$nmf_setup_tab04_8h.html" title="GUI definition for the Setup Model page class nmfSetup_Tab4. " alt="" coords="3950,80,4075,107"/>
<area shape="rect" id="node30" href="$nmf_setup_tab03_8h.html" title="GUI definition for the Setup Species page class nmfSetup_Tab3. " alt="" coords="4099,80,4225,107"/>
<area shape="rect" id="node31" href="$nmf_estimation_tab01_8h.html" title="GUI definition for the nmfEstimation_Tab1 Population Parameters Data class. " alt="" coords="784,80,937,107"/>
<area shape="rect" id="node32" href="$nmf_estimation_tab02_8h.html" title="GUI definition for the nmfEstimation_Tab2 Harvest Data class. " alt="" coords="4281,80,4435,107"/>
<area shape="rect" id="node33" href="$nmf_estimation_tab03_8h.html" title="GUI definition for the nmfEstimation_Tab3 Competition Data class. " alt="" coords="4459,80,4612,107"/>
<area shape="rect" id="node34" href="$nmf_estimation_tab04_8h.html" title="GUI definition for the nmfEstimation_Tab4 Predation Data class. " alt="" coords="4636,80,4789,107"/>
<area shape="rect" id="node35" href="$nmf_estimation_tab05_8h.html" title="GUI definition for the nmfEstimation_Tab5 Observation Data class. " alt="" coords="4813,80,4967,107"/>
<area shape="rect" id="node32" href="$nmf_estimation_tab02_8h.html" title="GUI definition for the nmfEstimation_Tab2 Harvest Data class. " alt="" coords="4249,80,4403,107"/>
<area shape="rect" id="node33" href="$nmf_estimation_tab03_8h.html" title="GUI definition for the nmfEstimation_Tab3 Competition Data class. " alt="" coords="4427,80,4580,107"/>
<area shape="rect" id="node34" href="$nmf_estimation_tab04_8h.html" title="GUI definition for the nmfEstimation_Tab4 Predation Data class. " alt="" coords="4604,80,4757,107"/>
<area shape="rect" id="node35" href="$nmf_estimation_tab05_8h.html" title="GUI definition for the nmfEstimation_Tab5 Observation Data class. " alt="" coords="4781,80,4935,107"/>
<area shape="rect" id="node36" href="$nmf_estimation_tab06_8h.html" title="GUI definition for the nmfEstimation_Tab6 Estimation Run class. " alt="" coords="263,80,416,107"/>
<area shape="rect" id="node37" href="$nmf_diagnostic_tab01_8h.html" title="GUI definition for the nmfDiagnostic_Tab1 Parameter Profiles Diagnostics Data class. " alt="" coords="1473,80,1627,107"/>
<area shape="rect" id="node37" href="$nmf_diagnostic_tab01_8h.html" title="GUI definition for the nmfDiagnostic_Tab1 Parameter Profiles Diagnostics Data class. " alt="" coords="1307,80,1460,107"/>
<area shape="rect" id="node38" href="$nmf_diagnostic_tab02_8h.html" title="GUI definition for the nmfDiagnostic_Tab2 Retrospective Analysis Diagnostics Data class..." alt="" coords="440,80,593,107"/>
<area shape="rect" id="node39" href="$nmf_forecast_tab01_8h.html" title="GUI definition for the nmfForecast_Tab1 Forecast Setup Data class. " alt="" coords="4991,80,5133,107"/>
<area shape="rect" id="node40" href="$nmf_forecast_tab02_8h.html" title="GUI definition for the nmfForecast_Tab2 Forecast Harvest Data class. " alt="" coords="5157,80,5300,107"/>
<area shape="rect" id="node41" href="$nmf_forecast_tab03_8h.html" title="GUI definition for the nmfForecast_Tab3 Forecast Uncertainty Parameter Data class. " alt="" coords="5324,80,5467,107"/>
<area shape="rect" id="node42" href="$nmf_forecast_tab04_8h.html" title="GUI definition for the nmfForecast_Tab4 Forecast Run class. " alt="" coords="5491,80,5633,107"/>
<area shape="rect" id="node39" href="$nmf_forecast_tab01_8h.html" title="GUI definition for the nmfForecast_Tab1 Forecast Setup Data class. " alt="" coords="4959,80,5101,107"/>
<area shape="rect" id="node40" href="$nmf_forecast_tab02_8h.html" title="GUI definition for the nmfForecast_Tab2 Forecast Harvest Data class. " alt="" coords="5125,80,5268,107"/>
<area shape="rect" id="node41" href="$nmf_forecast_tab03_8h.html" title="GUI definition for the nmfForecast_Tab3 Forecast Uncertainty Parameter Data class. " alt="" coords="5292,80,5435,107"/>
<area shape="rect" id="node42" href="$nmf_forecast_tab04_8h.html" title="GUI definition for the nmfForecast_Tab4 Forecast Run class. " alt="" coords="5459,80,5601,107"/>
<area shape="rect" id="node43" href="$nmf_output_controls_8h.html" title="GUI definition for the Control widgets class MSSPM_GuiOutputControls in the Output area..." alt="" coords="617,80,760,107"/>
<area shape="rect" id="node50" href="$_r_e_m_o_r_a_8h_source.html" title="REMORA.h" alt="" coords="961,80,1053,107"/>
</map>
2 changes: 1 addition & 1 deletion docs/html/nmf_main_window_8h__incl.md5
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2c0e69082db54b1d92962a7cdf3250c7
8d998b119f9fbe184b50d2f84f9f6dbf
Binary file modified docs/html/nmf_main_window_8h__incl.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions docs/html/nmf_main_window_8h_source.html
View file

Large diffs are not rendered by default.

0 comments on commit 74ae40b

Please sign in to comment.