Husky/Kanalsanierungsverwaltung
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.weneg.de/Cosysda/SanVerwaltung

Browse Source
This commit is contained in:
Husky
2019-03-11 18:44:27 +01:00
parent 0e3b6841d8 27c09ce6be
commit fc1f1a7e92
5 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SanSystem/Dongle.cs
View File

@@ -80,11 +80,14 @@ namespace SanSystem
public bool CheckDongleVorhanden() public bool CheckDongleVorhanden()
{ {
#if LAPTOP
return true;
#else
if (hcmse == null) if (hcmse == null)
return false; return false;
else else
return true; return true;
#endif
} }
public string GetDongleSerial() public string GetDongleSerial()
@@ -113,7 +116,9 @@ namespace SanSystem
public bool IsLicensed(byte neededMask) public bool IsLicensed(byte neededMask)
{ {
#if LAPTOP
return true;
#else
uint DongleFeature = GetFeatureMap(); uint DongleFeature = GetFeatureMap();
//Trace.WriteLine("DongleFeature: " + DongleFeature); //Trace.WriteLine("DongleFeature: " + DongleFeature);
@@ -123,6 +128,7 @@ namespace SanSystem
if ((DongleFeatureB & neededMask) == neededMask) if ((DongleFeatureB & neededMask) == neededMask)
return true; return true;
return false; return false;
#endif
} }
public void Dispose() public void Dispose()

3
SanSystem/Program.cs
View File

@@ -1,4 +1,5 @@
using System; #define LAPTOP
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;

2
SanSystem/SanSystem.csproj
View File

@@ -18,7 +18,7 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>TRACE;DEBUG;LAPTOP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\SanSystem.xml</DocumentationFile> <DocumentationFile>bin\Debug\SanSystem.xml</DocumentationFile>

12
SanSystem/UCInliner.cs
View File

@@ -225,13 +225,13 @@ namespace SanSystem
ChartAxisLayout layout2 = new ChartAxisLayout(); ChartAxisLayout layout2 = new ChartAxisLayout();
chartControl.Axes.Add(axis0); chartControl.Axes.Add(axis0);
chartControl.Axes.Add(axis1); //chartControl.Axes.Add(axis1);
layout1.Spacing = 12; layout1.Spacing = 12;
layout2.Spacing = 12; layout2.Spacing = 12;
layout1.Axes.Add(axis); layout1.Axes.Add(axis);
layout2.Axes.Add(axis0); layout2.Axes.Add(axis0);
layout2.Axes.Add(axis1); //layout2.Axes.Add(axis1);
chartControl.ChartArea.YLayouts.Add(layout1); chartControl.ChartArea.YLayouts.Add(layout1);
chartControl.ChartArea.YLayouts.Add(layout2); chartControl.ChartArea.YLayouts.Add(layout2);
@@ -262,23 +262,23 @@ namespace SanSystem
chartControl.LegendAlignment = ChartAlignment.Center; chartControl.LegendAlignment = ChartAlignment.Center;
chartControl.Title.Visible = false; chartControl.Title.Visible = false;
ChartAxis chartAxis = new ChartAxis(); /*ChartAxis chartAxis = new ChartAxis();
chartAxis.Orientation = ChartOrientation.Horizontal; chartAxis.Orientation = ChartOrientation.Horizontal;
chartAxis.Range = new MinMaxInfo(0, 6, 1); chartAxis.Range = new MinMaxInfo(0, 6, 1);
chartAxis.DrawGrid = false; chartAxis.DrawGrid = false;
chartAxis.LineType.Width = 1F; chartAxis.LineType.Width = 1F;
chartAxis.LineType.ForeColor = Color.Black; chartAxis.LineType.ForeColor = Color.Black;
chartControl.Axes.Add(chartAxis); chartControl.Axes.Add(chartAxis);
*/
chartControl.Series.Add(temperaturChart); chartControl.Series.Add(temperaturChart);
chartControl.Series.Add(druckChart); chartControl.Series.Add(druckChart);
chartControl.Skins = Skins.Metro; chartControl.Skins = Skins.Metro;
axis1.OpposedPosition = true; //axis1.OpposedPosition = true;
axis.EdgeLabelsDrawingMode = ChartAxisEdgeLabelsDrawingMode.Shift; axis.EdgeLabelsDrawingMode = ChartAxisEdgeLabelsDrawingMode.Shift;
axis0.EdgeLabelsDrawingMode = ChartAxisEdgeLabelsDrawingMode.Shift; axis0.EdgeLabelsDrawingMode = ChartAxisEdgeLabelsDrawingMode.Shift;
axis1.EdgeLabelsDrawingMode = ChartAxisEdgeLabelsDrawingMode.Shift; //axis1.EdgeLabelsDrawingMode = ChartAxisEdgeLabelsDrawingMode.Shift;
return chartControl; return chartControl;
} }

3
SanSystem/frmMain.cs
View File

@@ -54,6 +54,9 @@ namespace SanSystem
öffnenToolStripMenuItem.Text = Global.Instance.language.Labels["mainmenu_projekt_open"]; öffnenToolStripMenuItem.Text = Global.Instance.language.Labels["mainmenu_projekt_open"];
toolStripStatus_projekt_Label.Text = Datenbank.Instance.projekt; toolStripStatus_projekt_Label.Text = Datenbank.Instance.projekt;
#if (DEBUG || LAPTOP)
this.Text += " INTERNE DEBUG VERSION";
#endif
} }