1
0
Fork 0
Commit graph

653 commits

Author SHA1 Message Date
ThorstenB
b4d90150c5 issue #127: make screen shots work with OSG multi-threading
Make sure actual snap shot is executed in graphics context.
(patch requires simgear+fgdata update!)
2011-05-28 23:27:46 +02:00
ThorstenB
9f13c49d29 issue #316: panning not working when center-on-aircraft enabled
Panning feature looked broken to some users since auto-center is enabled
by default which blocks panning. center-on-aircraft is now disabled
automatically when view is panned.
2011-05-20 19:48:05 +02:00
ThorstenB
0c500d4fc4 Wish #304: MapWidget's center-on-aircraft button should be sticky
Thanks to Victhor Foster for the idea.
2011-04-16 10:53:09 +02:00
ThorstenB
d7798a7cc2 Slightly brighter blue color level for map widget
Almost couldn't see the new blue color on my screen.
Enjoy the blues... :)
2011-03-27 11:32:41 +02:00
Stuart Buchanan
23971c17aa Improve display of shipping in map widget. 2011-03-26 11:02:00 +00:00
Torsten Dreyer
f938a23d7c clear two gcc warnings 2011-02-25 20:46:18 +01:00
ThorstenB
7f846d20c7 Make route editing sane.
Drag&drop, insert and remove now update the current waypoint as expected.
2011-01-23 00:45:06 +01:00
James Turner
7cbb3a10ed Expand route-manager waypoint info, to support smarter FMS functions. 2011-01-20 00:39:42 +00:00
Curtis L. Olson
7fb8114feb Add code to draw AI ships on the map widget (useful for carrier ops.)
An AI Tanker requested from the AI menu has an id of -2, so change the code to
only ignore AI models with an ID of -1.
2011-01-07 13:05:47 -06:00
James Turner
7d58b44f73 Alexey Varjat: Add ILS data to GUI/MapWidget 2011-01-03 17:29:24 +00:00
James Turner
a91ec5f9f9 Initial work on CMake build files, with considerable help from Olaf Flebbe. 2010-12-19 15:06:04 +00:00
Torsten Dreyer
58fbd0d72a msvc warning fixes 2010-12-15 16:40:25 +01:00
James Turner
2c175f57ae Override puaComboBox recalc_bbox, ignore the popup-menu 2010-12-07 10:33:14 +00:00
Tim Moore
38e1600bed add a command to print information about visible objects in the scene 2010-11-15 00:09:52 +01:00
Christian Schmitt
0a5e86f4e6 remove old .cvsignore files 2010-11-11 01:16:29 +01:00
James Turner
e5abcb1d4e Merge commit 'refs/merge-requests/9' of git://gitorious.org/fg/flightgear into integration/merge9
Conflicts:
	src/GUI/new_gui.cxx
2010-10-25 09:12:21 +01:00
ThorstenB
d61e992d76 Fix occasional start-up crash when reading GUI XMLs.
_dialog_props holds SGSharedPtrs (pointers managed by reference counters).
Explicitly casting the object to an unmanaged SGPropertyNode* and deleting it
may cause heap corruption, since the following assignment "_dialog_props[..] = ..."
also tries to delete the (already deleted) object.
2010-10-24 21:36:15 +02:00
James Turner
7ccba95b9c Remove direct uses of PLIB ulXXX functions 2010-10-24 07:10:51 +01:00
James Turner
dd2eec7bd8 Airways/procedures code - add new data structures to store waypoints and
procedures, and routing algorithms, and modify the GPS, route manager and
WaypointList to use the new objects.
2010-10-20 09:02:02 +01:00
James Turner
1afd4e602e Get rid of FGGeneral; expose equivlanet values via properties. 2010-10-01 09:33:31 +01:00
James Turner
582c1e8df8 Tidy new_gui header 2010-09-30 23:10:00 +01:00
James Turner
19360a8425 Fix 'using std::' abuses 2010-08-09 08:36:20 +01:00
James Turner
5c507beba2 Fix up Win32 GUI code after simgear/screen cleanup; deprecated dialog code going away. 2010-07-31 16:56:07 +01:00
James Turner
18d42ec1af Rename reInit() method to 'resetSimulator', and document that it's hooked up to the 'reset' command. 2010-07-01 22:50:11 +01:00
Torsten Dreyer
c89b18ddbd Ignore generated files
add generated files to gitignore that has also been in cvsignore
remove generated config.h-msvc* from source control
2010-06-02 11:27:16 +02:00
Tim Moore
0d45920098 Merge branch 'jmt/gps' into next 2010-04-25 18:31:19 +02:00
jmt
3419b28919 MapWidget: fix a crash on uninitialized. 2010-04-25 09:00:41 +02:00
Tim Moore
ebdeb3eed3 Merge branch 'jmt/gps' into next
Conflicts:
	src/Instrumentation/navradio.cxx
