Merge branch 'qPCR4vir-dev' into develop
This commit is contained in:
Jinhao
commit
a57c7ac409
@ -232,6 +232,73 @@
|
||||
<ClCompile Include="..\..\source\threads\pool.cpp" />
|
||||
<ClCompile Include="..\..\source\unicode_bidi.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\include\nana\any.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\basic_types.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\c++defines.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\charset.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\concepts.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\config.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\datetime.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\deploy.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\fwd.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\animation.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\basis.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\dragger.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\drawing.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\effects.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\element.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\filebox.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\layout_utility.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\msgbox.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\notifier.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\place.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\programming_interface.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\screen.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\state_cursor.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\timer.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\tooltip.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\button.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\categorize.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\checkbox.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\combox.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\date_chooser.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\float_listbox.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\form.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\frame.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\group.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\label.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\listbox.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\menu.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\menubar.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\panel.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\picture.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\progress.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\scroll.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\slider.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\spinbox.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\tabbar.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\textbox.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\toolbar.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\treebox.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\widget.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\gui\wvl.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\internationalization.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\key_type.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\optional.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\stdc++.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\std_condition_variable.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\std_mutex.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\std_thread.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\traits.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\unicode_bidi.hpp" />
|
||||
<ClInclude Include="..\..\include\nana\verbose_preprocessor.hpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\include\nana\pop_ignore_diagnostic" />
|
||||
<None Include="..\..\include\nana\push_ignore_diagnostic" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
|
||||
@ -41,6 +41,15 @@
|
||||
<Filter Include="Sources\threads">
|
||||
<UniqueIdentifier>{c1cdf46a-519f-422a-947f-39e173045414}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Include">
|
||||
<UniqueIdentifier>{d68bd89c-170f-445f-b79f-aa03c881ab6b}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Include\gui">
|
||||
<UniqueIdentifier>{a5d87649-2cd1-4a8f-a1f9-7151eaf6c772}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Include\gui\widgets">
|
||||
<UniqueIdentifier>{0e6a58ab-652c-45d7-b9aa-8d9f2fa80ea1}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\source\any.cpp">
|
||||
@ -284,4 +293,197 @@
|
||||
<Filter>Sources\gui</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\spinbox.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\group.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\treebox.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\listbox.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\menu.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\menubar.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\progress.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\widget.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\textbox.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\toolbar.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\button.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\combox.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\label.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\panel.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\picture.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\tabbar.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\categorize.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\scroll.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\slider.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\checkbox.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\date_chooser.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\float_listbox.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\form.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\widgets\frame.hpp">
|
||||
<Filter>Include\gui\widgets</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\animation.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\basis.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\dragger.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\drawing.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\effects.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\element.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\filebox.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\layout_utility.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\msgbox.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\notifier.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\place.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\programming_interface.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\screen.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\state_cursor.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\timer.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\tooltip.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui\wvl.hpp">
|
||||
<Filter>Include\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\any.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\basic_types.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\c++defines.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\charset.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\concepts.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\config.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\datetime.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\deploy.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\fwd.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\gui.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\internationalization.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\key_type.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\optional.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\std_condition_variable.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\std_mutex.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\std_thread.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\stdc++.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\traits.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\unicode_bidi.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\include\nana\verbose_preprocessor.hpp">
|
||||
<Filter>Include</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\include\nana\pop_ignore_diagnostic">
|
||||
<Filter>Include</Filter>
|
||||
</None>
|
||||
<None Include="..\..\include\nana\push_ignore_diagnostic">
|
||||
<Filter>Include</Filter>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@ -58,7 +58,7 @@ namespace nana
|
||||
{
|
||||
div_start, div_end, splitter,
|
||||
identifier, dock, fit, hfit, vfit, vert, grid, number, array, reparray,
|
||||
weight, gap, margin, arrange, variable, repeated, min_px, max_px, left, right, top, bottom, undisplayed, invisible,
|
||||
weight, width, height, gap, margin, arrange, variable, repeated, min_px, max_px, left, right, top, bottom, undisplayed, invisible,
|
||||
collapse, parameters,
|
||||
equal,
|
||||
eof, error
|
||||
@ -235,15 +235,21 @@ namespace nana
|
||||
|
||||
idstr_.assign(idstart, sp_);
|
||||
|
||||
if ("weight" == idstr_ || "min" == idstr_ || "max" == idstr_)
|
||||
if ( "weight" == idstr_
|
||||
|| "min" == idstr_
|
||||
|| "max" == idstr_
|
||||
|| "width" == idstr_
|
||||
|| "height" == idstr_
|
||||
)
|
||||
{
|
||||
auto ch = idstr_[1];
|
||||
auto c3 = idstr_[2], c1 =idstr_[0];
|
||||
_m_attr_number_value();
|
||||
switch (ch)
|
||||
switch (c3)
|
||||
{
|
||||
case 'e': return token::weight;
|
||||
case 'i': return token::min_px;
|
||||
case 'a': return token::max_px;
|
||||
case 'i': return c1=='w'? token::weight : token::height;
|
||||
case 'n': return token::min_px;
|
||||
case 'x': return token::max_px;
|
||||
case 'd': return token::width;
|
||||
}
|
||||
}
|
||||
else if ("dock" == idstr_)
|
||||
@ -742,6 +748,7 @@ namespace nana
|
||||
{
|
||||
public:
|
||||
enum class kind{ arrange, vertical_arrange, grid, splitter, dock, dockpane};
|
||||
using token = place_parts::tokenizer::token;
|
||||
|
||||
division(kind k, std::string&& n) noexcept
|
||||
: kind_of_division(k),
|
||||
@ -1082,6 +1089,7 @@ namespace nana
|
||||
|
||||
::nana::rectangle field_area;
|
||||
number_t weight;
|
||||
token weigth_type=token::weight;
|
||||
number_t min_px, max_px;
|
||||
|
||||
place_parts::margin margin;
|
||||
@ -2616,10 +2624,10 @@ namespace nana
|
||||
|
||||
auto place::implement::scan_div(place_parts::tokenizer& tknizer) -> std::unique_ptr<division>
|
||||
{
|
||||
typedef place_parts::tokenizer::token token;
|
||||
using token = place_parts::tokenizer::token ;
|
||||
|
||||
std::unique_ptr<division> div;
|
||||
token div_type = token::eof;
|
||||
token div_type = token::eof , weight_type=token::weight;
|
||||
auto fit = fit_policy::none;
|
||||
place_parts::repeated_array fit_parameters;
|
||||
|
||||
@ -2726,7 +2734,7 @@ namespace nana
|
||||
}
|
||||
}
|
||||
break;
|
||||
case token::weight: case token::min_px: case token::max_px:
|
||||
case token::weight: case token::min_px: case token::max_px: case token::width: case token::height:
|
||||
{
|
||||
auto n = tknizer.number();
|
||||
//If n is the type of real, convert it to integer.
|
||||
@ -2736,7 +2744,9 @@ namespace nana
|
||||
|
||||
switch (tk)
|
||||
{
|
||||
case token::weight: weight = n; break;
|
||||
case token::weight: weight = n; weight_type = token::weight; break; // we could detect errors here (redefinitions and duplicates)
|
||||
case token::width : weight = n; weight_type = token::width ; break;
|
||||
case token::height: weight = n; weight_type = token::height; break;
|
||||
case token::min_px: min_px = n; break;
|
||||
case token::max_px: max_px = n; break;
|
||||
default: break; //Useless
|
||||
@ -2805,10 +2815,16 @@ namespace nana
|
||||
}
|
||||
}
|
||||
|
||||
token unmatch = token::width;
|
||||
switch (div_type)
|
||||
{
|
||||
case token::eof:
|
||||
case token::vert:
|
||||
case token::eof: unmatch = token::height; // "horitontal" div
|
||||
case token::vert: // "vertical" div
|
||||
for (auto& ch : children)
|
||||
if (ch->weigth_type == unmatch)
|
||||
throw std::invalid_argument("nana.place: unmatch vertical-heigth/horizontal-width betwen division '"
|
||||
+name+"' and children division '" + ch->name);
|
||||
|
||||
div.reset(new div_arrange(token::vert == div_type, std::move(name), std::move(arrange)));
|
||||
break;
|
||||
case token::grid:
|
||||
@ -2837,6 +2853,7 @@ namespace nana
|
||||
default:
|
||||
throw std::invalid_argument("nana.place: invalid division type.");
|
||||
}
|
||||
div->weigth_type = weight_type;
|
||||
|
||||
//Requirements for min/max
|
||||
//1, min and max != negative
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user