Automated Merge Preparation

This commit is contained in:
Jan Schuffenhauer
2020-01-17 10:00:04 +01:00
parent 065455dd51
commit 579e9028e0
16 changed files with 897 additions and 908 deletions

View File

@@ -101,8 +101,8 @@ $(document).ready(function(){initNavTree('_intelli_tool_circle_8cpp_source.html'
<div class="line"><a name="l00013"></a><span class="lineno"> 13</span>&#160;}</div>
<div class="line"><a name="l00014"></a><span class="lineno"> 14</span>&#160; </div>
<div class="line"><a name="l00015"></a><span class="lineno"> 15</span>&#160;<span class="keywordtype">void</span> IntelliToolCircle::drawCircle(<span class="keywordtype">int</span> radius){</div>
<div class="line"><a name="l00016"></a><span class="lineno"> 16</span>&#160; QColor inner = this-&gt;<a class="code" href="class_intelli_tool.html#ae2e0ac394611a361ab4ef2fe55c03fef">colorPicker</a>-&gt;<a class="code" href="class_intelli_color_picker.html#a55568fbf5dc783f06284b7031ffe9415">getSecondColor</a>();</div>
<div class="line"><a name="l00017"></a><span class="lineno"> 17</span>&#160; inner.setAlpha(<a class="code" href="class_intelli_tool.html#a55f6b45b416b7d790fa8bc09603bf67f">Toolsettings</a>-&gt;<a class="code" href="class_intelli_toolsettings.html#a7d6ce2054ec4bcba7629dc2b514b6b5c">getInnerAlpha</a>());</div>
<div class="line"><a name="l00016"></a><span class="lineno"> 16</span>&#160; QColor inner = this-&gt;<a class="code" href="class_intelli_tool.html#ae2e0ac394611a361ab4ef2fe55c03fef">colorPicker</a>-&gt;<a class="code" href="class_intelli_color_picker.html#ab41abe8fb7e184db2c33e792f09792e0">getSecondColor</a>();</div>
<div class="line"><a name="l00017"></a><span class="lineno"> 17</span>&#160; inner.setAlpha(<a class="code" href="class_intelli_tool.html#a55f6b45b416b7d790fa8bc09603bf67f">Toolsettings</a>-&gt;<a class="code" href="class_intelli_toolsettings.html#a96d267baa782a32784dbeb1b7cd68cc4">getInnerAlpha</a>());</div>
<div class="line"><a name="l00018"></a><span class="lineno"> 18</span>&#160; <span class="keywordtype">int</span> yMinimum, yMaximum, xMinimum, xMaximum;</div>
<div class="line"><a name="l00019"></a><span class="lineno"> 19</span>&#160; yMinimum = centerPoint.y() - radius;</div>
<div class="line"><a name="l00020"></a><span class="lineno"> 20</span>&#160; yMaximum = centerPoint.y() + radius;</div>
@@ -114,14 +114,14 @@ $(document).ready(function(){initNavTree('_intelli_tool_circle_8cpp_source.html'
<div class="line"><a name="l00026"></a><span class="lineno"> 26</span>&#160; }</div>
<div class="line"><a name="l00027"></a><span class="lineno"> 27</span>&#160; </div>
<div class="line"><a name="l00028"></a><span class="lineno"> 28</span>&#160; <span class="comment">//TODO implement circle drawing algorithm bresenham</span></div>
<div class="line"><a name="l00029"></a><span class="lineno"> 29</span>&#160; radius = <span class="keyword">static_cast&lt;</span><span class="keywordtype">int</span><span class="keyword">&gt;</span>(radius + (<a class="code" href="class_intelli_tool.html#a55f6b45b416b7d790fa8bc09603bf67f">Toolsettings</a>-&gt;<a class="code" href="class_intelli_toolsettings.html#a68528dd3bad8f39ba19fa6b12a4e415a">getLineWidth</a>() / 2.));</div>
<div class="line"><a name="l00029"></a><span class="lineno"> 29</span>&#160; radius = <span class="keyword">static_cast&lt;</span><span class="keywordtype">int</span><span class="keyword">&gt;</span>(radius + (<a class="code" href="class_intelli_tool.html#a55f6b45b416b7d790fa8bc09603bf67f">Toolsettings</a>-&gt;<a class="code" href="class_intelli_toolsettings.html#abb3ee5a9c8a379167060799d275e65c3">getLineWidth</a>() / 2.));</div>
<div class="line"><a name="l00030"></a><span class="lineno"> 30</span>&#160; yMinimum = (centerPoint.y() - radius);</div>
<div class="line"><a name="l00031"></a><span class="lineno"> 31</span>&#160; yMaximum = (centerPoint.y() + radius);</div>
<div class="line"><a name="l00032"></a><span class="lineno"> 32</span>&#160; <span class="keywordflow">for</span>(<span class="keywordtype">int</span> i = yMinimum; i&lt;=yMaximum; i++) {</div>
<div class="line"><a name="l00033"></a><span class="lineno"> 33</span>&#160; xMinimum = <span class="keyword">static_cast&lt;</span><span class="keywordtype">int</span><span class="keyword">&gt;</span>(centerPoint.x() - sqrt(pow(radius,2) - pow(i - centerPoint.y(),2)));</div>
<div class="line"><a name="l00034"></a><span class="lineno"> 34</span>&#160; xMaximum = <span class="keyword">static_cast&lt;</span><span class="keywordtype">int</span><span class="keyword">&gt;</span>(centerPoint.x() + sqrt(pow(radius,2) - pow(i - centerPoint.y(),2)));</div>
<div class="line"><a name="l00035"></a><span class="lineno"> 35</span>&#160; this-&gt;<a class="code" href="class_intelli_tool.html#a144d469cc03584f501194529a1b53c77">Canvas</a>-&gt;<a class="code" href="struct_layer_object.html#af01a139bc8edfdbb338393874e89bd83">image</a>-&gt;<a class="code" href="class_intelli_image.html#a2e787f1b333b59401643936ebb3dcfe1">drawPoint</a>(QPoint(xMinimum,i), <a class="code" href="class_intelli_tool.html#ae2e0ac394611a361ab4ef2fe55c03fef">colorPicker</a>-&gt;<a class="code" href="class_intelli_color_picker.html#aae2eb27b928fe9388b9398b0556303b7">getFirstColor</a>(),<a class="code" href="class_intelli_tool.html#a55f6b45b416b7d790fa8bc09603bf67f">Toolsettings</a>-&gt;<a class="code" href="class_intelli_toolsettings.html#a68528dd3bad8f39ba19fa6b12a4e415a">getLineWidth</a>());</div>
<div class="line"><a name="l00036"></a><span class="lineno"> 36</span>&#160; this-&gt;<a class="code" href="class_intelli_tool.html#a144d469cc03584f501194529a1b53c77">Canvas</a>-&gt;<a class="code" href="struct_layer_object.html#af01a139bc8edfdbb338393874e89bd83">image</a>-&gt;<a class="code" href="class_intelli_image.html#a2e787f1b333b59401643936ebb3dcfe1">drawPoint</a>(QPoint(xMaximum,i), <a class="code" href="class_intelli_tool.html#ae2e0ac394611a361ab4ef2fe55c03fef">colorPicker</a>-&gt;<a class="code" href="class_intelli_color_picker.html#aae2eb27b928fe9388b9398b0556303b7">getFirstColor</a>(),<a class="code" href="class_intelli_tool.html#a55f6b45b416b7d790fa8bc09603bf67f">Toolsettings</a>-&gt;<a class="code" href="class_intelli_toolsettings.html#a68528dd3bad8f39ba19fa6b12a4e415a">getLineWidth</a>());</div>
<div class="line"><a name="l00035"></a><span class="lineno"> 35</span>&#160; this-&gt;<a class="code" href="class_intelli_tool.html#a144d469cc03584f501194529a1b53c77">Canvas</a>-&gt;<a class="code" href="struct_layer_object.html#af01a139bc8edfdbb338393874e89bd83">image</a>-&gt;<a class="code" href="class_intelli_image.html#a2e787f1b333b59401643936ebb3dcfe1">drawPoint</a>(QPoint(xMinimum,i), <a class="code" href="class_intelli_tool.html#ae2e0ac394611a361ab4ef2fe55c03fef">colorPicker</a>-&gt;<a class="code" href="class_intelli_color_picker.html#aeb08029a0c946ed0402c9c11a91965b1">getFirstColor</a>(),<a class="code" href="class_intelli_tool.html#a55f6b45b416b7d790fa8bc09603bf67f">Toolsettings</a>-&gt;<a class="code" href="class_intelli_toolsettings.html#abb3ee5a9c8a379167060799d275e65c3">getLineWidth</a>());</div>
<div class="line"><a name="l00036"></a><span class="lineno"> 36</span>&#160; this-&gt;<a class="code" href="class_intelli_tool.html#a144d469cc03584f501194529a1b53c77">Canvas</a>-&gt;<a class="code" href="struct_layer_object.html#af01a139bc8edfdbb338393874e89bd83">image</a>-&gt;<a class="code" href="class_intelli_image.html#a2e787f1b333b59401643936ebb3dcfe1">drawPoint</a>(QPoint(xMaximum,i), <a class="code" href="class_intelli_tool.html#ae2e0ac394611a361ab4ef2fe55c03fef">colorPicker</a>-&gt;<a class="code" href="class_intelli_color_picker.html#aeb08029a0c946ed0402c9c11a91965b1">getFirstColor</a>(),<a class="code" href="class_intelli_tool.html#a55f6b45b416b7d790fa8bc09603bf67f">Toolsettings</a>-&gt;<a class="code" href="class_intelli_toolsettings.html#abb3ee5a9c8a379167060799d275e65c3">getLineWidth</a>());</div>
<div class="line"><a name="l00037"></a><span class="lineno"> 37</span>&#160; }</div>
<div class="line"><a name="l00038"></a><span class="lineno"> 38</span>&#160; </div>
<div class="line"><a name="l00039"></a><span class="lineno"> 39</span>&#160; xMinimum = (centerPoint.x() - radius);</div>
@@ -183,7 +183,7 @@ $(document).ready(function(){initNavTree('_intelli_tool_circle_8cpp_source.html'
<div class="ttc" id="aclass_intelli_tool_circle_html_ae2d9b0fb6695c184c4cb507a5fb75506"><div class="ttname"><a href="class_intelli_tool_circle.html#ae2d9b0fb6695c184c4cb507a5fb75506">IntelliToolCircle::onWheelScrolled</a></div><div class="ttdeci">virtual void onWheelScrolled(int value) override</div><div class="ttdoc">A function managing the scroll event. Changing the edge Width relative to value.</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_tool_circle_8cpp_source.html#l00071">IntelliToolCircle.cpp:71</a></div></div>
<div class="ttc" id="aclass_intelli_tool_html_a34b7ef1dde96b94a0ce450a25ae1778c"><div class="ttname"><a href="class_intelli_tool.html#a34b7ef1dde96b94a0ce450a25ae1778c">IntelliTool::onMouseLeftPressed</a></div><div class="ttdeci">virtual void onMouseLeftPressed(int x, int y)</div><div class="ttdoc">A function managing the left click Pressed of a Mouse. Resetting the current draw....</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_tool_8cpp_source.html#l00029">IntelliTool.cpp:29</a></div></div>
<div class="ttc" id="aclass_intelli_tool_html_a55f6b45b416b7d790fa8bc09603bf67f"><div class="ttname"><a href="class_intelli_tool.html#a55f6b45b416b7d790fa8bc09603bf67f">IntelliTool::Toolsettings</a></div><div class="ttdeci">IntelliToolsettings * Toolsettings</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_tool_8h_source.html#l00059">IntelliTool.h:59</a></div></div>
<div class="ttc" id="aclass_intelli_color_picker_html_a55568fbf5dc783f06284b7031ffe9415"><div class="ttname"><a href="class_intelli_color_picker.html#a55568fbf5dc783f06284b7031ffe9415">IntelliColorPicker::getSecondColor</a></div><div class="ttdeci">QColor getSecondColor()</div><div class="ttdoc">A function to read the secondary selected color.</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_color_picker_8cpp_source.html#l00019">IntelliColorPicker.cpp:19</a></div></div>
<div class="ttc" id="aclass_intelli_toolsettings_html_a96d267baa782a32784dbeb1b7cd68cc4"><div class="ttname"><a href="class_intelli_toolsettings.html#a96d267baa782a32784dbeb1b7cd68cc4">IntelliToolsettings::getInnerAlpha</a></div><div class="ttdeci">int getInnerAlpha() const</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_toolsettings_8cpp_source.html#l00028">IntelliToolsettings.cpp:28</a></div></div>
<div class="ttc" id="aclass_painting_area_html"><div class="ttname"><a href="class_painting_area.html">PaintingArea</a></div><div class="ttdoc">The PaintingArea class manages the methods and stores information about the current painting area,...</div><div class="ttdef"><b>Definition:</b> <a href="_painting_area_8h_source.html#l00053">PaintingArea.h:53</a></div></div>
<div class="ttc" id="aclass_intelli_tool_html_a555aa8a74992327f740dd69b3bb0ccca"><div class="ttname"><a href="class_intelli_tool.html#a555aa8a74992327f740dd69b3bb0ccca">IntelliTool::isDrawing</a></div><div class="ttdeci">bool isDrawing</div><div class="ttdoc">A flag checking if the user is currently drawing or not.</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_tool_8h_source.html#l00074">IntelliTool.h:74</a></div></div>
<div class="ttc" id="aclass_intelli_color_picker_html_ab41abe8fb7e184db2c33e792f09792e0"><div class="ttname"><a href="class_intelli_color_picker.html#ab41abe8fb7e184db2c33e792f09792e0">IntelliColorPicker::getSecondColor</a></div><div class="ttdeci">QColor getSecondColor() const</div><div class="ttdoc">A function to read the secondary selected color.</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_color_picker_8cpp_source.html#l00019">IntelliColorPicker.cpp:19</a></div></div>
@@ -194,7 +194,6 @@ $(document).ready(function(){initNavTree('_intelli_tool_circle_8cpp_source.html'
<div class="ttc" id="aclass_intelli_tool_circle_html_a7a03b65b95d7b5d72e6a92c95f068954"><div class="ttname"><a href="class_intelli_tool_circle.html#a7a03b65b95d7b5d72e6a92c95f068954">IntelliToolCircle::~IntelliToolCircle</a></div><div class="ttdeci">virtual ~IntelliToolCircle() override</div><div class="ttdoc">A Destructor.</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_tool_circle_8cpp_source.html#l00011">IntelliToolCircle.cpp:11</a></div></div>
<div class="ttc" id="aclass_intelli_tool_html"><div class="ttname"><a href="class_intelli_tool.html">IntelliTool</a></div><div class="ttdoc">An abstract class that manages the basic events, like mouse clicks or scrolls events.</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_tool_8h_source.html#l00017">IntelliTool.h:17</a></div></div>
<div class="ttc" id="a_painting_area_8h_html"><div class="ttname"><a href="_painting_area_8h.html">PaintingArea.h</a></div></div>
<div class="ttc" id="aclass_intelli_color_picker_html_aae2eb27b928fe9388b9398b0556303b7"><div class="ttname"><a href="class_intelli_color_picker.html#aae2eb27b928fe9388b9398b0556303b7">IntelliColorPicker::getFirstColor</a></div><div class="ttdeci">QColor getFirstColor()</div><div class="ttdoc">A function to read the primary selected color.</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_color_picker_8cpp_source.html#l00015">IntelliColorPicker.cpp:15</a></div></div>
<div class="ttc" id="aclass_intelli_tool_html_a631388999f36013628e13b9de87a6f7b"><div class="ttname"><a href="class_intelli_tool.html#a631388999f36013628e13b9de87a6f7b">IntelliTool::ActiveType</a></div><div class="ttdeci">Tooltype ActiveType</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_tool_8h_source.html#l00052">IntelliTool.h:52</a></div></div>
<div class="ttc" id="aclass_intelli_color_picker_html"><div class="ttname"><a href="class_intelli_color_picker.html">IntelliColorPicker</a></div><div class="ttdoc">The IntelliColorPicker manages the selected colors for one whole project.</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_color_picker_8h_source.html#l00014">IntelliColorPicker.h:14</a></div></div>
<div class="ttc" id="aclass_intelli_tool_circle_html_a90ee58c5390a86afc75c14ca79b91d7b"><div class="ttname"><a href="class_intelli_tool_circle.html#a90ee58c5390a86afc75c14ca79b91d7b">IntelliToolCircle::onMouseMoved</a></div><div class="ttdeci">virtual void onMouseMoved(int x, int y) override</div><div class="ttdoc">A function managing the mouse moved event. Draws a circle with radius of eulerian norm of mouse posit...</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_tool_circle_8cpp_source.html#l00076">IntelliToolCircle.cpp:76</a></div></div>