[pygccxml-commit] source/pyplusplus/gui ui.py,1.19,1.20

[Roman <rom...@us...>]

Update of /cvsroot/pygccxml/source/pyplusplus/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5023/pyplusplus/gui

Modified Files:
	ui.py 
Log Message:
fixing GUI code generation

Index: ui.py
===================================================================
RCS file: /cvsroot/pygccxml/source/pyplusplus/gui/ui.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ui.py	13 Feb 2006 07:25:20 -0000	1.19
--- ui.py	22 Mar 2006 06:35:41 -0000	1.20
***************
*** 21,26 ****
      
  from pygccxml import parser
! from pygccxml import declarations
! from pyplusplus import module_creator
  
  import wizard
--- 21,25 ----
      
  from pygccxml import parser
! from pyplusplus import module_builder
  
  import wizard
***************
*** 169,176 ****
      def __init__(self
                   , parent
!                  , on_generate_code_header
!                  , on_generate_code_header_dir
!                  , on_generate_advanced_pyplusplus
!                  , on_generate_simple_pyplusplus
                   , on_create_gccxml):
          custom_frame_t.__init__( self, parent, sticky=Tkinter.NW )
--- 168,173 ----
      def __init__(self
                   , parent
!                  , on_generate_code
!                  , on_generate_pyplusplus
                   , on_create_gccxml):
          custom_frame_t.__init__( self, parent, sticky=Tkinter.NW )
***************
*** 178,210 ****
          temp = Tkinter.Button( self
                                 , width=37
!                                , text="generate code for declarations"
!                                       + '\n'
!                                       + "found in the header file"
!                                , command=on_generate_code_header )
          temp.grid( row=0, columnspan=3, sticky=Tkinter.NW + Tkinter.E )
  
          temp = Tkinter.Button( self
!                                , text="generate code for declarations"
!                                       + '\n'
!                                       + "found in the header file and it's directory"
!                                , command=on_generate_code_header_dir )
          temp.grid( row=1, sticky=Tkinter.NW + Tkinter.E)
  
          temp = Tkinter.Button( self
-                                , text="generate simple pyplusplus code"
-                                , command=on_generate_simple_pyplusplus )
-         temp.grid( row=2, sticky=Tkinter.NW + Tkinter.E)
- 
-         temp = Tkinter.Button( self
-                                , text="generate advanced pyplusplus code"
-                                , command=on_generate_advanced_pyplusplus )
-         temp.grid( row=3, sticky=Tkinter.NW + Tkinter.E)
- 
-         temp = Tkinter.Button( self
                                 , text="create XML"
                                 , command=on_create_gccxml )
!         temp.grid( row=4, sticky=Tkinter.NW + Tkinter.E)
  
!         map( lambda i:  self.rowconfigure( i, weight=1 ), range(4) )
          #self.columnconfigure( 0, weight=1 )
          
--- 175,193 ----
          temp = Tkinter.Button( self
                                 , width=37
!                                , text="generate code"
!                                , command=on_generate_code )
          temp.grid( row=0, columnspan=3, sticky=Tkinter.NW + Tkinter.E )
  
          temp = Tkinter.Button( self
!                                , text="generate pyplusplus code"
!                                , command=on_generate_pyplusplus )
          temp.grid( row=1, sticky=Tkinter.NW + Tkinter.E)
  
          temp = Tkinter.Button( self
                                 , text="create XML"
                                 , command=on_create_gccxml )
!         temp.grid( row=2, sticky=Tkinter.NW + Tkinter.E)
  
!         map( lambda i:  self.rowconfigure( i, weight=1 ), range(3) )
          #self.columnconfigure( 0, weight=1 )
          
***************
*** 265,272 ****
      
  class main_widget_ui_t(custom_frame_t):
-     class FILTERING:
-         ALL_FROM_HEADER = "all from header"
-         ALL_FROM_HEADER_DIR = "all from header dir"
-         
      def __init__(self, parent=None ):
          custom_frame_t.__init__( self, parent )
