Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

4 changes: 2 additions & 2 deletions AutoPanelBuilder/AutoPanelBuilder.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="Triangle, Version=0.0.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Triangle.0.0.6-Beta3\lib\net45\Triangle.dll</HintPath>
<HintPath>..\GerberProjects\packages\Triangle.0.0.6-Beta3\lib\net45\Triangle.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -67,4 +67,4 @@
<Content Include="favicon.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
6 changes: 3 additions & 3 deletions DirtyPCBs/DirtyPCB_BoardStats/DirtyPCB_BoardStats.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<ApplicationIcon>favicon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\..\GerberProjects\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
<Reference Include="DotNetZip, Version=1.11.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\..\GerberProjects\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -76,4 +76,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
6 changes: 3 additions & 3 deletions GerberAnalyse/GerberAnalyse.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
<ApplicationIcon>favicon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
<Reference Include="DotNetZip, Version=1.11.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -72,4 +72,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
12 changes: 5 additions & 7 deletions GerberLibrary/GerberLibrary.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Triangle, Version=0.0.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\Triangle.0.0.6-Beta3\lib\net45\Triangle.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Artwork Related\BasicBounce.cs" />
Expand Down Expand Up @@ -112,12 +115,7 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\dependencies\Triangle.NET\Triangle.NET\Triangle\Triangle.csproj">
<Project>{f7907a0a-b75f-400b-9e78-bfad00db4d6b}</Project>
<Name>Triangle</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand All @@ -126,4 +124,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
2 changes: 1 addition & 1 deletion GerberPanelizer/GerberPanelize.cs
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ private void glControl1_Paint(object sender, PaintEventArgs e)

GL.Disable(EnableCap.DepthTest);
GL.Enable(EnableCap.Blend);
GL.BlendFunc(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha);
GL.BlendFunc(BlendingFactor.SrcAlpha, BlendingFactor.OneMinusSrcAlpha);
GL.Hint(HintTarget.LineSmoothHint, HintMode.Nicest);
GL.Hint(HintTarget.PointSmoothHint, HintMode.Nicest);