2010-03-28 15:32:59 +02:00
jmt
e4c4a3a412 MapWidget for the GUI, initial commit. 2010-03-28 15:25:47 +02:00
Tim Moore
39def8132a Merge branch 'jmt/gpswidget' 2010-03-28 15:15:58 +02:00
Tim Moore
7ee645aa20 Merge branch 'timoore/getpath-rebase' into next 2010-03-09 11:25:18 +01:00
Tim Moore
7ff80d11a0 changes for SGPropertyNode::getPath return type
It's now a std::string.
2010-03-09 11:24:45 +01:00
Tim Moore
0b6579d6fb Merge branch 'jmt/gpswidget' into next 2010-02-25 23:34:04 +01:00
jmt
8e12b0b679 Make automake happier. 2010-02-25 23:33:43 +01:00
Tim Moore
4ae8c90f76 Merge branch 'jmt/font' 2010-02-25 12:06:08 +01:00
Tim Moore
51846e5129 Merge branch 'jmt/gpswidget' into next 2010-02-23 08:53:58 +01:00
jmt
f0e72608a7 waypointList: stop using GNU extension / C99 features. 2010-02-23 08:53:46 +01:00
Tim Moore
da8be3ae7b Merge branch 'jmt/gpswidget' into next 2010-02-22 09:37:05 +01:00
Tim Moore
247219d1f1 remove trailing slash / empty line from Makefile.am 2010-02-22 09:36:10 +01:00
Tim Moore
de79ec4421 Merge branch 'jmt/gpswidget' into next 2010-02-21 22:26:29 +01:00
jmt
4468d785b5 GPS / route-manager: add new custom widget to display the waypoints list.
Supports various new editing features, including dragging to re-order, and
+/- keys to adjust the target altitude for a waypoint. Also displays some
additional information, and will display *even* more once I land airways/
SID/STAR support.
2010-02-21 22:26:14 +01:00
Tim Moore
351d1ddb5e Merge branch 'jmt/gui' into next 2010-02-17 07:41:48 +01:00
jmt
4f99561f63 Quiet: reduce log-level of various things from INFO to DEBUG or BULK, and tune the categories/level of some specific messages.
Commit split by timoore in order to apply most of it to maint branch.
2010-02-17 07:41:23 +01:00
jmt
26361f2f5a Bugfix: stop dialogs jumping around when re-layout occurs - make positions persistent. 2010-02-17 07:31:05 +01:00
jmt
73334cf61b Bugfix #35 / denker #20F:
Guard against invalid font names in panel XML files, and make font name
comparisons case-insensitive so that 'helvetica', 'Helvetica' or 'HELVETICA'
work as expected.
2010-02-11 00:20:59 +01:00
fredb
00e9ad3055 MINGW patch from Benot Laniel 2010-01-25 17:12:04 +01:00
Tim Moore
8933486a56 Merge branch 'jmt/dialog' 2009-11-26 23:32:38 +01:00
jmt
71c03b1ce4 Dynamic combo-boxes; read values from the property tree. 2009-11-04 23:13:42 +01:00
Tim Moore
3c5679fa40 Merge branches 'jmt/dialog' and 'durk/scenery' 2009-10-12 11:06:12 +02:00
jmt
23ce537168 Update for screen-dumps in PNG format instead of PPM. 2009-10-07 08:24:59 +02:00
jmt
90106c59ce Dialog support for conditional enable and visible flags, and re-running layout when conditions change. Used by the GPS code, but potentially in many other places I expect. 2009-10-04 02:06:48 +02:00
torsten
16eefc84d1 Tatsuhiro Nishioka:
Patches for configure.ac and Makefile.am files in FG/SG so Mac developers can build these in a unix way.
These also enables Mac developers to choose either PLIB framework or PLIB static libs.
2009-09-17 22:54:42 +02:00
Tim Moore
8238bcddbd fix warnings in GUI code 2009-08-24 18:00:10 +02:00
torsten
0c2db22988 Advanced input subsystem - Step1: cleanup dependencies 2009-08-08 08:37:14 +02:00
fredb
94caa0b891 Fix case typo 2009-07-27 23:52:33 +02:00
fredb
9718338560 Compile under MSVC9 2009-07-27 23:52:33 +02:00
Tim Moore
7d6c567fde Refer to property types using props:: namespace
BOOL, FLOAT etc. conflict with typedefs in windows.h.
2009-07-17 14:54:12 +02:00
timoore
5cf18d30c6 Support for VEC3D and VEC4D properties.
Tiny update to property_list for extended properties.

