Mercurial > octave-nkf

comparison libinterp/corefcn/graphics.cc @ 19630:0e1f5a750d00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Tue, 20 Jan 2015 10:24:46 -0500
parents 03067dab10ca be7ac98fab43
children db92e7e28e1f
comparison
equal deleted inserted replaced
19626:37d37297acf8 19630:0e1f5a750d00
4319 + std::abs (sz(1) - 364.0 * mm2in) < tol) 4319 + std::abs (sz(1) - 364.0 * mm2in) < tol)
4320 typ = "b4"; 4320 typ = "b4";
4321 else if (std::abs (sz(0) - 182.0 * mm2in) 4321 else if (std::abs (sz(0) - 182.0 * mm2in)
4322 + std::abs (sz(1) - 257.0 * mm2in) < tol) 4322 + std::abs (sz(1) - 257.0 * mm2in) < tol)
4323 typ = "b5"; 4323 typ = "b5";
4324 else if (std::abs (sz(0) - 9.0) 4324 else if (std::abs (sz(0) - 9.0)
4325 + std::abs (sz(1) - 12.0) < tol) 4325 + std::abs (sz(1) - 12.0) < tol)
4326 typ = "arch-a"; 4326 typ = "arch-a";
4327 else if (std::abs (sz(0) - 12.0) 4327 else if (std::abs (sz(0) - 12.0)
4328 + std::abs (sz(1) - 18.0) < tol) 4328 + std::abs (sz(1) - 18.0) < tol)
4329 typ = "arch-b"; 4329 typ = "arch-b";
4334 + std::abs (sz(1) - 36.0) < tol) 4334 + std::abs (sz(1) - 36.0) < tol)
4335 typ = "arch-d"; 4335 typ = "arch-d";
4336 else if (std::abs (sz(0) - 36.0) 4336 else if (std::abs (sz(0) - 36.0)
4337 + std::abs (sz(1) - 48.0) < tol) 4337 + std::abs (sz(1) - 48.0) < tol)
4338 typ = "arch-e"; 4338 typ = "arch-e";
4339 else if (std::abs (sz(0) - 8.5) 4339 else if (std::abs (sz(0) - 8.5)
4340 + std::abs (sz(1) - 11.0) < tol) 4340 + std::abs (sz(1) - 11.0) < tol)
4341 typ = "a"; 4341 typ = "a";
4342 else if (std::abs (sz(0) - 11.0) 4342 else if (std::abs (sz(0) - 11.0)
4343 + std::abs (sz(1) - 17.0) < tol) 4343 + std::abs (sz(1) - 17.0) < tol)
4344 typ = "b"; 4344 typ = "b";
10679 retval = pl->second; 10679 retval = pl->second;
10680 10680
10681 return retval; 10681 return retval;
10682 } 10682 }
10683 10683
10684 void 10684 void
10685 gtk_manager::do_register_toolkit (const std::string& name) 10685 gtk_manager::do_register_toolkit (const std::string& name)
10686 { 10686 {
10687 if (dtk.empty () || name == "qt" 10687 if (dtk.empty () || name == "qt"
10688 || (name == "fltk" 10688 || (name == "fltk"
10689 && available_toolkits.find ("qt") == available_toolkits.end ())) 10689 && available_toolkits.find ("qt") == available_toolkits.end ()))
10690 dtk = name; 10690 dtk = name;
10691 10691
10692 available_toolkits.insert (name); 10692 available_toolkits.insert (name);
10693 } 10693 }
10694 10694
10695 void 10695 void
10696 gtk_manager::do_unregister_toolkit (const std::string& name) 10696 gtk_manager::do_unregister_toolkit (const std::string& name)
10697 { 10697 {
10698 available_toolkits.erase (name); 10698 available_toolkits.erase (name);
10699 10699
10700 if (dtk == name) 10700 if (dtk == name)