Skip to content

Commit

Permalink
Patching netedit expected results. Refs #3045
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Mar 1, 2018
1 parent b051207 commit 9ba87dc
Show file tree
Hide file tree
Showing 16 changed files with 1,004 additions and 929 deletions.
398 changes: 199 additions & 199 deletions tests/netedit/additionalElements/calibrator/load_values_flows/log.netedit

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Warning: Adding calibrator route into calibrator 'calibratorRoutes'
Warning: Adding calibrator route into calibrator 'calibratorRoutes'
Warning: Adding calibrator vehicle type into calibrator 'calibratorRoutes'
Warning: Optional float attribute 'period' of flow is missing; Default value '10.00' will be used.
Warning: Optional int attribute 'probability' of flow is missing; Default value '1.00' will be used.
Warning: Optional float attribute 'probability' of flow is missing; Default value '1.00' will be used.
Warning: route with ID = 'typeWithoutCalibrator' cannot be created; their route with ID = 'typeWithoutCalibrator' doesn't exist
Warning: Additionals saved
Warning: Created connection 'fromgneE0_0togneE1_0' in retrieveGNEConnection()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ Warning: Adding calibrator vehicle type into calibrator 'calibratorVehicleTypes'
Warning: Adding calibrator route into calibrator 'calibratorVehicleTypes'
Warning: Adding calibrator vehicle type into calibrator 'calibratorVehicleTypes'
Warning: Optional float attribute 'period' of flow is missing; Default value '10.00' will be used.
Warning: Optional int attribute 'probability' of flow is missing; Default value '1.00' will be used.
Warning: Optional float attribute 'probability' of flow is missing; Default value '1.00' will be used.
Warning: route with ID = 'typeWithoutCalibrator' cannot be created; their route with ID = 'typeWithoutCalibrator' doesn't exist
Warning: Additionals saved
Warning: Created connection 'fromgneE0_0togneE1_0' in retrieveGNEConnection()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Warning: Deleting unreferenced calibrator 'calibrator_gneE1_2'
Warning: Deleting unreferenced calibrator 'calibrator_gneE0_3'
Warning: Created connection 'fromgneE0_1togneE1_1' in retrieveGNEConnection()
Warning: Created connection 'fromgneE1_1togneE0_1' in retrieveGNEConnection()
Warning: Loaded texture Lane Pedestrian in GUITextureSubSys::getTexture
Warning: Additionals saved
Warning: Loaded texture Lane Pedestrian in GUITextureSubSys::getTexture
Warning: Deleting unreferenced edge 'gneE0' in GNENet destructor
Warning: Deleting unreferenced lane 'gneE0_0' in GNEEdge destructor
Warning: Deleting unreferenced lane 'gneE0_1' in GNEEdge destructor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ Warning: Deleting unreferenced containerStop 'containerStop_gneE1_0_1'
Warning: Deleting unreferenced containerStop 'containerStop_gneE0_0_0'
Warning: Created connection 'fromgneE0_1togneE1_1' in retrieveGNEConnection()
Warning: Created connection 'fromgneE1_1togneE0_1' in retrieveGNEConnection()
Warning: Additionals saved
Warning: Loaded texture Lane Pedestrian in GUITextureSubSys::getTexture
Warning: Additionals saved
Warning: Deleting unreferenced edge 'gneE0' in GNENet destructor
Warning: Deleting unreferenced lane 'gneE0_0' in GNEEdge destructor
Warning: Deleting unreferenced lane 'gneE0_1' in GNEEdge destructor
Expand Down
6 changes: 3 additions & 3 deletions tests/netedit/additionalElements/detentry/inspect/log.netedit
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ Warning: Value '' for attribute pos of detEntry isn't valid
Warning: Value '' for attribute pos of detEntry isn't valid
Warning: Setting new attribute pos '25' into detEntry 'e3Detector_0detEntry0'
Warning: Setting new attribute friendlyPos 'true' into detEntry 'e3Detector_0detEntry0'
Warning: Setting new attribute parentOfAdditional 'e3Detector_1' into detEntry 'e3Detector_0detEntry0'
Warning: Setting new attribute parentItem 'e3Detector_1' into detEntry 'e3Detector_0detEntry0'
Warning: Setting new attribute blockMovement 'true' into detEntry 'e3Detector_0detEntry0'
Warning: Loaded texture lock in GUITextureSubSys::getTexture
Warning: Keys Ctrl + Z (Undo) pressed
Warning: Setting previous attribute blockMovement '0' into detEntry 'e3Detector_0detEntry0'
Warning: Keys Ctrl + Z (Undo) pressed
Warning: Setting previous attribute parentOfAdditional 'e3Detector_0' into detEntry 'e3Detector_0detEntry0'
Warning: Setting previous attribute parentItem 'e3Detector_0' into detEntry 'e3Detector_0detEntry0'
Warning: Keys Ctrl + Z (Undo) pressed
Warning: Setting previous attribute friendlyPos '0' into detEntry 'e3Detector_0detEntry0'
Warning: Keys Ctrl + Z (Undo) pressed
Expand All @@ -49,7 +49,7 @@ Warning: Setting new attribute pos '25' into detEntry 'e3Detector_0detEntry0'
Warning: Keys Ctrl + Y (Redo) pressed
Warning: Setting new attribute friendlyPos 'true' into detEntry 'e3Detector_0detEntry0'
Warning: Keys Ctrl + Y (Redo) pressed
Warning: Setting new attribute parentOfAdditional 'e3Detector_1' into detEntry 'e3Detector_0detEntry0'
Warning: Setting new attribute parentItem 'e3Detector_1' into detEntry 'e3Detector_0detEntry0'
Warning: Keys Ctrl + Y (Redo) pressed
Warning: Setting new attribute blockMovement 'true' into detEntry 'e3Detector_0detEntry0'
Warning: e3Detector with ID 'e3Detector_0' cannot be writed in additional file because doesn't have childs.
Expand Down
6 changes: 3 additions & 3 deletions tests/netedit/additionalElements/detexit/inspect/log.netedit
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ Warning: Value '' for attribute pos of detExit isn't valid
Warning: Value '' for attribute pos of detExit isn't valid
Warning: Setting new attribute pos '25' into detExit 'e3Detector_0detExit0'
Warning: Setting new attribute friendlyPos 'true' into detExit 'e3Detector_0detExit0'
Warning: Setting new attribute parentOfAdditional 'e3Detector_1' into detExit 'e3Detector_0detExit0'
Warning: Setting new attribute parentItem 'e3Detector_1' into detExit 'e3Detector_0detExit0'
Warning: Setting new attribute blockMovement 'true' into detExit 'e3Detector_0detExit0'
Warning: Loaded texture lock in GUITextureSubSys::getTexture
Warning: Keys Ctrl + Z (Undo) pressed
Warning: Setting previous attribute blockMovement '0' into detExit 'e3Detector_0detExit0'
Warning: Keys Ctrl + Z (Undo) pressed
Warning: Setting previous attribute parentOfAdditional 'e3Detector_0' into detExit 'e3Detector_0detExit0'
Warning: Setting previous attribute parentItem 'e3Detector_0' into detExit 'e3Detector_0detExit0'
Warning: Keys Ctrl + Z (Undo) pressed
Warning: Setting previous attribute friendlyPos '0' into detExit 'e3Detector_0detExit0'
Warning: Keys Ctrl + Z (Undo) pressed
Expand All @@ -49,7 +49,7 @@ Warning: Setting new attribute pos '25' into detExit 'e3Detector_0detExit0'
Warning: Keys Ctrl + Y (Redo) pressed
Warning: Setting new attribute friendlyPos 'true' into detExit 'e3Detector_0detExit0'
Warning: Keys Ctrl + Y (Redo) pressed
Warning: Setting new attribute parentOfAdditional 'e3Detector_1' into detExit 'e3Detector_0detExit0'
Warning: Setting new attribute parentItem 'e3Detector_1' into detExit 'e3Detector_0detExit0'
Warning: Keys Ctrl + Y (Redo) pressed
Warning: Setting new attribute blockMovement 'true' into detExit 'e3Detector_0detExit0'
Warning: e3Detector with ID 'e3Detector_0' cannot be writed in additional file because doesn't have childs.
Expand Down
Loading

0 comments on commit 9ba87dc

Please sign in to comment.