diff --git a/src/GUI/prop_picker.cxx b/src/GUI/prop_picker.cxx index 38002a0a6..0f3371fe0 100755 --- a/src/GUI/prop_picker.cxx +++ b/src/GUI/prop_picker.cxx @@ -41,11 +41,15 @@ #include #include +#include STL_STRING +SG_USING_STD(string); + +// A local alternative name, for use when a variable called "string" is in scope - e.g. in classes derived from puInput. +typedef string stdString; + #define DOTDOTSLASH "../" #define SLASH "/" -string name, line, value; - static puObject *PP_widget = 0; // widget location and size... @@ -137,13 +141,17 @@ static string getValueTypeString( const SGPropertyNode *node ) { void fgPropPicker::fgPropPickerHandleSlider ( puObject * slider ) { + puListBox* list_box = (puListBox*) slider -> getUserData () ; + float val ; slider -> getValue ( &val ) ; val = 1.0f - val ; - - puListBox* list_box = (puListBox*) slider -> getUserData () ; - int index = int ( list_box -> getNumItems () * val ) ; - list_box -> setTopItem ( index ) ; + int scroll_range = list_box->getNumItems () - list_box->getNumVisible() ; + if ( scroll_range > 0 ) + { + int index = int ( scroll_range * val + 0.5 ) ; + list_box -> setTopItem ( index ) ; + } } void fgPropPicker::fgPropPickerHandleArrow ( puObject *arrow ) @@ -160,14 +168,18 @@ void fgPropPicker::fgPropPickerHandleArrow ( puObject *arrow ) float val ; slider -> getValue ( &val ) ; val = 1.0f - val ; - int num_items = list_box->getNumItems () - 1 ; - if ( num_items > 0 ) + int scroll_range = list_box->getNumItems () - list_box->getNumVisible() ; + if ( scroll_range > 0 ) { - int index = int ( num_items * val + 0.5 ) + inc ; - if ( index > num_items ) index = num_items ; + int index = int ( scroll_range * val + 0.5 ) ; + index += inc ; + // if ( index > scroll_range ) index = scroll_range ; + // Allow buttons to scroll further than the slider does + if ( index > ( list_box->getNumItems () - 1 ) ) + index = ( list_box->getNumItems () - 1 ) ; if ( index < 0 ) index = 0 ; - slider -> setValue ( 1.0f - (float)index / num_items ) ; + slider -> setValue ( 1.0f - (float)index / scroll_range ) ; list_box -> setTopItem ( index ) ; } } @@ -296,16 +308,15 @@ void fgPropPicker::fgPropPickerHandleOk ( puObject* b ) FG_POP_PUI_DIALOG( prop_picker ); } -/* -fgPropPicker::~fgPropPicker () +void fgPropPicker::delete_arrays () { if ( files ) { for ( int i=0; i setLabel (startDir); slider = new puSlider (w-30,40+20*arrows,h-100-40*arrows,TRUE,20); - slider->setDelta(0.1f); slider->setValue(1.0f); - slider->setSliderFraction (0.2f) ; - slider->setCBMode( PUSLIDER_DELTA ); list_box = new puListBox ( 10, 40, w-40, h-60 ) ; list_box -> setLabel ( title ); @@ -375,17 +390,6 @@ fgPropPicker::fgPropPicker ( int x, int y, int w, int h, int arrows, up_arrow->setCallback ( fgPropPickerHandleArrow ) ; } - if ( arrows == 2 ) - { - down_arrow = new puArrowButton ( w-30, 40, w-10, 60, PUARROW_FASTDOWN ) ; - down_arrow->setUserData ( slider ) ; - down_arrow->setCallback ( fgPropPickerHandleArrow ) ; - - up_arrow = new puArrowButton ( w-30, h-80, w-10, h-60, PUARROW_FASTUP ) ; - up_arrow->setUserData ( slider ) ; - up_arrow->setCallback ( fgPropPickerHandleArrow ) ; - } - // after picker is built, load the list box with data... find_props () ; @@ -400,43 +404,36 @@ fgPropPicker::fgPropPicker ( int x, int y, int w, int h, int arrows, } +// Like strcmp, but for sorting property nodes into a suitable display order. +static int nodeNameCompare(const void *ppNode1, const void *ppNode2) +{ + const SGPropertyNode_ptr pNode1 = *(const SGPropertyNode_ptr *)ppNode1; + const SGPropertyNode_ptr pNode2 = *(const SGPropertyNode_ptr *)ppNode2; + + // Compare name first, and then index. + int diff = strcmp(pNode1->getName(), pNode2->getName()); + if (diff) return diff; + return pNode1->getIndex() - pNode2->getIndex(); +} + + +// Replace the current list of properties with the children of node "startDir". void fgPropPicker::find_props () { - int pi; + int i; - if ( files != NULL ) - { - for ( int i = 0 ; i < num_files ; i++ ) { - delete files[i] ; - delete names[i] ; - delete values[i] ; - } - - delete [] files ; - delete [] names ; - delete [] values ; - delete [] dflag ; - } - + delete_arrays(); num_files = 0 ; - char dir [ PUSTRING_MAX * 2 ] ; +// printf("dir begin of find_props=%s\n",startDir); +// printf("len of dir=%i",strlen(startDir)); + SGPropertyNode * node = globals->get_props()->getNode(startDir); - int iindex = 0; - char sindex [ 20 ]; - - strcpy ( dir, startDir ) ; - - int i = 0 ; -// printf("dir begin of find_props=%s\n",dir); -// printf("len of dir=%i",strlen(dir)); - SGPropertyNode * node = globals->get_props()->getNode(dir); - - num_files = (int)node->nChildren(); + num_files = (node) ? (int)node->nChildren() : 0; // instantiate string objects and add [.] and [..] for subdirs - if (strcmp(dir,"/") == 0) { + if (strcmp(startDir,"/") == 0) { files = new char* [ num_files+1 ] ; names = new char* [ num_files+1 ] ; values = new char* [ num_files+1 ] ; @@ -450,7 +447,7 @@ void fgPropPicker::find_props () names = new char* [ num_files+1 ] ; values = new char* [ num_files+1 ] ; dflag = new char [ num_files+1 ] ; - line = "."; + stdString line = "."; files [ 0 ] = new char[ strlen(line.c_str())+2 ]; strcpy ( files [ 0 ], line.c_str() ); names [ 0 ] = new char[ 2 ]; @@ -468,87 +465,69 @@ void fgPropPicker::find_props () }; - for (i = 0; i < (int)node->nChildren(); i++) { - SGPropertyNode * child = node->getChild(i); - name = child->getName(); - if ( node->getChild(name.c_str(), 1) != 0 ) { - iindex = child->getIndex(); - sprintf(sindex, "[%d]", iindex); - name += sindex; - } - line = name; - names[ pi ] = new char[ strlen(line.c_str())+2 ] ; - strcpy ( names [ pi ], line.c_str() ) ; + if (node) { + // Get the list of children + int nChildren = node->nChildren(); + SGPropertyNode_ptr * children = new SGPropertyNode_ptr[nChildren]; + for (i = 0; i < nChildren; i++) { + children[i] = node->getChild(i); + } + + // Sort the children into display order + qsort(children, nChildren, sizeof(children[0]), nodeNameCompare); + + // Make lists of the children's names, values, etc. + for (i = 0; i < nChildren; i++) { + SGPropertyNode * child = children[i]; + stdString name = child->getDisplayName(true); + names[ pi ] = new char[ strlen(name.c_str())+2 ] ; + strcpy ( names [ pi ], name.c_str() ) ; if ( child->nChildren() > 0 ) { dflag[ pi ] = 1 ; - files[ pi ] = new char[ strlen(line.c_str())+strlen(sindex)+4 ] ; - strcpy ( files [ pi ], line.c_str() ) ; + files[ pi ] = new char[ strlen(name.c_str())+2 ] ; + strcpy ( files [ pi ], name.c_str() ) ; strcat ( files [ pi ], "/" ) ; values[ pi ] = new char[ 2 ] ; } else { dflag[ pi ] = 0 ; - value = node->getStringValue ( name.c_str(), "" ); + stdString value = child->getStringValue(); values[ pi ] = new char[ strlen(value.c_str())+2 ] ; strcpy ( values [pi], value.c_str() ); - line += " = '" + value + "' " + "("; - line += getValueTypeString( node->getNode( name.c_str() ) ); + stdString line = name + " = '" + value + "' " + "("; + line += getValueTypeString( child ); line += ")"; + // truncate entries to plib pui limit + if (line.length() > (PUSTRING_MAX-1)) line[PUSTRING_MAX-1] = '\0'; files[ pi ] = new char[ strlen(line.c_str())+2 ] ; strcpy ( files [ pi ], line.c_str() ) ; } // printf("files->%i of %i %s\n",pi, node->nChildren(), files [pi]); ++pi; - } + } - // truncate entries to 80 characters (plib pui limit) - for (i = 0; i < num_files; i++) { - if (strlen(files[i]) > 80) files[i][79] = '\0'; + delete [] children; } files [ num_files ] = NULL ; - // leave the . and .. alone... - int ii = ( strcmp(files [0], "." ) == 0 ) ? 2 : 0; - - // Sort the entries. This is a simple N^2 extraction sort. More - // elaborate algorithms aren't necessary for the few dozen - // properties we're going to sort. - for(i=ii; i setLabel (startDir); list_box -> newList ( files ) ; - // if non-empty list, adjust the size of the slider... - if (num_files > 1) { - if ((11.0f/(num_files)) < 1) { - slider->setSliderFraction (11.0f/(num_files)) ; - slider->reveal(); - up_arrow->reveal(); - down_arrow->reveal(); - } - else { - slider->setSliderFraction (0.9999f) ; - slider->hide(); - up_arrow->hide(); - down_arrow->hide(); - } + // adjust the size of the slider... + if (num_files > list_box->getNumVisible()) { + slider->setSliderFraction((float)list_box->getNumVisible() / num_files); + slider->setValue(1.0f); + slider->reveal(); + up_arrow->reveal(); + down_arrow->reveal(); + } else { + slider->hide(); + up_arrow->hide(); + down_arrow->hide(); } - } void fgPropEdit::fgPropEditHandleCancel ( puObject* b ) diff --git a/src/GUI/prop_picker.hxx b/src/GUI/prop_picker.hxx index aeec0d6fa..593b2e669 100755 --- a/src/GUI/prop_picker.hxx +++ b/src/GUI/prop_picker.hxx @@ -26,6 +26,8 @@ class fgPropPicker : public puDialogBox static void fgPropPickerHandleArrow ( puObject *arrow ); static void fgPropPickerHandleOk ( puObject* b ); + void delete_arrays () ; + char** files ; char** names ; char** values ;