Skip to content

Commit 27eb10a

Browse files
Preferences were missing in load model
1 parent a88c8e1 commit 27eb10a

3 files changed

Lines changed: 26 additions & 17 deletions

File tree

kratos.gid/kratos.tcl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ proc Kratos::RegisterGiDEvents { } {
8282

8383
# Preferences window
8484
GiD_RegisterPluginPreferencesProc Kratos::Event_ModifyPreferencesWindow
85+
CreateWidgetsFromXml::ClearCachePreferences
8586
}
8687

8788
proc Kratos::Event_InitProblemtype { dir } {
@@ -200,6 +201,10 @@ proc Kratos::LoadCommonScripts { } {
200201
}
201202

202203
proc Kratos::Event_LoadModelSPD { filespd } {
204+
after 1 [list Kratos::LoadModelSPD $filespd]
205+
}
206+
207+
proc Kratos::LoadModelSPD { filespd } {
203208
variable kratos_private
204209

205210
# Event called if a model exists, so close all the windows while tree isn't loaded
@@ -259,13 +264,15 @@ proc Kratos::Event_LoadModelSPD { filespd } {
259264

260265
after 500 {set ::Kratos::kratos_private(model_log_folder) [file join [GiD_Info Project ModelName].gid Logs]}
261266
}
267+
262268
}
263269

264270
proc Kratos::Event_EndProblemtype { } {
265271
Kratos::Log "End session"
266272
# New event system need an unregister
267273
if {[GidUtils::VersionCmp "14.1.4d"] >= 0 } {
268274
GiD_UnRegisterEvents PROBLEMTYPE Kratos
275+
GiD_UnRegisterPluginPreferencesProc Kratos::Event_ModifyPreferencesWindow
269276
}
270277
if {[array exists ::Kratos::kratos_private]} {
271278
# Close the log and moves them to the folder

kratos.gid/scripts/Controllers/PreferencesWindow.tcl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ proc Kratos::ModifyPreferencesWindow { root } {
4242

4343
if {[info exists kratos_private(Path)]} {
4444
set findnode [$root find "name" "general"]
45-
4645
if { $findnode != "" } {
4746
set xml_preferences_filename [file join $kratos_private(Path) scripts Controllers Preferences.xml]
4847
set xml_data [GidUtils::ReadFile $xml_preferences_filename]

kratos.gid/scripts/Logs.tcl

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,18 @@ proc Kratos::GetLogFilePath { } {
1919
proc Kratos::InitLog { } {
2020
variable kratos_private
2121

22-
if {! $Kratos::kratos_private(allow_logs)} {return ""}
22+
if {[info exists Kratos::kratos_private(allow_logs)] && $Kratos::kratos_private(allow_logs)>0} {
2323

24-
set kratos_private(LogFilename) [clock format [clock seconds] -format "%Y%m%d%H%M%S"].log
25-
set logpath [Kratos::GetLogFilePath]
26-
file mkdir [file dirname $logpath]
27-
set logfile [open $logpath "a+"];
28-
puts $logfile "Kratos Log Session"
29-
close $logfile
30-
set kratos_private(Log) [list ]
31-
32-
Kratos::AutoFlush
24+
set kratos_private(LogFilename) [clock format [clock seconds] -format "%Y%m%d%H%M%S"].log
25+
set logpath [Kratos::GetLogFilePath]
26+
file mkdir [file dirname $logpath]
27+
set logfile [open $logpath "a+"];
28+
puts $logfile "Kratos Log Session"
29+
close $logfile
30+
set kratos_private(Log) [list ]
31+
32+
Kratos::AutoFlush
33+
}
3334
}
3435

3536
proc Kratos::Log {msg} {
@@ -79,8 +80,9 @@ proc Kratos::FlushLog { } {
7980
}
8081

8182
proc Kratos::AutoFlush {} {
82-
if {! $Kratos::kratos_private(allow_logs)} {return ""}
83-
after 5000 {Kratos::AutoFlush}
83+
if {[info exists Kratos::kratos_private(allow_logs)] && $Kratos::kratos_private(allow_logs)>0} {
84+
after 5000 {Kratos::AutoFlush}
85+
}
8486
}
8587

8688
proc Kratos::ViewLog {} {
@@ -96,8 +98,9 @@ if { [GiD_Set SaveGidDefaults] } {
9698

9799
proc Kratos::MoveLogsToFolder {folder {flush_log 1}} {
98100

99-
if {! $Kratos::kratos_private(allow_logs)} {return ""}
100-
if {$flush_log} {FlushLog}
101-
if {![file exists $folder]} {file mkdir $folder}
102-
file copy -force [Kratos::GetLogFilePath] $folder
101+
if {[info exists Kratos::kratos_private(allow_logs)] && $Kratos::kratos_private(allow_logs)>0} {
102+
if {$flush_log} {FlushLog}
103+
if {![file exists $folder]} {file mkdir $folder}
104+
file copy -force [Kratos::GetLogFilePath] $folder
105+
}
103106
}

0 commit comments

Comments
 (0)