changed some cofniguration in properties

Author: jginternational

kratos.gid/exec/compiled.win.bat

@@ -10,7 +10,8 @@ REM ErrorFile: "%2\%1.err"
 DEL "%2\%1.info"
 DEL "%2\%1.err"
 
-set PATH=%run_kratos_exe%;%run_kratos_exe%\\libs;%PATH%
+set PATH=%kratos_bin_path%\\libs;%PATH%
+set PYTHONPATH=%kratos_bin_path%
 
 REM Run Python using the script MainKratos.py
-%run_kratos_exe%\\runkratos .\MainKratos.py > "%2\\%1.info" 2> "%2\\%1.err"
+python .\MainKratos.py > "%2\\%1.info" 2> "%2\\%1.err"

kratos.gid/scripts/Controllers/Preferences.xml

@@ -18,14 +18,14 @@
             <option value='1' label='1'/>
             <option value='2' label='2'/>
         </combobox>
-        <entrywithbutton name="debug_folder" label="Debug path" variable="debug_folder" buttonimage="folder.png" variablemanager='Kratos::ManagePreferences' buttonfunction="OpenBrowserForDirectory" help='Path to the kratos debug folder. This is placed in the launch.json file for debugging' />
+        <entrywithbutton name="debug_folder" label="Debug path" variable="debug_folder" buttonimage="folder.png" variablemanager='Kratos::ManagePreferences' buttonfunction="OpenBrowserForDirectoryDebug" help='Path to the kratos debug folder. This is placed in the launch.json file for debugging' />
         <comboboxframe name="launch_configuration" label="Launch configuration" variable="launch_configuration" variablemanager='Kratos::ManagePreferences' help='' >
             <option value='Launch via pip on GiDs python' label='Launch via pip on GiDs python'/>
             <option value='Launch via pip' label='Launch via pip'  setactivate="python_path"/>
-            <option value='Launch local compiled version' label='Launch local compiled version' setactivate="runkratos_path"/>
+            <option value='Launch local compiled version' label='Launch local compiled version' setactivate="python_path kratos_bin_path"/>
             <option value='Docker' label='Docker' setactivate="docker_image" />
-            <entrywithbutton name="python_path" variable="python_path" label="Python path (exe)" variablemanager='Kratos::ManagePreferences'  help='Path to python.exe' buttonimage="folder.png" buttonfunction="GetPythonPath"/>
-            <entrywithbutton name="runkratos_path" variable="runkratos_path" label="Kratos path (exe)" variablemanager='Kratos::ManagePreferences'  help='Path to runkratos.exe' buttonimage="folder.png" buttonfunction="OpenBrowserForDirectory"/>
+            <entrywithbutton name="python_path" variable="python_path" label="Python path (exe)" variablemanager='Kratos::ManagePreferences'  help='Path to python.exe' buttonimage="folder.png" buttonfunction="OpenBrowserForDirectoryPython"/>
+            <entrywithbutton name="kratos_bin_path" variable="kratos_bin_path" label="Kratos path (bin)" variablemanager='Kratos::ManagePreferences'  help='Path to your compiled kratos folder' buttonimage="folder.png" buttonfunction="OpenBrowserForDirectoryKratos"/>
             <entry name="docker_image" variable="docker_image" label="Docker image" variablemanager='Kratos::ManagePreferences'  help='Name of the Kratos Docker image'/>
         </comboboxframe>
     </labelframe>

kratos.gid/scripts/Controllers/PreferencesWindow.tcl

@@ -39,9 +39,9 @@ proc Kratos::ManagePreferences { cmd name {value ""}} {
                     set ret "fjgarate/kratos-run"
                 }
                 "python_path" {
-                    set ret [Kratos::GetDefaultPythonPath] 
+                    set ret [Kratos::GetDefaultPythonPath]
                 }
-                "runkratos_path" {
+                "kratos_bin_path" {
                     set ret [file join $::Kratos::kratos_private(Path) exec kratos runkratos.exe]
                 }
                 default {

kratos.gid/scripts/Launch.tcl

@@ -288,8 +288,8 @@ proc Kratos::ExecuteLaunchByMode {launch_mode} {
         set docker_image [Kratos::ManagePreferences GetValue docker_image]
         set ::env(kratos_docker_image) $docker_image
     } elseif {[dict get $mode name] eq {Launch local compiled version}} {
-        set runkratos_path [Kratos::ManagePreferences GetValue runkratos_path]
-        set ::env(runkratos_path) $runkratos_path
+        set kratos_bin_path [Kratos::ManagePreferences GetValue kratos_bin_path]
+        set ::env(kratos_bin_path) $kratos_bin_path
     } else {
         set python_exe_path [Kratos::ManagePreferences GetValue python_path]
         set ::env(kratos_python_exe) $python_exe_path

kratos.gid/scripts/Utils.tcl

@@ -152,7 +152,7 @@ proc Kratos::RegisterEnvironment { } {
     #do not save preferences starting with flag gid.exe -c (that specify read only an alternative file)
     if { [GiD_Set SaveGidDefaults] } {
         variable kratos_private
-        set vars_to_save [list DevMode echo_level mdpa_format debug_folder allow_logs launch_configuration python_path runkratos_path docker_image]
+        set vars_to_save [list DevMode echo_level mdpa_format debug_folder allow_logs launch_configuration python_path kratos_bin_path docker_image]
         set preferences [dict create]
         foreach v $vars_to_save {
             if {[info exists kratos_private($v)]} {
@@ -310,8 +310,16 @@ proc Kratos::OpenCaseIn {program} {
 }
 
 if { ![GidUtils::IsTkDisabled] } {
-    proc xmlprograms::OpenBrowserForDirectory { baseframe variable} {
-        set $variable [MessageBoxGetFilename directory write [_ "Select kratos debug compiled folder (kratos / bin / debug"]]
+    proc xmlprograms::OpenBrowserForDirectoryDebug { baseframe variable} {
+        set $variable [MessageBoxGetFilename directory write [_ "Select kratos debug compiled folder (kratos / bin / debug)"]]
+        return variable
+    }
+    proc xmlprograms::OpenBrowserForDirectoryPython { baseframe variable} {
+        set $variable [MessageBoxGetFilename directory write [_ "Select python installation folder (python path, where python3.exe is)"]]
+        return variable
+    }
+    proc xmlprograms::OpenBrowserForDirectoryKratos { baseframe variable} {
+        set $variable [MessageBoxGetFilename directory write [_ "Select kratos compiled folder (kratos / bin / (release | debug))"]]
         return variable
     }
 }