diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f8dea16dfeefcfffb8f5d2fbf8f9d79d52bba2c5..6cafdcc92fcdc7dc6c6d8c23718e4d8ecee3fdcd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -258,7 +258,6 @@
<change beforePath="$PROJECT_DIR$/OpenFlipper/libs_required/ACG/CMakeLists.txt" afterPath="$PROJECT_DIR$/OpenFlipper/libs_required/ACG/CMakeLists.txt" />
<change beforePath="$PROJECT_DIR$/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.cc" afterPath="$PROJECT_DIR$/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.cc" />
<change beforePath="$PROJECT_DIR$/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.hh" afterPath="$PROJECT_DIR$/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.hh" />
- <change beforePath="$PROJECT_DIR$/Plugin-GCodeInterpreter/Resources/MachineSpecification.json" afterPath="$PROJECT_DIR$/Plugin-GCodeInterpreter/Resources/MachineSpecification.json" />
</list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<ignored path="$PROJECT_DIR$/cmake-build-release/" />
@@ -283,75 +282,71 @@
<file leaf-file-name="GCodeInterpreterPlugin.cc" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.cc">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="620">
- <caret line="101" column="1" lean-forward="false" selection-start-line="101" selection-start-column="1" selection-end-line="101" selection-end-column="1" />
+ <state relative-caret-position="378">
+ <caret line="106" column="68" lean-forward="true" selection-start-line="106" selection-start-column="68" selection-end-line="106" selection-end-column="68" />
<folding>
<element signature="e#3655#3678#0" expanded="true" />
- <element signature="e#6441#6506#0" expanded="true" />
+ <element signature="e#6796#6861#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Types.cc" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/OpenFlipper/common/Types.cc">
+ <file leaf-file-name="VectorT.hh" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/OpenFlipper/libs_required/ACG/Math/VectorT.hh">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="462">
- <caret line="161" column="0" lean-forward="false" selection-start-line="161" selection-start-column="0" selection-end-line="161" selection-end-column="0" />
+ <state relative-caret-position="350">
+ <caret line="126" column="27" lean-forward="false" selection-start-line="126" selection-start-column="27" selection-end-line="126" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="GCodeInterpreterPlugin.hh" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.hh">
+ <file leaf-file-name="OVMPropertyModelT.hh" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Plugin-PropertyVis/OpenVolumeMesh/OVMPropertyModelT.hh">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1189">
- <caret line="111" column="28" lean-forward="false" selection-start-line="111" selection-start-column="28" selection-end-line="111" selection-end-column="28" />
- <folding>
- <element signature="e#3655#3673#0" expanded="true" />
- </folding>
+ <state relative-caret-position="432">
+ <caret line="216" column="26" lean-forward="false" selection-start-line="216" selection-start-column="26" selection-end-line="216" selection-end-column="26" />
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="qstring.h" pinned="false" current-in-tab="false">
- <entry file="file:///ACG/acgdev/gcc-x86_64/qt-5.9.0/5.9/gcc_64/include/QtCore/qstring.h">
+ <file leaf-file-name="MeanCurvature.cc" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Plugin-MeanCurvature/MeanCurvature.cc">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
- <caret line="658" column="0" lean-forward="false" selection-start-line="658" selection-start-column="0" selection-end-line="658" selection-end-column="0" />
+ <caret line="151" column="9" lean-forward="false" selection-start-line="151" selection-start-column="9" selection-end-line="151" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="PluginFunctionsCore.hh" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/OpenFlipper/BasePlugin/PluginFunctionsCore.hh">
+ <file leaf-file-name="SmootherObject.cc" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Plugin-Smoother/SmootherObject.cc">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="276">
- <caret line="75" column="7" lean-forward="false" selection-start-line="75" selection-start-column="7" selection-end-line="75" selection-end-column="7" />
- <folding>
- <marker date="1520586843918" expanded="true" signature="4160:4268" ph="..." />
- </folding>
+ <state relative-caret-position="-539">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="GCodeInterpreterToolbox.cc" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Plugin-GCodeInterpreter/GCodeInterpreterToolbox.cc">
+ <file leaf-file-name="SmootherObject.hh" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Plugin-Smoother/SmootherObject.hh">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="972">
- <caret line="54" column="7" lean-forward="false" selection-start-line="54" selection-start-column="7" selection-end-line="54" selection-end-column="7" />
+ <state relative-caret-position="-1025">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ui_gcodeinterpreterControls.hh" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/cmake-build-debug-ntwk/Plugin-GCodeInterpreter/ui_gcodeinterpreterControls.hh">
+ <file leaf-file-name="SmootherPlugin.cc" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Plugin-Smoother/SmootherPlugin.cc">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1404">
- <caret line="78" column="20" lean-forward="false" selection-start-line="78" selection-start-column="8" selection-end-line="78" selection-end-column="20" />
+ <state relative-caret-position="2970">
+ <caret line="335" column="53" lean-forward="false" selection-start-line="335" selection-start-column="38" selection-end-line="335" selection-end-column="53" />
<folding />
</state>
</provider>
@@ -367,12 +362,14 @@
</provider>
</entry>
</file>
- <file leaf-file-name="MachineSpecification.json" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Plugin-GCodeInterpreter/Resources/MachineSpecification.json">
+ <file leaf-file-name="GCodeInterpreterPlugin.hh" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.hh">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="54">
- <caret line="3" column="18" lean-forward="false" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
- <folding />
+ <state relative-caret-position="486">
+ <caret line="122" column="46" lean-forward="false" selection-start-line="122" selection-start-column="46" selection-end-line="122" selection-end-column="46" />
+ <folding>
+ <element signature="e#3655#3673#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -459,18 +456,7 @@
<path>
<item name="OpenFlipper" type="dad4c3:CidrFilesViewHelper$MyProjectTreeStructure$1" />
<item name="OpenFlipper-Free" type="462c0819:PsiDirectoryNode" />
- <item name="Plugin-GCodeInterpreter" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="OpenFlipper" type="dad4c3:CidrFilesViewHelper$MyProjectTreeStructure$1" />
- <item name="OpenFlipper-Free" type="462c0819:PsiDirectoryNode" />
- <item name="Plugin-GCodeInterpreter" type="462c0819:PsiDirectoryNode" />
- <item name="Resources" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="OpenFlipper" type="dad4c3:CidrFilesViewHelper$MyProjectTreeStructure$1" />
- <item name="OpenFlipper-Free" type="462c0819:PsiDirectoryNode" />
- <item name="Plugin-SkeletalAnimation" type="462c0819:PsiDirectoryNode" />
+ <item name="Plugin-Smoother" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@@ -1499,7 +1485,7 @@
<workItem from="1522844826150" duration="6456000" />
<workItem from="1523442956321" duration="18342000" />
<workItem from="1524129995208" duration="3766000" />
- <workItem from="1524133822963" duration="1921000" />
+ <workItem from="1524133822963" duration="6142000" />
</task>
<task id="LOCAL-00001" summary="initial commit">
<created>1521044496300</created>
@@ -1519,7 +1505,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="59693000" />
+ <option name="totallyTimeSpent" value="63914000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="2560" height="1400" extended-state="6" />
@@ -1530,18 +1516,18 @@
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32890624" sideWeight="0.49570313" order="7" side_tool="false" content_ui="tabs" />
<window_info id="CMake" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22645915" sideWeight="0.49570313" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32890624" sideWeight="0.5046875" order="7" side_tool="true" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296875" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32890624" sideWeight="0.4953125" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32890624" sideWeight="0.4953125" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296875" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
<layout-to-restore>
@@ -1579,24 +1565,7 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
- <breakpoints>
- <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
- <url>file://$PROJECT_DIR$/Plugin-GCodeInterpreter/JsonAxisProvider.cc</url>
- <line>55</line>
- <option name="timeStamp" value="35" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
- <url>file://$PROJECT_DIR$/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.cc</url>
- <line>144</line>
- <option name="timeStamp" value="36" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
- <url>file://$PROJECT_DIR$/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.cc</url>
- <line>128</line>
- <option name="timeStamp" value="37" />
- </line-breakpoint>
- </breakpoints>
- <option name="time" value="38" />
+ <option name="time" value="39" />
</breakpoint-manager>
<watches-manager>
<configuration name="CMakeRunConfiguration">
@@ -1619,40 +1588,6 @@
</expressions>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/Plugin-SkeletalAnimation/Icons/skeletalAnimation.png">
- <provider selected="true" editor-type-id="images">
- <state />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/Plugin-Ruler/CMakeLists.txt">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/Plugin-HoleFilling/CMakeLists.txt">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="72">
- <caret line="4" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/Plugin-SkeletalAnimation/CMakeLists.txt">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="18">
- <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="2" selection-end-column="57" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/Plugin-GCodeInterpreter/CMakeLists.txt">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="18">
- <caret line="1" column="18" lean-forward="false" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.cc" />
<entry file="file://$PROJECT_DIR$/Type-Skeleton/ObjectTypes/Skeleton/Animation/AnimationHandle.hh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="91">
@@ -1793,6 +1728,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4770">
<caret line="265" column="0" lean-forward="false" selection-start-line="265" selection-start-column="0" selection-end-line="267" selection-end-column="81" />
+ <folding />
</state>
</provider>
</entry>
@@ -1862,14 +1798,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/cmake-build-debug-ntwk/Plugin-GCodeInterpreter/moc_GCodeInterpreterPlugin.cpp">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="330">
- <caret line="255" column="29" lean-forward="false" selection-start-line="255" selection-start-column="29" selection-end-line="255" selection-end-column="29" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/Plugin-GCodeInterpreter/MachineAxis.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
@@ -1886,14 +1814,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Plugin-GCodeInterpreter/JsonAxisProvider.cc">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="450">
- <caret line="55" column="0" lean-forward="false" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file:///ACG/acgdev/gcc-x86_64/qt-5.9.0/5.9/gcc_64/include/QtCore/qstring.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
@@ -1928,31 +1848,95 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/Plugin-SkeletalAnimation/SkeletalAnimationPlugin.cc">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="402">
+ <caret line="111" column="114" lean-forward="false" selection-start-line="111" selection-start-column="50" selection-end-line="111" selection-end-column="114" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Plugin-Smoother/SmootherPlugin.cc">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2970">
+ <caret line="335" column="53" lean-forward="false" selection-start-line="335" selection-start-column="38" selection-end-line="335" selection-end-column="53" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Plugin-Smoother/SmootherObject.cc">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-539">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Plugin-Smoother/SmootherObject.hh">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-1025">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/OpenFlipper/libs_required/ACG/Math/VectorT.hh">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="350">
+ <caret line="126" column="27" lean-forward="false" selection-start-line="126" selection-start-column="27" selection-end-line="126" selection-end-column="27" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Plugin-PropertyVis/OpenVolumeMesh/OVMPropertyModelT.hh">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="432">
+ <caret line="216" column="26" lean-forward="false" selection-start-line="216" selection-start-column="26" selection-end-line="216" selection-end-column="26" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Plugin-MeanCurvature/MeanCurvature.cc">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="432">
+ <caret line="151" column="9" lean-forward="false" selection-start-line="151" selection-start-column="9" selection-end-line="151" selection-end-column="9" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.hh">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1189">
- <caret line="111" column="28" lean-forward="false" selection-start-line="111" selection-start-column="28" selection-end-line="111" selection-end-column="28" />
+ <state relative-caret-position="486">
+ <caret line="122" column="46" lean-forward="false" selection-start-line="122" selection-start-column="46" selection-end-line="122" selection-end-column="46" />
<folding>
<element signature="e#3655#3673#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Plugin-SkeletalAnimation/SkeletalAnimationPlugin.cc">
+ <entry file="file://$PROJECT_DIR$/Plugin-GCodeInterpreter/JsonAxisProvider.cc">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="402">
- <caret line="111" column="114" lean-forward="false" selection-start-line="111" selection-start-column="50" selection-end-line="111" selection-end-column="114" />
+ <state relative-caret-position="450">
+ <caret line="55" column="0" lean-forward="false" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/cmake-build-debug-ntwk/Plugin-GCodeInterpreter/moc_GCodeInterpreterPlugin.cpp">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="534">
+ <caret line="218" column="72" lean-forward="false" selection-start-line="218" selection-start-column="72" selection-end-line="218" selection-end-column="72" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.cc">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="620">
- <caret line="101" column="1" lean-forward="false" selection-start-line="101" selection-start-column="1" selection-end-line="101" selection-end-column="1" />
+ <state relative-caret-position="378">
+ <caret line="106" column="68" lean-forward="true" selection-start-line="106" selection-start-column="68" selection-end-line="106" selection-end-column="68" />
<folding>
<element signature="e#3655#3678#0" expanded="true" />
- <element signature="e#6441#6506#0" expanded="true" />
+ <element signature="e#6796#6861#0" expanded="true" />
</folding>
</state>
</provider>
diff --git a/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.cc b/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.cc
index 4c191e08f1804c22f5b04a3172f0677a72621813..323e9ec50556fc589b1720823a11e92e8beac1f9 100644
--- a/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.cc
+++ b/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.cc
@@ -98,7 +98,24 @@ void GCodeInterpreterPlugin::initializePlugin() {
}
void GCodeInterpreterPlugin::setXAxis(double value) {
+ auto delta = value -x;
x = value;
+ if(_machineAxis == NULL) {
+ emit log("initialize machine axis first");
+ return;
+ }
+ auto mesh = PluginFunctions::triMeshObject(_machineAxis->objId);
+ if(mesh == 0) {
+ emit log("could not load object for id ");
+ return;
+ }
+
+ auto transform = mesh->manipulatorNode();
+ ACG::Vec3d vec3d (delta,0.0,0.0);
+
+
+ transform->translate(vec3d);
+ emit updateView();
}
void GCodeInterpreterPlugin::setYAxis(double value) {
@@ -127,8 +144,7 @@ void GCodeInterpreterPlugin::InitAxis(std::shared_ptr<MachineAxis> axis)
if (!axis->meshObjectPath.isNull() && !axis->meshObjectPath.isEmpty()) {
emit load(axis->meshObjectPath,typeId("TriangleMesh"), axis->objId);
- std::cout << axis->meshObjectPath.toStdString() << endl;
- std::cout << axis->objId << endl;
+
}
//proceed f.a. children
@@ -142,6 +158,7 @@ void GCodeInterpreterPlugin::InitModel() {
MachineAxisProvider* provider = new JsonAxisProvider("/home/mneurath/git/OpenFlipper-Free/Plugin-GCodeInterpreter/Resources/MachineSpecification.json");
const auto axis = provider->GetAxisDefinition();
InitAxis(axis);
+ _machineAxis = axis;
emit updateView();
}
diff --git a/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.hh b/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.hh
index 58aebfd119b16b75382fb77b62f3094281cdd9c2..ccd67da91ec72faf5688c5f1d1aeedfe2da617b5 100644
--- a/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.hh
+++ b/Plugin-GCodeInterpreter/GCodeInterpreterPlugin.hh
@@ -120,7 +120,7 @@ public:
private:
//axis values
double x,y,z,w,b;
-
+ std::shared_ptr<MachineAxis> _machineAxis;
//methods
void InitAxis(std::shared_ptr<MachineAxis> axis);