Added 3D models to project
Edited C# application, general functionality established git-svn-id: file:///srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/repositories/svn/Diplomarbeit@96 9fe90eed-be63-e94b-8204-d34ff4c2ff93
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 971 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -48,12 +48,18 @@
|
|||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Compile Include="initialisation.cs">
|
||||||
|
<SubType>Form</SubType>
|
||||||
|
</Compile>
|
||||||
<Compile Include="mainWindow.cs">
|
<Compile Include="mainWindow.cs">
|
||||||
<SubType>Form</SubType>
|
<SubType>Form</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="mainWindow.Designer.cs">
|
<Compile Include="mainWindow.Designer.cs">
|
||||||
<DependentUpon>mainWindow.cs</DependentUpon>
|
<DependentUpon>mainWindow.cs</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="Master.cs">
|
||||||
|
<SubType>Form</SubType>
|
||||||
|
</Compile>
|
||||||
<Compile Include="Program.cs" />
|
<Compile Include="Program.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
<EmbeddedResource Include="mainWindow.resx">
|
<EmbeddedResource Include="mainWindow.resx">
|
||||||
@@ -77,6 +83,9 @@
|
|||||||
<DependentUpon>Settings.settings</DependentUpon>
|
<DependentUpon>Settings.settings</DependentUpon>
|
||||||
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="test_control.cs">
|
||||||
|
<SubType>Form</SubType>
|
||||||
|
</Compile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
+1101
-27
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,27 @@
|
|||||||
using System;
|
/* ---------------------------------------------------------------------------
|
||||||
|
* MainWindow.cs (c) 2009 Micro-key bv
|
||||||
|
* ---------------------------------------------------------------------------
|
||||||
|
* Micro-key bv
|
||||||
|
* Industrieweg 28, 9804 TG Noordhorn
|
||||||
|
* Postbus 92, 9800 AB Zuidhorn
|
||||||
|
* The Netherlands
|
||||||
|
* Tel: +31 594 503020
|
||||||
|
* Fax: +31 594 505825
|
||||||
|
* Email: support@microkey.nl
|
||||||
|
* Web: www.microkey.nl
|
||||||
|
* ---------------------------------------------------------------------------
|
||||||
|
* Description: Main Form file. Bootup and Initialisation of the whole form
|
||||||
|
* ---------------------------------------------------------------------------
|
||||||
|
* Version(s): 0.1, Jan 08, 2008, MMi
|
||||||
|
* Creation.
|
||||||
|
* ---------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* ---------------------------------------------------------------------------
|
||||||
|
* System use files
|
||||||
|
* ---------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Data;
|
using System.Data;
|
||||||
@@ -6,6 +29,13 @@ using System.Drawing;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
|
using System.IO.Ports;
|
||||||
|
using System.Threading;
|
||||||
|
|
||||||
|
/* ---------------------------------------------------------------------------
|
||||||
|
* Local function definitions
|
||||||
|
* ---------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
namespace QUA_2475_designtest
|
namespace QUA_2475_designtest
|
||||||
{
|
{
|
||||||
@@ -14,11 +44,34 @@ namespace QUA_2475_designtest
|
|||||||
public mainWindow()
|
public mainWindow()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
initialise(); /* Init Variables, Arrays etc */
|
||||||
}
|
}
|
||||||
|
|
||||||
private void exit_Click(object sender, EventArgs e)
|
private void exit_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
/* Quit Window Session */
|
/* Quit Window Session */
|
||||||
|
Master_receiveMessages = false;
|
||||||
|
this.Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* TimeOut Function
|
||||||
|
* This runs always in an own Thread
|
||||||
|
* Functrion is called directly before a Test is started. When Time
|
||||||
|
* is over and the Test is still active, then call TimeOut Procedure
|
||||||
|
*/
|
||||||
|
private void TimeoutThread()
|
||||||
|
{
|
||||||
|
Thread.Sleep(20000);
|
||||||
|
if (activeTest == true)
|
||||||
|
{
|
||||||
|
TestIsTimeout(actualTest);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void B_conf_removeMB_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+8
@@ -8,3 +8,11 @@ C:\Dokumente und Einstellungen\m\Eigene Dateien\Visual Studio 2008\Projects\QUA_
|
|||||||
C:\Dokumente und Einstellungen\m\Eigene Dateien\Visual Studio 2008\Projects\QUA_2475_designtest\QUA_2475_designtest\obj\Debug\QUA_2475_designtest.pdb
|
C:\Dokumente und Einstellungen\m\Eigene Dateien\Visual Studio 2008\Projects\QUA_2475_designtest\QUA_2475_designtest\obj\Debug\QUA_2475_designtest.pdb
|
||||||
C:\Dokumente und Einstellungen\m\Eigene Dateien\Diplomarbeit\Tester\SW\designtest_control\QUA_2475_designtest\obj\Debug\QUA_2475_designtest.exe
|
C:\Dokumente und Einstellungen\m\Eigene Dateien\Diplomarbeit\Tester\SW\designtest_control\QUA_2475_designtest\obj\Debug\QUA_2475_designtest.exe
|
||||||
C:\Dokumente und Einstellungen\m\Eigene Dateien\Diplomarbeit\Tester\SW\designtest_control\QUA_2475_designtest\obj\Debug\QUA_2475_designtest.pdb
|
C:\Dokumente und Einstellungen\m\Eigene Dateien\Diplomarbeit\Tester\SW\designtest_control\QUA_2475_designtest\obj\Debug\QUA_2475_designtest.pdb
|
||||||
|
C:\Documents and Settings\mmi\Mijn documenten\Projects\Diplomarbeit\Tester\SW\designtest_control\QUA_2475_designtest\obj\Debug\QUA_2475_designtest.exe
|
||||||
|
C:\Documents and Settings\mmi\Mijn documenten\Projects\Diplomarbeit\Tester\SW\designtest_control\QUA_2475_designtest\obj\Debug\QUA_2475_designtest.pdb
|
||||||
|
C:\Documents and Settings\mmi\Mijn documenten\Projects\Diplomarbeit\Tester\SW\designtest_control\QUA_2475_designtest\bin\Debug\QUA_2475_designtest.exe
|
||||||
|
C:\Documents and Settings\mmi\Mijn documenten\Projects\Diplomarbeit\Tester\SW\designtest_control\QUA_2475_designtest\bin\Debug\QUA_2475_designtest.pdb
|
||||||
|
C:\Documents and Settings\mmi\Mijn documenten\Projects\Diplomarbeit\Tester\SW\designtest_control\QUA_2475_designtest\obj\Debug\ResolveAssemblyReference.cache
|
||||||
|
C:\Documents and Settings\mmi\Mijn documenten\Projects\Diplomarbeit\Tester\SW\designtest_control\QUA_2475_designtest\obj\Debug\QUA_2475_designtest.mainWindow.resources
|
||||||
|
C:\Documents and Settings\mmi\Mijn documenten\Projects\Diplomarbeit\Tester\SW\designtest_control\QUA_2475_designtest\obj\Debug\QUA_2475_designtest.Properties.Resources.resources
|
||||||
|
C:\Documents and Settings\mmi\Mijn documenten\Projects\Diplomarbeit\Tester\SW\designtest_control\QUA_2475_designtest\obj\Debug\QUA_2475_designtest.csproj.GenerateResource.Cache
|
||||||
|
|||||||
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user