New property types in nasal.
2009-07-16 12:10:47 +02:00
timoore
4cc3084256 SGPropertyNode::Type moves to simgear::props namespace 2009-07-16 12:10:47 +02:00
fredb
219be77f1e Suppress warnings 2009-07-02 08:59:16 +02:00
Tim Moore
b588a92b7f adapt to changes in sg_exception interface
sg_location now uses C strings. Also, change uses of sg_throwable to more
specific exceptions like sg_io_exception.
2009-06-16 11:46:47 +02:00
mfranz
744a23d0aa fix leaks; make destructors virtual 2009-05-18 12:24:16 +02:00
mfranz
a57b626633 Ctrl-Shift-click on the '.' entry fires listeners of the parent node.
This can be used to validate atomic branches after individual members
have been changed.

(This is useful no matter how the discussion on aggregate property types
ends, and not meant to enforce/accelerate a decision.)
2009-04-15 23:19:29 +02:00
mfranz
6a590ce9de gui/embedded nasal: don't rely on the nasal system being available 2009-04-01 09:23:54 +02:00
frohlich
a99ea1c7b5 Port over remaining Point3D usage to the more type and unit safe SG* classes.
Remove leftover headers from plib/sg.

Modified Files:
 	src/AIModel/AIBase.cxx
 	src/AIModel/AIFlightPlanCreateCruise.cxx
 	src/ATCDCL/AIEntity.cxx src/ATCDCL/AIEntity.hxx
 	src/ATCDCL/AIGAVFRTraffic.cxx src/ATCDCL/AIGAVFRTraffic.hxx
 	src/ATCDCL/AILocalTraffic.cxx src/ATCDCL/AILocalTraffic.hxx
 	src/ATCDCL/AIMgr.cxx src/ATCDCL/ATC.hxx
 	src/ATCDCL/ATCDialog.cxx src/ATCDCL/ATCProjection.cxx
 	src/ATCDCL/ATCProjection.hxx src/ATCDCL/ATCutils.cxx
 	src/ATCDCL/ATCutils.hxx src/ATCDCL/approach.cxx
 	src/ATCDCL/commlist.cxx src/ATCDCL/ground.cxx
	src/ATCDCL/ground.hxx src/ATCDCL/tower.cxx
 	src/ATCDCL/tower.hxx src/Airports/calc_loc.cxx
 	src/Airports/dynamics.cxx src/Airports/groundnetwork.cxx
 	src/Airports/parking.cxx src/Airports/runwayprefs.cxx
 	src/Airports/simple.cxx src/Cockpit/cockpit.cxx
 	src/Cockpit/hud.hxx src/Cockpit/hud_card.cxx
 	src/Cockpit/hud_rwy.cxx src/Environment/environment.cxx
 	src/FDM/UFO.cxx src/FDM/SP/MagicCarpet.cxx src/GUI/dialog.hxx
 	src/Instrumentation/HUD/HUD.hxx
 	src/Instrumentation/HUD/HUD_runway.cxx
 	src/Instrumentation/KLN89/kln89.cxx src/Main/fg_init.cxx
 	src/Main/viewer.cxx src/Main/viewmgr.cxx
 	src/Model/panelnode.cxx src/MultiPlayer/mpmessages.hxx
 	src/Scenery/tilemgr.cxx src/Traffic/SchedFlight.cxx
 	src/Traffic/TrafficMgr.cxx
