/[svn]/gigedit/trunk/src/gigedit/dimregionchooser.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/dimregionchooser.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1261 by persson, Thu Jul 5 17:12:20 2007 UTC revision 1420 by persson, Sun Oct 14 15:39:32 2007 UTC
# Line 49  DimRegionChooser::DimRegionChooser() Line 49  DimRegionChooser::DimRegionChooser()
49      add_events(Gdk::BUTTON_PRESS_MASK | Gdk::POINTER_MOTION_MASK |      add_events(Gdk::BUTTON_PRESS_MASK | Gdk::POINTER_MOTION_MASK |
50                 Gdk::POINTER_MOTION_HINT_MASK);                 Gdk::POINTER_MOTION_HINT_MASK);
51    
52      for (int i = 0 ; i < 256 ; i++) {      for (int i = 0 ; i < 256 ; i++) dimvalue[i] = 0;
         dimvalue_from[i] = 0;  
         dimvalue_to[i] = 1;  
     }  
53  }  }
54    
55  DimRegionChooser::~DimRegionChooser()  DimRegionChooser::~DimRegionChooser()
# Line 233  bool DimRegionChooser::on_expose_event(G Line 230  bool DimRegionChooser::on_expose_event(G
230    
231  void DimRegionChooser::on_size_request(GtkRequisition* requisition)  void DimRegionChooser::on_size_request(GtkRequisition* requisition)
232  {  {
     printf("DimRegionChooser::on_size_request\n");  
233      *requisition = GtkRequisition();      *requisition = GtkRequisition();
234      requisition->height = region ? nbDimensions * 20 : 0;      requisition->height = region ? nbDimensions * 20 : 0;
235      requisition->width = 800;      requisition->width = 800;
# Line 250  void DimRegionChooser::set_region(gig::R Line 246  void DimRegionChooser::set_region(gig::R
246              if (region->pDimensionDefinitions[dim].bits == 0) continue;              if (region->pDimensionDefinitions[dim].bits == 0) continue;
247              nbDimensions++;              nbDimensions++;
248    
249              int from = dimvalue_from[region->pDimensionDefinitions[dim].dimension];              int z = std::min(dimvalue[region->pDimensionDefinitions[dim].dimension],
250              int to = dimvalue_to[region->pDimensionDefinitions[dim].dimension];                               region->pDimensionDefinitions[dim].zones - 1);
             int z;  
             switch (region->pDimensionDefinitions[dim].split_type) {  
             case gig::split_type_normal:  
                 z = int((to + from) / 2.0 / region->pDimensionDefinitions[dim].zone_size);  
                 break;  
             case gig::split_type_bit:  
                 z = std::min(from, region->pDimensionDefinitions[dim].zones - 1);  
                 break;  
             }  
251              int mask =              int mask =
252                  ~(((1 << region->pDimensionDefinitions[dim].bits) - 1) <<                  ~(((1 << region->pDimensionDefinitions[dim].bits) - 1) <<
253                    bitcount);                    bitcount);
# Line 425  bool DimRegionChooser::on_button_press_e Line 412  bool DimRegionChooser::on_button_press_e
412                     region->pDimensionDefinitions[dim].split_type,                     region->pDimensionDefinitions[dim].split_type,
413                     region->pDimensionDefinitions[dim].zones,                     region->pDimensionDefinitions[dim].zones,
414                     region->pDimensionDefinitions[dim].zone_size);                     region->pDimensionDefinitions[dim].zone_size);
415  #if 0              dimvalue[region->pDimensionDefinitions[dim].dimension] = z;
             switch (region->pDimensionDefinitions[dim].split_type) {  
             case gig::split_type_normal:  
                 dimvalue_from[region->pDimensionDefinitions[dim].dimension] =  
                     int(z * region->pDimensionDefinitions[dim].zone_size);  
                 dimvalue_to[region->pDimensionDefinitions[dim].dimension] =  
                     int((z + 1) * region->pDimensionDefinitions[dim].zone_size) - 1;  
                 break;  
             case gig::split_type_bit:  
                 dimvalue_from[region->pDimensionDefinitions[dim].dimension] = z;  
                 dimvalue_to[region->pDimensionDefinitions[dim].dimension] = z + 1;  
                 break;  
             }  
 #endif  
416    
417              dimregno = c | (z << bitpos);              dimregno = c | (z << bitpos);
418    
# Line 589  bool DimRegionChooser::is_in_resize_zone Line 563  bool DimRegionChooser::is_in_resize_zone
563      return false;      return false;
564  }  }
565    
566  sigc::signal<void> DimRegionChooser::signal_dimregion_selected()  sigc::signal<void>& DimRegionChooser::signal_dimregion_selected()
567  {  {
568      return dimregion_selected;      return dimregion_selected;
569  }  }
570    
571  sigc::signal<void> DimRegionChooser::signal_region_changed()  sigc::signal<void>& DimRegionChooser::signal_region_changed()
572  {  {
573      return region_changed;      return region_changed;
574  }  }
Legend:
Removed from v.1261  
changed lines
  Added in v.1420
  ViewVC Help
Powered by ViewVC