Compare commits

...

3 Commits

Author SHA1 Message Date
NicolaP 6981bcafbb Opzione ReadOnly gestita da chiave di protezione 2022-04-08 12:45:02 +02:00
NicolaP 99d69a4ffe Merge branch 'NicolaP' into Features/OnlyRead 2022-03-17 15:19:29 +01:00
NicolaP 4355deafb3 Correzione gestione LinearDimensions 2022-03-17 15:11:39 +01:00
6 changed files with 17 additions and 7 deletions
+2
View File
@@ -25,6 +25,8 @@ Friend Module IniFile
DOORS = 2
DOORCREATOR = 8
JAMBS = 32
STEELDOOR = 256
READ_ONLY = 512
End Enum
' Path cartella Data
+2 -2
View File
@@ -57,8 +57,8 @@ Friend Class MainWindowModel
EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
EgtSetKey(sKey)
' Recupero livello e opzioni della chiave
Dim bKey As Boolean = EgtGetKeyLevel(3279, 2403, 1, IniFile.m_nKeyLevel) And
EgtGetKeyOptions(3279, 2403, 1, IniFile.m_nKeyOptions)
Dim bKey As Boolean = EgtGetKeyLevel(3279, 2404, 1, IniFile.m_nKeyLevel) And
EgtGetKeyOptions(3279, 2404, 1, IniFile.m_nKeyOptions)
'Inizializzazione generale di EgtInterface
m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
Dim sLogFile As String = IniFile.m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())
+2 -2
View File
@@ -72,5 +72,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.4.3.1")>
<Assembly: AssemblyFileVersion("2.4.3.1")>
<Assembly: AssemblyVersion("2.4.4.1")>
<Assembly: AssemblyFileVersion("2.4.4.1")>
+3 -1
View File
@@ -219,7 +219,9 @@ Friend Module OptionModule
End If
' verifico se il programma è in modalità di sola lettura DDF
If GetMainPrivateProfileInt(S_GENERAL, "ReadOnly", 0) <> 0 Then
If (IniFile.m_nKeyOptions And KEY_OPT.READ_ONLY) <> 0 Then
OptionModule.ReadOnlyDDF = True
ElseIf GetMainPrivateProfileInt(S_GENERAL, "ReadOnly", 0) <> 0 Then
OptionModule.ReadOnlyDDF = True
Else
OptionModule.ReadOnlyDDF = False
@@ -173,10 +173,15 @@ Public Class InstrumentPanelVM
Private m_DimensioningLayer As Integer
Public Sub LinearDimension(ByVal param As Object)
GetDistIsChecked = False
EgtSetCurrPartLayer(EgtGetFirstPart(), m_DimensioningLayer)
If EgtSetCurrPartLayer(1, m_DimensioningLayer) Then
Dim nIndFirstPart As Integer = EgtGetFirstPart()
m_DimensioningLayer = EgtGetFirstNameInGroup(nIndFirstPart, "AUX")
If Not EgtSetCurrPartLayer(nIndFirstPart, m_DimensioningLayer) Then
Map.refSceneManagerVM.GetController.ExecuteCommand(Controller.CMD.NEWPART)
Map.refSceneManagerVM.GetController.ExecuteCommand(Controller.CMD.NEWLAYER)
nIndFirstPart = EgtGetFirstPart()
m_DimensioningLayer = EgtGetCurrLayer()
EgtSetCurrPartLayer(1, m_DimensioningLayer)
'EgtSetColor(m_DimensioningLayer, "BLACK")
End If
' blocco la pagina corrente
+1
View File
@@ -453,6 +453,7 @@ Public Class SceneManagerVM
End Sub
Private Sub OnMouseSelectedPoint(ByVal sender As Object, ByVal PtP As Point3d, ByVal nSep As SEP, ByVal nId As Integer) Handles m_ProjectScene.OnMouseSelectedPoint
EgtSetCurrentContext(Map.refSceneManagerVM.ProjectScene.GetCtx())
Dim bDone As Boolean = (Keyboard.Modifiers And ModifierKeys.Control) <> ModifierKeys.Control
m_Controller.MouseSelectedPoint(PtP, nSep, nId, bDone)
End Sub