a bit more work towards HeeksCNC 1.0

Heeks · Feb 26, 2014 · d7ecbb8 · d7ecbb8
1 parent 3cfcdee
commit d7ecbb8
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 15 deletions.
diff --git a/HeeksCNC 1.0 installer.iss b/HeeksCNC 1.0 installer.iss
@@ -5,17 +5,17 @@
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{5351926C-54D6-4458-B834-759BCE9C5E5A}
-AppName=HeeksCNC032
-AppVerName=HeeksCNC 0.32.0
+AppId={{621BF3C2-49FC-4430-B36F-B62BA01C84A4}
+AppName=HeeksCNC 1.0
+AppVerName=HeeksCNC 1.0
 AppPublisher=Heeks Software
 AppPublisherURL=http://heeks.net/
 AppSupportURL=http://code.google.com/p/heekscnc/
 AppUpdatesURL=http://code.google.com/p/heekscnc/
-DefaultDirName={pf}\HeeksCNC032
-DefaultGroupName=HeeksCNC032
+DefaultDirName={pf}\HeeksCNC 1.0
+DefaultGroupName=HeeksCNC 1.0
 DisableProgramGroupPage=yes
-OutputBaseFilename=HeeksCNC 0.32.0
+OutputBaseFilename=HeeksCNC 1.0
 Compression=lzma
 SolidCompression=yes
 
@@ -33,7 +33,7 @@ Name: "{app}\HeeksCNC"; Permissions: users-modify
 Name: "{app}\HeeksCNC\nc"; Permissions: users-modify
 
 [Files]
-Source: "C:\Dev\HeeksCADSVN\HeeksCAD.exe"; DestDir: "{app}"; DestName: "HeeksCAD032.exe"; Flags: ignoreversion
+Source: "C:\Dev\HeeksCADSVN\HeeksCAD.exe"; DestDir: "{app}"; DestName: "HeeksCAD 1.0.exe"; Flags: ignoreversion
 Source: "C:\Dev\HeeksCADSVN\bitmaps\*.png"; DestDir: "{app}\bitmaps"; Flags: ignoreversion
 Source: "C:\Dev\HeeksCADSVN\bitmaps\angle\*.png"; DestDir: "{app}\bitmaps\angle"; Flags: ignoreversion
 Source: "C:\Dev\HeeksCADSVN\bitmaps\font.glf"; DestDir: "{app}\bitmaps"; Flags: ignoreversion
@@ -90,13 +90,13 @@ Source: "C:\Program Files (x86)\VoxelCut\wx*.dll"; DestDir: "{app}\HeeksCNC"; Fl
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: "{group}\HeeksCNC032"; Filename: "{app}\HeeksCAD032.exe"; WorkingDir: "{app}"; Parameters: "HeeksCNC/HeeksCNC.dll"
+Name: "{group}\HeeksCNC 1.0"; Filename: "{app}\HeeksCAD 1.0.exe"; WorkingDir: "{app}"; Parameters: "HeeksCNC/HeeksCNC.dll"
 
 [Run]
-Filename: "{app}\HeeksCAD032.exe"; WorkingDir: "{app}"; Parameters: "HeeksCNC/HeeksCNC.dll"; Description: "{cm:LaunchProgram,HeeksCNC}"; Flags: nowait postinstall skipifsilent
+Filename: "{app}\HeeksCAD 1.0.exe"; WorkingDir: "{app}"; Parameters: "HeeksCNC/HeeksCNC.dll"; Description: "{cm:LaunchProgram,HeeksCNC}"; Flags: nowait postinstall skipifsilent
 
 [Registry]
-Root: HKCU; Subkey: "Software\HeeksCAD032"; Flags: uninsdeletekeyifempty
-Root: HKCU; Subkey: "Software\HeeksCNC032"; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\HeeksCAD 1.0"; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\HeeksCNC 1.0"; Flags: uninsdeletekeyifempty
 
 
diff --git a/nc/iso.py b/nc/iso.py
@@ -330,10 +330,11 @@ def tool_defn(self, id, name='',params=None):
             self.write(self.SPACE() + self.TOOL_DEFINITION())
             self.write(self.SPACE() + ('P%i' % id) + ' ')
 
-            if (radius != None):
+            if (params['diameter'] != None):
                 self.write(self.SPACE() + ('R%.3f' % (float(params['diameter'])/2)))
 
-            if (length != None):
+            print params
+            if (params['cutting edge height'] != None):
                 self.write(self.SPACE() + 'Z%.3f' % float(params['cutting edge height']))
 
             self.write('\n')

diff --git a/src/CNCConfig.h b/src/CNCConfig.h
@@ -11,7 +11,7 @@ class CNCConfig: public wxConfig
 {
 public:
 	bool m_disabled;
-	CNCConfig():wxConfig(wxString(_T("HeeksCNC")) + _T(HEEKSCAD_VERSION_MAIN) + _T(HEEKSCAD_VERSION_SUB)), m_disabled(theApp.m_settings_restored){}
+	CNCConfig():wxConfig(wxString(_T("HeeksCNC ")) + _T(HEEKSCAD_VERSION_MAIN) + _T(".") + _T(HEEKSCAD_VERSION_SUB)), m_disabled(theApp.m_settings_restored){}
 	~CNCConfig(){}
 
 	bool DoWriteString(const wxString& key, const wxString& value){if(!m_disabled)return wxConfig::DoWriteString(key, value); return false;}

diff --git a/src/Program.cpp b/src/Program.cpp
@@ -757,7 +757,16 @@ Python CProgram::RewritePythonProgram()
 
 
 #ifdef FREE_VERSION
-	python << _T("write('Delete this line manually from each g-code file. Buy full version to remove this automatically. www.heeks.net\\n')\n");
+	python << _T("comment('MADE WITH FREE VERSION OF HEEKSCNC. Please buy full version to remove this text\\n')\n");
+	python << _T("comment('***********    MADE WITH FREE VERSION OF HEEKSCNC!   ***********\\n')\n");
+	python << _T("comment('***********    MADE WITH FREE VERSION OF HEEKSCNC!   ***********\\n')\n");
+	python << _T("comment('***********    MADE WITH FREE VERSION OF HEEKSCNC!   ***********\\n')\n");
+	python << _T("comment('***********    MADE WITH FREE VERSION OF HEEKSCNC!   ***********\\n')\n");
+	python << _T("comment('***********    MADE WITH FREE VERSION OF HEEKSCNC!   ***********\\n')\n");
+	python << _T("comment('***********    MADE WITH FREE VERSION OF HEEKSCNC!   ***********\\n')\n");
+	python << _T("comment('***********                    ***********\\n')\n");
+	python << _T("comment('***********    www.heeks.net   ***********\\n')\n");
+	python << _T("comment('***********                    ***********\\n')\n");
 #endif
 
 	// begin program

diff --git a/src/Simulate.cpp b/src/Simulate.cpp
@@ -35,6 +35,18 @@ static void	WriteCoords(std::wofstream &ofs)
 {
 	CBox box;
 	GetWorldBox(box);
+
+	if(!box.m_valid)
+	{
+		box = CBox(-100, -100, -50, 100, 100, 50);
+	}
+	else
+	{
+		while(box.Width() < 100){box.m_x[0] -= 5.0; box.m_x[3] += 5.0;}
+		while(box.Height() < 100){box.m_x[1] -= 5.0; box.m_x[4] += 5.0;}
+		box.m_x[2] -= 10.0;
+	}
+
 	ofs<<"toolpath.coords = Coords("<<box.MinX()<<", "<<box.MinY()<<", "<<box.MinZ()<<", "<<box.MaxX()<<", "<<box.MaxY()<<", "<<box.MaxZ()<<")\n";
 }