Skip to content

Commit

Permalink
Fixed issues with building/running on Ubuntu
Browse files Browse the repository at this point in the history 
* Removed unnecessary references
* Fixed issues with GUI layout
  • Loading branch information
@xenovacivus
xenovacivus committed Jan 14, 2014
1 parent 2d17bf7 commit c624f47
Show file tree
Hide file tree
Showing 17 changed files with 57 additions and 57 deletions.
6 changes: 0 additions & 6 deletions Commands/Commands.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@
<Reference Include="OpenTK">
<HintPath>..\ThirdParty\OpenTK\OpenTK.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ICommand.cs" />
Expand Down
6 changes: 1 addition & 5 deletions Commands/ICommand.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;


namespace Commands
{
public abstract class ICommand
Expand Down
6 changes: 1 addition & 5 deletions Commands/MoveTool.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using OpenTK;
using OpenTK;

namespace Commands
{
Expand Down
4 changes: 2 additions & 2 deletions GUI/COMPortForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ private void connect_Click(object sender, EventArgs e)
port.Open(portName, baudRate);
connect.Text = "Disconnect";
}
catch (NullReferenceException ex)
catch (NullReferenceException)
{
MessageBox.Show("Error Opening Com Port: No Port Name Selected!");
}
catch (FormatException ex)
catch (FormatException)
{
MessageBox.Show("Error Opening Com Port: Invalid Baud Rate!");
}
Expand Down
8 changes: 4 additions & 4 deletions GUI/Drawing3D.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions GUI/Drawing3D.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
1 change: 0 additions & 1 deletion GUI/GUI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
Expand Down
56 changes: 37 additions & 19 deletions GUI/PathCAM.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ void IOpenGLDrawable.Draw()
mesh.Draw();
}
}
catch (Exception ex)
catch (Exception)
{
}
}
Expand Down Expand Up @@ -282,7 +282,7 @@ private void InitializeComponent()
this.boundaryCheck = new System.Windows.Forms.Button();
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.openFileButton = new System.Windows.Forms.Button();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.showRobotFormCheckbox = new System.Windows.Forms.CheckBox();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.robotControl = new GUI.RobotControl();
this.drawing3D = new GUI.Drawing3D();
Expand Down Expand Up @@ -371,16 +371,16 @@ private void InitializeComponent()
this.openFileButton.UseVisualStyleBackColor = true;
this.openFileButton.Click += new System.EventHandler(this.loadButton_Click);
//
// checkBox1
// showRobotFormCheckbox
//
this.checkBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.checkBox1.AutoSize = true;
this.checkBox1.Location = new System.Drawing.Point(0, 588);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(15, 14);
this.checkBox1.TabIndex = 69;
this.checkBox1.UseVisualStyleBackColor = true;
this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
this.showRobotFormCheckbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.showRobotFormCheckbox.AutoSize = true;
this.showRobotFormCheckbox.Location = new System.Drawing.Point(-1, 449);
this.showRobotFormCheckbox.Name = "showRobotFormCheckbox";
this.showRobotFormCheckbox.Size = new System.Drawing.Size(15, 14);
this.showRobotFormCheckbox.TabIndex = 69;
this.showRobotFormCheckbox.UseVisualStyleBackColor = true;
this.showRobotFormCheckbox.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
//
// pictureBox1
//
Expand All @@ -395,9 +395,9 @@ private void InitializeComponent()
//
this.robotControl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.robotControl.BackColor = System.Drawing.Color.Transparent;
this.robotControl.Location = new System.Drawing.Point(0, 466);
this.robotControl.Location = new System.Drawing.Point(-1, 327);
this.robotControl.Name = "robotControl";
this.robotControl.Size = new System.Drawing.Size(183, 136);
this.robotControl.Size = new System.Drawing.Size(169, 136);
this.robotControl.TabIndex = 8;
this.robotControl.Visible = false;
//
Expand All @@ -407,22 +407,23 @@ private void InitializeComponent()
this.drawing3D.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.drawing3D.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.drawing3D.BackColor = System.Drawing.Color.Black;
this.drawing3D.ClearColor = System.Drawing.Color.Empty;
this.drawing3D.Location = new System.Drawing.Point(0, -1);
this.drawing3D.Location = new System.Drawing.Point(472, 12);
this.drawing3D.MinimumSize = new System.Drawing.Size(10, 10);
this.drawing3D.Name = "drawing3D";
this.drawing3D.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
this.drawing3D.Size = new System.Drawing.Size(986, 603);
this.drawing3D.Size = new System.Drawing.Size(100, 98);
this.drawing3D.TabIndex = 68;
this.drawing3D.VSync = false;
//
// PathCAM
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(986, 601);
this.Controls.Add(this.checkBox1);
this.ClientSize = new System.Drawing.Size(584, 462);
this.Controls.Add(this.showRobotFormCheckbox);
this.Controls.Add(this.saveGcodeButton);
this.Controls.Add(this.button2);
this.Controls.Add(this.clearPathsButton);
Expand All @@ -434,9 +435,10 @@ private void InitializeComponent()
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.drawing3D);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimumSize = new System.Drawing.Size(800, 600);
this.MinimumSize = new System.Drawing.Size(600, 500);
this.Name = "PathCAM";
this.Text = "PathCAM - Toolpath generation software for CNC robots";
this.Load += new System.EventHandler(this.PathCAM_Load);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
Expand All @@ -460,7 +462,23 @@ private void saveGcodeButton_Click(object sender, EventArgs e)

