|
@@ -15,25 +15,8 @@
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="4ddbafad-b85e-492e-80ec-3c73ef45688f" name="Default Changelist" comment="">
|
|
|
- <change afterPath="$PROJECT_DIR$/lib/include/IUnique.h" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/lib/src/Input.cpp" afterDir="false" />
|
|
|
<change afterPath="$PROJECT_DIR$/thirdparty/json/single_include/json.hpp" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/lib/CMakeLists.txt" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/include/HandlerModule.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/HandlerModule.h" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/include/IModule.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/IModule.h" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/include/IOutput.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/IOutput.h" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/include/IProcessor.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/IProcessor.h" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/include/Input.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/Input.h" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/include/ModuleBase.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/ModuleBase.h" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/include/ModuleMath.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/ModuleMath.h" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/include/Output.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/Output.h" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/include/ProcessorBase.h" beforeDir="false" afterPath="$PROJECT_DIR$/lib/include/ProcessorBase.h" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/src/ModuleBase.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/ModuleBase.cpp" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/src/ModuleMath.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/ModuleMath.cpp" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/src/ModuleSwitch.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/ModuleSwitch.cpp" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/src/Output.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/Output.cpp" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/lib/src/ProcessorBase.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/ProcessorBase.cpp" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/thirdparty/json" beforeDir="false" afterPath="$PROJECT_DIR$/thirdparty/json" afterDir="false" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
|
|
@@ -55,7 +38,7 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/lib/src/ModuleBase.cpp">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="330">
|
|
|
+ <state relative-caret-position="375">
|
|
|
<caret line="25" selection-start-line="25" selection-end-line="25" />
|
|
|
<folding>
|
|
|
<element signature="e#0#23#0" expanded="true" />
|
|
@@ -77,7 +60,7 @@
|
|
|
<entry file="file://$PROJECT_DIR$/lib/include/IModule.h">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="405">
|
|
|
- <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
|
|
|
+ <caret line="27" selection-start-line="27" selection-end-line="27" />
|
|
|
<folding>
|
|
|
<element signature="e#45#65#0" expanded="true" />
|
|
|
</folding>
|
|
@@ -88,8 +71,8 @@
|
|
|
<file pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/lib/include/ModuleBase.h">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="360">
|
|
|
- <caret line="24" column="54" lean-forward="true" selection-start-line="24" selection-start-column="54" selection-end-line="24" selection-end-column="54" />
|
|
|
+ <state relative-caret-position="345">
|
|
|
+ <caret line="24" column="54" selection-start-line="24" selection-start-column="54" selection-end-line="24" selection-end-column="54" />
|
|
|
<folding>
|
|
|
<element signature="e#51#69#0" expanded="true" />
|
|
|
</folding>
|
|
@@ -112,7 +95,7 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/lib/src/ProcessorBase.cpp">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="210">
|
|
|
+ <state relative-caret-position="345">
|
|
|
<caret line="23" column="34" selection-start-line="23" selection-start-column="34" selection-end-line="23" selection-end-column="34" />
|
|
|
</state>
|
|
|
</provider>
|
|
@@ -122,7 +105,7 @@
|
|
|
<entry file="file://$PROJECT_DIR$/lib/include/IUnique.h">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="195">
|
|
|
- <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
|
|
|
+ <caret line="13" column="1" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -130,7 +113,7 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/lib/include/ProcessorBase.h">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="419">
|
|
|
+ <state relative-caret-position="480">
|
|
|
<caret line="32" column="55" selection-start-line="32" selection-start-column="55" selection-end-line="32" selection-end-column="55" />
|
|
|
<folding>
|
|
|
<element signature="e#57#72#0" expanded="true" />
|
|
@@ -155,7 +138,7 @@
|
|
|
<entry file="file://$PROJECT_DIR$/lib/include/HandlerModule.h">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="150">
|
|
|
- <caret line="10" column="31" lean-forward="true" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
|
|
|
+ <caret line="10" column="31" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -238,8 +221,8 @@
|
|
|
<option name="configuration" value="0-mdd_lib" />
|
|
|
</component>
|
|
|
<component name="ProjectFrameBounds">
|
|
|
- <option name="x" value="277" />
|
|
|
- <option name="y" value="117" />
|
|
|
+ <option name="x" value="406" />
|
|
|
+ <option name="y" value="115" />
|
|
|
<option name="width" value="1440" />
|
|
|
<option name="height" value="927" />
|
|
|
</component>
|
|
@@ -423,7 +406,8 @@
|
|
|
<workItem from="1589982545546" duration="300000" />
|
|
|
<workItem from="1589982859071" duration="2825000" />
|
|
|
<workItem from="1590072044480" duration="1259000" />
|
|
|
- <workItem from="1590139016676" duration="23658000" />
|
|
|
+ <workItem from="1590139016676" duration="24307000" />
|
|
|
+ <workItem from="1590401033286" duration="1155000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
@@ -460,7 +444,7 @@
|
|
|
</history-entry>
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="129735000" />
|
|
|
+ <option name="totallyTimeSpent" value="131539000" />
|
|
|
</component>
|
|
|
<component name="TodoView" selected-index="2">
|
|
|
<todo-panel id="selected-file">
|
|
@@ -472,9 +456,9 @@
|
|
|
</todo-panel>
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="0" y="1105" width="1920" height="1006" extended-state="6" />
|
|
|
+ <frame x="406" y="115" width="1440" height="927" extended-state="0" />
|
|
|
<layout>
|
|
|
- <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49921754" visible="true" weight="0.23639274" />
|
|
|
+ <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49921754" visible="true" weight="0.32281205" />
|
|
|
<window_info id="Structure" order="1" sideWeight="0.5007825" side_tool="true" weight="0.22572039" />
|
|
|
<window_info id="Favorites" order="2" sideWeight="0.5007825" side_tool="true" weight="0.22572039" />
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
@@ -486,7 +470,7 @@
|
|
|
<window_info anchor="bottom" id="TODO" order="6" weight="0.32948583" />
|
|
|
<window_info anchor="bottom" id="Database Changes" order="7" />
|
|
|
<window_info anchor="bottom" id="Messages" order="8" weight="0.32423925" />
|
|
|
- <window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.27594072" />
|
|
|
+ <window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.30325815" />
|
|
|
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
|
|
|
<window_info anchor="bottom" id="Version Control" order="11" weight="0.32948583" />
|
|
|
<window_info anchor="bottom" id="CMake" order="12" weight="0.32948583" />
|
|
@@ -719,13 +703,7 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/lib/include/UniqueBase.h">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="180">
|
|
|
- <caret line="12" column="8" selection-start-line="12" selection-start-column="8" selection-end-line="16" selection-end-column="55" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/lib/include/UniqueBase.h" />
|
|
|
<entry file="file://$PROJECT_DIR$/lib/include/IOutput.h">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="180">
|
|
@@ -736,13 +714,7 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/lib/src/UniqueBase.cpp">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="45">
|
|
|
- <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="19" selection-end-column="5" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/lib/src/UniqueBase.cpp" />
|
|
|
<entry file="file://$PROJECT_DIR$/lib/include/Input.h">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="375">
|
|
@@ -781,23 +753,16 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/lib/src/ModuleSwitch.cpp">
|
|
|
+ <entry file="file://$PROJECT_DIR$/lib/src/ModuleBase.cpp">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="105">
|
|
|
- <caret line="7" column="40" selection-start-line="7" selection-start-column="40" selection-end-line="7" selection-end-column="40" />
|
|
|
+ <state relative-caret-position="375">
|
|
|
+ <caret line="25" selection-start-line="25" selection-end-line="25" />
|
|
|
<folding>
|
|
|
- <element signature="e#0#25#0" expanded="true" />
|
|
|
+ <element signature="e#0#23#0" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/lib/include/HandlerModule.h">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="150">
|
|
|
- <caret line="10" column="31" lean-forward="true" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/lib/include/Output.h">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="270">
|
|
@@ -805,33 +770,43 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/lib/include/IUnique.h">
|
|
|
+ <entry file="file://$PROJECT_DIR$/lib/include/IModule.h">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="195">
|
|
|
- <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
|
|
|
+ <state relative-caret-position="405">
|
|
|
+ <caret line="27" selection-start-line="27" selection-end-line="27" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#45#65#0" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/lib/include/IProcessor.h">
|
|
|
+ <entry file="file://$PROJECT_DIR$/lib/src/ModuleSwitch.cpp">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="165">
|
|
|
- <caret line="11" column="76" selection-start-line="11" selection-start-column="76" selection-end-line="11" selection-end-column="76" />
|
|
|
+ <state relative-caret-position="105">
|
|
|
+ <caret line="7" column="40" selection-start-line="7" selection-start-column="40" selection-end-line="7" selection-end-column="40" />
|
|
|
<folding>
|
|
|
- <element signature="e#51#71#0" expanded="true" />
|
|
|
+ <element signature="e#0#25#0" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/lib/src/ProcessorBase.cpp">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="210">
|
|
|
+ <state relative-caret-position="345">
|
|
|
<caret line="23" column="34" selection-start-line="23" selection-start-column="34" selection-end-line="23" selection-end-column="34" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/lib/include/IUnique.h">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="195">
|
|
|
+ <caret line="13" column="1" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/lib/include/ProcessorBase.h">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="419">
|
|
|
+ <state relative-caret-position="480">
|
|
|
<caret line="32" column="55" selection-start-line="32" selection-start-column="55" selection-end-line="32" selection-end-column="55" />
|
|
|
<folding>
|
|
|
<element signature="e#57#72#0" expanded="true" />
|
|
@@ -839,30 +814,27 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/lib/src/ModuleBase.cpp">
|
|
|
+ <entry file="file://$PROJECT_DIR$/lib/include/IProcessor.h">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="330">
|
|
|
- <caret line="25" selection-start-line="25" selection-end-line="25" />
|
|
|
+ <state relative-caret-position="165">
|
|
|
+ <caret line="11" column="76" selection-start-line="11" selection-start-column="76" selection-end-line="11" selection-end-column="76" />
|
|
|
<folding>
|
|
|
- <element signature="e#0#23#0" expanded="true" />
|
|
|
+ <element signature="e#51#71#0" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/lib/include/IModule.h">
|
|
|
+ <entry file="file://$PROJECT_DIR$/lib/include/HandlerModule.h">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="405">
|
|
|
- <caret line="27" lean-forward="true" selection-start-line="27" selection-end-line="27" />
|
|
|
- <folding>
|
|
|
- <element signature="e#45#65#0" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="150">
|
|
|
+ <caret line="10" column="31" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/lib/include/ModuleBase.h">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="360">
|
|
|
- <caret line="24" column="54" lean-forward="true" selection-start-line="24" selection-start-column="54" selection-end-line="24" selection-end-column="54" />
|
|
|
+ <state relative-caret-position="345">
|
|
|
+ <caret line="24" column="54" selection-start-line="24" selection-start-column="54" selection-end-line="24" selection-end-column="54" />
|
|
|
<folding>
|
|
|
<element signature="e#51#69#0" expanded="true" />
|
|
|
</folding>
|