From: <dil...@us...> - 2013-11-17 22:15:19
|
Revision: 6531 http://sourceforge.net/p/freeorion/code/6531 Author: dilvish-fo Date: 2013-11-17 22:15:13 +0000 (Sun, 17 Nov 2013) Log Message: ----------- adjusts threshhold for PP and RP 'waste' indicators up to 1e-4 rather than 1e-6, to avoid spurious triggers Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2013-11-17 12:26:27 UTC (rev 6530) +++ trunk/FreeOrion/UI/MapWnd.cpp 2013-11-17 22:15:13 UTC (rev 6531) @@ -4780,11 +4780,12 @@ m_research->SetBrowseInfoWnd(boost::shared_ptr<GG::BrowseInfoWnd>( new TextBrowseWnd(UserString("MAP_RESEARCH_TITLE"), UserString("MAP_RESEARCH_TEXT")))); - //Logger().debugStream() << "Research spend: " << empire->GetResearchQueue().TotalRPsSpent() << " output: " << empire->ResourceProduction(RE_RESEARCH); double totalRPSpent = empire->GetResearchQueue().TotalRPsSpent(); double totalProduction = empire->ResourceProduction(RE_RESEARCH); double totalWastedRP = totalProduction - totalRPSpent; - if (totalWastedRP > 1E-6) { + if (totalWastedRP > 1E-4) { + Logger().debugStream() << "MapWnd::RefreshResearchResourceIndicator: Showing Research Wasted Icon with RP spent: " + << totalRPSpent << " and RP Production: " << totalProduction << ", wasting " << totalWastedRP; m_research_wasted->Show(); m_research_wasted->ClearBrowseInfoWnd(); m_research_wasted->SetBrowseInfoWnd(boost::shared_ptr<GG::BrowseInfoWnd>( @@ -4819,11 +4820,12 @@ m_industry->SetBrowseInfoWnd(boost::shared_ptr<GG::BrowseInfoWnd>( new TextBrowseWnd(UserString("MAP_PRODUCTION_TITLE"), UserString("MAP_PRODUCTION_TEXT")))); - //Logger().debugStream() << "Industry spend: " << empire->GetProductionQueue().TotalPPsSpent() << " output: " << empire->ResourceProduction(RE_INDUSTRY); double totalPPSpent = empire->GetProductionQueue().TotalPPsSpent(); double totalProduction = empire->ResourceProduction(RE_INDUSTRY); double totalWastedPP = totalProduction - totalPPSpent; - if (totalWastedPP > 1E-6) { + if (totalWastedPP > 1E-4) { + Logger().debugStream() << "MapWnd::RefreshIndustryResourceIndicator: Showing Industry Wasted Icon with Industry spent: " + << totalPPSpent << " and Industry Production: " << totalProduction << ", wasting " << totalWastedPP; m_industry_wasted->Show(); m_industry_wasted->ClearBrowseInfoWnd(); m_industry_wasted->SetBrowseInfoWnd(boost::shared_ptr<GG::BrowseInfoWnd>( |
From: <dil...@us...> - 2013-11-18 03:37:16
|
Revision: 6533 http://sourceforge.net/p/freeorion/code/6533 Author: dilvish-fo Date: 2013-11-18 03:37:13 +0000 (Mon, 18 Nov 2013) Log Message: ----------- again increased thresholds for wasted RP & PP icon and starlane core coloring, to 0.05 Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2013-11-17 23:35:04 UTC (rev 6532) +++ trunk/FreeOrion/UI/MapWnd.cpp 2013-11-18 03:37:13 UTC (rev 6533) @@ -2432,7 +2432,7 @@ int system_id = planet->SystemID(); resPoolSystems[it->first].insert(system_id); m_resourceCenters.insert(system_id); - if (group_pp > allocatedPP[it->first] + 1e-4) + if (group_pp > allocatedPP[it->first] + 0.05) underAllocResSys.insert(system_id); } thisPool += ")"; @@ -4783,7 +4783,7 @@ double totalRPSpent = empire->GetResearchQueue().TotalRPsSpent(); double totalProduction = empire->ResourceProduction(RE_RESEARCH); double totalWastedRP = totalProduction - totalRPSpent; - if (totalWastedRP > 1E-4) { + if (totalWastedRP > 0.05) { Logger().debugStream() << "MapWnd::RefreshResearchResourceIndicator: Showing Research Wasted Icon with RP spent: " << totalRPSpent << " and RP Production: " << totalProduction << ", wasting " << totalWastedRP; m_research_wasted->Show(); @@ -4823,7 +4823,7 @@ double totalPPSpent = empire->GetProductionQueue().TotalPPsSpent(); double totalProduction = empire->ResourceProduction(RE_INDUSTRY); double totalWastedPP = totalProduction - totalPPSpent; - if (totalWastedPP > 1E-4) { + if (totalWastedPP > 0.05) { Logger().debugStream() << "MapWnd::RefreshIndustryResourceIndicator: Showing Industry Wasted Icon with Industry spent: " << totalPPSpent << " and Industry Production: " << totalProduction << ", wasting " << totalWastedPP; m_industry_wasted->Show(); |
From: <geo...@us...> - 2013-12-30 00:19:37
|
Revision: 6588 http://sourceforge.net/p/freeorion/code/6588 Author: geoffthemedio Date: 2013-12-30 00:19:32 +0000 (Mon, 30 Dec 2013) Log Message: ----------- -Changed some default hotkeys. -grooming Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2013-12-27 21:33:21 UTC (rev 6587) +++ trunk/FreeOrion/UI/MapWnd.cpp 2013-12-30 00:19:32 UTC (rev 6588) @@ -131,31 +131,30 @@ db.Add("UI.map-right-click-popup-menu", UserStringNop("OPTIONS_DB_UI_GALAXY_MAP_POPUP"), false, Validator<bool>()); - // We also register shortcut names/default values, for the - // context "map". - Hotkey::AddHotkey("map.return_to_map", GG::GGK_ESCAPE); - Hotkey::AddHotkey("map.open_chat", GG::GGK_RETURN); - Hotkey::AddHotkey("map.end_turn", GG::GGK_RETURN, GG::MOD_KEY_CTRL); - Hotkey::AddHotkey("map.sit_rep", GG::GGK_F2); - Hotkey::AddHotkey("map.research", GG::GGK_F3); - Hotkey::AddHotkey("map.production", GG::GGK_F4); - Hotkey::AddHotkey("map.design", GG::GGK_F5); - Hotkey::AddHotkey("map.menu", GG::GGK_F10); - Hotkey::AddHotkey("map.zoom_in", GG::GGK_e); - Hotkey::AddHotkey("map.zoom_in_alt", GG::GGK_KP_PLUS); - Hotkey::AddHotkey("map.zoom_out", GG::GGK_r); - Hotkey::AddHotkey("map.zoom_out_alt", GG::GGK_KP_MINUS); - Hotkey::AddHotkey("map.zoom_home_system", GG::GGK_d); - Hotkey::AddHotkey("map.zoom_prev_system", GG::GGK_x); - Hotkey::AddHotkey("map.zoom_next_system", GG::GGK_c); - Hotkey::AddHotkey("map.zoom_prev_fleet", GG::GGK_v); - Hotkey::AddHotkey("map.zoom_next_fleet", GG::GGK_b); - Hotkey::AddHotkey("map.zoom_prev_idle_fleet", GG::GGK_f); - Hotkey::AddHotkey("map.zoom_next_idle_fleet", GG::GGK_g); - - Hotkey::AddHotkey("cut",GG::GGK_x, GG::MOD_KEY_CTRL); - Hotkey::AddHotkey("copy",GG::GGK_c, GG::MOD_KEY_CTRL); - Hotkey::AddHotkey("paste",GG::GGK_v, GG::MOD_KEY_CTRL); + // Register hotkey names/default values for the context "map". + Hotkey::AddHotkey("map.return_to_map", GG::GGK_ESCAPE); + Hotkey::AddHotkey("map.open_chat", GG::GGK_RETURN); + Hotkey::AddHotkey("map.end_turn", GG::GGK_RETURN, GG::MOD_KEY_CTRL); + Hotkey::AddHotkey("map.sit_rep", GG::GGK_n); + Hotkey::AddHotkey("map.research", GG::GGK_r); + Hotkey::AddHotkey("map.production", GG::GGK_p); + Hotkey::AddHotkey("map.design", GG::GGK_d); + Hotkey::AddHotkey("map.menu", GG::GGK_F10); + Hotkey::AddHotkey("map.zoom_in", GG::GGK_z); + Hotkey::AddHotkey("map.zoom_in_alt", GG::GGK_KP_PLUS); + Hotkey::AddHotkey("map.zoom_out", GG::GGK_x); + Hotkey::AddHotkey("map.zoom_out_alt", GG::GGK_KP_MINUS); + Hotkey::AddHotkey("map.zoom_home_system", GG::GGK_h); + Hotkey::AddHotkey("map.zoom_prev_system", GG::GGK_LESS); + Hotkey::AddHotkey("map.zoom_next_system", GG::GGK_GREATER); + Hotkey::AddHotkey("map.zoom_prev_fleet", GG::GGK_f); + Hotkey::AddHotkey("map.zoom_next_fleet", GG::GGK_g); + Hotkey::AddHotkey("map.zoom_prev_idle_fleet", GG::GGK_UNKNOWN); + Hotkey::AddHotkey("map.zoom_next_idle_fleet", GG::GGK_UNKNOWN); + + Hotkey::AddHotkey("cut", GG::GGK_x, GG::MOD_KEY_CTRL); + Hotkey::AddHotkey("copy", GG::GGK_c, GG::MOD_KEY_CTRL); + Hotkey::AddHotkey("paste", GG::GGK_v, GG::MOD_KEY_CTRL); } bool temp_bool = RegisterOptions(&AddOptions); |
From: <geo...@us...> - 2014-01-12 23:03:28
|
Revision: 6634 http://sourceforge.net/p/freeorion/code/6634 Author: geoffthemedio Date: 2014-01-12 23:03:22 +0000 (Sun, 12 Jan 2014) Log Message: ----------- Minor grooming. Actually committing for test purposes... Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2014-01-12 19:04:00 UTC (rev 6633) +++ trunk/FreeOrion/UI/MapWnd.cpp 2014-01-12 23:03:22 UTC (rev 6634) @@ -2145,7 +2145,9 @@ // create system icons std::vector<TemporaryPtr<const System> > systems = objects.FindObjects<System>(); - for (std::vector<TemporaryPtr<const System> >::const_iterator sys_it = systems.begin(); sys_it != systems.end(); ++sys_it) { + for (std::vector<TemporaryPtr<const System> >::const_iterator sys_it = systems.begin(); + sys_it != systems.end(); ++sys_it) + { TemporaryPtr<const System> sys = *sys_it; int sys_id = sys->ID(); |
From: <geo...@us...> - 2014-01-19 10:00:33
|
Revision: 6652 http://sourceforge.net/p/freeorion/code/6652 Author: geoffthemedio Date: 2014-01-19 10:00:29 +0000 (Sun, 19 Jan 2014) Log Message: ----------- Missed pointer to id value change from previous commit. Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2014-01-19 07:35:42 UTC (rev 6651) +++ trunk/FreeOrion/UI/MapWnd.cpp 2014-01-19 10:00:29 UTC (rev 6652) @@ -3898,7 +3898,7 @@ UniverseObjectType obj_type = obj->ObjectType(); if (obj_type >= OBJ_BUILDING && obj_type < OBJ_SYSTEM) { net.SendMessage(ModeratorActionMessage(player_id, - Moderator::SetOwner(*it, empire_id))); + Moderator::SetOwner(obj->ID(), empire_id))); } } } |
From: <geo...@us...> - 2014-01-27 07:50:06
|
Revision: 6753 http://sourceforge.net/p/freeorion/code/6753 Author: geoffthemedio Date: 2014-01-27 07:50:02 +0000 (Mon, 27 Jan 2014) Log Message: ----------- Undo accidental commit of testing edit. Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2014-01-27 07:32:18 UTC (rev 6752) +++ trunk/FreeOrion/UI/MapWnd.cpp 2014-01-27 07:50:02 UTC (rev 6753) @@ -2013,7 +2013,7 @@ timer.restart(); - //SidePanel::Refresh(); // recreate contents of all SidePanels. ensures previous turn's objects and signals are disposed of + SidePanel::Refresh(); // recreate contents of all SidePanels. ensures previous turn's objects and signals are disposed of Logger().debugStream() << "MapWnd::InitTurn sidepanel refresh time: " << (timer.elapsed() * 1000.0); |
From: <geo...@us...> - 2014-01-29 18:24:33
|
Revision: 6770 http://sourceforge.net/p/freeorion/code/6770 Author: geoffthemedio Date: 2014-01-29 18:24:28 +0000 (Wed, 29 Jan 2014) Log Message: ----------- Manually fire fleet's StateChangedSignal when the client stops having it automatically explore, so that the fleet's FleetWnd panel will update accordingly. Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2014-01-29 18:12:24 UTC (rev 6769) +++ trunk/FreeOrion/UI/MapWnd.cpp 2014-01-29 18:24:28 UTC (rev 6770) @@ -5142,17 +5142,22 @@ } } -void MapWnd::SetFleetExploring(const int fleet_id){ +void MapWnd::SetFleetExploring(const int fleet_id) { std::set<int>::iterator it = std::find(m_fleets_exploring.begin(), m_fleets_exploring.end(), fleet_id); - if(it == m_fleets_exploring.end()){ //this fleet is not currently exploring + if (it == m_fleets_exploring.end()){ //this fleet is not currently exploring m_fleets_exploring.insert(fleet_id); DispatchFleetsExploring(); } } -void MapWnd::StopFleetExploring(const int fleet_id){ +void MapWnd::StopFleetExploring(const int fleet_id) { m_fleets_exploring.erase(fleet_id); DispatchFleetsExploring(); + // force UI update. Removing a fleet from the UI's list of exploring fleets + // doesn't actually change the Fleet object's state in any way, so the UI + // would otherwise still show the fleet as "exploring" + if (TemporaryPtr<Fleet> fleet = GetFleet(fleet_id)) + fleet->StateChangedSignal(); } bool MapWnd::IsFleetExploring(const int fleet_id){ |
From: <geo...@us...> - 2014-03-06 20:39:15
|
Revision: 6948 http://sourceforge.net/p/freeorion/code/6948 Author: geoffthemedio Date: 2014-03-06 20:39:12 +0000 (Thu, 06 Mar 2014) Log Message: ----------- Safety checks in MapWnd::ZoomToHomeSystem. Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2014-03-06 13:30:31 UTC (rev 6947) +++ trunk/FreeOrion/UI/MapWnd.cpp 2014-03-06 20:39:12 UTC (rev 6948) @@ -5060,11 +5060,15 @@ } bool MapWnd::ZoomToHomeSystem() { - int id = Empires().Lookup(HumanClientApp::GetApp()->EmpireID())->CapitalID(); + const Empire* empire = Empires().Lookup(HumanClientApp::GetApp()->EmpireID()); + if (!empire) + return false; + int home_id = empire->CapitalID(); - if (id != INVALID_OBJECT_ID) { - TemporaryPtr<const UniverseObject> object = GetUniverseObject(id); - if (!object) return false; + if (home_id != INVALID_OBJECT_ID) { + TemporaryPtr<const UniverseObject> object = GetUniverseObject(home_id); + if (!object) + return false; CenterOnObject(object->SystemID()); SelectSystem(object->SystemID()); } |
From: <geo...@us...> - 2014-03-23 13:06:03
|
Revision: 6990 http://sourceforge.net/p/freeorion/code/6990 Author: geoffthemedio Date: 2014-03-23 13:05:59 +0000 (Sun, 23 Mar 2014) Log Message: ----------- Increased constructed width of industry and research indicators so that their whole area is clickable. Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2014-03-23 11:00:40 UTC (rev 6989) +++ trunk/FreeOrion/UI/MapWnd.cpp 2014-03-23 13:05:59 UTC (rev 6990) @@ -820,13 +820,13 @@ 0, 3, false); m_population->SetName("Population StatisticIcon"); - m_industry = new StatisticIcon(GG::X0, GG::Y0, ICON_WIDTH, m_btn_turn->Height(), + m_industry = new StatisticIcon(GG::X0, GG::Y0, ICON_DUAL_WIDTH, m_btn_turn->Height(), ClientUI::MeterIcon(METER_INDUSTRY), 0, 3, false); m_industry->SetName("Industry StatisticIcon"); GG::Connect(m_industry->LeftClickedSignal, boost::bind(&MapWnd::ToggleProduction, this)); - m_research = new StatisticIcon(GG::X0, GG::Y0, ICON_WIDTH, m_btn_turn->Height(), + m_research = new StatisticIcon(GG::X0, GG::Y0, ICON_DUAL_WIDTH, m_btn_turn->Height(), ClientUI::MeterIcon(METER_RESEARCH), 0, 3, false); m_research->SetName("Research StatisticIcon"); @@ -847,9 +847,11 @@ 0, 3, false); m_detection->SetName("Detection StatisticIcon"); - m_industry_wasted = new GG::Button(GG::X0, GG::Y0, ICON_WIDTH, GG::Y(Value(ICON_WIDTH)), "", font, GG::CLR_WHITE, GG::CLR_ZERO); + m_industry_wasted = new GG::Button(GG::X0, GG::Y0, ICON_WIDTH, GG::Y(Value(ICON_WIDTH)), + "", font, GG::CLR_WHITE, GG::CLR_ZERO); m_industry_wasted->SetMinSize(GG::Pt(ICON_WIDTH, GG::Y(Value(ICON_WIDTH)))); - m_research_wasted = new GG::Button(GG::X0, GG::Y0, ICON_WIDTH, GG::Y(Value(ICON_WIDTH)), "", font, GG::CLR_WHITE, GG::CLR_ZERO); + m_research_wasted = new GG::Button(GG::X0, GG::Y0, ICON_WIDTH, GG::Y(Value(ICON_WIDTH)), + "", font, GG::CLR_WHITE, GG::CLR_ZERO); m_research_wasted->SetMinSize(GG::Pt(ICON_WIDTH, GG::Y(Value(ICON_WIDTH)))); GG::SubTexture wasted_ressource_subtexture = GG::SubTexture(ClientUI::GetTexture(ClientUI::ArtDir() / |
From: <geo...@us...> - 2014-04-08 22:31:19
|
Revision: 7027 http://sourceforge.net/p/freeorion/code/7027 Author: geoffthemedio Date: 2014-04-08 22:31:15 +0000 (Tue, 08 Apr 2014) Log Message: ----------- Added a reset of the auto-turn end state variable in MapWnd so that resigning a game while in auto-end-turn mode then starting a new game doesn't immediately start ending turns automatically. Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2014-04-08 22:29:59 UTC (rev 7026) +++ trunk/FreeOrion/UI/MapWnd.cpp 2014-04-08 22:31:15 UTC (rev 7027) @@ -4389,6 +4389,8 @@ m_scale_line->Hide(); m_zoom_slider->Hide(); m_sitrep_panel->ShowSitRepsForTurn(INVALID_GAME_TURN); + if (m_auto_end_turn) + ToggleAutoEndTurn(); } void MapWnd::Sanitize() { |
From: <geo...@us...> - 2014-07-13 19:25:30
|
Revision: 7250 http://sourceforge.net/p/freeorion/code/7250 Author: geoffthemedio Date: 2014-07-13 19:25:20 +0000 (Sun, 13 Jul 2014) Log Message: ----------- Small patch by vincele disabling / early aborting map rendering when the research screen is visible. Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2014-07-13 16:27:59 UTC (rev 7249) +++ trunk/FreeOrion/UI/MapWnd.cpp 2014-07-13 19:25:20 UTC (rev 7250) @@ -1191,6 +1191,8 @@ // save CPU / GPU activity by skipping rendering when it's not needed if (m_design_wnd->Visible()) return; // as of this writing, the design screen has a fully opaque background + if (m_research_wnd->Visible()) + return; glPushClientAttrib(GL_CLIENT_ALL_ATTRIB_BITS); |
From: <geo...@us...> - 2014-07-19 11:13:46
|
Revision: 7268 http://sourceforge.net/p/freeorion/code/7268 Author: geoffthemedio Date: 2014-07-19 11:13:42 +0000 (Sat, 19 Jul 2014) Log Message: ----------- grooming Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2014-07-19 10:00:42 UTC (rev 7267) +++ trunk/FreeOrion/UI/MapWnd.cpp 2014-07-19 11:13:42 UTC (rev 7268) @@ -5494,7 +5494,7 @@ //list all unexplored systems by taking the neighboors of explored systems because ObjectMap does not list them all. std::set<int> candidates_unknown_systems; - std::set<int> explored_systems = empire->ExploredSystems(); + std::set<int> explored_systems = empire->ExploredSystems(); candidates_unknown_systems = AddNeighboorsToSet(empire, explored_systems); std::set<int> neighboors = AddNeighboorsToSet(empire, candidates_unknown_systems); candidates_unknown_systems.insert(neighboors.begin(), neighboors.end()); @@ -5502,97 +5502,102 @@ //list all unknow systems with the distance to the nearest supply available std::map<int, int> unknown_systems; std::set<int> supplyable_systems = empire->FleetSupplyableSystemIDs(); - for (std::set<int>::iterator it = candidates_unknown_systems.begin(); it != candidates_unknown_systems.end(); it ++) { - if (TemporaryPtr<System> system = GetSystem(*it)){ - if (!empire->HasExploredSystem(system->ID()) && systems_being_explored.find(*it) == systems_being_explored.end()) { - //we compute the minimum distance to find a supplyable system - std::pair<int, int> pair = GetNearestSupplyPoint(empire, system->ID()); - if (pair.first != INVALID_OBJECT_ID) { - unknown_systems[system->ID()] = pair.second; - } - } + for (std::set<int>::iterator it = candidates_unknown_systems.begin(); + it != candidates_unknown_systems.end(); it ++) + { + TemporaryPtr<System> system = GetSystem(*it); + if (!system) + continue; + if (!empire->HasExploredSystem(system->ID()) && + systems_being_explored.find(*it) == systems_being_explored.end()) + { + // compute the minimum distance to find a supplyable system + std::pair<int, int> pair = GetNearestSupplyPoint(empire, system->ID()); + if (pair.first != INVALID_OBJECT_ID) + unknown_systems[system->ID()] = pair.second; } } Logger().debugStream() << "MapWnd::DispatchFleetsExploring There is " << unknown_systems.size() << "unknown systems"; - //for now, send each ship to the nearest unexplored system where no other ship has been ordered so far + // send each ship to the nearest unexplored system where no other ship has + // been ordered so far std::set<int> systems_order_sent; //list all systems ID for which a ship was sent this turn int nbr_fleet_to_send = fleet_idle.size(); bool remaining_system_to_explore = true; - for (int i = 0; i < nbr_fleet_to_send; i++){ //at each iteration, we should send one ship on its way + for (int i = 0; i < nbr_fleet_to_send; i++) { //at each iteration, send one ship on its way double min_dist = DBL_MAX; int end_system_id = INVALID_OBJECT_ID; int start_system_id = INVALID_OBJECT_ID; - int last_visibility = NUM_VISIBILITIES; //greater than max visibility + int last_visibility = NUM_VISIBILITIES; // greater than max visibility int better_fleet_id; - for (std::set<int>::iterator it = fleet_idle.begin(); it != fleet_idle.end(); it ++){ + for (std::set<int>::iterator it = fleet_idle.begin(); it != fleet_idle.end(); it ++) { TemporaryPtr<Fleet> fleet = GetFleet(*it); - if (fleet && fleet->MovePath().empty()) { + if (!fleet || !fleet->MovePath().empty()) + continue; - double far_min_dist = DBL_MAX; - int far_system_id; //id of the closest unknown system without taking fuel into account + double far_min_dist = DBL_MAX; + int far_system_id; //id of the closest unknown system without taking fuel into account - for (std::map<int, int>::iterator system_it = unknown_systems.begin(); system_it != unknown_systems.end(); system_it ++) { - if (systems_order_sent.find(system_it->first) != systems_order_sent.end()) - continue; //someone already went there this turn + for (std::map<int, int>::iterator system_it = unknown_systems.begin(); system_it != unknown_systems.end(); system_it ++) { + if (systems_order_sent.find(system_it->first) != systems_order_sent.end()) + continue; //someone already went there this turn - std::pair<std::list<int>, double> pair = GetUniverse().ShortestPath(fleet->SystemID(), system_it->first, empire_id); + std::pair<std::list<int>, double> pair = GetUniverse().ShortestPath(fleet->SystemID(), system_it->first, empire_id); - //we check for the fuel. - bool is_doable_for_fuel = true; - std::list<int> route = pair.first; - double current_fuel = fleet->Fuel(); - for (std::list<int>::iterator route_it = ++(route.begin()); route_it != route.end(); route_it ++) { - if (supplyable_systems.count(*route_it) > 0) { - if (fleet->Fuel() != fleet->MaxFuel()) { - is_doable_for_fuel = false; //if we need to ressupply, do it the first time we enter the empire. If we are full, we can cross it. - } - } else { - current_fuel --; + //we check for the fuel. + bool is_doable_for_fuel = true; + std::list<int> route = pair.first; + double current_fuel = fleet->Fuel(); + for (std::list<int>::iterator route_it = ++(route.begin()); route_it != route.end(); route_it ++) { + if (supplyable_systems.count(*route_it) > 0) { + if (fleet->Fuel() != fleet->MaxFuel()) { + is_doable_for_fuel = false; //if we need to ressupply, do it the first time we enter the empire. If we are full, we can cross it. } - if (current_fuel < 0) { - is_doable_for_fuel = false; - } + } else { + current_fuel --; } - - if (current_fuel < system_it->second) + if (current_fuel < 0) { is_doable_for_fuel = false; + } + } - int vis = GetUniverse().GetObjectVisibilityByEmpire(system_it->first, empire_id); - if (vis == VIS_NO_VISIBILITY) vis = VIS_BASIC_VISIBILITY; //those two levels of visibility appears to be identical for a system + if (current_fuel < system_it->second) + is_doable_for_fuel = false; - if (((pair.second < min_dist && vis <= last_visibility) || vis < last_visibility) && is_doable_for_fuel) { //we can explore this system - min_dist = pair.second; - end_system_id = system_it->first; - last_visibility = vis; - better_fleet_id = fleet->ID(); - start_system_id = fleet->SystemID(); - } + int vis = GetUniverse().GetObjectVisibilityByEmpire(system_it->first, empire_id); + if (vis == VIS_NO_VISIBILITY) vis = VIS_BASIC_VISIBILITY; //those two levels of visibility appears to be identical for a system - if (pair.second < far_min_dist) { //we can explore this system - far_min_dist = pair.second; - far_system_id = system_it->first; - } + if (((pair.second < min_dist && vis <= last_visibility) || vis < last_visibility) && is_doable_for_fuel) { //we can explore this system + min_dist = pair.second; + end_system_id = system_it->first; + last_visibility = vis; + better_fleet_id = fleet->ID(); + start_system_id = fleet->SystemID(); } - if (!remaining_system_to_explore || min_dist == DBL_MAX) { - if (fleet->Fuel() == fleet->MaxFuel() && far_min_dist != DBL_MAX) { - //we have full fuel and no unknown planet in range. We can go to a far system, but we will have to wait for resupply - Logger().debugStream() << "MapWnd::DispatchFleetsExploring : Next system for fleet " << fleet->ID() << " is " << far_system_id << ". Not enough fuel for the round trip"; - systems_order_sent.insert(far_system_id); - HumanClientApp::GetApp()->Orders().IssueOrder(OrderPtr(new FleetMoveOrder(empire_id, fleet->ID(), fleet->SystemID(), far_system_id))); - } else { - //no unknown planet in range. Let's try to get home to resupply - std::pair<int, int> pair = GetNearestSupplyPoint(empire, fleet->SystemID()); - Logger().debugStream() << "MapWnd::DispatchFleetsExploring : Fleet " << fleet->ID() << " going to resupply at " << pair.first; - HumanClientApp::GetApp()->Orders().IssueOrder(OrderPtr(new FleetMoveOrder(empire_id, fleet->ID(), fleet->SystemID(), pair.first))); - } - i = nbr_fleet_to_send; //stop the loop since every fleet will have order + if (pair.second < far_min_dist) { //we can explore this system + far_min_dist = pair.second; + far_system_id = system_it->first; } } + + if (!remaining_system_to_explore || min_dist == DBL_MAX) { + if (fleet->Fuel() == fleet->MaxFuel() && far_min_dist != DBL_MAX) { + //we have full fuel and no unknown planet in range. We can go to a far system, but we will have to wait for resupply + Logger().debugStream() << "MapWnd::DispatchFleetsExploring : Next system for fleet " << fleet->ID() << " is " << far_system_id << ". Not enough fuel for the round trip"; + systems_order_sent.insert(far_system_id); + HumanClientApp::GetApp()->Orders().IssueOrder(OrderPtr(new FleetMoveOrder(empire_id, fleet->ID(), fleet->SystemID(), far_system_id))); + } else { + //no unknown planet in range. Let's try to get home to resupply + std::pair<int, int> pair = GetNearestSupplyPoint(empire, fleet->SystemID()); + Logger().debugStream() << "MapWnd::DispatchFleetsExploring : Fleet " << fleet->ID() << " going to resupply at " << pair.first; + HumanClientApp::GetApp()->Orders().IssueOrder(OrderPtr(new FleetMoveOrder(empire_id, fleet->ID(), fleet->SystemID(), pair.first))); + } + i = nbr_fleet_to_send; //stop the loop since every fleet will have order + } } if (min_dist != DBL_MAX) { |
From: <geo...@us...> - 2014-07-21 21:14:36
|
Revision: 7279 http://sourceforge.net/p/freeorion/code/7279 Author: geoffthemedio Date: 2014-07-21 21:14:32 +0000 (Mon, 21 Jul 2014) Log Message: ----------- Removed setting of map pedia article when opening the research or production screens. Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2014-07-21 17:54:07 UTC (rev 7278) +++ trunk/FreeOrion/UI/MapWnd.cpp 2014-07-21 21:14:32 UTC (rev 7279) @@ -4835,8 +4835,6 @@ // indicate selection on button m_btn_research->SetUnpressedGraphic(GG::SubTexture(ClientUI::GetTexture(ClientUI::ArtDir() / "icons" / "buttons" / "research_mouseover.png"))); m_btn_research->SetRolloverGraphic (GG::SubTexture(ClientUI::GetTexture(ClientUI::ArtDir() / "icons" / "buttons" / "research.png"))); - - m_pedia_panel->SetText("ENC_TECH", false); } void MapWnd::HideResearch() { @@ -4865,7 +4863,6 @@ HideResearch(); HideDesign(); HideSidePanel(); - m_pedia_panel->SetIndex(); // show the production window m_production_wnd->Update(); |
From: <geo...@us...> - 2014-08-03 19:06:11
|
Revision: 7369 http://sourceforge.net/p/freeorion/code/7369 Author: geoffthemedio Date: 2014-08-03 19:05:58 +0000 (Sun, 03 Aug 2014) Log Message: ----------- grooming Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2014-08-03 18:39:09 UTC (rev 7368) +++ trunk/FreeOrion/UI/MapWnd.cpp 2014-08-03 19:05:58 UTC (rev 7369) @@ -87,43 +87,43 @@ } void AddOptions(OptionsDB& db) { - db.Add("UI.galaxy-gas-background", UserStringNop("OPTIONS_DB_GALAXY_MAP_GAS"), true, Validator<bool>()); - db.Add("UI.galaxy-starfields", UserStringNop("OPTIONS_DB_GALAXY_MAP_STARFIELDS"), true, Validator<bool>()); - db.Add("UI.show-galaxy-map-scale", UserStringNop("OPTIONS_DB_GALAXY_MAP_SCALE_LINE"), true, Validator<bool>()); - db.Add("UI.show-galaxy-map-zoom-slider", UserStringNop("OPTIONS_DB_GALAXY_MAP_ZOOM_SLIDER"), false, Validator<bool>()); - db.Add("UI.optimized-system-rendering", UserStringNop("OPTIONS_DB_OPTIMIZED_SYSTEM_RENDERING"), true, Validator<bool>()); - db.Add("UI.starlane-thickness", UserStringNop("OPTIONS_DB_STARLANE_THICKNESS"), 2.0, RangedStepValidator<double>(0.25, 0.25, 10.0)); - db.Add("UI.starlane-core-multiplier", UserStringNop("OPTIONS_DB_STARLANE_CORE"), 4.0, RangedStepValidator<double>(1.0, 1.0, 10.0)); - db.Add("UI.resource-starlane-colouring", UserStringNop("OPTIONS_DB_RESOURCE_STARLANE_COLOURING"), true, Validator<bool>()); - db.Add("UI.fleet-supply-lines", UserStringNop("OPTIONS_DB_FLEET_SUPPLY_LINES"), true, Validator<bool>()); - db.Add("UI.fleet-supply-line-width", UserStringNop("OPTIONS_DB_FLEET_SUPPLY_LINE_WIDTH"), 3.0, RangedStepValidator<double>(0.25, 0.25, 10.0)); - db.Add("UI.fleet-supply-line-dot-spacing", UserStringNop("OPTIONS_DB_FLEET_SUPPLY_LINE_DOT_SPACING"), 20, RangedStepValidator<int>(1, 3, 40)); - db.Add("UI.fleet-supply-line-dot-rate", UserStringNop("OPTIONS_DB_FLEET_SUPPLY_LINE_DOT_RATE"), 0.02, RangedStepValidator<double>(0.01, 0.01, 0.1)); - db.Add("UI.unowned-starlane-colour", UserStringNop("OPTIONS_DB_UNOWNED_STARLANE_COLOUR"), StreamableColor(GG::Clr(72, 72, 72, 255)), Validator<StreamableColor>()); + db.Add("UI.galaxy-gas-background", UserStringNop("OPTIONS_DB_GALAXY_MAP_GAS"), true, Validator<bool>()); + db.Add("UI.galaxy-starfields", UserStringNop("OPTIONS_DB_GALAXY_MAP_STARFIELDS"), true, Validator<bool>()); + db.Add("UI.show-galaxy-map-scale", UserStringNop("OPTIONS_DB_GALAXY_MAP_SCALE_LINE"), true, Validator<bool>()); + db.Add("UI.show-galaxy-map-zoom-slider", UserStringNop("OPTIONS_DB_GALAXY_MAP_ZOOM_SLIDER"), false, Validator<bool>()); + db.Add("UI.optimized-system-rendering", UserStringNop("OPTIONS_DB_OPTIMIZED_SYSTEM_RENDERING"), true, Validator<bool>()); + db.Add("UI.starlane-thickness", UserStringNop("OPTIONS_DB_STARLANE_THICKNESS"), 2.0, RangedStepValidator<double>(0.25, 0.25, 10.0)); + db.Add("UI.starlane-core-multiplier", UserStringNop("OPTIONS_DB_STARLANE_CORE"), 4.0, RangedStepValidator<double>(1.0, 1.0, 10.0)); + db.Add("UI.resource-starlane-colouring", UserStringNop("OPTIONS_DB_RESOURCE_STARLANE_COLOURING"), true, Validator<bool>()); + db.Add("UI.fleet-supply-lines", UserStringNop("OPTIONS_DB_FLEET_SUPPLY_LINES"), true, Validator<bool>()); + db.Add("UI.fleet-supply-line-width", UserStringNop("OPTIONS_DB_FLEET_SUPPLY_LINE_WIDTH"), 3.0, RangedStepValidator<double>(0.25, 0.25, 10.0)); + db.Add("UI.fleet-supply-line-dot-spacing", UserStringNop("OPTIONS_DB_FLEET_SUPPLY_LINE_DOT_SPACING"), 20, RangedStepValidator<int>(1, 3, 40)); + db.Add("UI.fleet-supply-line-dot-rate", UserStringNop("OPTIONS_DB_FLEET_SUPPLY_LINE_DOT_RATE"), 0.02, RangedStepValidator<double>(0.01, 0.01, 0.1)); + db.Add("UI.unowned-starlane-colour", UserStringNop("OPTIONS_DB_UNOWNED_STARLANE_COLOUR"), StreamableColor(GG::Clr(72, 72, 72, 255)), Validator<StreamableColor>()); - db.Add("UI.show-detection-range", UserStringNop("OPTIONS_DB_GALAXY_MAP_DETECTION_RANGE"), true, Validator<bool>()); + db.Add("UI.show-detection-range", UserStringNop("OPTIONS_DB_GALAXY_MAP_DETECTION_RANGE"), true, Validator<bool>()); - db.Add("UI.system-fog-of-war", UserStringNop("OPTIONS_DB_UI_SYSTEM_FOG"), true, Validator<bool>()); - db.Add("UI.system-fog-of-war-spacing", UserStringNop("OPTIONS_DB_UI_SYSTEM_FOG_SPACING"), 4.0, RangedStepValidator<double>(0.25, 1.5, 8.0)); + db.Add("UI.system-fog-of-war", UserStringNop("OPTIONS_DB_UI_SYSTEM_FOG"), true, Validator<bool>()); + db.Add("UI.system-fog-of-war-spacing", UserStringNop("OPTIONS_DB_UI_SYSTEM_FOG_SPACING"), 4.0, RangedStepValidator<double>(0.25, 1.5, 8.0)); - db.Add("UI.system-icon-size", UserStringNop("OPTIONS_DB_UI_SYSTEM_ICON_SIZE"), 14, RangedValidator<int>(8, 50)); + db.Add("UI.system-icon-size", UserStringNop("OPTIONS_DB_UI_SYSTEM_ICON_SIZE"), 14, RangedValidator<int>(8, 50)); - db.Add("UI.system-circles", UserStringNop("OPTIONS_DB_UI_SYSTEM_CIRCLES"), true, Validator<bool>()); - db.Add("UI.system-circle-size", UserStringNop("OPTIONS_DB_UI_SYSTEM_CIRCLE_SIZE"), 1.0, RangedStepValidator<double>(0.125, 1.0, 2.5)); + db.Add("UI.system-circles", UserStringNop("OPTIONS_DB_UI_SYSTEM_CIRCLES"), true, Validator<bool>()); + db.Add("UI.system-circle-size", UserStringNop("OPTIONS_DB_UI_SYSTEM_CIRCLE_SIZE"), 1.0, RangedStepValidator<double>(0.125, 1.0, 2.5)); - db.Add("UI.system-tiny-icon-size-threshold",UserStringNop("OPTIONS_DB_UI_SYSTEM_TINY_ICON_SIZE_THRESHOLD"),10, RangedValidator<int>(1, 16)); - db.Add("UI.system-selection-indicator-size",UserStringNop("OPTIONS_DB_UI_SYSTEM_SELECTION_INDICATOR_SIZE"),1.625, RangedStepValidator<double>(0.125, 0.5, 5)); - db.Add("UI.system-selection-indicator-fps", UserStringNop("OPTIONS_DB_UI_SYSTEM_SELECTION_INDICATOR_FPS"), 12, RangedValidator<int>(1, 60)); + db.Add("UI.system-tiny-icon-size-threshold",UserStringNop("OPTIONS_DB_UI_SYSTEM_TINY_ICON_SIZE_THRESHOLD"), 10, RangedValidator<int>(1, 16)); + db.Add("UI.system-selection-indicator-size",UserStringNop("OPTIONS_DB_UI_SYSTEM_SELECTION_INDICATOR_SIZE"), 1.625, RangedStepValidator<double>(0.125, 0.5, 5)); + db.Add("UI.system-selection-indicator-fps", UserStringNop("OPTIONS_DB_UI_SYSTEM_SELECTION_INDICATOR_FPS"), 12, RangedValidator<int>(1, 60)); - db.Add("UI.system-name-unowned-color", UserStringNop("OPTIONS_DB_UI_SYSTEM_NAME_UNOWNED_COLOR"), StreamableColor(GG::Clr(160, 160, 160, 255)), Validator<StreamableColor>()); + db.Add("UI.system-name-unowned-color", UserStringNop("OPTIONS_DB_UI_SYSTEM_NAME_UNOWNED_COLOR"), StreamableColor(GG::Clr(160, 160, 160, 255)), Validator<StreamableColor>()); - db.Add("UI.tiny-fleet-button-minimum-zoom", UserStringNop("OPTIONS_DB_UI_TINY_FLEET_BUTTON_MIN_ZOOM"), 0.75, RangedStepValidator<double>(0.125, 0.125, 4.0)); - db.Add("UI.small-fleet-button-minimum-zoom",UserStringNop("OPTIONS_DB_UI_SMALL_FLEET_BUTTON_MIN_ZOOM"), 1.50, RangedStepValidator<double>(0.125, 0.125, 4.0)); - db.Add("UI.medium-fleet-button-minimum-zoom",UserStringNop("OPTIONS_DB_UI_MEDIUM_FLEET_BUTTON_MIN_ZOOM"), 4.00, RangedStepValidator<double>(0.125, 0.125, 4.0)); + db.Add("UI.tiny-fleet-button-minimum-zoom", UserStringNop("OPTIONS_DB_UI_TINY_FLEET_BUTTON_MIN_ZOOM"), 0.75, RangedStepValidator<double>(0.125, 0.125, 4.0)); + db.Add("UI.small-fleet-button-minimum-zoom",UserStringNop("OPTIONS_DB_UI_SMALL_FLEET_BUTTON_MIN_ZOOM"), 1.50, RangedStepValidator<double>(0.125, 0.125, 4.0)); + db.Add("UI.medium-fleet-button-minimum-zoom",UserStringNop("OPTIONS_DB_UI_MEDIUM_FLEET_BUTTON_MIN_ZOOM"), 4.00, RangedStepValidator<double>(0.125, 0.125, 4.0)); - db.Add("UI.detection-range-opacity", UserStringNop("OPTIONS_DB_GALAXY_MAP_DETECTION_RANGE_OPACITY"), 3, RangedValidator<int>(0, 8)); + db.Add("UI.detection-range-opacity", UserStringNop("OPTIONS_DB_GALAXY_MAP_DETECTION_RANGE_OPACITY"), 3, RangedValidator<int>(0, 8)); - db.Add("UI.map-right-click-popup-menu", UserStringNop("OPTIONS_DB_UI_GALAXY_MAP_POPUP"), false, Validator<bool>()); + db.Add("UI.map-right-click-popup-menu", UserStringNop("OPTIONS_DB_UI_GALAXY_MAP_POPUP"), false, Validator<bool>()); // Register hotkey names/default values for the context "map". @@ -2006,7 +2006,6 @@ } } - void MapWnd::EnableOrderIssuing(bool enable/* = true*/) { // disallow order enabling if this client does not have an empire // and is not a moderator |
From: <ve...@us...> - 2014-08-26 18:04:22
|
Revision: 7627 http://sourceforge.net/p/freeorion/code/7627 Author: vezzra Date: 2014-08-26 18:04:15 +0000 (Tue, 26 Aug 2014) Log Message: ----------- Patch by vincele fixing galaxy map zoom slider showing on intro screen Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2014-08-26 08:08:52 UTC (rev 7626) +++ trunk/FreeOrion/UI/MapWnd.cpp 2014-08-26 18:04:15 UTC (rev 7627) @@ -3738,7 +3738,7 @@ void MapWnd::RefreshSliders() { if (m_zoom_slider) { - if (GetOptionsDB().Get<bool>("UI.show-galaxy-map-zoom-slider")) + if (GetOptionsDB().Get<bool>("UI.show-galaxy-map-zoom-slider") && Visible()) m_zoom_slider->Show(); else m_zoom_slider->Hide(); |
From: <geo...@us...> - 2014-10-03 15:55:56
|
Revision: 7737 http://sourceforge.net/p/freeorion/code/7737 Author: geoffthemedio Date: 2014-10-03 15:55:48 +0000 (Fri, 03 Oct 2014) Log Message: ----------- Missed destructor virtualization from previous commit. Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2014-10-03 14:12:35 UTC (rev 7736) +++ trunk/FreeOrion/UI/MapWnd.cpp 2014-10-03 15:55:48 UTC (rev 7737) @@ -288,7 +288,7 @@ UpdateEnabled(); } - ~MapScaleLine() + virtual ~MapScaleLine() { delete m_label; } virtual void Render() { |
From: <dil...@us...> - 2014-11-07 20:08:10
|
Revision: 7761 http://sourceforge.net/p/freeorion/code/7761 Author: dilvish-fo Date: 2014-11-07 20:08:05 +0000 (Fri, 07 Nov 2014) Log Message: ----------- patch by Mitten.O to fix starlane coloring problem from r7756 Revision Links: -------------- http://sourceforge.net/p/freeorion/code/7756 Modified Paths: -------------- trunk/FreeOrion/UI/MapWnd.cpp Modified: trunk/FreeOrion/UI/MapWnd.cpp =================================================================== --- trunk/FreeOrion/UI/MapWnd.cpp 2014-11-05 23:26:09 UTC (rev 7760) +++ trunk/FreeOrion/UI/MapWnd.cpp 2014-11-07 20:08:05 UTC (rev 7761) @@ -2747,6 +2747,7 @@ lane_colour = empire->Color(); m_starlane_colors.store(lane_colour); + m_starlane_colors.store(lane_colour); //std::cout << "Adding half lane between " << start_system->Name() << " to " << dest_system->Name() << " with colour of empire " << empire->Name() << std::endl; |