2009-03-18 08:00:08 +01:00
frohlich
b120d9dfb3 Casaba Halász: Fix some const warnings.
Modified Files:
	src/FDM/YASim/Rotor.cpp src/FDM/YASim/Rotor.hpp
	src/GUI/fonts.cxx
2009-03-05 10:52:03 +01:00
mfranz
0bc3ec940d make resize margin smaller 2009-02-13 10:18:20 +01:00
mfranz
880533037a call puaLargeInput's checkKey() if active (fixes ctrl-c) 2009-02-13 10:18:17 +01:00
mfranz
ec03d4ce01 move <text> before <property> part, so that <format>s are applied initially 2009-02-02 00:58:01 +01:00
mfranz
c366a445c5 textbox: add <top-line> param that sets first line (last line if negative) 2009-02-01 23:44:10 +01:00
mfranz
48f22c330a make use of plib/svn features 2009-02-01 23:44:10 +01:00
mfranz
2e1cfcb83d fgPopup::checkHit(): revert r1.103 (consume mouse hits by default)
Can't reproduce the problem that r1.103 meant to fix, but it
caused another problem: MMB dragging events weren't passed,
so e.g. power lever control in the bo105 stopped working.
2009-01-26 09:48:14 +01:00
mfranz
b8c0e67cdc one more PUCLASS exception (not that we used puaScrollBar yet) 2009-01-21 09:55:33 +01:00
mfranz
aa6e5fb528 disable dragging margins on non resizable dialogs 2009-01-18 23:21:44 +01:00
mfranz
390c1f4d1f - ctrl-click in the property browser is for toggling bools, not dragging
- add vertical arg to sliders (apparently nobody ever use a vertical one :-)
- simplification
2009-01-18 23:21:41 +01:00
mfranz
e0463a51ae - shift drag for global window dragging (like ctrl for global resizing)
- cleanup & some coding style unification
2009-01-13 23:07:52 +01:00
mfranz
a59ae7cb92 fix mouse flicker/disappearing problem 2009-01-12 13:04:44 +01:00
mfranz
16d2de1a0f allow resizing dialogs by grabbing the frame (without Ctrl-key);
Ctrl extends the resize sensible area to the whole dialog
2009-01-12 13:04:39 +01:00
mfranz
ab58bbd41e hits are consumed by default (prevents actions in lower dialogs) 2009-01-12 13:04:19 +01:00
mfranz
cc0b7e0076 puaLargeInput (textbox) aren't draggable areas 2009-01-12 13:04:14 +01:00
mfranz
014f366369 resize in SE direction (draggable borders planned) 2009-01-12 13:04:03 +01:00
mfranz
95c5a726a7 make dialogs resizable with Ctrl-dragging
At the moment the dialog grows to North-East. Only dialogs with
the <resizable> flag set to true are resizable.
2009-01-12 13:03:55 +01:00
mfranz
41da00105c apply custom widget fonts also to the legend, so that they show
up in list/textbox etc. (This should really be separately settable
via style definition, but it's very rarely used and a change now
is probably not worth it as we'll probably switch to osgWidget,
anyway.)
2009-01-10 00:07:15 +01:00
jmt
f1b10eddfa FGAirportList is gone. Everything should work as before, especially the
AirportList dialog. (It would now be possible to trivially implement a
VOR or NDB named search, if anyone wants such a thing).
2008-12-27 13:20:08 +00:00
mfranz
35f7f55507 Csaba/"Jester" and /me: since a few weeks the property browser had
displayed garbage in the title line if one left a directory. Jester
spent a lot of time finding the cause: a bug that must have been
there since ... forever: fgfs reported to PUI the string addresses
as returned by SGPropertyNode::getStringValue() without considering
that this address isn't valid after the next write access to that
node! It's almost a miracle that it worked so well for so long,
despite that issue. (I also used to opportunity for some more
cleanup -- so I'm to blame for any newly introduced bugs, and
also for reverting some of Jester's cleanups. :-)
2008-12-18 20:18:50 +00:00
mfranz
7f2f1e39e3 show verbose mode (see $FG_ROOT/Docs/README.gui -> property-list) 2008-12-03 20:18:15 +00:00
mfranz
995eaac10b screenshots: check for empty screenshots-dir 2008-10-19 16:25:05 +00:00
fredb
9ebb9128c8 MINGW patch by Csaba Halasz, reworked by me to avoid breaking MSVC or Cygwin build 2008-09-28 08:27:32 +00:00
durk
b2df4d41a5 Czaba Halasz:
Somebody please add config.h to AirportList.cxx, because the #include
<plib/puAux.h> (in AirportList.hxx) needs the PU_USE_NONE define.

DT: Done :-)
2008-08-21 20:14:26 +00:00
mfranz
aedc6f0614 use <enabled>false</enabled> flag for widgets that shouldn't be drawn
instead of <hide>true</hide>. This is consistent with other places
in fgfs, like menu entries, hud elements, subsystem switches, etc.
2008-08-05 05:27:07 +00:00
timoore
6f802959ce CameraGroup class for managing multiple cameras.
CameraGroup supports cameras opened in different windows or in the
same window, with flexible view and perspective specification.

