nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor EngineMappingMatterSlice

Browse source 
Changes
- Move ApplicationSettings to PrinterSettings readonly static
- Add Resolver to SliceSettingsData
- Move Resolvers from EngineMapping to PrinterSettings
- Move macro replacements from Printer to PrinterSettings
  - Change macro replacements to token definitions only
- Change EngineMapping to define Exports with optional conversion
This commit is contained in:
jlewin 2019-06-26 12:43:44 -07:00
parent 46757c6a15
commit d97be92d21
38 changed files with 889 additions and 811 deletions
Download patch file Download diff file Expand all files Collapse all files

64
MatterControlLib/SlicerConfiguration/MappingClasses/InjectGCodeCommands.cs
View file

@ -1,64 +0,0 @@
/*
Copyright (c) 2016, Lars Brubaker
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System.Collections.Generic;
namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
{
public class InjectGCodeCommands : UnescapeNewlineCharacters
{
public InjectGCodeCommands(PrinterConfig printer, string canonicalSettingsName, string exportedName)
: base(printer, canonicalSettingsName, exportedName)
{
}
protected void AddDefaultIfNotPresent(List<string> linesAdded, string commandToAdd, string[] lines, string comment)
{
string command = commandToAdd.Split(' ')[0].Trim();
if (!LineStartsWith(lines, command))
{
linesAdded.Add(string.Format("{0} ; {1}", commandToAdd, comment));
}
}
protected static bool LineStartsWith(string[] lines, string command)
{
foreach (string line in lines)
{
if (line.StartsWith(command))
{
return true;
}
}
return false;
}
}
}