Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.2.2_BRANCH' into develop

Browse Source 
# Conflicts:
#	Libs/CMS_CORE_Library.dll
This commit is contained in:
Lucio Maranta
2019-07-30 11:09:43 +02:00
parent 1364371252 7a351072b2
commit ffa880adfb
24 changed files with 6264 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Client/View/NcWindow.cs
+311 -306
View File
@@ -71,7 +71,7 @@ namespace Active_Client.View
private static uint ActualPID;
private static WinEventDelegate procDelegate;
private static WinEventDelegate procDelegateWindow;
private static keyboardHookProc keybDelegate;
private static keyboardHookProc keybDelegate;
private static uint LastdwmsEventTime;
private static uint LastHookedPID;
private static uint KeyboardPID;
@@ -100,12 +100,15 @@ namespace Active_Client.View
private static int ActiveNCWindowStyle;
private static int ActiveNCWindowBorder;
private static int ActiveWindowNCWindowStyle;
private static int ActiveWindowNCWindowBorder;
private static int ActiveWindowNCWindowBorder;
private static uint ActiveWindowNCPopUp;
private static uint ActiveNCWindowNCPopUp;
public static MainForm mainFrm;
private static string prodEXEname;
private static string prodEXEname;
public static NcState State { get { return state; } }
private static NcState state;
@@ -153,31 +156,31 @@ namespace Active_Client.View
ncprocess.WaitForInputIdle();
//Wait until the process is started
if (Config.VendorHmiConfig.Type != 2)
{
//If is not Siemens try to wait the HMI for a period of tyme. After that re-open the window
TriedTimes = 1;
while ((processes[0].MainWindowHandle == IntPtr.Zero || !isWindowReady(processes[0].MainWindowTitle)) && TriedTimes < TimesToTryKill)
{
processes = Process.GetProcessesByName(processname);
if (processes[0].MainWindowHandle == IntPtr.Zero)
{
Thread.Sleep(WaitingMs);
TriedTimes++;
}
}
if (Config.VendorHmiConfig.Type != 2)
{
//If is not Siemens try to wait the HMI for a period of tyme. After that re-open the window
TriedTimes = 1;
while ((processes[0].MainWindowHandle == IntPtr.Zero || !isWindowReady(processes[0].MainWindowTitle)) && TriedTimes < TimesToTryKill)
{
processes = Process.GetProcessesByName(processname);
if (processes[0].MainWindowHandle == IntPtr.Zero)
{
Thread.Sleep(WaitingMs);
TriedTimes++;
}
}
}
else
{
//If is Siemens wait the HMI for an infinite time
while (processes[0].MainWindowHandle == IntPtr.Zero || !isWindowReady(processes[0].MainWindowTitle))
{
processes = Process.GetProcessesByName(processname);
if (processes[0].MainWindowHandle == IntPtr.Zero)
{
Thread.Sleep(WaitingMs);
}
}
else
{
//If is Siemens wait the HMI for an infinite time
while (processes[0].MainWindowHandle == IntPtr.Zero || !isWindowReady(processes[0].MainWindowTitle))
{
processes = Process.GetProcessesByName(processname);
if (processes[0].MainWindowHandle == IntPtr.Zero)
{
Thread.Sleep(WaitingMs);
}
}
}
//Kill the process if needed
@@ -204,9 +207,9 @@ namespace Active_Client.View
//Add arguments if is Fanuc NC
if (Config.VendorHmiConfig.Type == 1)
ncprocess.StartInfo.Arguments = "/H=" + Config.VendorHmiConfig.IpAddress + ":" + Config.VendorHmiConfig.Port + "/T=5";
//Start the Process
ncprocess.StartInfo.Arguments = "/H=" + Config.VendorHmiConfig.IpAddress + ":" + Config.VendorHmiConfig.Port + "/T=5";
//Start the Process
ncprocess.Start();
ncprocess.WaitForInputIdle(1000);
@@ -228,9 +231,9 @@ namespace Active_Client.View
ncprocess = processes[0];
Thread.Sleep(1000);
}
//Set the kill method
}
//Set the kill method
ncprocess.Exited += OnprocessExit;
//Set Window Started => true
@@ -255,32 +258,32 @@ namespace Active_Client.View
//Wait until window title become correct
//Remove the Frame Border
RemoveFrameBorder(ncprocess.MainWindowHandle);
//Maximize Window if is Osai
if (Config.VendorHmiConfig.Type == 3)
ShowWindow(ncprocess.MainWindowHandle, SW_SHOWMAXIMIZED);
RemoveFrameBorder(ncprocess.MainWindowHandle);
//Maximize Window if is Osai
if (Config.VendorHmiConfig.Type == 3)
ShowWindow(ncprocess.MainWindowHandle, SW_SHOWMAXIMIZED);
return 0;
}
// Start/Open the PROD Window
}
// Start/Open the PROD Window
public static int StartProdWindow(string EXEpath, string EXEname)
{
Process[] processes;
Process[] processes;
ProcKilled = false;
prodEXEname = EXEname;
//Set Window Started = false
prodwindowstarted = false;
//Read if exists a Process with correct name
processes = Process.GetProcessesByName(EXEname);
//If exists the Process
prodwindowstarted = false;
//Read if exists a Process with correct name
processes = Process.GetProcessesByName(EXEname);
//If exists the Process
if (processes.Length > 0)
{
//Set the first founded process
@@ -288,15 +291,15 @@ namespace Active_Client.View
prodprocess.WaitForInputIdle(1000);
//Wait until the process is started
TriedTimes = 1;
while ((processes[0].MainWindowHandle == IntPtr.Zero || !isWindowReady(processes[0].MainWindowTitle)) && TriedTimes < TimesToTryKill)
{
processes = Process.GetProcessesByName(EXEname);
if (processes[0].MainWindowHandle == IntPtr.Zero)
{
Thread.Sleep(WaitingMs);
TriedTimes++;
}
TriedTimes = 1;
while ((processes[0].MainWindowHandle == IntPtr.Zero || !isWindowReady(processes[0].MainWindowTitle)) && TriedTimes < TimesToTryKill)
{
processes = Process.GetProcessesByName(EXEname);
if (processes[0].MainWindowHandle == IntPtr.Zero)
{
Thread.Sleep(WaitingMs);
TriedTimes++;
}
}
//Kill the process if needed
@@ -320,8 +323,8 @@ namespace Active_Client.View
//Setup the Process path
prodprocess.StartInfo.FileName = EXEpath;
//Start the Process
//Start the Process
prodprocess.Start();
prodprocess.WaitForInputIdle();
@@ -343,18 +346,18 @@ namespace Active_Client.View
prodprocess = processes[0];
Thread.Sleep(1000);
}
}
//Set Window Started => true
prodwindowstarted = true;
//Show the Main Window & Hide the Others (Only Siemens)
ShowWindow(prodprocess.MainWindowHandle, WS_SHOW);
//Remove the Frame Border
RemoveFrameBorder(prodprocess.MainWindowHandle);
ShowWindow(prodprocess.MainWindowHandle, WS_SHOW);
//Remove the Frame Border
RemoveFrameBorder(prodprocess.MainWindowHandle);
return 0;
}
@@ -406,10 +409,10 @@ namespace Active_Client.View
if (Config.VendorHmiConfig.Type == 2)
KillAllProcessWithName(SiemensTool2Name);
}
//Kill/Close the PROD Window
}
//Kill/Close the PROD Window
public static void CloseProdWindow(bool forced)
{
Process[] processes;
@@ -419,8 +422,8 @@ namespace Active_Client.View
//Kill the Process
if (prodprocess != null && !prodprocess.HasExited)
prodprocess.Kill();
prodprocess.Kill();
//Read if exists a Process with correct name
processes = Process.GetProcessesByName(prodEXEname);
@@ -434,29 +437,29 @@ namespace Active_Client.View
Thread.Sleep(WaitingMs);
TriedTimes++;
}
}
}
//Show Nc Window
}
}
//Show Nc Window
public static void ShowNcWindow()
{
if (windowstarted)
{
ShowWindow(ncprocess.MainWindowHandle, SW_SHOWNOACTIVATE);
ResizeAndMoveNcWindow(ncWindowX, ncWindowY, ncWindowWidth, ncWindowHeight);
if (windowstarted)
{
ShowWindow(ncprocess.MainWindowHandle, SW_SHOWNOACTIVATE);
ResizeAndMoveNcWindow(ncWindowX, ncWindowY, ncWindowWidth, ncWindowHeight);
}
}
//Show Prod Window
}
//Show Prod Window
public static void ShowProdWindow()
{
if (prodwindowstarted)
if (prodwindowstarted)
{
ShowWindow(prodprocess.MainWindowHandle, SW_SHOWNOACTIVATE);
ResizeAndMoveProdWindow(HMI_WINDOW_POS_X_DEMO, HMI_WINDOW_POS_Y_DEMO, HMI_WINDOW_WIDTH_DEMO, HMI_WINDOW_HEIGHT_DEMO);
ShowWindow(prodprocess.MainWindowHandle, SW_SHOWNOACTIVATE);
ResizeAndMoveProdWindow(HMI_WINDOW_POS_X_DEMO, HMI_WINDOW_POS_Y_DEMO, HMI_WINDOW_WIDTH_DEMO, HMI_WINDOW_HEIGHT_DEMO);
}
}
@@ -466,9 +469,9 @@ namespace Active_Client.View
{
if (windowstarted)
ShowWindow(ncprocess.MainWindowHandle, WS_MINIMIZE);
}
//Show Prod Window
}
//Show Prod Window
public static void MinimizeProdWindow()
{
if (prodwindowstarted)
@@ -481,9 +484,9 @@ namespace Active_Client.View
{
if (windowstarted)
ShowWindow(ncprocess.MainWindowHandle, WS_HIDE);
}
//Hide Prod Window
}
//Hide Prod Window
public static void HideProdWindow()
{
if (prodwindowstarted)
@@ -544,21 +547,21 @@ namespace Active_Client.View
{
if (windowstarted)
ForceFocus(prodprocess.MainWindowHandle);
}
//Force NC Redraw
}
//Force NC Redraw
public static void ForceNcRedraw()
{
if (windowstarted)
{
HideNcWindow();
ShowNcWindow();
if (windowstarted)
{
HideNcWindow();
ShowNcWindow();
}
}
//Force STEP Focus
}
//Force STEP Focus
public static void ForceStepFocus()
{
if (MainViewHandle != IntPtr.Zero)
@@ -602,25 +605,25 @@ namespace Active_Client.View
MainViewHandle = Handle;
NcHND = NcHandle;
//Set the parent of the window
if (windowstarted)
SetParent(ncprocess.MainWindowHandle, NcHandle);
//Set the parent of the window
if (prodwindowstarted)
//Set the parent of the window
if (windowstarted)
SetParent(ncprocess.MainWindowHandle, NcHandle);
//Set the parent of the window
if (prodwindowstarted)
SetParent(prodprocess.MainWindowHandle, ProdHandle);
//Get the Process-Id
GetWindowThreadProcessId(MainViewHandle, out MainProcessPID);
if (windowstarted)
GetWindowThreadProcessId(ncprocess.MainWindowHandle, out NcProcessPID);
if (prodwindowstarted)
GetWindowThreadProcessId(MainViewHandle, out MainProcessPID);
if (windowstarted)
GetWindowThreadProcessId(ncprocess.MainWindowHandle, out NcProcessPID);
if (prodwindowstarted)
GetWindowThreadProcessId(prodProcess.MainWindowHandle, out ProdProcessPID);
//Resize the Window
if (windowstarted)
ResizeAndMoveNcWindow(ncWindowX, ncWindowY, ncWindowWidth, ncWindowHeight);
if (prodwindowstarted)
//Resize the Window
if (windowstarted)
ResizeAndMoveNcWindow(ncWindowX, ncWindowY, ncWindowWidth, ncWindowHeight);
if (prodwindowstarted)
ResizeAndMoveProdWindow(HMI_WINDOW_POS_X_DEMO, HMI_WINDOW_POS_Y_DEMO, HMI_WINDOW_WIDTH_DEMO, HMI_WINDOW_HEIGHT_DEMO);
//Start Keyboard Hook
@@ -638,17 +641,17 @@ namespace Active_Client.View
//Attach the new hook
procDelegate = new WinEventDelegate(WinEventProc);
hhook = SetWinEventHook(EVENT_SYSTEM_FOREGROUND, EVENT_SYSTEM_FOREGROUND, IntPtr.Zero, procDelegate, 0, 0, WINEVENT_OUTOFCONTEXT);
//Detach the hook
hhook = SetWinEventHook(EVENT_SYSTEM_FOREGROUND, EVENT_SYSTEM_FOREGROUND, IntPtr.Zero, procDelegate, 0, 0, WINEVENT_OUTOFCONTEXT);
//Detach the hook
if (hhookWindow != IntPtr.Zero)
UnhookWinEvent(hhookWindow);
//Attach the OSAI hook
if (windowstarted && Config.VendorHmiConfig.Type == 3)
{
procDelegateWindow = new WinEventDelegate(WinEventProcWindow);
hhookWindow = SetWinEventHook(EVENT_OBJECT_CREATE, EVENT_OBJECT_DESTROY, IntPtr.Zero, procDelegateWindow, 0, 0, WINEVENT_OUTOFCONTEXT);
//Attach the OSAI hook
if (windowstarted && (Config.VendorHmiConfig.Type == 2 || Config.VendorHmiConfig.Type == 3))
{
procDelegateWindow = new WinEventDelegate(WinEventProcWindow);
hhookWindow = SetWinEventHook(EVENT_OBJECT_CREATE, EVENT_OBJECT_DESTROY, IntPtr.Zero, procDelegateWindow, 0, 0, WINEVENT_OUTOFCONTEXT);
}
FollowingFocus = true;
@@ -683,11 +686,11 @@ namespace Active_Client.View
//Detach the hook
if (hhook != IntPtr.Zero)
UnhookWinEvent(hhook);
UnhookWinEvent(hhook);
if (hhookWindow != IntPtr.Zero)
UnhookWinEvent(hhookWindow);
UnhookWinEvent(hhookWindow);
FollowingFocus = false;
if (keybhook != IntPtr.Zero)
@@ -702,10 +705,10 @@ namespace Active_Client.View
if (Config.VendorHmiConfig.FollowNcWindow && FollowNCThread != null)
FollowNCThread.Abort();
}
//Take screenshot of the Nc Window
}
//Take screenshot of the Nc Window
public static void CaptureHMI()
{
RECT rc = new RECT();
@@ -740,7 +743,7 @@ namespace Active_Client.View
}
public static void ActivateNcWindow()
{
{
SetForegroundWindow(ncprocess.MainWindowHandle);
}
@@ -752,17 +755,17 @@ namespace Active_Client.View
//Show virtual Keyboard in last position
public static void reOpenVirtualKeyboard()
{
Task.Run(() =>
Task.Run(() =>
{
Thread.Sleep(100);
if (KeyboardVisible && LastKeybPoint != null && !IsWindowVisible(KeyboardHandle))
openVirtualKeyboard(LastKeybPoint, false, true);
});
}
//Open/Show virtual Keyboard
}
//Open/Show virtual Keyboard
public static void openVirtualKeyboard(CfrRect LastPoint, Boolean forcedCenterPosition, Boolean forcedLastPosition)
{
//Save last Point
@@ -772,7 +775,7 @@ namespace Active_Client.View
Point Position = ElaborateKeyboardPosition(LastPoint, forcedCenterPosition, forcedLastPosition);
//Run in a Task (Don't stop Browser UI)
Task.Run(() =>
Task.Run(() =>
{
//Open & Find Keyboard
@@ -827,7 +830,7 @@ namespace Active_Client.View
//Setup variable "Keyboard visible"
KeyboardVisible = true;
});
});
}
@@ -849,13 +852,13 @@ namespace Active_Client.View
processes[i].Kill();
KeyboardPID = 0;
KeyboardHandle = IntPtr.Zero;
}
//Hide virtual keyboard
KeyboardHandle = IntPtr.Zero;
}
//Hide virtual keyboard
public static void hideVirtualKeyboard()
{
if (KeyboardHandle != IntPtr.Zero)
@@ -891,24 +894,24 @@ namespace Active_Client.View
//If flag forcedCenterPosition is true -> put in center-bottom position
else if (forcedCenterPosition)
{
LastKeybPosition = new Point()
LastKeybPosition = new Point()
{
X = (Screen.PrimaryScreen.Bounds.Width / 2) - (Constants.KEYB_WIDTH / 2),
Y = Screen.PrimaryScreen.Bounds.Height - Constants.KEYB_HEIGHT
Y = Screen.PrimaryScreen.Bounds.Height - Constants.KEYB_HEIGHT
};
return LastKeybPosition;
}
//In all others calc the position from HTML Node changed
else
{
//
//Setup position Y
{
//
//Setup position Y
/*
* 1) try to put the keyboard below the html object. If there's not enough space (2)
* 2) try to put above the html object. If there's not enough space yet (3)
* 3) put close to the bottom edge of the screen
*/
*/
keybY = ObjectPoint.Y + ObjectPoint.Height + Constants.KEYB_Y_OFFSET;
if ((keybY + Constants.KEYB_HEIGHT) > Screen.PrimaryScreen.Bounds.Height)
keybY = ObjectPoint.Y - Constants.KEYB_Y_OFFSET - Constants.KEYB_HEIGHT;
@@ -931,8 +934,8 @@ namespace Active_Client.View
//Setup the Final Position
LastKeybPosition = new Point() { X = keybX, Y = keybY };
return LastKeybPosition;
}
}
}
@@ -941,8 +944,8 @@ namespace Active_Client.View
private static void deleteMenuKeyboard(IntPtr Handle)
{
// NO Control-Box + NO resize window
SetWindowLong(Handle, GWL_STYLE, (GetWindowLong(Handle, GWL_STYLE) & ~0x80000 & ~0x40000));
SetWindowLong(Handle, GWL_STYLE, (GetWindowLong(Handle, GWL_STYLE) & ~0x80000 & ~0x40000));
}
@@ -969,112 +972,114 @@ namespace Active_Client.View
//Set the window Handle Parameter
KeyboardHandle = processes[0].MainWindowHandle;
}
}
#endregion
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
#region WINDOWS_EVENT_OVERRIDE
private static void WinEventProcWindow(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
{
//Read the actual ID of the Process
private static void WinEventProcWindow(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
{
//Read the actual ID of the Process
GetWindowThreadProcessId(hwnd, out ActualWindowPID);
if (ActualWindowPID == NcProcessPID && NcProcessPID != 0 && hWinEventHook != ncprocess.MainWindowHandle)
{
//Read the style of the window
ActiveWindowNCWindowStyle = GetWindowLong(hwnd, GWL_STYLE);
//Find if it has the border
ActiveWindowNCWindowBorder = (ActiveWindowNCWindowStyle & WS_BORDER);
//if it has the border and a title execute focus
if (ActiveWindowNCWindowStyle != 0 && ActiveWindowNCWindowBorder == WS_BORDER && ReadWindowTitle(hwnd) != "")
{
if (eventType == EVENT_OBJECT_CREATE)
{
SetForegroundWindow(ncprocess.MainWindowHandle);
}
else if (eventType == EVENT_OBJECT_DESTROY)
SetWindowPos(MainViewHandle, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_SHOWWINDOW);
}
}
if (ActualWindowPID == NcProcessPID && NcProcessPID != 0 && hWinEventHook != ncprocess.MainWindowHandle)
{
//Read the style of the window
ActiveWindowNCWindowStyle = GetWindowLong(hwnd, GWL_STYLE);
//Find if it has the border
ActiveWindowNCWindowBorder = (ActiveWindowNCWindowStyle & WS_BORDER);
ActiveWindowNCPopUp = ((uint)ActiveWindowNCWindowStyle & WS_POPUP);
//if it has the border and a title execute focus
if (ActiveWindowNCWindowStyle != 0 && (((ActiveWindowNCWindowBorder == WS_BORDER) && ReadWindowTitle(hwnd) != "") || (ActiveWindowNCPopUp == WS_POPUP) ))
{
if (eventType == EVENT_OBJECT_CREATE)
{
SetForegroundWindow(ncprocess.MainWindowHandle);
}
else if (eventType == EVENT_OBJECT_DESTROY)
SetWindowPos(MainViewHandle, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_SHOWWINDOW);
}
}
}
//Following Nc Window Method
private static void WinEventProc(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
{
ActualHND = hwnd;
//Read the actual ID of the Process
GetWindowThreadProcessId(hwnd, out ActualPID);
//Delete the TOPMOST Style of the Window
if (NcProcessPID != 0 && ActualPID == NcProcessPID)
{
//Read the style of the window
ActiveNCWindowStyle = GetWindowLong(hwnd, GWL_STYLE);
//Find if it has the border
ActiveNCWindowBorder = (ActiveNCWindowStyle & WS_BORDER);
//if it has the border and a title execute focus
if (ActiveNCWindowStyle != 0 && ActiveNCWindowBorder == WS_BORDER && ReadWindowTitle(hwnd) != "" && hwnd != ncprocess.MainWindowHandle)
{
SetWindowPos(ncprocess.MainWindowHandle, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_SHOWWINDOW);
}
}
//If the PID is the STEP-HMI Process
if (ActualPID == MainProcessPID)
{
if (!IsIconic(MainViewHandle))
{
//Show Virtual keyboard
if (Config.ClientConfig.ShowVirtualKeyboard && Environment.OSVersion.Version.Major < 10)
reOpenVirtualKeyboard();
}
}
//If the PID is the NC-HMI Process
else if ((ActualPID == NcProcessPID && NcProcessPID != 0) || (ActualPID == ProdProcessPID && ProdProcessPID != 0))
{
//Hide the TaskBar
if (Environment.OSVersion.Version.Major < 10)
HideTaskBar();
}
//If the PID is OTHER Process
else
{
//Show the TaskBar
if (Environment.OSVersion.Version.Major < 10)
ShowTaskBar();
//SetForegroundWindow(hwnd);
//Hide Virtual keyboard
if (Config.ClientConfig.ShowVirtualKeyboard && Environment.OSVersion.Version.Major < 10 && KeyboardPID != 0 && ActualPID != KeyboardPID)
closeVirtualKeyboard();
}
//Save the Last Hooked PID
LastHookedHND = ActualHND;
LastHookedPID = ActualPID;
//Save the Last TimeStamp
LastdwmsEventTime = dwmsEventTime;
}
//Hook Keyboard Handle
{
ActualHND = hwnd;
//Read the actual ID of the Process
GetWindowThreadProcessId(hwnd, out ActualPID);
//Delete the TOPMOST Style of the Window
if (NcProcessPID != 0 && ActualPID == NcProcessPID)
{
//Read the style of the window
ActiveNCWindowStyle = GetWindowLong(hwnd, GWL_STYLE);
//Find if it has the border
ActiveNCWindowBorder = (ActiveNCWindowStyle & WS_BORDER);
ActiveNCWindowNCPopUp = ((uint)ActiveWindowNCWindowStyle & WS_POPUP);
//if it has the border and a title execute focus
if (ActiveNCWindowStyle != 0 && ((ActiveNCWindowBorder == WS_BORDER && ReadWindowTitle(hwnd) != "") || (ActiveNCWindowNCPopUp == WS_POPUP)) && hwnd != ncprocess.MainWindowHandle)
{
SetWindowPos(ncprocess.MainWindowHandle, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_SHOWWINDOW);
}
}
//If the PID is the STEP-HMI Process
if (ActualPID == MainProcessPID)
{
if (!IsIconic(MainViewHandle))
{
//Show Virtual keyboard
if (Config.ClientConfig.ShowVirtualKeyboard && Environment.OSVersion.Version.Major < 10)
reOpenVirtualKeyboard();
}
}
//If the PID is the NC-HMI Process
else if ((ActualPID == NcProcessPID && NcProcessPID != 0) || (ActualPID == ProdProcessPID && ProdProcessPID != 0))
{
//Hide the TaskBar
if (Environment.OSVersion.Version.Major < 10)
HideTaskBar();
}
//If the PID is OTHER Process
else
{
//Show the TaskBar
if (Environment.OSVersion.Version.Major < 10)
ShowTaskBar();
//SetForegroundWindow(hwnd);
//Hide Virtual keyboard
if (Config.ClientConfig.ShowVirtualKeyboard && Environment.OSVersion.Version.Major < 10 && KeyboardPID != 0 && ActualPID != KeyboardPID)
closeVirtualKeyboard();
}
//Save the Last Hooked PID
LastHookedHND = ActualHND;
LastHookedPID = ActualPID;
//Save the Last TimeStamp
LastdwmsEventTime = dwmsEventTime;
}
//Hook Keyboard Handle
private static void KeybEventProc(int nCode, IntPtr wParam, IntPtr lParam)
{
int Key = Marshal.ReadInt32(lParam);
@@ -1157,16 +1162,16 @@ namespace Active_Client.View
else if (resize)
MoveWindow(WindowHandle, ParentRct.Left, ParentRct.Top, LastWidth, LastHeight, true);
}
}
//Read Window Title
private static string ReadWindowTitle(IntPtr hwnd)
{
int length = GetWindowTextLength(hwnd);
StringBuilder sb = new StringBuilder(length + 1);
GetWindowText(hwnd, sb, sb.Capacity);
return sb.ToString().Trim();
}
//Read Window Title
private static string ReadWindowTitle(IntPtr hwnd)
{
int length = GetWindowTextLength(hwnd);
StringBuilder sb = new StringBuilder(length + 1);
GetWindowText(hwnd, sb, sb.Capacity);
return sb.ToString().Trim();
}
@@ -1334,13 +1339,13 @@ namespace Active_Client.View
//Set as foreground
SetForegroundWindow(Handle);
}
}
}
private static void RemoveFrameBorder(IntPtr Handle)
{
int style = GetWindowLong(Handle, GWL_STYLE);
SetWindowLong(Handle, GWL_STYLE, (style & ~WS_CAPTION & ~WS_THICKFRAME));
{
int style = GetWindowLong(Handle, GWL_STYLE);
SetWindowLong(Handle, GWL_STYLE, (style & ~WS_CAPTION & ~WS_THICKFRAME));
}
#endregion
@@ -1398,19 +1403,19 @@ namespace Active_Client.View
//NC Following Method
public static void FollowNcBehaviour()
{
{
uint process = 0;
try
{
while (true)
{
GetWindowThreadProcessId(GetForegroundWindow(), out process);
if (state != NcState.SHOW && state != NcState.SHOWPROD && (process == NcProcessPID || process == ProdProcessPID))
{
GetWindowThreadProcessId(GetForegroundWindow(), out process);
if (state != NcState.SHOW && state != NcState.SHOWPROD && (process == NcProcessPID || process == ProdProcessPID))
mainFrm.HideAUXWindow();
else if (state == NcState.SHOWPROD && process == NcProcessPID && prodwindowstarted)
else if (state == NcState.SHOWPROD && process == NcProcessPID && prodwindowstarted)
mainFrm.ShowProdWindow();
else if (state == NcState.SHOW && process == ProdProcessPID && windowstarted)
else if (state == NcState.SHOW && process == ProdProcessPID && windowstarted)
mainFrm.ShowNCWindow();
if (Process.GetProcessesByName(processname).Length == 0)
@@ -1430,15 +1435,15 @@ namespace Active_Client.View
//Show Task Bar
ShowTaskBar();
//Exit from Application
if (mainFrm.InvokeRequired)
mainFrm.Invoke((MethodInvoker)delegate ()
{
mainFrm.sendClose();
});
else
{
mainFrm.sendClose();
//Exit from Application
if (mainFrm.InvokeRequired)
mainFrm.Invoke((MethodInvoker)delegate ()
{
mainFrm.sendClose();
});
else
{
mainFrm.sendClose();
}
}
@@ -1477,7 +1482,7 @@ namespace Active_Client.View
private const uint EVENT_OBJECT_FOCUS = 0x8005;
private const uint EVENT_SYSTEM_FOREGROUND = 0x0003;
private const uint EVENT_OBJECT_CREATE = 0x8000;
private const uint EVENT_OBJECT_DESTROY = 0x8001;
private const uint EVENT_OBJECT_DESTROY = 0x8001;
private const uint WINEVENT_OUTOFCONTEXT = 0;
private const UInt32 SWP_NOSIZE = 0x0001;
private const UInt32 SWP_NOMOVE = 0x0002;
@@ -1560,7 +1565,7 @@ namespace Active_Client.View
[return: MarshalAs(UnmanagedType.I4)]
static extern int GetWindowText(IntPtr hWnd, StringBuilder text, int count);
[DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
[DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
static extern int GetWindowTextLength(IntPtr hWnd);
[DllImport("user32.dll")]
@@ -1573,8 +1578,8 @@ namespace Active_Client.View
[DllImport("user32.dll")]
static extern IntPtr SetWindowsHookEx(int idHook, keyboardHookProc callback, IntPtr hInstance, uint threadId);
delegate void keyboardHookProc(int nCode, IntPtr wParam, IntPtr lParam);
delegate void keyboardHookProc(int nCode, IntPtr wParam, IntPtr lParam);
[DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
private static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, IntPtr lParam);
@@ -1640,9 +1645,9 @@ namespace Active_Client.View
[DllImport("user32", EntryPoint = "GetMenuItemCount", SetLastError = true,
CharSet = CharSet.Unicode, ExactSpelling = true,
CallingConvention = CallingConvention.Winapi)]
private static extern int GetMenuItemCount(IntPtr hMenu);
private static extern int GetMenuItemCount(IntPtr hMenu);
[StructLayout(LayoutKind.Sequential)]
public struct RECT
{
Step.Config/ServerConfigController.cs
+2 -2
View File
@@ -173,7 +173,7 @@ namespace Step.Config
}
}
public static bool CheckAreaStatus(string areaName)
public static bool CheckAreaStatus(string areaName)
{ // Get Area status ( enabled field) by name
switch (areaName)
{
@@ -211,7 +211,7 @@ namespace Step.Config
}
private static void ReadScadaFile()
{
{
DirectoryInfo d = new DirectoryInfo(SCADA_DIRECTORY);
FileInfo[] files = d.GetFiles("*.xml");
Step.Database/DatabaseContext.cs
+1 -1
View File
@@ -66,7 +66,7 @@ namespace Step.Database
ServiceController service = new ServiceController("MySQL");
try
{
TimeSpan timeout = TimeSpan.FromSeconds(2);
TimeSpan timeout = TimeSpan.FromSeconds(DATABASE_PROCESS_TIMEOUT);
service.WaitForStatus(ServiceControllerStatus.Running, timeout);
}
Step.Model/Constants.cs
+1
View File
@@ -7,6 +7,7 @@ namespace Step.Model
{
public static string NOT_FOUND_ALARM_MESSAGE = "Alarm_id_{0} : Message not found";
public static string NOT_CONFIGURATED_ALARM_MESSAGE = "Alarm_id_{0} : Message not configurated";
public static int DATABASE_PROCESS_TIMEOUT = 5;
//Costanti Tipo metreica utensili
public const string RADIUS_METRIC = "RADIUS";
Step.NC/NcHandler.cs
+11
View File
@@ -1226,6 +1226,9 @@ namespace Step.NC
// Choose which list contains the maximum number of elements
int max = layer.Buttons.Count();
if (layer.Labels.Count() > max)
max = layer.Images.Count();
if (layer.Labels.Count() > max)
max = layer.Images.Count();
@@ -1341,5 +1344,13 @@ namespace Step.NC
return true;
}
public bool ResetMaintenanceCounter(uint counter)
{
CmsError cmsError = numericalControl.PLC_WResetMachineCounters(counter);
if (cmsError.IsError())
return false;
return true;
}
}
}
Step.UI/Dialogs/ResetCountersForm.Designer.cs
Generated
+17 -44
View File
@@ -29,6 +29,7 @@
private void InitializeComponent()
{
this.Panel1 = new System.Windows.Forms.Panel();
this.labelValue = new System.Windows.Forms.Label();
this.textBoxHours = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.comboBoxSpindle = new System.Windows.Forms.ComboBox();
@@ -37,9 +38,6 @@
this.Label_NewPassword = new System.Windows.Forms.Label();
this.TableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.OK_Pwd_Button = new System.Windows.Forms.Button();
this.textBoxNewVal = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.labelValue = new System.Windows.Forms.Label();
this.Panel1.SuspendLayout();
this.TableLayoutPanel1.SuspendLayout();
this.SuspendLayout();
@@ -52,8 +50,6 @@
this.Panel1.BackColor = System.Drawing.Color.White;
this.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.Panel1.Controls.Add(this.labelValue);
this.Panel1.Controls.Add(this.textBoxNewVal);
this.Panel1.Controls.Add(this.label3);
this.Panel1.Controls.Add(this.textBoxHours);
this.Panel1.Controls.Add(this.label2);
this.Panel1.Controls.Add(this.comboBoxSpindle);
@@ -62,9 +58,20 @@
this.Panel1.Controls.Add(this.Label_NewPassword);
this.Panel1.Location = new System.Drawing.Point(-6, -2);
this.Panel1.Name = "Panel1";
this.Panel1.Size = new System.Drawing.Size(327, 177);
this.Panel1.Size = new System.Drawing.Size(327, 142);
this.Panel1.TabIndex = 4;
//
// labelValue
//
this.labelValue.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelValue.Location = new System.Drawing.Point(116, 73);
this.labelValue.Name = "labelValue";
this.labelValue.Size = new System.Drawing.Size(186, 26);
this.labelValue.TabIndex = 15;
this.labelValue.Tag = "Password";
this.labelValue.Text = "Actual Value";
this.labelValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// textBoxHours
//
this.textBoxHours.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -114,7 +121,7 @@
// TextBox_Password
//
this.TextBox_Password.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.TextBox_Password.Location = new System.Drawing.Point(116, 134);
this.TextBox_Password.Location = new System.Drawing.Point(116, 102);
this.TextBox_Password.Name = "TextBox_Password";
this.TextBox_Password.PasswordChar = '*';
this.TextBox_Password.Size = new System.Drawing.Size(186, 26);
@@ -126,7 +133,7 @@
//
this.Label_NewPassword.AutoSize = true;
this.Label_NewPassword.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label_NewPassword.Location = new System.Drawing.Point(41, 137);
this.Label_NewPassword.Location = new System.Drawing.Point(41, 105);
this.Label_NewPassword.Name = "Label_NewPassword";
this.Label_NewPassword.Size = new System.Drawing.Size(69, 18);
this.Label_NewPassword.TabIndex = 7;
@@ -140,7 +147,7 @@
this.TableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.TableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.TableLayoutPanel1.Controls.Add(this.OK_Pwd_Button, 1, 0);
this.TableLayoutPanel1.Location = new System.Drawing.Point(79, 186);
this.TableLayoutPanel1.Location = new System.Drawing.Point(79, 151);
this.TableLayoutPanel1.Name = "TableLayoutPanel1";
this.TableLayoutPanel1.RowCount = 1;
this.TableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
@@ -158,49 +165,17 @@
this.OK_Pwd_Button.Text = "Reset";
this.OK_Pwd_Button.Click += new System.EventHandler(this.OK_Pwd_Button_Click);
//
// textBoxNewVal
//
this.textBoxNewVal.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBoxNewVal.Location = new System.Drawing.Point(116, 102);
this.textBoxNewVal.Name = "textBoxNewVal";
this.textBoxNewVal.Size = new System.Drawing.Size(186, 26);
this.textBoxNewVal.TabIndex = 13;
this.textBoxNewVal.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label3.Location = new System.Drawing.Point(34, 105);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(76, 18);
this.label3.TabIndex = 14;
this.label3.Tag = "Password";
this.label3.Text = "New Value";
//
// labelValue
//
this.labelValue.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelValue.Location = new System.Drawing.Point(116, 73);
this.labelValue.Name = "labelValue";
this.labelValue.Size = new System.Drawing.Size(186, 26);
this.labelValue.TabIndex = 15;
this.labelValue.Tag = "Password";
this.labelValue.Text = "Actual Value";
this.labelValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// ResetCountersForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(310, 244);
this.ClientSize = new System.Drawing.Size(310, 209);
this.Controls.Add(this.Panel1);
this.Controls.Add(this.TableLayoutPanel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "ResetCountersForm";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Reset Counters";
this.Load += new System.EventHandler(this.PasswordForm_Load);
@@ -222,8 +197,6 @@
internal System.Windows.Forms.Label label1;
internal System.Windows.Forms.TextBox textBoxHours;
internal System.Windows.Forms.Label label2;
internal System.Windows.Forms.TextBox textBoxNewVal;
internal System.Windows.Forms.Label label3;
internal System.Windows.Forms.Label labelValue;
}
}
Step.UI/Dialogs/ResetCountersForm.cs
+7 -13
View File
@@ -1,4 +1,5 @@
using Step.NC;
using CMS_CORE_Library.Models;
using Step.NC;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -8,6 +9,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using static CMS_CORE_Library.Models.DataStructures;
namespace Step.UI
{
@@ -72,14 +74,6 @@ namespace Step.UI
return;
}
uint val = 0;
bool isNumber = uint.TryParse(textBoxNewVal.Text, out val);
if (!isNumber)
{
MessageBox.Show("New-Value must be a number", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
// sfrutto password delle teste, passando la testa 0
if (!Utils.CandiesController.HeadsPasswordCheck(psw, Convert.ToInt32(Matricola), 0))
{
@@ -87,7 +81,7 @@ namespace Step.UI
return;
}
if (!Nc.ResetMachineWTime(val))
if (!Nc.ResetMaintenanceCounter((uint) comboBoxSpindle.SelectedIndex))
{
MessageBox.Show("Error While Resetting time", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
@@ -96,7 +90,6 @@ namespace Step.UI
MessageBox.Show("Time resetted", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
ReadHours();
TextBox_Password.Text = "";
textBoxNewVal.Text = "";
}
private void ReadHours()
@@ -111,15 +104,16 @@ namespace Step.UI
uint realVal = 0;
uint secs = 0;
uint hours = 0;
;
if (!Nc.ReadMachineWTime(out realVal))
List<CounterModel> Contatori = new List<CounterModel>();
if (Nc.GetMainenancesCounter(out Contatori) != NO_ERROR)
{
MessageBox.Show("Error While reading time", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
else
{
realVal = Contatori.FirstOrDefault(X => X.Id == (comboBoxSpindle.SelectedIndex - 1)).Value;
uint min = Convert.ToUInt32(Math.Floor((double)realVal / 60));
secs = realVal % 60;
if (min >= 60)
Step.UI/Dialogs/ResetCountersForm.resx
+1777
View File
File diff suppressed because it is too large Load Diff
Step.UI/Dialogs/ResetMachineHoursForm.Designer.cs
Generated
+212
View File
@@ -0,0 +1,212 @@
namespace Step.UI
{
partial class ResetMachineHoursForm
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ResetMachineHoursForm));
this.Panel1 = new System.Windows.Forms.Panel();
this.labelValue = new System.Windows.Forms.Label();
this.textBoxNewVal = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.textBoxHours = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.TextBox_Password = new System.Windows.Forms.TextBox();
this.Label_NewPassword = new System.Windows.Forms.Label();
this.TableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.Reload_Button = new System.Windows.Forms.Button();
this.OK_Pwd_Button = new System.Windows.Forms.Button();
this.Panel1.SuspendLayout();
this.TableLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
// Panel1
//
this.Panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.Panel1.BackColor = System.Drawing.Color.White;
this.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.Panel1.Controls.Add(this.labelValue);
this.Panel1.Controls.Add(this.textBoxNewVal);
this.Panel1.Controls.Add(this.label3);
this.Panel1.Controls.Add(this.textBoxHours);
this.Panel1.Controls.Add(this.label2);
this.Panel1.Controls.Add(this.TextBox_Password);
this.Panel1.Controls.Add(this.Label_NewPassword);
this.Panel1.Location = new System.Drawing.Point(-6, -2);
this.Panel1.Name = "Panel1";
this.Panel1.Size = new System.Drawing.Size(327, 136);
this.Panel1.TabIndex = 4;
//
// labelValue
//
this.labelValue.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelValue.Location = new System.Drawing.Point(116, 36);
this.labelValue.Name = "labelValue";
this.labelValue.Size = new System.Drawing.Size(186, 26);
this.labelValue.TabIndex = 15;
this.labelValue.Tag = "Password";
this.labelValue.Text = "Actual Value";
this.labelValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// textBoxNewVal
//
this.textBoxNewVal.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBoxNewVal.Location = new System.Drawing.Point(116, 65);
this.textBoxNewVal.Name = "textBoxNewVal";
this.textBoxNewVal.Size = new System.Drawing.Size(186, 26);
this.textBoxNewVal.TabIndex = 13;
this.textBoxNewVal.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label3.Location = new System.Drawing.Point(34, 68);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(76, 18);
this.label3.TabIndex = 14;
this.label3.Tag = "Password";
this.label3.Text = "New Value";
//
// textBoxHours
//
this.textBoxHours.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBoxHours.Location = new System.Drawing.Point(116, 7);
this.textBoxHours.Name = "textBoxHours";
this.textBoxHours.ReadOnly = true;
this.textBoxHours.Size = new System.Drawing.Size(186, 26);
this.textBoxHours.TabIndex = 11;
this.textBoxHours.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.Location = new System.Drawing.Point(23, 10);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(87, 18);
this.label2.TabIndex = 12;
this.label2.Tag = "Password";
this.label2.Text = "Actual Value";
//
// TextBox_Password
//
this.TextBox_Password.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.TextBox_Password.Location = new System.Drawing.Point(116, 97);
this.TextBox_Password.Name = "TextBox_Password";
this.TextBox_Password.PasswordChar = '*';
this.TextBox_Password.Size = new System.Drawing.Size(186, 26);
this.TextBox_Password.TabIndex = 1;
this.TextBox_Password.UseSystemPasswordChar = true;
this.TextBox_Password.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBox_Password_KeyDown);
//
// Label_NewPassword
//
this.Label_NewPassword.AutoSize = true;
this.Label_NewPassword.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label_NewPassword.Location = new System.Drawing.Point(41, 100);
this.Label_NewPassword.Name = "Label_NewPassword";
this.Label_NewPassword.Size = new System.Drawing.Size(69, 18);
this.Label_NewPassword.TabIndex = 7;
this.Label_NewPassword.Tag = "Password";
this.Label_NewPassword.Text = "Password";
//
// TableLayoutPanel1
//
this.TableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.TableLayoutPanel1.ColumnCount = 2;
this.TableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.TableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.TableLayoutPanel1.Controls.Add(this.Reload_Button, 0, 0);
this.TableLayoutPanel1.Controls.Add(this.OK_Pwd_Button, 1, 0);
this.TableLayoutPanel1.Location = new System.Drawing.Point(79, 145);
this.TableLayoutPanel1.Name = "TableLayoutPanel1";
this.TableLayoutPanel1.RowCount = 1;
this.TableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.TableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 46F));
this.TableLayoutPanel1.Size = new System.Drawing.Size(219, 46);
this.TableLayoutPanel1.TabIndex = 3;
//
// Reload_Button
//
this.Reload_Button.Anchor = System.Windows.Forms.AnchorStyles.None;
this.Reload_Button.Location = new System.Drawing.Point(3, 3);
this.Reload_Button.Name = "Reload_Button";
this.Reload_Button.Size = new System.Drawing.Size(103, 39);
this.Reload_Button.TabIndex = 6;
this.Reload_Button.Text = "Reload";
this.Reload_Button.Click += new System.EventHandler(this.Reload_Button_Click);
//
// OK_Pwd_Button
//
this.OK_Pwd_Button.Anchor = System.Windows.Forms.AnchorStyles.None;
this.OK_Pwd_Button.Location = new System.Drawing.Point(112, 3);
this.OK_Pwd_Button.Name = "OK_Pwd_Button";
this.OK_Pwd_Button.Size = new System.Drawing.Size(103, 39);
this.OK_Pwd_Button.TabIndex = 5;
this.OK_Pwd_Button.Text = "Reset";
this.OK_Pwd_Button.Click += new System.EventHandler(this.OK_Pwd_Button_Click);
//
// ResetMachineHoursForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(310, 203);
this.Controls.Add(this.Panel1);
this.Controls.Add(this.TableLayoutPanel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "ResetMachineHoursForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Reset Machine Working-Hours";
this.Load += new System.EventHandler(this.PasswordForm_Load);
this.Panel1.ResumeLayout(false);
this.Panel1.PerformLayout();
this.TableLayoutPanel1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
internal System.Windows.Forms.Panel Panel1;
internal System.Windows.Forms.TextBox TextBox_Password;
internal System.Windows.Forms.Label Label_NewPassword;
internal System.Windows.Forms.TableLayoutPanel TableLayoutPanel1;
internal System.Windows.Forms.Button OK_Pwd_Button;
internal System.Windows.Forms.TextBox textBoxHours;
internal System.Windows.Forms.Label label2;
internal System.Windows.Forms.TextBox textBoxNewVal;
internal System.Windows.Forms.Label label3;
internal System.Windows.Forms.Label labelValue;
internal System.Windows.Forms.Button Reload_Button;
}
}
Step.UI/Dialogs/ResetMachineHoursForm.cs
+121
View File
@@ -0,0 +1,121 @@
using Step.NC;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Step.UI
{
public partial class ResetMachineHoursForm : Form
{
private NcHandler Nc;
private String Matricola;
public ResetMachineHoursForm()
{
InitializeComponent();
}
public void setNcData(String matr, NcHandler Nch)
{
this.Matricola = matr;
this.Text = "Reset Machine Working-Hours - " + this.Matricola;
this.Nc = Nch;
}
private void Cancel_Pwd_Button_Click(object sender, EventArgs e)
{
this.DialogResult = DialogResult.Cancel;
this.Close();
}
private void OK_Pwd_Button_Click(object sender, EventArgs e)
{
checkPSW(TextBox_Password.Text);
}
private void PasswordForm_Load(object sender, EventArgs e)
{
TextBox_Password.Text = "";
this.ActiveControl = textBoxNewVal;
ReadHours();
}
private void TextBox_Password_KeyDown(object sender, KeyEventArgs e)
{
checkPSW(TextBox_Password.Text);
}
private void Reload_Button_Click(object sender, EventArgs e)
{
ReadHours();
}
private void checkPSW(String psw)
{
if(Matricola== null || Matricola.Trim() == "" || Convert.ToInt32(Matricola) <= 0)
{
MessageBox.Show("Machine ID non correct", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
uint val = 0;
bool isNumber = uint.TryParse(textBoxNewVal.Text, out val);
if (!isNumber)
{
MessageBox.Show("New-Value must be a number", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
// sfrutto password delle teste, passando la testa 0
if (!Utils.CandiesController.HeadsPasswordCheck(psw, Convert.ToInt32(Matricola), 0))
{
MessageBox.Show("Wrong password", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
if (!Nc.ResetMachineWTime(val))
{
MessageBox.Show("Error While Resetting time", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
MessageBox.Show("Time resetted", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
ReadHours();
TextBox_Password.Text = "";
textBoxNewVal.Text = "";
}
private void ReadHours()
{
uint realVal = 0;
uint secs = 0;
uint hours = 0;
;
if (!Nc.ReadMachineWTime(out realVal))
{
MessageBox.Show("Error While reading time", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
else
{
uint min = Convert.ToUInt32(Math.Floor((double)realVal / 60));
secs = realVal % 60;
if (min >= 60)
{
hours = Convert.ToUInt32(Math.Floor((double)min / 60));
min = min % 60;
}
textBoxHours.Text = hours.ToString() + "h " + min.ToString() + "m " + secs.ToString() + "s";
labelValue.Text = realVal.ToString();
}
}
}
}
Step.UI/Dialogs/ResetMachineHoursForm.resx
+1897
View File
File diff suppressed because it is too large Load Diff
Step.UI/Dialogs/ResetSpindleForm.Designer.cs
Generated
+2 -1
View File
@@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ResetSpindleForm));
this.Panel1 = new System.Windows.Forms.Panel();
this.textBoxHours = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
@@ -179,10 +180,10 @@
this.Controls.Add(this.Panel1);
this.Controls.Add(this.TableLayoutPanel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "ResetSpindleForm";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Reset Spindle Active Time";
this.Load += new System.EventHandler(this.PasswordForm_Load);
Step.UI/Dialogs/ResetSpindleForm.resx
+1777
View File
File diff suppressed because it is too large Load Diff
Step.UI/ServerControlWindow.Designer.cs
Generated
+40 -18
View File
@@ -67,6 +67,8 @@ namespace Step.UI
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.resetSpindleHoursToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.resetCountersToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.resetMachineWorkingHoursToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.resetMachineWorkingHoursToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.NotifyIconMenu.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.panel1.SuspendLayout();
@@ -80,7 +82,7 @@ namespace Step.UI
this.StepNotifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("StepNotifyIcon.Icon")));
this.StepNotifyIcon.Text = "Active";
this.StepNotifyIcon.Visible = true;
this.StepNotifyIcon.Click += new System.EventHandler(this.NotifyIcon_Click);
this.StepNotifyIcon.DoubleClick += new System.EventHandler(this.NotifyIcon_Click);
//
// NotifyIconMenu
//
@@ -99,7 +101,8 @@ namespace Step.UI
this.goBackToStandardModeToolStripMenuItem,
this.toolStripSeparator,
this.resetSpindleHoursToolStripMenuItem,
this.resetCountersToolStripMenuItem});
this.resetCountersToolStripMenuItem,
this.resetMachineWorkingHoursToolStripMenuItem});
this.adminMachineToolStripMenuItem.Name = "adminMachineToolStripMenuItem";
this.adminMachineToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
this.adminMachineToolStripMenuItem.Text = "Service";
@@ -108,7 +111,7 @@ namespace Step.UI
//
this.passwordToolStripMenuItem.Image = global::Step.UI.Properties.Resources.Apps_Lock_icon;
this.passwordToolStripMenuItem.Name = "passwordToolStripMenuItem";
this.passwordToolStripMenuItem.Size = new System.Drawing.Size(214, 22);
this.passwordToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
this.passwordToolStripMenuItem.Text = "Password";
this.passwordToolStripMenuItem.Click += new System.EventHandler(this.passwordToolStripMenuItem_Click);
//
@@ -116,7 +119,7 @@ namespace Step.UI
//
this.goBackToStandardModeToolStripMenuItem.Image = global::Step.UI.Properties.Resources.Apps_Unlock_icon;
this.goBackToStandardModeToolStripMenuItem.Name = "goBackToStandardModeToolStripMenuItem";
this.goBackToStandardModeToolStripMenuItem.Size = new System.Drawing.Size(214, 22);
this.goBackToStandardModeToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
this.goBackToStandardModeToolStripMenuItem.Text = "Go back to standard mode";
this.goBackToStandardModeToolStripMenuItem.Visible = false;
this.goBackToStandardModeToolStripMenuItem.Click += new System.EventHandler(this.goBackToStandardModeToolStripMenuItem_Click);
@@ -124,13 +127,13 @@ namespace Step.UI
// toolStripSeparator
//
this.toolStripSeparator.Name = "toolStripSeparator";
this.toolStripSeparator.Size = new System.Drawing.Size(211, 6);
this.toolStripSeparator.Size = new System.Drawing.Size(231, 6);
this.toolStripSeparator.Visible = false;
//
// resetSpindleHoursToolStripMenuItem
//
this.resetSpindleHoursToolStripMenuItem.Name = "resetSpindleHoursToolStripMenuItem";
this.resetSpindleHoursToolStripMenuItem.Size = new System.Drawing.Size(214, 22);
this.resetSpindleHoursToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
this.resetSpindleHoursToolStripMenuItem.Text = "Reset Spindle Active Time";
this.resetSpindleHoursToolStripMenuItem.Visible = false;
this.resetSpindleHoursToolStripMenuItem.Click += new System.EventHandler(this.resetSpindleHoursToolStripMenuItem_Click);
@@ -138,8 +141,8 @@ namespace Step.UI
// resetCountersToolStripMenuItem
//
this.resetCountersToolStripMenuItem.Name = "resetCountersToolStripMenuItem";
this.resetCountersToolStripMenuItem.Size = new System.Drawing.Size(214, 22);
this.resetCountersToolStripMenuItem.Text = "Reset Counters";
this.resetCountersToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
this.resetCountersToolStripMenuItem.Text = "Reset CMS-Active Counters";
this.resetCountersToolStripMenuItem.Visible = false;
this.resetCountersToolStripMenuItem.Click += new System.EventHandler(this.resetCountersToolStripMenuItem_Click);
//
@@ -352,14 +355,14 @@ namespace Step.UI
// closeCMSServerToolStripMenuItem
//
this.closeCMSServerToolStripMenuItem.Name = "closeCMSServerToolStripMenuItem";
this.closeCMSServerToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
this.closeCMSServerToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.closeCMSServerToolStripMenuItem.Text = "Close Active Server";
this.closeCMSServerToolStripMenuItem.Click += new System.EventHandler(this.closeCMSServerToolStripMenuItem_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(171, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
//
// serviceToolStripMenuItem
//
@@ -368,16 +371,17 @@ namespace Step.UI
this.goBackToStandardModeToolStripMenuItem1,
this.toolStripSeparator1,
this.resetSpindleHoursToolStripMenuItem1,
this.resetCountersToolStripMenuItem1});
this.resetCountersToolStripMenuItem1,
this.resetMachineWorkingHoursToolStripMenuItem1});
this.serviceToolStripMenuItem.Name = "serviceToolStripMenuItem";
this.serviceToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
this.serviceToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.serviceToolStripMenuItem.Text = "Service";
//
// passwordToolStripMenuItem1
//
this.passwordToolStripMenuItem1.Image = global::Step.UI.Properties.Resources.Apps_Lock_icon;
this.passwordToolStripMenuItem1.Name = "passwordToolStripMenuItem1";
this.passwordToolStripMenuItem1.Size = new System.Drawing.Size(214, 22);
this.passwordToolStripMenuItem1.Size = new System.Drawing.Size(234, 22);
this.passwordToolStripMenuItem1.Text = "Password";
this.passwordToolStripMenuItem1.Click += new System.EventHandler(this.passwordToolStripMenuItem1_Click);
//
@@ -385,7 +389,7 @@ namespace Step.UI
//
this.goBackToStandardModeToolStripMenuItem1.Image = global::Step.UI.Properties.Resources.Apps_Unlock_icon;
this.goBackToStandardModeToolStripMenuItem1.Name = "goBackToStandardModeToolStripMenuItem1";
this.goBackToStandardModeToolStripMenuItem1.Size = new System.Drawing.Size(214, 22);
this.goBackToStandardModeToolStripMenuItem1.Size = new System.Drawing.Size(234, 22);
this.goBackToStandardModeToolStripMenuItem1.Text = "Go back to standard mode";
this.goBackToStandardModeToolStripMenuItem1.Visible = false;
this.goBackToStandardModeToolStripMenuItem1.Click += new System.EventHandler(this.goBackToStandardModeToolStripMenuItem1_Click);
@@ -393,13 +397,13 @@ namespace Step.UI
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(211, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(231, 6);
this.toolStripSeparator1.Visible = false;
//
// resetSpindleHoursToolStripMenuItem1
//
this.resetSpindleHoursToolStripMenuItem1.Name = "resetSpindleHoursToolStripMenuItem1";
this.resetSpindleHoursToolStripMenuItem1.Size = new System.Drawing.Size(214, 22);
this.resetSpindleHoursToolStripMenuItem1.Size = new System.Drawing.Size(234, 22);
this.resetSpindleHoursToolStripMenuItem1.Text = "Reset Spindle Active Time";
this.resetSpindleHoursToolStripMenuItem1.Visible = false;
this.resetSpindleHoursToolStripMenuItem1.Click += new System.EventHandler(this.resetSpindleHoursToolStripMenuItem1_Click);
@@ -407,11 +411,27 @@ namespace Step.UI
// resetCountersToolStripMenuItem1
//
this.resetCountersToolStripMenuItem1.Name = "resetCountersToolStripMenuItem1";
this.resetCountersToolStripMenuItem1.Size = new System.Drawing.Size(214, 22);
this.resetCountersToolStripMenuItem1.Text = "Reset Counters";
this.resetCountersToolStripMenuItem1.Size = new System.Drawing.Size(234, 22);
this.resetCountersToolStripMenuItem1.Text = "Reset CMS-Active Counters";
this.resetCountersToolStripMenuItem1.Visible = false;
this.resetCountersToolStripMenuItem1.Click += new System.EventHandler(this.resetCountersToolStripMenuItem1_Click);
//
// resetMachineWorkingHoursToolStripMenuItem
//
this.resetMachineWorkingHoursToolStripMenuItem.Name = "resetMachineWorkingHoursToolStripMenuItem";
this.resetMachineWorkingHoursToolStripMenuItem.Size = new System.Drawing.Size(234, 22);
this.resetMachineWorkingHoursToolStripMenuItem.Text = "Reset Machine Working Hours";
this.resetMachineWorkingHoursToolStripMenuItem.Visible = false;
this.resetMachineWorkingHoursToolStripMenuItem.Click += new System.EventHandler(this.resetMachineWorkingHoursToolStripMenuItem_Click);
//
// resetMachineWorkingHoursToolStripMenuItem1
//
this.resetMachineWorkingHoursToolStripMenuItem1.Name = "resetMachineWorkingHoursToolStripMenuItem1";
this.resetMachineWorkingHoursToolStripMenuItem1.Size = new System.Drawing.Size(234, 22);
this.resetMachineWorkingHoursToolStripMenuItem1.Text = "Reset Machine Working Hours";
this.resetMachineWorkingHoursToolStripMenuItem1.Visible = false;
this.resetMachineWorkingHoursToolStripMenuItem1.Click += new System.EventHandler(this.resetMachineWorkingHoursToolStripMenuItem1_Click);
//
// ServerControlWindow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -479,5 +499,7 @@ namespace Step.UI
private ToolStripMenuItem resetCountersToolStripMenuItem1;
private ToolStripSeparator toolStripSeparator3;
private ToolStripSeparator toolStripSeparator2;
private ToolStripMenuItem resetMachineWorkingHoursToolStripMenuItem;
private ToolStripMenuItem resetMachineWorkingHoursToolStripMenuItem1;
}
}
Step.UI/ServerControlWindow.cs
+19
View File
@@ -30,6 +30,7 @@ namespace Step.UI
PasswordForm PswForm;
ResetSpindleForm ResSpForm;
ResetCountersForm ResCouForm;
ResetMachineHoursForm ResMaHouForm;
LockForm LckFrm;
[DllImport("user32.dll")]
@@ -60,6 +61,7 @@ namespace Step.UI
PswForm = new PasswordForm();
ResSpForm = new ResetSpindleForm();
ResCouForm = new ResetCountersForm();
ResMaHouForm = new ResetMachineHoursForm();
if (NcConfig != null && NcConfig.NcVendor != null)
TXTType.Text = NcConfig.NcVendor;
@@ -238,7 +240,9 @@ namespace Step.UI
PswForm.setNcData(model.CmsMachineIdNumber,nc);
ResSpForm.setNcData(model.CmsMachineIdNumber,nc);
ResCouForm.setNcData(model.CmsMachineIdNumber,nc);
ResMaHouForm.setNcData(model.CmsMachineIdNumber,nc);
passwordToolStripMenuItem.Enabled = true;
passwordToolStripMenuItem1.Enabled = true;
});
}
else
@@ -250,6 +254,7 @@ namespace Step.UI
TXTMachId.Text = "---";
CHNcConnected.Checked = false;
passwordToolStripMenuItem.Enabled = false;
passwordToolStripMenuItem1.Enabled = false;
});
}
@@ -307,6 +312,8 @@ namespace Step.UI
resetSpindleHoursToolStripMenuItem1.Visible = true;
goBackToStandardModeToolStripMenuItem.Visible = true;
goBackToStandardModeToolStripMenuItem1.Visible = true;
resetMachineWorkingHoursToolStripMenuItem.Visible = true;
resetMachineWorkingHoursToolStripMenuItem1.Visible = true;
toolStripSeparator.Visible = true;
toolStripSeparator1.Visible = true;
passwordToolStripMenuItem.Enabled = false;
@@ -323,6 +330,8 @@ namespace Step.UI
resetSpindleHoursToolStripMenuItem1.Visible = false;
goBackToStandardModeToolStripMenuItem.Visible = false;
goBackToStandardModeToolStripMenuItem1.Visible = false;
resetMachineWorkingHoursToolStripMenuItem.Visible = false;
resetMachineWorkingHoursToolStripMenuItem1.Visible = false;
toolStripSeparator.Visible = false;
toolStripSeparator1.Visible = false;
passwordToolStripMenuItem.Enabled = true;
@@ -376,5 +385,15 @@ namespace Step.UI
{
ResCouForm.ShowDialog();
}
private void resetMachineWorkingHoursToolStripMenuItem_Click(object sender, EventArgs e)
{
ResMaHouForm.ShowDialog();
}
private void resetMachineWorkingHoursToolStripMenuItem1_Click(object sender, EventArgs e)
{
ResMaHouForm.ShowDialog();
}
}
}
Step.UI/Step.UI.csproj
+9
View File
@@ -64,6 +64,12 @@
<Compile Include="Dialogs\LockForm.Designer.cs">
<DependentUpon>LockForm.cs</DependentUpon>
</Compile>
<Compile Include="Dialogs\ResetMachineHoursForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialogs\ResetMachineHoursForm.Designer.cs">
<DependentUpon>ResetMachineHoursForm.cs</DependentUpon>
</Compile>
<Compile Include="Dialogs\ResetCountersForm.cs">
<SubType>Form</SubType>
</Compile>
@@ -109,6 +115,9 @@
<EmbeddedResource Include="Dialogs\LockForm.resx">
<DependentUpon>LockForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\ResetMachineHoursForm.resx">
<DependentUpon>ResetMachineHoursForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\ResetCountersForm.resx">
<DependentUpon>ResetCountersForm.cs</DependentUpon>
</EmbeddedResource>
Step.Utils/languages/IT.xml
+7 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Automatically generated by lucio.maranta: 2019-07-03 -->
<!-- Automatically generated by lucio.maranta: 2019-07-30 -->
<root>
<language_it>Italiano</language_it>
<header_maintainance_request>Effettuare manutenzione</header_maintainance_request>
@@ -292,7 +292,7 @@
<tooling_equipment_param_residualLife>Vita Residua</tooling_equipment_param_residualLife>
<tooling_equipment_param_disabled>Ut. disabilitato</tooling_equipment_param_disabled>
<tooling_equipment_param_broken>Ut. rotto</tooling_equipment_param_broken>
<tooling_equipment_param_measured>Ut. misurato</tooling_equipment_param_measured>
<tooling_equipment_param_measured>Ut. Misurato</tooling_equipment_param_measured>
<tooling_equipment_param_clockwiseRotation>Rotazione Oraria</tooling_equipment_param_clockwiseRotation>
<tooling_equipment_param_counterClockwiseRotation>Rotazione Antioraria</tooling_equipment_param_counterClockwiseRotation>
<tooling_equipment_param_offsetId1>Id Offset 1</tooling_equipment_param_offsetId1>
@@ -617,8 +617,8 @@
<footer_tooltip_under_hood>Apre/Chiude area sotto-il-cofano</footer_tooltip_under_hood>
<footer_tooltip_job_editor>Job Editor</footer_tooltip_job_editor>
<footer_tooltip_users>User Manager</footer_tooltip_users>
<header_tooltip_btn_close>Chiudi CMS-Step</header_tooltip_btn_close>
<header_tooltip_btn_minimize>Minimizza CMS-Step</header_tooltip_btn_minimize>
<header_tooltip_btn_close>Chiudi CMS-Active</header_tooltip_btn_close>
<header_tooltip_btn_minimize>Minimizza CMS-Active</header_tooltip_btn_minimize>
<header_tooltip_btn_help>Visualizza Help macchina</header_tooltip_btn_help>
<header_tooltip_btn_mchinfo>Visualizza Informazioni macchina</header_tooltip_btn_mchinfo>
<header_tooltip_btn_usrinfo>Visualizza Informazioni utente</header_tooltip_btn_usrinfo>
@@ -660,4 +660,7 @@
<job_item_delay>Ritardo</job_item_delay>
<job_item_origin>Origine</job_item_origin>
<job_item_end_program>Fine Programma</job_item_end_program>
<modal_confirm_start_unload>Sei sicuro di voler scaricare l&#39;utensile?</modal_confirm_start_unload>
<axes_reset_title>Azzeramento assi</axes_reset_title>
<axes_reset_message>Azzeramento assi in corso...</axes_reset_message>
</root>
Step.Utils/languages/de.xml
+7 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Automatically generated by lucio.maranta: 2019-07-03 -->
<!-- Automatically generated by lucio.maranta: 2019-07-30 -->
<root>
<language_it>Deutsch</language_it>
<header_maintainance_request>Wartung ausführen</header_maintainance_request>
@@ -292,7 +292,7 @@
<tooling_equipment_param_residualLife>Restlebensdauer</tooling_equipment_param_residualLife>
<tooling_equipment_param_disabled>Werk. deaktiviert</tooling_equipment_param_disabled>
<tooling_equipment_param_broken>Werk. gestört</tooling_equipment_param_broken>
<tooling_equipment_param_measured>Werk. gemessen</tooling_equipment_param_measured>
<tooling_equipment_param_measured>Werkz. Gemessen</tooling_equipment_param_measured>
<tooling_equipment_param_clockwiseRotation>Drehung im Uhrzeigersinn</tooling_equipment_param_clockwiseRotation>
<tooling_equipment_param_counterClockwiseRotation>Drehung gegen den Uhrzeigersinn</tooling_equipment_param_counterClockwiseRotation>
<tooling_equipment_param_offsetId1>Offset-ID 1</tooling_equipment_param_offsetId1>
@@ -617,8 +617,8 @@
<footer_tooltip_under_hood>Bereich Unterschicht öffnen/schließen</footer_tooltip_under_hood>
<footer_tooltip_job_editor>Job-Editor</footer_tooltip_job_editor>
<footer_tooltip_users>Benutzer-Manager</footer_tooltip_users>
<header_tooltip_btn_close>CMS-Schritt schließen</header_tooltip_btn_close>
<header_tooltip_btn_minimize>CMS-Schritt minimieren</header_tooltip_btn_minimize>
<header_tooltip_btn_close>CMS-Active schließen</header_tooltip_btn_close>
<header_tooltip_btn_minimize>CMS-Active minimieren</header_tooltip_btn_minimize>
<header_tooltip_btn_help>Help der Maschine anzeigen</header_tooltip_btn_help>
<header_tooltip_btn_mchinfo>Informationen der Maschine anzeigen</header_tooltip_btn_mchinfo>
<header_tooltip_btn_usrinfo>Informationen des Benutzers anzeigen</header_tooltip_btn_usrinfo>
@@ -660,4 +660,7 @@
<job_item_delay>Verzögerung</job_item_delay>
<job_item_origin>Ursprung</job_item_origin>
<job_item_end_program>Programmende</job_item_end_program>
<modal_confirm_start_unload>Möchten Sie das Tool wirklich entladen?</modal_confirm_start_unload>
<axes_reset_title>Achsennullung</axes_reset_title>
<axes_reset_message>Achsennullung läuft</axes_reset_message>
</root>
Step.Utils/languages/en.xml
+7 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Automatically generated by lucio.maranta: 2019-07-03 -->
<!-- Automatically generated by lucio.maranta: 2019-07-30 -->
<root>
<language_it>English</language_it>
<header_maintainance_request>Maintenance request</header_maintainance_request>
@@ -292,7 +292,7 @@
<tooling_equipment_param_residualLife>Residual Life</tooling_equipment_param_residualLife>
<tooling_equipment_param_disabled>Tool Disabled</tooling_equipment_param_disabled>
<tooling_equipment_param_broken>Tool Broken</tooling_equipment_param_broken>
<tooling_equipment_param_measured>Tool measured</tooling_equipment_param_measured>
<tooling_equipment_param_measured>Tool Measured</tooling_equipment_param_measured>
<tooling_equipment_param_clockwiseRotation>Clockwise Rotation</tooling_equipment_param_clockwiseRotation>
<tooling_equipment_param_counterClockwiseRotation>Counterclockwise Rotation</tooling_equipment_param_counterClockwiseRotation>
<tooling_equipment_param_offsetId1>Offset 1 Id</tooling_equipment_param_offsetId1>
@@ -617,8 +617,8 @@
<footer_tooltip_under_hood>Open/Close Under-the-hood Area</footer_tooltip_under_hood>
<footer_tooltip_job_editor>Job Editor</footer_tooltip_job_editor>
<footer_tooltip_users>Users Manager</footer_tooltip_users>
<header_tooltip_btn_close>Close CMS-Step</header_tooltip_btn_close>
<header_tooltip_btn_minimize>Minimize CMS-Step</header_tooltip_btn_minimize>
<header_tooltip_btn_close>Close CMS-Active</header_tooltip_btn_close>
<header_tooltip_btn_minimize>Minimize CMS-Active</header_tooltip_btn_minimize>
<header_tooltip_btn_help>Show machine help</header_tooltip_btn_help>
<header_tooltip_btn_mchinfo>Show machine info</header_tooltip_btn_mchinfo>
<header_tooltip_btn_usrinfo>Show user info</header_tooltip_btn_usrinfo>
@@ -660,4 +660,7 @@
<job_item_delay>Delay</job_item_delay>
<job_item_origin>Origin</job_item_origin>
<job_item_end_program>End Program</job_item_end_program>
<modal_confirm_start_unload>Are you sure you want to unload the tool?</modal_confirm_start_unload>
<axes_reset_title>Axes zeroing</axes_reset_title>
<axes_reset_message>Axes zeroing in progress...</axes_reset_message>
</root>
Step.Utils/languages/fr.xml
+7 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Automatically generated by lucio.maranta: 2019-07-03 -->
<!-- Automatically generated by lucio.maranta: 2019-07-30 -->
<root>
<language_it>Français</language_it>
<header_maintainance_request>Procéder à la maintenance</header_maintainance_request>
@@ -292,7 +292,7 @@
<tooling_equipment_param_residualLife>Vie Résiduelle</tooling_equipment_param_residualLife>
<tooling_equipment_param_disabled>Out. invalidé</tooling_equipment_param_disabled>
<tooling_equipment_param_broken>Out. brisé</tooling_equipment_param_broken>
<tooling_equipment_param_measured>Out. mesuré</tooling_equipment_param_measured>
<tooling_equipment_param_measured>Out. Mesuré</tooling_equipment_param_measured>
<tooling_equipment_param_clockwiseRotation>Rotation Horaire</tooling_equipment_param_clockwiseRotation>
<tooling_equipment_param_counterClockwiseRotation>Rotation Antihoraire</tooling_equipment_param_counterClockwiseRotation>
<tooling_equipment_param_offsetId1>Id Offset 1</tooling_equipment_param_offsetId1>
@@ -617,8 +617,8 @@
<footer_tooltip_under_hood>Ouvrir/Fermer zone sous le capot</footer_tooltip_under_hood>
<footer_tooltip_job_editor>Job Editor</footer_tooltip_job_editor>
<footer_tooltip_users>Gestionnaire Utilisateurs</footer_tooltip_users>
<header_tooltip_btn_close>Fermer CMS-Step</header_tooltip_btn_close>
<header_tooltip_btn_minimize>Minimiser CMS-Step</header_tooltip_btn_minimize>
<header_tooltip_btn_close>Fermer CMS-Active</header_tooltip_btn_close>
<header_tooltip_btn_minimize>Minimiser CMS-Active</header_tooltip_btn_minimize>
<header_tooltip_btn_help>Afficher Aide machine</header_tooltip_btn_help>
<header_tooltip_btn_mchinfo>Afficher Informations machine</header_tooltip_btn_mchinfo>
<header_tooltip_btn_usrinfo>Afficher Informations utilisateur</header_tooltip_btn_usrinfo>
@@ -660,4 +660,7 @@
<job_item_delay>Retard</job_item_delay>
<job_item_origin>Origine</job_item_origin>
<job_item_end_program>Fin de programme</job_item_end_program>
<modal_confirm_start_unload>Êtes-vous sûr de vouloir décharger l&#39;outil?</modal_confirm_start_unload>
<axes_reset_title>Réinitialisation des axes</axes_reset_title>
<axes_reset_message>Réinitialisation des axes en cours ...</axes_reset_message>
</root>
Step.Utils/languages/hr.xml
+7 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Automatically generated by lucio.maranta: 2019-07-03 -->
<!-- Automatically generated by lucio.maranta: 2019-07-30 -->
<root>
<language_it>Hrvatski</language_it>
<header_maintainance_request>Izvršiti održavanje</header_maintainance_request>
@@ -292,7 +292,7 @@
<tooling_equipment_param_residualLife>Ostatak Života</tooling_equipment_param_residualLife>
<tooling_equipment_param_disabled>Alat onesposobljen</tooling_equipment_param_disabled>
<tooling_equipment_param_broken>Alat slomljen</tooling_equipment_param_broken>
<tooling_equipment_param_measured>Alat izmjeren</tooling_equipment_param_measured>
<tooling_equipment_param_measured>Alat Izmjeren</tooling_equipment_param_measured>
<tooling_equipment_param_clockwiseRotation>Rotacija u Smjeru kazaljke na satu</tooling_equipment_param_clockwiseRotation>
<tooling_equipment_param_counterClockwiseRotation>Rotacija Suprotnom smjeru kazaljke na satu</tooling_equipment_param_counterClockwiseRotation>
<tooling_equipment_param_offsetId1>Id Offset 1</tooling_equipment_param_offsetId1>
@@ -616,8 +616,8 @@
<footer_tooltip_under_hood>Otvara/zatvara prostor ispod haube</footer_tooltip_under_hood>
<footer_tooltip_job_editor>Job Editor</footer_tooltip_job_editor>
<footer_tooltip_users>User Manager</footer_tooltip_users>
<header_tooltip_btn_close>Zatvori CMS-Step</header_tooltip_btn_close>
<header_tooltip_btn_minimize>Minimiziraj CMS-Step</header_tooltip_btn_minimize>
<header_tooltip_btn_close>Zatvori CMS-Active</header_tooltip_btn_close>
<header_tooltip_btn_minimize>Minimiziraj CMS-Active</header_tooltip_btn_minimize>
<header_tooltip_btn_help>Predoči Help stroja</header_tooltip_btn_help>
<header_tooltip_btn_mchinfo>Predoči Informacije o Stroju</header_tooltip_btn_mchinfo>
<header_tooltip_btn_usrinfo>Predoči Informacije o korisniku</header_tooltip_btn_usrinfo>
@@ -659,4 +659,7 @@
<job_item_delay>Kašnjenje</job_item_delay>
<job_item_origin>Originalno</job_item_origin>
<job_item_end_program>Kraj Programa</job_item_end_program>
<modal_confirm_start_unload>Möchten Sie das Tool wirklich entladen?</modal_confirm_start_unload>
<axes_reset_title>Osi svesti na ništicu</axes_reset_title>
<axes_reset_message>Osi svesti na ništicu...</axes_reset_message>
</root>
Step.Utils/languages/ro.xml
+7 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Automatically generated by lucio.maranta: 2019-07-03 -->
<!-- Automatically generated by lucio.maranta: 2019-07-30 -->
<root>
<language_it>Română</language_it>
<header_maintainance_request>Efectuați întreținerea</header_maintainance_request>
@@ -292,7 +292,7 @@
<tooling_equipment_param_residualLife>Viața Reziduală</tooling_equipment_param_residualLife>
<tooling_equipment_param_disabled>Unealtă invalidă</tooling_equipment_param_disabled>
<tooling_equipment_param_broken>Unealtă stricată</tooling_equipment_param_broken>
<tooling_equipment_param_measured>Unealtă măsurată</tooling_equipment_param_measured>
<tooling_equipment_param_measured>Unealtă Măsurată</tooling_equipment_param_measured>
<tooling_equipment_param_clockwiseRotation>Rotire în sensul acelor de ceasornic</tooling_equipment_param_clockwiseRotation>
<tooling_equipment_param_counterClockwiseRotation>Rotire în sens invers acelor de ceasornic</tooling_equipment_param_counterClockwiseRotation>
<tooling_equipment_param_offsetId1>Id Offset 1</tooling_equipment_param_offsetId1>
@@ -617,8 +617,8 @@
<footer_tooltip_under_hood>Deschide / Închide zona sub capotă</footer_tooltip_under_hood>
<footer_tooltip_job_editor>Job Editor</footer_tooltip_job_editor>
<footer_tooltip_users>User Manager</footer_tooltip_users>
<header_tooltip_btn_close>Închideți CMS-Step</header_tooltip_btn_close>
<header_tooltip_btn_minimize>Minimizați CMS-Step</header_tooltip_btn_minimize>
<header_tooltip_btn_close>Închideți CMS-Active</header_tooltip_btn_close>
<header_tooltip_btn_minimize>Minimizați CMS-Active</header_tooltip_btn_minimize>
<header_tooltip_btn_help>Vizualizați Ajutor mașină</header_tooltip_btn_help>
<header_tooltip_btn_mchinfo>Vizualizați informațiile despre mașină</header_tooltip_btn_mchinfo>
<header_tooltip_btn_usrinfo>Vizualizați Informațiile utilizator</header_tooltip_btn_usrinfo>
@@ -660,4 +660,7 @@
<job_item_delay>Întârziere</job_item_delay>
<job_item_origin>Început</job_item_origin>
<job_item_end_program>Sfârșitul Programului</job_item_end_program>
<modal_confirm_start_unload>Sigur doriți să descărcați instrumentul?</modal_confirm_start_unload>
<axes_reset_title>Axe zero</axes_reset_title>
<axes_reset_message>Axe zero la desfășurare...</axes_reset_message>
</root>
Step/SetupActive.iss
+17 -15
View File
@@ -10,7 +10,7 @@
#define FolderName "Active"
#define SCMIcoName "SCM.ico"
#define MyAppVersion "1.2"
#define MyAppVersion "1.2.2"
#define MyAppPublisher "CMS"
#define MyAppURL "https://www.scmgroup.com/it/cms"
#define MyAppExeName "Active.exe"
@@ -99,7 +99,7 @@ english.InstallingDotNet = Installing .Net
[Tasks]
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: checkablealone; Components: Fanuc Osai Siemens
Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkablealone; Components: Fanuc Osai Siemens
Name: startupicon; Description: {cm:CreateStartupIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkablealone; Components: Fanuc Osai
Name: startupicon; Description: {cm:CreateStartupIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkablealone; Components: Fanuc Osai Siemens
Name: sinumerikicons; Description: {cm:CreateSinumerikIcons}; GroupDescription: {cm:AdditionalIcons}; Flags: checkablealone; Components: Siemens
[Files]
@@ -144,27 +144,29 @@ Source: "{#InvDialPath}\*"; DestDir: "{app}\..\Utility\Cms_Inverter_Diagnosis\";
[Icons]
; Default icons
Name: {group}\{#AppName}; Filename: {app}\{#MyAppExeName}; Comment: {#AppName}; Components: Fanuc Osai; Check: NOT GetStyleOption;
Name: {userdesktop}\{#AppName}; Filename: {app}\{#MyAppExeName}; Tasks: desktopicon; Comment: {#AppName}; Components: Fanuc Osai; Check: NOT GetStyleOption;
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#AppName}; Filename: {app}\{#MyAppExeName}; Tasks: quicklaunchicon; Comment: {#AppName}; Components: Fanuc Osai; Check: NOT GetStyleOption;
Name: {userstartup}\{#AppName}; Filename: {app}\{#MyAppExeName}; Tasks: startupicon; Comment: {#AppName}; Components: Fanuc Osai; Check: NOT GetStyleOption;
Name: {group}\{#AppName}; Filename: {app}\{#MyAppExeName}; Components: Fanuc Osai; Check: NOT GetStyleOption;
Name: {userdesktop}\{#AppName}; Filename: {app}\{#MyAppExeName}; Tasks: desktopicon; Components: Fanuc Osai; Check: NOT GetStyleOption;
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#AppName}; Filename: {app}\{#MyAppExeName}; Tasks: quicklaunchicon; Components: Fanuc Osai; Check: NOT GetStyleOption;
Name: {userstartup}\{#AppName}; Filename: {app}\{#MyAppExeName}; Tasks: startupicon; Components: Fanuc Osai; Check: NOT GetStyleOption;
; Siemens startup icon with parameters "-start ..."
Name: {group}\{#AppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: "{app}\{#MyAppExeName}"; Comment: {#AppName}; Components: Siemens; Check: NOT GetStyleOption;
Name: {userdesktop}\{#AppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: "{app}\{#MyAppExeName}"; Tasks: desktopicon; Comment: {#AppName}; Components: Siemens; Check: NOT GetStyleOption;
Name: {group}\{#AppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: "{app}\{#MyAppExeName}"; Components: Siemens; Check: NOT GetStyleOption;
Name: {userdesktop}\{#AppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: "{app}\{#MyAppExeName}"; Tasks: desktopicon; Components: Siemens; Check: NOT GetStyleOption;
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#AppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon; Comment: {#AppName}; Components: Siemens; Check: NOT GetStyleOption;
Name: {userstartup}\{#AppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Tasks: startupicon; IconFilename: "{app}\{#MyAppExeName}"; Parameters: -start {app}\{#MyAppExeName}; Components: Siemens; Check: NOT GetStyleOption;
; SCM ICONS
; Default icons
Name: {group}\{#SCMAppName}; Filename: {app}\{#MyAppExeName}; IconFilename: {app}\{#SCMIcoName}; Comment: {#SCMAppName}; Components: Fanuc Osai; Check: GetStyleOption;
Name: {userdesktop}\{#SCMAppName}; Filename: {app}\{#MyAppExeName}; IconFilename: {app}\{#SCMIcoName}; Tasks: desktopicon; Comment: {#SCMAppName}; Components: Fanuc Osai; Check: GetStyleOption;
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#SCMAppName}; Filename: {app}\{#MyAppExeName}; IconFilename: {app}\{#SCMIcoName}; Tasks: quicklaunchicon; Comment: {#SCMAppName}; Components: Fanuc Osai; Check: GetStyleOption;
Name: {userstartup}\{#SCMAppName}; Filename: {app}\{#MyAppExeName}; IconFilename: {app}\{#SCMIcoName}; Tasks: startupicon; Comment: {#SCMAppName}; Components: Fanuc Osai; Check: GetStyleOption;
Name: {group}\{#SCMAppName}; Filename: {app}\{#MyAppExeName}; IconFilename: {app}\{#SCMIcoName}; Components: Fanuc Osai; Check: GetStyleOption;
Name: {userdesktop}\{#SCMAppName}; Filename: {app}\{#MyAppExeName}; IconFilename: {app}\{#SCMIcoName}; Tasks: desktopicon; Components: Fanuc Osai; Check: GetStyleOption;
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#SCMAppName}; Filename: {app}\{#MyAppExeName}; IconFilename: {app}\{#SCMIcoName}; Tasks: quicklaunchicon; Components: Fanuc Osai; Check: GetStyleOption;
Name: {userstartup}\{#SCMAppName}; Filename: {app}\{#MyAppExeName}; IconFilename: {app}\{#SCMIcoName}; Parameters: -start {app}\{#MyAppExeName}; Tasks: startupicon; Components: Fanuc Osai; Check: GetStyleOption;
; SCM Siemens startup icon with parameters "-start ..."
Name: {group}\{#SCMAppName}; Filename: {#IconsPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: {app}\{#SCMIcoName}; Comment: {#SCMAppName}; Components: Siemens; Check: GetStyleOption;
Name: {userdesktop}\{#SCMAppName}; Filename: {#IconsPath}{#SCMIcoName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: {app}\{#SCMIcoName}; Tasks: desktopicon; Comment: {#SCMAppName}; Components: Siemens; Check: GetStyleOption;
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#SCMAppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: {app}\{#SCMIcoName};Tasks: quicklaunchicon; Comment: {#SCMAppName}; Components: Siemens; Check: GetStyleOption;
Name: {group}\{#SCMAppName}; Filename: {#IconsPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: {app}\{#SCMIcoName}; Components: Siemens; Check: GetStyleOption;
Name: {userdesktop}\{#SCMAppName}; Filename: {#IconsPath}{#SCMIcoName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: {app}\{#SCMIcoName}; Tasks: desktopicon; Components: Siemens; Check: GetStyleOption;
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#SCMAppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: {app}\{#SCMIcoName};Tasks: quicklaunchicon; Components: Siemens; Check: GetStyleOption;
Name: {userstartup}\{#SCMAppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: {app}\{#SCMIcoName}; Tasks: startupicon; Components: Siemens; Check: GetStyleOption;
[Run]
; Install .net
Step/wwwroot/src/app_modules/production/components/card-job-production.vue
+1 -1
View File
@@ -27,7 +27,7 @@
</div>
</div>
<div class="info-container">
<div class="var">
<div class="var" v-if="false">
<div class="variable">{{'card_job_production_feed_override' | localize('Feed override:')}}</div>
<div class="elm number">{{getFeedOverride}}<span class="umeasure">&nbsp;</span></div>
</div>