Expand Down
10 changes: 5 additions & 5 deletions GerberPanelizer/GerberPanelize.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\OpenTK.1.1.2349.61993\lib\NET40\OpenTK.dll</HintPath>
<Reference Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\OpenTK.3.0.1\lib\net20\OpenTK.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OpenTK.GLControl, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
<Reference Include="OpenTK.GLControl, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\OpenTK.GLControl.3.0.1\lib\net20\OpenTK.GLControl.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -261,4 +261,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
4 changes: 2 additions & 2 deletions GerberPanelizer/QuickFont/QFont.cs
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ private SizeF PrintOrMeasure(string text, QFontAlignment alignment, bool measure

if (Options.UseDefaultBlendFunction)
{
GL.BlendFunc(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha);
GL.BlendFunc(BlendingFactor.SrcAlpha, BlendingFactor.OneMinusSrcAlpha);
}

}
Expand Down Expand Up @@ -1137,7 +1137,7 @@ private SizeF PrintOrMeasure(ProcessedText processedText, bool measureOnly)
if (Options.UseDefaultBlendFunction)
{

GL.BlendFunc(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha);
GL.BlendFunc(BlendingFactor.SrcAlpha, BlendingFactor.OneMinusSrcAlpha);

}
}
Expand Down
6 changes: 3 additions & 3 deletions GerberPanelizer/QuickFont/QuickFont.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="OpenTK">
<HintPath>..\GerberCombinerBuilder\bin\Release\OpenTK.dll</HintPath>
<Reference Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\OpenTK.3.0.1\lib\net20\OpenTK.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -99,4 +99,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
6 changes: 3 additions & 3 deletions GerberPanelizer/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FarseerPhysics" version="3.5.0" targetFramework="net45" />
<package id="OpenTK" version="1.1.2349.61993" targetFramework="net45" />
<package id="OpenTK.GLControl" version="1.1.2349.61993" targetFramework="net45" />
<package id="OpenTK" version="3.0.1.0" targetFramework="net45" />
<package id="OpenTK.GLControl" version="3.0.1.0" targetFramework="net45" />
<package id="Triangle" version="0.0.6-Beta3" targetFramework="net45" />
</packages>
</packages>
16 changes: 0 additions & 16 deletions GerberProjects/GerberProjects.sln
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FrontPanelBuilder", "..\Fro
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GerberToDxf", "..\GerberToDxf\GerberToDxf\GerberToDxf.csproj", "{843057E6-2FC0-4C78-AAB3-197C60AE72BF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{AAAFD0A7-47D1-4530-86CA-B68C5790E7C1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Triangle", "..\dependencies\Triangle.NET\Triangle.NET\Triangle\Triangle.csproj", "{F7907A0A-B75F-400B-9E78-BFAD00DB4D6B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -330,14 +326,6 @@ Global
{843057E6-2FC0-4C78-AAB3-197C60AE72BF}.Release|Any CPU.Build.0 = Release|Any CPU
{843057E6-2FC0-4C78-AAB3-197C60AE72BF}.Release|x86.ActiveCfg = Release|Any CPU
{843057E6-2FC0-4C78-AAB3-197C60AE72BF}.Release|x86.Build.0 = Release|Any CPU
{F7907A0A-B75F-400B-9E78-BFAD00DB4D6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F7907A0A-B75F-400B-9E78-BFAD00DB4D6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F7907A0A-B75F-400B-9E78-BFAD00DB4D6B}.Debug|x86.ActiveCfg = Debug|Any CPU
{F7907A0A-B75F-400B-9E78-BFAD00DB4D6B}.Debug|x86.Build.0 = Debug|Any CPU
{F7907A0A-B75F-400B-9E78-BFAD00DB4D6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F7907A0A-B75F-400B-9E78-BFAD00DB4D6B}.Release|Any CPU.Build.0 = Release|Any CPU
{F7907A0A-B75F-400B-9E78-BFAD00DB4D6B}.Release|x86.ActiveCfg = Release|Any CPU
{F7907A0A-B75F-400B-9E78-BFAD00DB4D6B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -373,10 +361,6 @@ Global
{822016C1-52B8-449C-BE7A-D3ABA943B8B6} = {5B17443F-D48D-429E-83E3-2C7DCA8C6ED3}
{485C42A7-B359-4091-9BE7-7B8E99A8D7EA} = {5B17443F-D48D-429E-83E3-2C7DCA8C6ED3}
{843057E6-2FC0-4C78-AAB3-197C60AE72BF} = {F705564A-6956-4675-A941-6ED916ADC0AD}
{F7907A0A-B75F-400B-9E78-BFAD00DB4D6B} = {AAAFD0A7-47D1-4530-86CA-B68C5790E7C1}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D3E1B175-5E33-4A46-8DBC-A8B9B4A50987}
EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
Expand Down
8 changes: 4 additions & 4 deletions GerberViewer/GLGraphicsInterface.cs
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -542,9 +542,9 @@ public void Link()
AttributeInfo info = new AttributeInfo();
int length = 0;

StringBuilder name = new StringBuilder();
String name;

GL.GetActiveAttrib(ProgramID, i, 256, out length, out info.size, out info.type, name);
GL.GetActiveAttrib(ProgramID, i, 256, out length, out info.size, out info.type, out name);

info.name = name.ToString();
info.address = GL.GetAttribLocation(ProgramID, info.name);
Expand All @@ -556,9 +556,9 @@ public void Link()
UniformInfo info = new UniformInfo();
int length = 0;

StringBuilder name = new StringBuilder();
String name;

GL.GetActiveUniform(ProgramID, i, 256, out length, out info.size, out info.type, name);
GL.GetActiveUniform(ProgramID, i, 256, out length, out info.size, out info.type, out name);

info.name = name.ToString();
Uniforms.Add(name.ToString(), info);
Expand Down
22 changes: 11 additions & 11 deletions GerberViewer/GerberViewer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@
<ApplicationIcon>favicon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
<Reference Include="DotNetZip, Version=1.11.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OpenTK, Version=1.2.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\OpenTK.Next.1.2.2336.6514-pre\lib\net20\OpenTK.dll</HintPath>
<Reference Include="OpenTK, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\OpenTK.3.0.1\lib\net20\OpenTK.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OpenTK.GLControl, Version=1.2.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\OpenTK.Next.GLControl.1.2.2336.6514-pre\lib\net20\OpenTK.GLControl.dll</HintPath>
<Reference Include="OpenTK.GLControl, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\OpenTK.GLControl.3.0.1\lib\net20\OpenTK.GLControl.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand All @@ -68,12 +68,12 @@
<HintPath>..\GerberProjects\packages\Triangle.0.0.6-Beta3\lib\net45\Triangle.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.11.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\DockPanelSuite.2.11.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\DockPanelSuite.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2015, Version=2.11.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\DockPanelSuite.ThemeVS2015.2.11.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll</HintPath>
<Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2015, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\GerberProjects\packages\DockPanelSuite.ThemeVS2015.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down Expand Up @@ -144,4 +144,4 @@
<Content Include="favicon.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
2 changes: 1 addition & 1 deletion GerberViewer/LayerDisplay.cs
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ private void Glcontrol1_Paint(object sender, PaintEventArgs e)
GL.UniformMatrix4(MainShader.Uniforms["trans"].address, false, ref M);
GL.UniformMatrix4(MainShader.Uniforms["view"].address, false, ref View);
GL.Enable(EnableCap.Blend);
GL.BlendFunc(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha);
GL.BlendFunc(BlendingFactor.SrcAlpha, BlendingFactor.OneMinusSrcAlpha);
VBOCache.RenderVBO(MainShader);
MainShader.UnBind();
//DrawGerbersToGraphicsInterface(Bounds, GI);
Expand Down
7 changes: 3 additions & 4 deletions GerberViewer/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<package id="DockPanelSuite" version="2.11.0" targetFramework="net452" />
<package id="DockPanelSuite.ThemeVS2015" version="2.11.0" targetFramework="net452" />
<package id="DotNetZip" version="1.10.1" targetFramework="net452" />
<package id="OpenTK" version="1.1.1589.5942" targetFramework="net452" />
<package id="OpenTK.Next" version="1.2.2336.6514-pre" targetFramework="net452" />
<package id="OpenTK.Next.GLControl" version="1.2.2336.6514-pre" targetFramework="net452" />
<package id="OpenTK" version="3.0.1.0" targetFramework="net452" />
<package id="OpenTK.GLControl" version="3.0.1.0" targetFramework="net452" />
<package id="Triangle" version="0.0.6-Beta3" targetFramework="net452" />
</packages>
</packages>
4 changes: 2 additions & 2 deletions Project_Utilities/TilingLibrary/TINRS-ArtWork.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="GlmNet, Version=0.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\GerberProjects\packages\GlmNet.0.5.1.0\lib\net40\GlmNet.dll</HintPath>
<HintPath>..\..\GerberProjects\packages\GlmNet.0.5.1\lib\net40\GlmNet.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -82,4 +82,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@ Tools to load/edit/create/panelize/prerender sets of gerber files.

A recent build is available on http://blog.thisisnotrocketscience.nl/projects/pcb-panelizer/

The .sln file (for VS2015 community edition) can be found in the GerberProjects folder.

All tools are clean C# and will run fine under Mono.

Please see http://www.thisisnotrocketscience.nl for news/updates/blogs

Follow us on twitter: @rocket_not

## Building
### Visual Studio 2015 upwards
Open the `GerberProjects/GerberProjects.sln` solution, convert it to your version of Visual Studio
(if necessary), then build it. Dependencies should be fetched automatically via Nuget.

### Linux
Run `./build.sh`. Dependencies should be automatically fetched.
35 changes: 35 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#!/bin/sh

set -euo pipefail
set -x

nuget () {
package="$1"
version="$2"
zip="`mktemp`.zip"
url="https://www.nuget.org/api/v2/package/$package/$version"
dir="GerberProjects/packages/$package.$version"

test -d "$dir" || {
wget "$url" -O "$zip"
mkdir -p "$dir"
unzip "$zip" -d "$dir"
rm "$zip"
}
}

# Needed as xbuild gets confused about some modern terminals
export TERM=xterm

nuget Triangle 0.0.6-Beta3
nuget DotNetZip 1.11.0
nuget OpenTK 3.0.1
nuget OpenTK.GLControl 3.0.1
nuget netDXF 2.0.2
nuget netDXF 0.9.3
nuget GlmNet 0.5.1
nuget DockPanelSuite 3.0.6
nuget DockPanelSuite.ThemeVS2015 3.0.6


xbuild /p:Configuration=Debug GerberProjects/GerberProjects.sln
1 change: 0 additions & 1 deletion dependencies/Triangle.NET
Submodule Triangle.NET deleted from 6f0e55