mirror of
https://github.com/fltk/fltk.git
synced 2026-06-04 15:32:12 +08:00
STR #1381: added optional "precision" argument when writing floats or doubles to a Preferences file.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5330 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
@@ -1,5 +1,7 @@
|
|||||||
CHANGES IN FLTK 1.1.8
|
CHANGES IN FLTK 1.1.8
|
||||||
|
|
||||||
|
- Optional precission argument when storing floats or
|
||||||
|
doubles in a Preferences file (STR #1381)
|
||||||
- Fixed callback not called when using arrow keys
|
- Fixed callback not called when using arrow keys
|
||||||
in Fl_Slider (STR #1333)
|
in Fl_Slider (STR #1333)
|
||||||
- Changing the shorcut of a widget in fluid now marks
|
- Changing the shorcut of a widget in fluid now marks
|
||||||
|
|||||||
@@ -65,7 +65,9 @@ public:
|
|||||||
|
|
||||||
char set( const char *entry, int value );
|
char set( const char *entry, int value );
|
||||||
char set( const char *entry, float value );
|
char set( const char *entry, float value );
|
||||||
|
char set( const char *entry, float value, int precision );
|
||||||
char set( const char *entry, double value );
|
char set( const char *entry, double value );
|
||||||
|
char set( const char *entry, double value, int precision );
|
||||||
char set( const char *entry, const char *value );
|
char set( const char *entry, const char *value );
|
||||||
char set( const char *entry, const void *value, int size );
|
char set( const char *entry, const void *value, int size );
|
||||||
|
|
||||||
|
|||||||
@@ -181,7 +181,9 @@ group.
|
|||||||
<H4><a name="Fl_Preferences.set">int set(const char *entry, int value)<BR>
|
<H4><a name="Fl_Preferences.set">int set(const char *entry, int value)<BR>
|
||||||
int set(const char *entry, int value)<BR>
|
int set(const char *entry, int value)<BR>
|
||||||
int set(const char *entry, float value)<BR>
|
int set(const char *entry, float value)<BR>
|
||||||
|
int set(const char *entry, float value, int precision)<BR>
|
||||||
int set(const char *entry, double value)<BR>
|
int set(const char *entry, double value)<BR>
|
||||||
|
int set(const char *entry, double value, int precision)<BR>
|
||||||
int set(const char *entry, const char *text)<BR>
|
int set(const char *entry, const char *text)<BR>
|
||||||
int set(const char *entry, const void *data, int size)</a></H4>
|
int set(const char *entry, const void *data, int size)</a></H4>
|
||||||
|
|
||||||
|
|||||||
@@ -247,6 +247,19 @@ char Fl_Preferences::set( const char *key, float value )
|
|||||||
{
|
{
|
||||||
sprintf( nameBuffer, "%g", value );
|
sprintf( nameBuffer, "%g", value );
|
||||||
node->set( key, nameBuffer );
|
node->set( key, nameBuffer );
|
||||||
|
float v1 = atof(nameBuffer);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set an entry (name/value pair)
|
||||||
|
*/
|
||||||
|
char Fl_Preferences::set( const char *key, float value, int precision )
|
||||||
|
{
|
||||||
|
sprintf( nameBuffer, "%.*g", precision, value );
|
||||||
|
node->set( key, nameBuffer );
|
||||||
|
float v1 = atof(nameBuffer);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -273,6 +286,17 @@ char Fl_Preferences::set( const char *key, double value )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set an entry (name/value pair)
|
||||||
|
*/
|
||||||
|
char Fl_Preferences::set( const char *key, double value, int precision )
|
||||||
|
{
|
||||||
|
sprintf( nameBuffer, "%*g", precision, value );
|
||||||
|
node->set( key, nameBuffer );
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// remove control sequences from a string
|
// remove control sequences from a string
|
||||||
static char *decodeText( const char *src )
|
static char *decodeText( const char *src )
|
||||||
{
|
{
|
||||||
|
|||||||
+19
-42
@@ -1,45 +1,22 @@
|
|||||||
//
|
|
||||||
// "$Id$"
|
|
||||||
//
|
|
||||||
// Hello, World! program for the Fast Light Tool Kit (FLTK).
|
|
||||||
//
|
|
||||||
// Copyright 1998-2005 by Bill Spitzak and others.
|
|
||||||
//
|
|
||||||
// This library is free software; you can redistribute it and/or
|
|
||||||
// modify it under the terms of the GNU Library General Public
|
|
||||||
// License as published by the Free Software Foundation; either
|
|
||||||
// version 2 of the License, or (at your option) any later version.
|
|
||||||
//
|
|
||||||
// This library is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
// Library General Public License for more details.
|
|
||||||
//
|
|
||||||
// You should have received a copy of the GNU Library General Public
|
|
||||||
// License along with this library; if not, write to the Free Software
|
|
||||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
||||||
// USA.
|
|
||||||
//
|
|
||||||
// Please report all bugs and problems on the following page:
|
|
||||||
//
|
|
||||||
// http://www.fltk.org/str.php
|
|
||||||
//
|
|
||||||
|
|
||||||
#include <FL/Fl.H>
|
#include <FL/Fl.H>
|
||||||
#include <FL/Fl_Window.H>
|
#include <FL/Fl_Gl_Window.H>
|
||||||
#include <FL/Fl_Box.H>
|
#include <stdio.h>
|
||||||
|
|
||||||
int main(int argc, char **argv) {
|
int main(int argc, char **argv)
|
||||||
Fl_Window *window = new Fl_Window(300,180);
|
{
|
||||||
Fl_Box *box = new Fl_Box(FL_UP_BOX,20,40,260,100,"Hello, World!");
|
Fl_Window *window = new Fl_Window(300,200);
|
||||||
box->labelfont(FL_BOLD+FL_ITALIC);
|
window->clear_border(); // no border!!
|
||||||
box->labelsize(36);
|
window->show();
|
||||||
box->labeltype(FL_SHADOW_LABEL);
|
|
||||||
window->end();
|
|
||||||
window->show(argc, argv);
|
|
||||||
return Fl::run();
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
// wait some time
|
||||||
// End of "$Id$".
|
Fl::wait(10.);
|
||||||
//
|
window->size(0,0);
|
||||||
|
|
||||||
|
while(true) {
|
||||||
|
printf("LOOP ");
|
||||||
|
// doesn't wait....
|
||||||
|
Fl::wait(100.);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user