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

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

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

revision 2616 by schoenebeck, Tue Jun 10 20:20:21 2014 UTC revision 2617 by schoenebeck, Tue Jun 10 22:49:45 2014 UTC
# Line 449  static void scheduleCopyDimensionRegions Line 449  static void scheduleCopyDimensionRegions
449          uint dstDimValues[8] = {};          uint dstDimValues[8] = {};
450          DimensionCase srcDimCase = dimCase;          DimensionCase srcDimCase = dimCase;
451          DimensionCase dstDimCase = dimCase;          DimensionCase dstDimCase = dimCase;
452          if (dims.count(mainDim)) {          srcDimCase[mainDim] = iSrcMainBit;
453              srcDimCase[mainDim] = iSrcMainBit;          dstDimCase[mainDim] = iDstMainBit;
             dstDimCase[mainDim] = iDstMainBit;  
         }  
454    
455          #if DEBUG_COMBINE_INSTRUMENTS          #if DEBUG_COMBINE_INSTRUMENTS
456          printf("-------------------------------\n");          printf("-------------------------------\n");
# Line 471  static void scheduleCopyDimensionRegions Line 469  static void scheduleCopyDimensionRegions
469          #if DEBUG_COMBINE_INSTRUMENTS          #if DEBUG_COMBINE_INSTRUMENTS
470          printf("dst "); fflush(stdout);          printf("dst "); fflush(stdout);
471          #endif          #endif
472          fillDimValues(dstDimValues, dstDimCase, outRgn, true);          fillDimValues(dstDimValues, dstDimCase, outRgn, false);
473          gig::DimensionRegion* srcDimRgn = inRgn->GetDimensionRegionByValue(srcDimValues);          gig::DimensionRegion* srcDimRgn = inRgn->GetDimensionRegionByValue(srcDimValues);
474          gig::DimensionRegion* dstDimRgn = outRgn->GetDimensionRegionByValue(dstDimValues);          gig::DimensionRegion* dstDimRgn = outRgn->GetDimensionRegionByValue(dstDimValues);
475          #if DEBUG_COMBINE_INSTRUMENTS          #if DEBUG_COMBINE_INSTRUMENTS
# Line 507  static void scheduleCopyDimensionRegions Line 505  static void scheduleCopyDimensionRegions
505              printf("dst velocity value = %d\n", dstDimCase[gig::dimension_velocity]);              printf("dst velocity value = %d\n", dstDimCase[gig::dimension_velocity]);
506              printf("dst refilled "); fflush(stdout);              printf("dst refilled "); fflush(stdout);
507              #endif              #endif
508              fillDimValues(dstDimValues, dstDimCase, outRgn, true);              fillDimValues(dstDimValues, dstDimCase, outRgn, false);
509              dstDimRgn = outRgn->GetDimensionRegionByValue(dstDimValues);              dstDimRgn = outRgn->GetDimensionRegionByValue(dstDimValues);
510              #if DEBUG_COMBINE_INSTRUMENTS              #if DEBUG_COMBINE_INSTRUMENTS
511              printf("reselected dstDimRgn=%lx\n", (uint64_t)dstDimRgn);              printf("reselected dstDimRgn=%lx\n", (uint64_t)dstDimRgn);

Legend:
Removed from v.2616  
changed lines
  Added in v.2617

  ViewVC Help
Powered by ViewVC