diff --git a/SanSystem/Dongle.cs b/SanSystem/Dongle.cs index 797e9df..a59a641 100644 --- a/SanSystem/Dongle.cs +++ b/SanSystem/Dongle.cs @@ -80,11 +80,14 @@ namespace SanSystem public bool CheckDongleVorhanden() { - +#if LAPTOP + return true; +#else if (hcmse == null) return false; else return true; +#endif } public string GetDongleSerial() @@ -113,7 +116,9 @@ namespace SanSystem public bool IsLicensed(byte neededMask) { - +#if LAPTOP + return true; +#else uint DongleFeature = GetFeatureMap(); //Trace.WriteLine("DongleFeature: " + DongleFeature); @@ -123,6 +128,7 @@ namespace SanSystem if ((DongleFeatureB & neededMask) == neededMask) return true; return false; +#endif } public void Dispose() diff --git a/SanSystem/Program.cs b/SanSystem/Program.cs index 39d6a6b..c6338f3 100644 --- a/SanSystem/Program.cs +++ b/SanSystem/Program.cs @@ -1,4 +1,5 @@ -using System; +#define LAPTOP +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; diff --git a/SanSystem/SanSystem.csproj b/SanSystem/SanSystem.csproj index 0401c70..ed0f6fa 100644 --- a/SanSystem/SanSystem.csproj +++ b/SanSystem/SanSystem.csproj @@ -18,7 +18,7 @@ full false bin\Debug\ - DEBUG;TRACE + TRACE;DEBUG;LAPTOP prompt 4 bin\Debug\SanSystem.xml diff --git a/SanSystem/UCInliner.cs b/SanSystem/UCInliner.cs index 2b59205..327adca 100644 --- a/SanSystem/UCInliner.cs +++ b/SanSystem/UCInliner.cs @@ -225,13 +225,13 @@ namespace SanSystem ChartAxisLayout layout2 = new ChartAxisLayout(); chartControl.Axes.Add(axis0); - chartControl.Axes.Add(axis1); + //chartControl.Axes.Add(axis1); layout1.Spacing = 12; layout2.Spacing = 12; layout1.Axes.Add(axis); layout2.Axes.Add(axis0); - layout2.Axes.Add(axis1); + //layout2.Axes.Add(axis1); chartControl.ChartArea.YLayouts.Add(layout1); chartControl.ChartArea.YLayouts.Add(layout2); @@ -262,23 +262,23 @@ namespace SanSystem chartControl.LegendAlignment = ChartAlignment.Center; chartControl.Title.Visible = false; - ChartAxis chartAxis = new ChartAxis(); + /*ChartAxis chartAxis = new ChartAxis(); chartAxis.Orientation = ChartOrientation.Horizontal; chartAxis.Range = new MinMaxInfo(0, 6, 1); chartAxis.DrawGrid = false; chartAxis.LineType.Width = 1F; chartAxis.LineType.ForeColor = Color.Black; chartControl.Axes.Add(chartAxis); - + */ chartControl.Series.Add(temperaturChart); chartControl.Series.Add(druckChart); chartControl.Skins = Skins.Metro; - axis1.OpposedPosition = true; + //axis1.OpposedPosition = true; axis.EdgeLabelsDrawingMode = ChartAxisEdgeLabelsDrawingMode.Shift; axis0.EdgeLabelsDrawingMode = ChartAxisEdgeLabelsDrawingMode.Shift; - axis1.EdgeLabelsDrawingMode = ChartAxisEdgeLabelsDrawingMode.Shift; + //axis1.EdgeLabelsDrawingMode = ChartAxisEdgeLabelsDrawingMode.Shift; return chartControl; } diff --git a/SanSystem/frmMain.cs b/SanSystem/frmMain.cs index 08680c5..392da31 100644 --- a/SanSystem/frmMain.cs +++ b/SanSystem/frmMain.cs @@ -54,6 +54,9 @@ namespace SanSystem öffnenToolStripMenuItem.Text = Global.Instance.language.Labels["mainmenu_projekt_open"]; toolStripStatus_projekt_Label.Text = Datenbank.Instance.projekt; +#if (DEBUG || LAPTOP) + this.Text += " INTERNE DEBUG VERSION"; +#endif }