private void checkBox1_CheckedChanged(object sender, EventArgs e)
{
robotControl.Visible = checkBox1.Checked;
robotControl.Visible = showRobotFormCheckbox.Checked;
}

private void drawing3D_Load(object sender, EventArgs e)
{

}

private void PathCAM_Load(object sender, EventArgs e)
{
// Programatically fill the entire client rectangle with the drawing area.
// This makes sure the size is independent of window border and makes
// editing the GUI in the designer much easier.
this.drawing3D.Location = new Point(0, 0);
this.drawing3D.Size = this.ClientRectangle.Size;
robotControl.Location = new Point(0, ClientRectangle.Height - robotControl.Height);
showRobotFormCheckbox.Location = new Point(0, ClientRectangle.Height - showRobotFormCheckbox.Height + 1);
}
}
}
6 changes: 3 additions & 3 deletions GUI/PathCAM.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAICAAAAAAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAA
Expand Down
3 changes: 1 addition & 2 deletions GUI/RobotControl.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions GUI/RobotControl.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
2 changes: 1 addition & 1 deletion GUI/RouterGUI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ void IOpenGLDrawable.Draw()
GL.PointSize(1);
GL.Enable(EnableCap.Lighting);
}
catch (Exception ex)
catch (Exception)
{
}
}
Expand Down
2 changes: 1 addition & 1 deletion GUI/RouterUI.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion GUI/TriangleMeshGUI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void GenerateTabPaths(float toolRadius)
tabs.Add(new TabsGUI(line, toolRadius, true));
}
}
catch (Exception ex)
catch (Exception)
{
}
this.Offset = offset; // Force the offset update in the tabs
Expand Down
1 change: 0 additions & 1 deletion Serial/Serial.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion Serial/SerialPacket.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ public void SerialByteTransmitComplete()
TransmitPacketComplete();
}
return;
break;

default:
// Shouldn't ever get here.
Expand Down
2 changes: 1 addition & 1 deletion Serial/SerialPortWrapper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ void port_DataReceived(object sender, SerialDataReceivedEventArgs e)
packet.ProcessDataChar(data);
}
}
catch (Exception ex)
catch (Exception)
{
}
}
Expand Down

0 comments on commit c624f47

Please sign in to comment.