Laptop direktive hinzugefügt.
Unnötige Axen beschriftung entfernt
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
#define LAPTOP
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DefineConstants>TRACE;DEBUG;LAPTOP</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<DocumentationFile>bin\Debug\SanSystem.xml</DocumentationFile>
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user