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

Added realRadius & realLength

Browse Source 
Added .NET heidiSQL check on setup
Fix incremental softkey x10..
This commit is contained in:
Lucio Maranta
2019-06-04 17:15:58 +02:00
parent 708f958b0f
commit 96d19f4779
16 changed files with 87 additions and 32 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.Config/Config/scadaValidator.xsd
+1 -1
View File
@@ -73,7 +73,7 @@
<xs:complexType>
<xs:all>
<xs:element name="memClickIndex" type="xs:string" minOccurs='1' maxOccurs='1'/>
<xs:element name="memVisibleIndex" type="xs:string" minOccurs='1' maxOccurs='1'/>
<xs:element name="memEnabledIndex" type="xs:string" minOccurs='1' maxOccurs='1'/>
</xs:all>
</xs:complexType>
</xs:element>
Step.Model/DTOModels/Scada/ScadaSchemaModel.cs
+2 -2
View File
@@ -104,8 +104,8 @@ namespace Step.Model.DTOModels.Scada
//[XmlElement("id")]
public int Id { get; set; }
[XmlElement("label")]
public ScadaSchemaLabelDataModel Label { get; set; }
//[XmlElement("label")]
//public ScadaSchemaLabelDataModel Label { get; set; }
[XmlElement("position")]
public ScadaSchemaPositionModel Position { get; set; }
Step.NC/NcToolTableHandler.cs
+2 -2
View File
@@ -182,7 +182,7 @@ namespace Step.NC
.FindTools()
.Select(x => (NcToolModel)x)
.Where(x => shanks.Any(y => y.ShankId == x.ShankId)) // Find only mounted tools
.ToList();
.ToList();
// Update tools
return numericalControl.TOOLS_WUpdateTools(tools);
@@ -190,7 +190,7 @@ namespace Step.NC
public CmsError UpdateOffset(short offsetId, OffsetModel offsetData)
{
return numericalControl.TOOLS_WOffset(offsetId, offsetData);
return numericalControl.TOOLS_WOffset(offsetId, ref offsetData);
}
public CmsError UpdateToolOffsetId(int toolId, int positionId, short offsetId, out DTONcToolModel toolWithOffsets)
Step.Utils/languages/IT.xml
+3 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Automatically generated by nicola.carminati: 2019-05-23 -->
<!-- Automatically generated by lucio.maranta: 2019-06-04 -->
<root>
<language_it>Italiano</language_it>
<header_maintainance_request>Effettuare manutenzione</header_maintainance_request>
@@ -373,6 +373,8 @@
<tooling_equipment_cedgepar_corrAngle>Angolo di Correzione</tooling_equipment_cedgepar_corrAngle>
<tooling_equipment_cedgepar_boomLenght>Lunghezza Braccio</tooling_equipment_cedgepar_boomLenght>
<tooling_equipment_cedgepar_ballRadius>Raggio Sfera</tooling_equipment_cedgepar_ballRadius>
<tooling_equipment_cedgepar_realRadius>Raggio Reale</tooling_equipment_cedgepar_realRadius>
<tooling_equipment_cedgepar_realLength>Lunghezza Reale</tooling_equipment_cedgepar_realLength>
<tooling_equipment_list_select_none>Nessuna selezione</tooling_equipment_list_select_none>
<tooling_equipment_list_select_generic>Generico</tooling_equipment_list_select_generic>
<tooling_equipment_list_select_timeLife>A Tempo</tooling_equipment_list_select_timeLife>
Step.Utils/languages/en.xml
+3 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Automatically generated by nicola.carminati: 2019-05-23 -->
<!-- Automatically generated by lucio.maranta: 2019-06-04 -->
<root>
<language_it>English</language_it>
<header_maintainance_request>Maintenance request</header_maintainance_request>
@@ -373,6 +373,8 @@
<tooling_equipment_cedgepar_corrAngle>Angle Correction</tooling_equipment_cedgepar_corrAngle>
<tooling_equipment_cedgepar_boomLenght>Boom Lenght</tooling_equipment_cedgepar_boomLenght>
<tooling_equipment_cedgepar_ballRadius>Ball Radius</tooling_equipment_cedgepar_ballRadius>
<tooling_equipment_cedgepar_realRadius>Real Radius</tooling_equipment_cedgepar_realRadius>
<tooling_equipment_cedgepar_realLength>Real Length</tooling_equipment_cedgepar_realLength>
<tooling_equipment_list_select_none>None</tooling_equipment_list_select_none>
<tooling_equipment_list_select_generic>Generic</tooling_equipment_list_select_generic>
<tooling_equipment_list_select_timeLife>Time</tooling_equipment_list_select_timeLife>
Step.Utils/languages/fr.xml
+3 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Automatically generated by nicola.carminati: 2019-05-23 -->
<!-- Automatically generated by lucio.maranta: 2019-06-04 -->
<root>
<language_it>Français</language_it>
<header_maintainance_request>Procéder à la maintenance</header_maintainance_request>
@@ -373,6 +373,8 @@
<tooling_equipment_cedgepar_corrAngle>Angle de Correction</tooling_equipment_cedgepar_corrAngle>
<tooling_equipment_cedgepar_boomLenght>Longueur Bras</tooling_equipment_cedgepar_boomLenght>
<tooling_equipment_cedgepar_ballRadius>Rayon Sphère</tooling_equipment_cedgepar_ballRadius>
<tooling_equipment_cedgepar_realRadius>Rayon Réel</tooling_equipment_cedgepar_realRadius>
<tooling_equipment_cedgepar_realLength>Longueur Réelle</tooling_equipment_cedgepar_realLength>
<tooling_equipment_list_select_none>Aucune sélection</tooling_equipment_list_select_none>
<tooling_equipment_list_select_generic>Générique</tooling_equipment_list_select_generic>
<tooling_equipment_list_select_timeLife>À Temps</tooling_equipment_list_select_timeLife>
Step/Controllers/WebApi/NcToolManagerController.cs
+2 -1
View File
@@ -252,7 +252,8 @@ namespace Step.Controllers.WebApi
return BadRequest(cmsError.localizationKey);
offsetData.Id = offsetId;
return Ok(offsetData);
return Ok(offsetData);
}
}
Step/Controllers/WebApi/ScadaController.cs
+4 -4
View File
@@ -8,14 +8,14 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web.Http;
using static CMS_CORE_Library.Models.DataStructures;
using static CMS_CORE_Library.Models.DataStructures;
using static Step.Config.ServerConfig;
using static Step.Model.Constants;
namespace Step.Controllers.WebApi
{
[RoutePrefix("api/scada")]
public class ScadaController : ApiController
public class ScadaController : ApiController
{
[Route("list"), HttpGet]
public IHttpActionResult GetScadaList()
@@ -30,7 +30,7 @@ namespace Step.Controllers.WebApi
public IHttpActionResult SubscribeScada(int scadaId)
{
// Find schema
ScadaSchemaModel selectedScadaSchema = ConfiguredScadaSchema
ScadaSchemaModel selectedScadaSchema = ConfiguredScadaSchema
.Where(x => x.Id == scadaId)
.FirstOrDefault();
@@ -55,7 +55,7 @@ namespace Step.Controllers.WebApi
[Route("unsubscribe/{scadaId:int}"), HttpGet]
public IHttpActionResult UnsubscribeScada(int scadaId)
{
using (NcHandler ncHandler = new NcHandler())
using (NcHandler ncHandler = new NcHandler())
{
// Find scada by id
ScadaSchemaModel scadaToRemove = SubscribedScada
Step/Controllers/WebApi/UserController.cs
+4
View File
@@ -12,6 +12,7 @@ using System.Web.Http;
using System.Web.Helpers;
using static Step.Model.Constants;
using static Step.Utils.LanguageController;
using Step.Utils;
namespace Step.Controllers.WebApi
{
@@ -40,6 +41,9 @@ namespace Step.Controllers.WebApi
// Send to the clients the id of the disconnected user
var context = GlobalHost.ConnectionManager.GetHubContext<NcHub>();
context.Clients.All.logout(new { id = userId.Value });
StepLogger.LogMessage("Logout: " + userId.Value + "Date:" + DateTime.Now, ERROR_LEVEL.INFO);
return Ok();
}
Step/SetupActive.iss
+15 -9
View File
@@ -168,10 +168,10 @@ Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#SCMAppName}; File
[Run]
; Install .net
Filename: {tmp}\{#DotNetInstallerName}; Description: {cm:InstallDotNet}; WorkingDir:{tmp}; StatusMsg: {cm:InstallingDotNet};
Filename: {tmp}\{#DotNetInstallerName}; Description: {cm:InstallDotNet}; WorkingDir:{tmp}; StatusMsg: {cm:InstallingDotNet}; Check: NetFrameworkNeedInstall
;Check: NetFrameworkIsMissing
; Install MariaDb
Filename: "msiexec.exe"; Description: {cm:InstallDotNet}; WorkingDir:{tmp}; StatusMsg: {cm:InstallingMariaDB}; Parameters: "/i {tmp}\{#MariaDBInstallerName}"
Filename: "msiexec.exe"; Description: {cm:InstallDotNet}; WorkingDir:{tmp}; StatusMsg: {cm:InstallingMariaDB}; Parameters: "/i {tmp}\{#MariaDBInstallerName}"; Check: CheckHeidiSQLNeedInstall;
[Code]
///////////// SiemensPath ///////////////////////////////
@@ -209,14 +209,9 @@ var
Result := sSiemensPath ;
end;
///////////////// FrameworkIsNotInstalled ////////////////////////////////////
function FrameworkIsNotInstalled: Boolean;
begin;
Result := not RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\.NETFramework\policy\v4.0');
end;
///////////////// Check .NET Framework 4.6.2 ////////////////////////////////////
function NetFrameworkIsMissing(): Boolean;
function NetFrameworkNeedInstall(): Boolean;
var
bSuccess: Boolean;
regVersion: Cardinal;
@@ -229,6 +224,17 @@ var
end;
end;
///////////// Check heidiSQL /////////////////
function CheckHeidiSQLNeedInstall: Boolean;
begin
if FileExists(ExpandConstant('C:\Program Files (x86)\Common Files\MariaDBShared\HeidiSQL\heidisql.exe'))
then Result:= false
else
begin
Result:= True
end;
end;
///////////////// CreateCustomInputOptionCMsorSCM //////////////////////////
procedure CreateCustomInputOptionCMSorSCM;
begin
Step/wwwroot/assets/styles/base/buttons.less
+18 -1
View File
@@ -241,8 +241,25 @@ button.soft {
}
}
&.square {
width: 48px;
width: 60px;
}
&.incremental {
padding: 0px 2px;
margin-right: 0px;
margin-left: 0px;
}
&.firstIncr {
margin-left: 4px;
border-radius: 2px 0px 0px 2px !important
}
&.middleIncr {
border-radius: 0px !important
}
&.lastIncr {
border-radius: 0px 2px 2px 0px !important
}
i.fa {
font-size: 24px;
}
Step/wwwroot/assets/styles/style.css
+16 -1
View File
@@ -3422,7 +3422,22 @@ button.soft[disabled]:not(.readonly) img {
filter: grayscale(100%) invert(44%);
}
button.soft.square {
width: 48px;
width: 60px;
}
button.soft.incremental {
padding: 0px 2px;
margin-right: 0px;
margin-left: 0px;
}
button.soft.firstIncr {
margin-left: 4px;
border-radius: 2px 0px 0px 2px !important;
}
button.soft.middleIncr {
border-radius: 0px !important;
}
button.soft.lastIncr {
border-radius: 0px 2px 2px 0px !important;
}
button.soft i.fa {
font-size: 24px;
Step/wwwroot/src/@types/tooling.d.ts
Vendored
+3 -1
View File
@@ -134,7 +134,9 @@ declare module server {
radius: number,
wearLength: number,
wearRadius: number,
unitOfMeasure: string
unitOfMeasure: string,
realRadius: number,
realLength: number
}
export interface ShankNc{
Step/wwwroot/src/app_modules/tooling/components/tooling-equipment.ts
+3 -1
View File
@@ -737,8 +737,10 @@ public isEquipmentSelected(offset){
}));
}
else{
this.modifyOffsetInTool(tool, model);
await awaiter(new ToolingService().UpdateNcEdgeData(tool, model).then(response => {
for(var k in model) model[k] = response[k]
this.modifyOffsetInTool(tool, model);
this.toolsConfiguration = (this.$store.state as AppModel).tooling.toolsConfiguration;
this.edgeConfiguration = (this.$store.state as AppModel).tooling.edgesConfiguration;
this.disableList = false;
Step/wwwroot/src/app_modules/under-the-hood/components/jog-menu.vue
+8 -6
View File
@@ -10,8 +10,12 @@
<button @click="ncClick(30)" :disabled="!isKeyActive(30)" :class="{active:isKeySelected(30) , inverted:isReadOnly(30)}" class="soft icon spaced"><img src="assets/icons/under-hood-png/over-stroke.png">{{name(30)}}</button>
<button v-if="!machineInfo.isOsai" @click="ncClick(21)" :disabled="!isKeyActive(21)" :class="{active:isKeySelected(21) , inverted:isReadOnly(21)}" class="soft spaced">{{name(21)}}</button>
<button @click="toggleIncr()" v-if="isKeySelected(7)" ref="incbutton" :class="{active:showIncrMenu}" class="soft spaced">{{"jog_menu_inc" | localize("Inc.")}}&nbsp;{{incLabel}}</button>
<!-- INCR SINGLE BUTTON <button @click="toggleIncr()" v-if="isKeySelected(7)" ref="incbutton" :class="{active:showIncrMenu}" class="soft spaced">{{"jog_menu_inc" | localize("Inc.")}}&nbsp;{{incLabel}}</button>
-->
<button v-if="isKeySelected(7)" @click="ncClick(25)" :class="{active:isKeySelected(25)}" class="soft square incremental firstIncr">{{name(25)}}</button>
<button v-if="isKeySelected(7)" @click="ncClick(26)" :class="{active:isKeySelected(26)}" class="soft square incremental middleIncr">{{name(26)}}</button>
<button v-if="isKeySelected(7)" @click="ncClick(27)" :class="{active:isKeySelected(27)}" class="soft square incremental middleIncr">{{name(27)}}</button>
<button v-if="isKeySelected(7)" @click="ncClick(28)" :class="{active:isKeySelected(28)}" class="soft square incremental lastIncr">{{name(28)}}</button>
<div class="axes-menu-container" v-if="showAxesMenu">
<div class="menu">
@@ -23,17 +27,15 @@
</div>
</div>
<div class="incr-menu-container" v-if="showIncrMenu" :style="{left: incMenuPosition}">
<!--<div class="incr-menu-container" v-if="showIncrMenu" :style="{left: incMenuPosition}">
<div class="menu" ref="incmenu">
<button @click="ncClick(25)" :class="{active:isKeySelected(25)}">{{name(25)}}</button>
<button @click="ncClick(26)" :class="{active:isKeySelected(26)}">{{name(26)}}</button>
<button @click="ncClick(27)" :class="{active:isKeySelected(27)}">{{name(27)}}</button>
<button @click="ncClick(28)" :class="{active:isKeySelected(28)}">{{name(28)}}</button>
</div>
</div>
</div> -->
</div>
</template>
<script>