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

Added DIS messages,

Browse Source 
Fix setup SCM icons
This commit is contained in:
Lucio Maranta
2019-04-30 17:45:55 +02:00
parent 470c620421
commit 5a8e09bbca
10 changed files with 81 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/CMS_CORE_Library.dll
BIN
View File
Binary file not shown.
Step.Model/DTOModels/DTOProcessDataModel.cs
+6
View File
@@ -16,9 +16,11 @@ namespace Step.Model.DTOModels
public List<ProcessModel> processes;
public string UnitMeasure;
public bool CanLoadProgram;
public string ProcessMessage;
public DTOProcessesDataModel()
{
ProcessMessage = "";
IsRunning = false;
processes = new List<ProcessModel>();
}
@@ -50,11 +52,15 @@ namespace Step.Model.DTOModels
if (StartStopQueueEnabled != item.StartStopQueueEnabled)
return false;
// Selected process data
if (ActiveOffsetId != item.ActiveOffsetId)
return false;
if (ActiveOrigin != item.ActiveOrigin)
return false;
if (ProcessMessage != item.ProcessMessage)
return false;
if (UnitMeasure != item.UnitMeasure)
return false;
Step.NC/NcHandler.cs
+4
View File
@@ -427,8 +427,12 @@ namespace Step.NC
processesData.QueueStatus = queueStatus.Status;
processesData.StartStopQueueEnabled = queueStatus.StartStopQueueEnabled;
// Selected process data
processesData.ActiveOrigin = selectedData.Origin;
processesData.ActiveOffsetId = selectedData.ActiveOffsetId;
processesData.ProcessMessage = selectedData.ProcessMessage;
// Measure
processesData.UnitMeasure = UMeas;
return cmsError;
Step/SetupActive.iss
+28 -24
View File
@@ -5,7 +5,10 @@
; Inno Setup Compiler version 5.6.0
;==================================================
#define MyAppName "Active"
#define AppName "CMS Active"
#define SCMAppName "Maestro Active cnc"
#define FolderName "Active"
#define MyAppVersion "1.0"
#define MyAppPublisher "CMS"
#define MyAppURL "https://www.scmgroup.com/it/cms"
@@ -19,7 +22,7 @@
#define SinumerikPath1 "{pf}\Siemens\Sinumerik\HMIsl\siemens\sinumerik\hmi\autostart\"
#define SinumerikPath2 "C:\Siemens\Sinumerik\HMIsl\siemens\sinumerik\hmi\autostart\"
#define SinumerikPath3 "{pf}\Siemens\MotionControl\siemens\sinumerik\hmi\autostart\"
#define SinumerikAppName "Sinumerik HMI"
#define SinumerikAppName "Sinumerik HMI"
#define SinumerikAppExeName "run_hmi.exe"
; Support installers
; .Net
@@ -31,14 +34,13 @@
[Setup]
AppName={#MyAppName}
AppName={#AppName}
AppVersion={#MyAppVersion}
AppVerName={#MyAppName} {#MyAppVersion}
AppVerName={#AppName} {#MyAppVersion}
AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName=C:\CMS\{#MyAppName}
DisableDirPage=true
DisableProgramGroupPage=yes
Compression=lzma
@@ -46,9 +48,9 @@ SolidCompression=true
VersionInfoVersion={#MyAppVersion}
VersionInfoCompany={#MyAppPublisher}
VersionInfoDescription={#MyAppName}
VersionInfoTextVersion={#MyAppVersion}
VersionInfoCopyright={#MyAppPublisher}
DefaultDirName = C:\CMS\{#FolderName}\{#FolderName}
;WizardImageFile=C:\Programmi\Inno Setup 5\WizModernImage-IS.bmp
;WizardSmallImageFile=C:\Programmi\Inno Setup 5\CMS.bmp
WindowVisible=false
@@ -60,10 +62,10 @@ Name: custom; Description: CMS installation; Flags: iscustom
; Set NC types, this types are used to configure server config file
[Components]
Name: Demo; Description: {#MyAppName} {cm:ForDemoNC}; Types: custom; Flags: exclusive
Name: Fanuc; Description: {#MyAppName} {cm:ForFanucNC}; Types: custom; Flags: exclusive
Name: Osai; Description: {#MyAppName} {cm:ForOsaiNC}; Types: custom; Flags: exclusive
Name: Siemens; Description: {#MyAppName} {cm:ForSiemensNC}; Types: custom; Flags: exclusive
Name: Demo; Description: {#AppName} {cm:ForDemoNC}; Types: custom; Flags: exclusive
Name: Fanuc; Description: {#AppName} {cm:ForFanucNC}; Types: custom; Flags: exclusive
Name: Osai; Description: {#AppName} {cm:ForOsaiNC}; Types: custom; Flags: exclusive
Name: Siemens; Description: {#AppName} {cm:ForSiemensNC}; Types: custom; Flags: exclusive
[Languages]
Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -133,26 +135,28 @@ Source: {#MariaDBInstallerPath}\{#MariaDBInstallerName}; DestDir: {tmp}; Flags:
[Icons]
; Default icons
Name: {group}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Comment: {#MyAppName}; Components: Demo Fanuc Osai; Check: NOT GetStyleOption;
Name: {userdesktop}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks: desktopicon; Comment: {#MyAppName}; Components: Demo Fanuc Osai; Check: NOT GetStyleOption;
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks: quicklaunchicon; Comment: {#MyAppName}; Components: Demo Fanuc Osai; Check: NOT GetStyleOption;
Name: {userstartup}\{#MyAppName}; Filename: {app}\{#MyAppExeName}; Tasks: startupicon; Comment: {#MyAppName}; Components: Demo Fanuc Osai; Check: NOT GetStyleOption;
Name: {group}\{#AppName}; Filename: {app}\{#MyAppExeName}; Comment: {#AppName}; Components: Demo Fanuc Osai; Check: NOT GetStyleOption;
Name: {userdesktop}\{#AppName}; Filename: {app}\{#MyAppExeName}; Tasks: desktopicon; Comment: {#AppName}; Components: Demo Fanuc Osai; Check: NOT GetStyleOption;
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#AppName}; Filename: {app}\{#MyAppExeName}; Tasks: quicklaunchicon; Comment: {#AppName}; Components: Demo Fanuc Osai; Check: NOT GetStyleOption;
Name: {userstartup}\{#AppName}; Filename: {app}\{#MyAppExeName}; Tasks: startupicon; Comment: {#AppName}; Components: Demo Fanuc Osai; Check: NOT GetStyleOption;
; Siemens startup icon with parameters "-start ..."
Name: {group}\{#MyAppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: "{app}\{#MyAppExeName}"; Comment: {#MyAppName}; Components: Siemens; Check: NOT GetStyleOption;
Name: {userdesktop}\{#MyAppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: "{app}\{#MyAppExeName}"; Tasks: desktopicon; Comment: {#MyAppName}; Components: Siemens; Check: NOT GetStyleOption;
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon; Comment: {#MyAppName}; Components: Siemens; Check: NOT GetStyleOption;
Name: {group}\{#SCMAppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: "{app}\{#MyAppExeName}"; Comment: {#AppName}; Components: Siemens; Check: NOT GetStyleOption;
Name: {userdesktop}\{#SCMAppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: "{app}\{#MyAppExeName}"; Tasks: desktopicon; Comment: {#AppName}; Components: Siemens; Check: NOT GetStyleOption;
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#SCMAppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon; Comment: {#AppName}; Components: Siemens; Check: NOT GetStyleOption;
; SCM ICONS
; Default icons
Name: {group}\{#MyAppName}; Filename: {#IconsPath}{#SCMIcoName}; Comment: {#MyAppName}; Components: Demo Fanuc Osai; Check: GetStyleOption;
Name: {userdesktop}\{#MyAppName}; Filename: {#IconsPath}{#SCMIcoName}; Tasks: desktopicon; Comment: {#MyAppName}; Components: Demo Fanuc Osai; Check: GetStyleOption;
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {#IconsPath}{#SCMIcoName}; Tasks: quicklaunchicon; Comment: {#MyAppName}; Components: Demo Fanuc Osai; Check: GetStyleOption;
Name: {userstartup}\{#MyAppName}; Filename: {#IconsPath}{#SCMIcoName}; Tasks: startupicon; Comment: {#MyAppName}; Components: Demo Fanuc Osai; Check: GetStyleOption;
Name: {group}\{#SCMAppName}; Filename: {app}\{#MyAppExeName}; IconFilename: {#IconsPath}{#SCMIcoName}; Comment: {#SCMAppName}; Components: Demo Fanuc Osai; Check: GetStyleOption;
Name: {userdesktop}\{#SCMAppName}; Filename: {app}\{#MyAppExeName}; IconFilename: {#IconsPath}{#SCMIcoName}; Tasks: desktopicon; Comment: {#SCMAppName}; Components: Demo Fanuc Osai; Check: GetStyleOption;
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#SCMAppName}; Filename: {app}\{#MyAppExeName}; IconFilename: {#IconsPath}{#SCMIcoName}; Tasks: quicklaunchicon; Comment: {#SCMAppName}; Components: Demo Fanuc Osai; Check: GetStyleOption;
Name: {userstartup}\{#SCMAppName}; Filename: {app}\{#MyAppExeName}; IconFilename: {#IconsPath}{#SCMIcoName}; Tasks: startupicon; Comment: {#SCMAppName}; Components: Demo Fanuc Osai; Check: GetStyleOption;
; SCM Siemens startup icon with parameters "-start ..."
Name: {group}\{#MyAppName}; Filename: {#IconsPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: {#IconsPath}{#SCMIcoName}; Comment: {#MyAppName}; Components: Siemens; Check: GetStyleOption;
Name: {userdesktop}\{#MyAppName}; Filename: {#IconsPath}{#SCMIcoName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: {#IconsPath}{#SCMIcoName}; Tasks: desktopicon; Comment: {#MyAppName}; Components: Siemens; Check: GetStyleOption;
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {code:SiemensPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: {#IconsPath}{#SCMIcoName};Tasks: quicklaunchicon; Comment: {#MyAppName}; Components: Siemens; Check: GetStyleOption;
Name: {group}\{#SCMAppName}; Filename: {#IconsPath}{#SinumerikAppExeName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: {#IconsPath}{#SCMIcoName}; Comment: {#SCMAppName}; Components: Siemens; Check: GetStyleOption;
Name: {userdesktop}\{#SCMAppName}; Filename: {#IconsPath}{#SCMIcoName}; Parameters: -start {app}\{#MyAppExeName}; IconFilename: {#IconsPath}{#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: {#IconsPath}{#SCMIcoName};Tasks: quicklaunchicon; Comment: {#SCMAppName}; Components: Siemens; Check: GetStyleOption;
[Run]
; Install .net
Step/wwwroot/assets/styles/base/card.less
+12 -2
View File
@@ -1502,13 +1502,23 @@
margin-left: 5px;
text-align: left;
}
.message {
width: 800px;
border-radius: 2px;
display: flex;
align-items: center;
color: @color-greyish-brown;
padding-right: 8px;
font-size: 20px;
}
}
.var:nth-child(odd) .number {
.var:nth-child(odd) .elm {
background-color: @color-white4;
}
.var:nth-child(even) .number {
.var:nth-child(even) .elm {
background-color: @color-clear-blue-30;
}
Step/wwwroot/assets/styles/style.css
+11 -2
View File
@@ -8250,10 +8250,19 @@ footer .container button.big:before {
margin-left: 5px;
text-align: left;
}
.card-job-production .card-job-production-body .card-job-production-body-top .var:nth-child(odd) .number {
.card-job-production .card-job-production-body .card-job-production-body-top .var .message {
width: 800px;
border-radius: 2px;
display: flex;
align-items: center;
color: #4b4b4b;
padding-right: 8px;
font-size: 20px;
}
.card-job-production .card-job-production-body .card-job-production-body-top .var:nth-child(odd) .elm {
background-color: #f3f3f3;
}
.card-job-production .card-job-production-body .card-job-production-body-top .var:nth-child(even) .number {
.card-job-production .card-job-production-body .card-job-production-body-top .var:nth-child(even) .elm {
background-color: rgba(23, 145, 255, 0.3);
}
.card-job-production .card-job-production-body .card-job-production-body-top .img-container {
Step/wwwroot/src/app_modules/production/components/card-job-production.ts
+3
View File
@@ -58,6 +58,9 @@ export default class CardJobProduction extends Vue {
get activeOffsetId() {
return this.$store.state.process.activeOffsetId;
}
get activeProcessMessage() {
return this.$store.state.process.processMessage;
}
get canLoadProgram() {
return this.$store.state.process.canLoadProgram;
}
Step/wwwroot/src/app_modules/production/components/card-job-production.vue
+7 -2
View File
@@ -29,11 +29,16 @@
<div class="info-container">
<div class="var">
<div class="variable">{{'card_job_production_origin' | localize('Origine attiva:')}}</div>
<div class="number">{{activeOrigin}}<span class="umeasure">&nbsp;</span></div>
<div class="elm number">{{activeOrigin}}<span class="umeasure">&nbsp;</span></div>
</div>
<div class="var">
<div class="variable">{{'card_job_production_offset' | localize('Id correttore attivo:')}}</div>
<div class="number">{{activeOffsetId}}<span class="umeasure">&nbsp;</span></div>
<div class="elm number">{{activeOffsetId}}<span class="umeasure">&nbsp;</span></div>
</div>
<div class="var" v-if="activeProcessMessage">
<div class="variable">{{'card_job_production_message' | localize('Messaggio:')}}</div>
<div class="elm message">{{activeProcessMessage}}</div>
</div>
</div>
</div>
Step/wwwroot/src/services/hub.ts
+1 -1
View File
@@ -191,6 +191,7 @@ export class Hub {
processModelActions.setStartStopQueueEnabled(store, data.startStopQueueEnabled);
processModelActions.setQueueStatus(store, data.queueStatus);
processModelActions.setCurrentOffsetId(store, data.activeOffsetId);
processModelActions.setProcessMessage(store, data.processMessage)
processModelActions.setCurrentOrigin(store, data.activeOrigin);
processModelActions.setCanLoadProgram(store, data.canLoadProgram);
processModelActions.setUnitMeasure(store, data.unitMeasure);
@@ -285,7 +286,6 @@ export class Hub {
}
private static manageNcStatus(status) {
console.log("STATUS", status)
if (Hub._ncConnectionNotificationVisible && status.connected) {
machineStatusActions.setNcConnectionStatus(store, status.connected);
var toast = document.querySelector('#ncConnection') as any;
Step/wwwroot/src/store/runningProcess.store.ts
+9
View File
@@ -10,6 +10,7 @@ export interface RunningProcessModel {
m155messages: Array<signalr_process.M155Messages>,
activeOffsetId: number,
activeOrigin: number,
processMessage: string,
unitMeasure: string,
canLoadProgram: boolean,
}
@@ -32,6 +33,7 @@ export interface ProcessModelActionsInterface {
hideM155Messsage(context, Id: number);
setCurrentOrigin(context, Id: number);
setCurrentOffsetId(context, Id: number);
setProcessMessage(context, message: string);
setUnitMeasure(context, Id: number);
setCanLoadProgram(context, Id: number);
}
@@ -56,6 +58,7 @@ export const processStore = {
valueAxisSelected: { interpolated: Object, machine: Object, programmePos: Object, toGo: Object },
activeOffsetId: 0,
activeOrigin: 0,
processMessage: "",
unitMeasure: "mm",
canLoadProgram: false
} as RunningProcessModel,
@@ -72,6 +75,9 @@ export const processStore = {
SetCurrentOffsetId(store, Id){
store.activeOffsetId = Id;
},
SetProcessMessage(store, message){
store.processMessage = message;
},
SetStartStopQueueEnabled(store, queueEnabled){
store.startStopQueueEnabled = queueEnabled;
},
@@ -180,6 +186,9 @@ export const processStore = {
setCurrentOffsetId(context, Id){
context.commit("SetCurrentOffsetId", Id);
},
setProcessMessage(context, message){
context.commit("SetProcessMessage", message);
},
setM155Messsages(context, data){
context.commit("setM155Messsages", data);
},