Merge branch 'main' of github.com:eclipse-sumo/sumo into Netedit_dev

eclipse-sumo · Dec 20, 2024 · 588986a · 588986a
2 parents 03c07d9 + 7306d9b
commit 588986a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -2,8 +2,8 @@ name: documentation
 
 on:
   push:            # run on push events in the docs subfolder
-    paths:
-      - 'docs/**'
+   paths:
+     - 'docs/**'
   workflow_dispatch:
   schedule:
   - cron: '30 1 * * *' # daily at 01:30 UTC
@@ -45,6 +45,7 @@ jobs:
   # checking external links
   ############################
   external-link-check:
+    if: github.event_name != 'push'
     runs-on: ubuntu-latest
 
     steps:

diff --git a/.github/workflows/macos-wheels.yml b/.github/workflows/macos-wheels.yml
@@ -148,12 +148,12 @@ jobs:
         python3 build_config/version.py build_config/setup-traci.py ./setup.py
         python3 -m build --wheel
 
-    - name: Running libsumo tests
-      run: |
-        python3 -m pip install -f tools/dist sumolib traci
-        python3 -m pip install -f python-wheels libsumo
-        cd tests
-        texttest -b ci -v ci -a complex.libsumo
+    # - name: Running libsumo tests
+    #   run: |
+    #     python3 -m pip install -f tools/dist sumolib traci
+    #     python3 -m pip install -f python-wheels libsumo
+    #     cd tests
+    #     texttest -b ci -v ci -a complex.libsumo
 
     - name: Compressing test results
       if: failure()

diff --git a/src/netedit/frames/network/GNECrossingFrame.cpp b/src/netedit/frames/network/GNECrossingFrame.cpp
@@ -70,7 +70,7 @@ GNECrossingFrame::JunctionInformation::JunctionInformation(GNECrossingFrame* cro
     // Create frame for junction ID
     FXHorizontalFrame* junctionIDFrame = new FXHorizontalFrame(getCollapsableFrame(), GUIDesignAuxiliarHorizontalFrame);
     // create label
-    new FXLabel(junctionIDFrame, "", nullptr, GUIDesignLabelThickedFixed(100));
+    new FXLabel(junctionIDFrame, "Edited", nullptr, GUIDesignLabelThickedFixed(100));
     // create text field and disable it
     myTextFieldJunctionID = new FXTextField(junctionIDFrame, GUIDesignTextFieldNCol, this, MID_GNE_SELECT, GUIDesignTextField);
     myTextFieldJunctionID->disable();

diff --git a/tests/netedit/attributesEnum.py b/tests/netedit/attributesEnum.py
@@ -377,12 +377,12 @@ class create:
         edges = 1
         priority = 2
         width = 3
-        button = 10
+        button = 9
 
     class createTLS:
         edges = 1
         width = 2
-        button = 10
+        button = 9
 
     class inspect:
         edges = 1
@@ -412,8 +412,8 @@ class inspectSelectionTLS:
         linkIndex2 = 4
         parameters = 7
 
-    clearEdges = 3
-    firstField = 4
+    useSelectedEdges = 3
+    firstField = 3
 
 
 # TLS