--- 248,251 ----
***************
*** 285,292 ****
          
          self._actions_ui = actions_ui_t( self
!                                          , on_generate_code_header=lambda:self._generate_code( self.FILTERING.ALL_FROM_HEADER )
!                                          , on_generate_code_header_dir=lambda:self._generate_code( self.FILTERING.ALL_FROM_HEADER_DIR ) 
!                                          , on_generate_advanced_pyplusplus=lambda: self._generate_advanced_pyplusplus()
!                                          , on_generate_simple_pyplusplus=lambda: self._generate_simple_pyplusplus()
                                           , on_create_gccxml=lambda:self._create_xml())
          
--- 264,269 ----
          
          self._actions_ui = actions_ui_t( self
!                                          , on_generate_code=lambda:self._generate_code()
!                                          , on_generate_pyplusplus=lambda: self._generate_pyplusplus()
                                           , on_create_gccxml=lambda:self._create_xml())
          
***************
*** 310,314 ****
          self.columnconfigure( 1, weight=1 )
  
!     def _generate_advanced_pyplusplus(self):
          config = self._parser_configurator.parser_configuration()
          header_file = self._header_file_configurator.header_file()
--- 287,291 ----
          self.columnconfigure( 1, weight=1 )
  
!     def _generate_pyplusplus(self):
          config = self._parser_configurator.parser_configuration()
          header_file = self._header_file_configurator.header_file()
***************
*** 318,329 ****
          self._generated_code.set_generated_code( w.code_advanced() )
  
-     def _generate_simple_pyplusplus(self):
-         config = self._parser_configurator.parser_configuration()
-         header_file = self._header_file_configurator.header_file()
-         config.include_paths.append( os.path.split( header_file )[0] )
-         config.working_directory = os.path.split( header_file )[0]
-         w = wizard.wizard_t( config, header_file, wizard.FILTER_TYPE.FROM_FILE_AND_DIR )
-         self._generated_code.set_generated_code( w.code_simple() )
- 
      def _create_xml( self ):
          try:
--- 295,298 ----
***************
*** 348,354 ****
              self._generated_code.set_generated_code( '\n'.join( user_msg ) )
              
!     def _generate_code(self, filter):
          try:
-             start_time = time.clock()        
              config = self._parser_configurator.parser_configuration()
              header_file = self._header_file_configurator.header_file()
--- 317,322 ----
              self._generated_code.set_generated_code( '\n'.join( user_msg ) )
              
!     def _generate_code(self):
          try:
              config = self._parser_configurator.parser_configuration()
              header_file = self._header_file_configurator.header_file()
***************
*** 357,370 ****
              config.include_paths.append( os.path.split( header_file )[0] )
              config.working_directory = os.path.split( header_file )[0]
!             decls_all = parser.parse( [ header_file ], config=config )
              parsed_time = time.clock() - start_time
-             if filter == self.FILTERING.ALL_FROM_HEADER:
-                 decls = declarations.filtering.by_location( decls_all, [header_file] )
-             else:
-                 decls = declarations.filtering.by_location( decls_all, [os.path.split(header_file)[0]] )
  
!             extmodule = module_creator.create( decls, "pyplusplus", False )
!             extmodule.user_defined_directories.extend( config.include_paths )
!             code = extmodule.create()
              code = code.replace( '\n\r', '\n' )
              code = code.replace( '\r\n', '\n' )
--- 325,336 ----
              config.include_paths.append( os.path.split( header_file )[0] )
              config.working_directory = os.path.split( header_file )[0]
!             
!             start_time = time.clock()        
!             mb = module_builder.module_builder_t( [ header_file ], config )
              parsed_time = time.clock() - start_time
  
!             mb.build_code_creator( "pyplusplus" )
!             mb.code_creator.user_defined_directories.extend( config.include_paths )
!             code = mb.code_creator.create()
              code = code.replace( '\n\r', '\n' )
              code = code.replace( '\r\n', '\n' )