2.0

jaku98 · May 24, 2022 · 086fdbb · 086fdbb
1 parent 4688c34
commit 086fdbb
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/RadarSoft2.0.py b/RadarSoft2.0.py
@@ -1,5 +1,5 @@
 # Title [pol]: Model programowy systemu zobrazowania sytuacji powietrznej w radarze pokładowym
-# Title [eng]: Radar software model of airborne situational awareness system
+# Title [eng]: Software model of the air situation display system in the on-board radar
 # Author: JAKUBCZYK MARCIN, Military University of Technology in Warsaw, 2022
 # Description: The program works with a simulation created in the Unreal Engine 4
 #              Information display system in FCR format with basic operation.
@@ -826,21 +826,21 @@ def recmessage():
                                 else:
                                     textAimBugAngle = fontSet.render(str(aimBugAngle) + str('R'), False, fontColorWhite)
                                 wGame.screen.blit(textAimBugAngle, [145, 110])
-                                if ((wWindow/2+objectsFoe[aimIndexFoe][1]*pxScaleAzi)) <= searchAziLeft+20:
+                                if ((wWindow/2+objectsFoe[aimIndexFoe][1]*pxScaleAzi)) <= searchAziLeft+30:
                                     if scanAziLeft > -scanAzimuth:
                                         scanAziLeft -= scanAziStep
                                         scanAziRight -= scanAziStep
-                                elif ((wWindow/2+objectsFoe[aimIndexFoe][1]*pxScaleAzi)) >= searchAziRight-20:
+                                elif ((wWindow/2+objectsFoe[aimIndexFoe][1]*pxScaleAzi)) >= searchAziRight-30:
                                     if scanAziRight < scanAzimuth:    
                                         scanAziLeft += scanAziStep
                                         scanAziRight += scanAziStep
-                                if ((hWindow/2+objectsFoe[aimIndexFoe][2]*pxScaleEle)) >= hWindow/2+scanEleUp*pxScaleEle:
+                                if ((hWindow/2+objectsFoe[aimIndexFoe][2]*pxScaleEle)) >= hWindow/2+scanEleUp*pxScaleEle-30:
                                     if scanEleUp < scanElevation:   
                                         scanEleUp += scanEleStep
                                         scanEleDown += scanEleStep
                                         scanEleUp_ -= scanEleStep
                                         scanEleDown_ -= scanEleStep
-                                elif ((hWindow/2+objectsFoe[aimIndexFoe][2]*pxScaleEle)) <= hWindow/2+scanEleDown*pxScaleEle:
+                                elif ((hWindow/2+objectsFoe[aimIndexFoe][2]*pxScaleEle)) <= hWindow/2+scanEleDown*pxScaleEle+30:
                                     if scanEleDown > -scanElevation:
                                         scanEleUp -= scanEleStep
                                         scanEleDown -= scanEleStep
@@ -849,6 +849,8 @@ def recmessage():
                             if aimLogic == False:
                                 drawFoe(i)
                                 drawLastFoe(i)
+                            print('x', hWindow/2+objectsFoe[aimIndexFoe][2]*pxScaleEle)
+                            print('y', hWindow/2+scanEleUp*pxScaleEle)
             if roamTarget > 0:
                 for i in range(roamTarget):
                     if ((-scanAzimuth<=objectsRoam[i][1]<=scanAzimuth) and (-scanElevation<=objectsRoam[i][2]<=scanElevation)