Clean up mouse click handling via osgViewer. Don't let any camera
"have focus;" this forces events to be reported in window coordinates
and simplifies life. Don't use the osgViewer::View::requestWarpPointer
method; instead use our own code which only deals with window
coordinates.

Make glut and sdl versions work with CameraGroup too.
2008-08-01 15:57:29 +00:00
ehofman
14885374de header cleanups 2008-07-31 12:04:32 +00:00
ehofman
667e64e1eb - remove the SG_GLxxxx_H #defines, since OSG provides its own versions
- this exposed a bizarre issue on Mac where dragging in <AGL/agl.h> in
   extensions.hxx was pulling in all of Carbon to the global namespace
   - very scary. As a result, I now need to explicitly include CoreFoundation
   in fg_init.cxx.
 - change SG_USING_STD(x) to using std::x
2008-07-27 16:25:13 +00:00
fredb
3db0cf1659 Remove unneeded inclusions of windows.h, GL.h and GLU.H 2008-07-27 15:18:34 +00:00
mfranz
b68b751fd4 get rid of mouse.cxx and pu{Show|Hide}Cursor() 2008-07-27 09:39:10 +00:00
ehofman
46ae218672 remove all the FX and XMESA cruft relating to Glide support. 2008-07-27 07:54:13 +00:00
ehofman
d9bfd5a425 This should apply, and everything should build cleanly, in isolation from the
SimGear change. It changes all the SG_xxxx to be the 'real' includes, and gets
rid of many #ifdef SG_HAVE_STD_INCLUDES. As an added bonus, rather than
replacing 'SG_USING_NAMESPACE(std)' with 'using namespace std', I just fixed
the small number of places to use std:: explicitly. So we're no longer polluting
the global namespace with the entire contents of std, in many cases.

There is one more 'mechanical' change to come - getting rid of SG_USING_STD(X),
but I want to keep that separate from everything else. (There's another
mechnical change, replacing <math.h> with <cmath> and so on *everywhere*, but
one step at a time)
2008-07-25 18:38:29 +00:00
ehofman
eccddb3dfd Attached patches remove BORLANDC, and hence SG_MATH_EXCEPTION_CLASH and SG_INCOM
PLETE_FUNCTIONAL from SimGear and FlightGear.

As a result, SG_HAVE_STD_INCLUDES is now *always* set, so I will get the boring
fixes for that done, but separately. I'm still auditing the other things in comp
ilers.h - there's a lot that can die now BORLAND is gone.
2008-07-25 10:39:53 +00:00
mfranz
1ace68e836 don't run the help browser from a property that a user could have
changed to something evil, but rather make sure that the browser
string can be trusted. (TODO: change system() to vfork()/execvp() ?)
2008-07-09 19:35:53 +00:00
mfranz
0ae36e3979 remove depreciated and unused src/GUI/trackball.* 2008-07-09 12:44:32 +00:00