Program: wxMaracas
Module: $RCSfile: CutModelMainPanel.cxx,v $
Language: C++
-Date: $Date: 2010/04/29 15:39:43 $
-Version: $Revision: 1.9 $
+Date: $Date: 2010/04/29 16:05:33 $
+Version: $Revision: 1.10 $
Copyright: (c) 2002, 2003
License:
void CutModelMainPanel::onRedo(){
try{
checkInvariant();
- int result = cutmanager->Redo();
+ /*int result = */ cutmanager->Redo();
}catch(CutModelException e){
showErrorDialog(e.getCause());
}
}
return exists;
-
}
// ----------------------------------------------------------------------------
manualPoint* manualBaseModel::GetManualPoint(int id)
}
}
-
// ---------------------------------------------------------------------------
void manualBaseModel::AddManualPoint( manualPoint* theManualPoint )
{
_lstPoints.push_back( theManualPoint );
}
-
+// ---------------------------------------------------------------------------
void manualBaseModel::Open(FILE *ff) // virtual
{
}
+// ---------------------------------------------------------------------------
void manualBaseModel::Save(FILE *ff) // virtual
{
}
-
+// ---------------------------------------------------------------------------
void manualBaseModel::SaveData(FILE *ff)// virtual
{
}
{
_sizePointsContour = size;
}
-
+// ---------------------------------------------------------------------------
double manualBaseModel::GetPathSize()
{
return 0.0;
}
-
+// ---------------------------------------------------------------------------
void manualBaseModel::Transform_Ax_Plus_B (double Ax, double Bx, double Ay, double By)
{
}
-
+// ---------------------------------------------------------------------------
void manualBaseModel::GetSpline_i_Point(int i, double *x, double *y, double *z)
{
//RaC 20-09-09 IF it's a points contour
*y = mp->GetY();
*z = mp->GetZ();
}
-
}
-
}
void manualBaseModel::GetSpline_t_Point(double t, double *x, double *y, double *z)
}
// ---------------------------------------------------------------------------
-double manualBaseModel::GetPathArea()
+double manualBaseModel::GetPathArea()
{
return 0.0;
}
-void manualBaseModel::GetNearestPointAndNormal(double *p, double *rp, double *rn)
+void manualBaseModel::GetNearestPointAndNormal(double *p, double *rp, double *rn)
{
}
-void manualBaseModel::SetCloseContour(bool closeContour)
+void manualBaseModel::SetCloseContour(bool closeContour)
{
}
-bool manualBaseModel::IfCloseContour()
+bool manualBaseModel::IfCloseContour()
{
return false;
}
// ----------------------------------------------------------------------------
void manualContourBaseControler::MouseClickRight(int x, int y)
{
-
SetCompleteCreation( true );
SetKeyBoardMoving( false );
this->GetManualContourModel()->SetCloseContour(true);
GetManualViewBaseContour()->TransfromCoordViewWorld(xx,yy,zz);
printf("EED %p manualContourBaseControler::AddPoint \n", this);
- GetManualContourModel()->AddPoint(xx,yy,zz);
+ GetManualContourModel()->AddPoint(xx,yy,zz);
GetManualViewBaseContour()->AddPoint();
// GetManualViewBaseContour()->UpdateViewPoint(id);
}
protected:
bool _easyCreation;
private:
-
+
};
#endif // manualContourControler_h
_sizePointsContour = size;
}
-
// ----------------------------------------------------------------------------
void manualContourModel::SetCloseContour(bool closeContour)
_bboxMapper = vtkPolyDataMapper::New();
_bboxMapper->ScalarVisibilityOff( );
-
_bboxMapper->SetInput(_pd);
_bboxMapper->ImmediateModeRenderingOn();
_contourVtkActor->SetMapper(_bboxMapper);
_contourVtkActor->GetProperty()->BackfaceCullingOff();
-
UpdateColorActor();
_pd->ComputeBounds();
InitTextActor();
-
-
}
void manualViewBaseContour::InitTextActor()
{
result=true;
SetPosibleSelected(result);
- }
+ }
}
-
}
return result;
}
Program: wxMaracas
Module: $RCSfile: wxMaracas_ViewerWidget.cxx,v $
Language: C++
- Date: $Date: 2010/04/20 16:11:37 $
- Version: $Revision: 1.27 $
+ Date: $Date: 2010/04/29 16:05:34 $
+ Version: $Revision: 1.28 $
Copyright: (c) 2002, 2003
License:
mwxsphereview = NULL;
mwxvtkclipping3Dview = NULL;
mwxvtk3Dbaseview_Clipping3D = NULL;
- mwxvtkmpr3Dview = NULL;
- vtkmpr3Ddataviewer = NULL;
+ mwxvtkmpr3Dview = NULL;
+ vtkmpr3Ddataviewer = NULL;
if (type==-1)
{
Program: wxMaracas
Module: $RCSfile: marAxis.h,v $
Language: C++
- Date: $Date: 2010/04/20 16:11:41 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2010/04/29 16:05:38 $
+ Version: $Revision: 1.3 $
Copyright: (c) 2002, 2003
License:
void calculateSignal( kVolume* vol );
- int getActualQuant( ) { return _actualQuant; }
+ int getActualQuant( ) { return _actualQuant; }
- float getSignal( uint32_t slice ) { return( _signal[ slice ] ); };
+ float getSignal( uint slice ) { return( _signal[ slice ] ); };
- double* getSplinePoint( uint32_t i ) { return ( _points[ i ] ); };
+ double* getSplinePoint( uint i ) { return ( _points[ i ] ); };
- int getHealthySlice( ) { return( _healthySlice ); };
- int getHealthySliceStart( ) { return( _healthySliceStart ); };
- int getHealthySliceEnd( ) { return( _healthySliceEnd ); };
+ int getHealthySlice( ) { return( _healthySlice ); };
+ int getHealthySliceStart( ) { return( _healthySliceStart ); };
+ int getHealthySliceEnd( ) { return( _healthySliceEnd ); };
- void setActualQuant(int act) { _actualQuant=act; };
+ void setActualQuant(int act) { _actualQuant=act; };
void setHealthySlice( int hsS, int hs, int hsE );
vtkImageData* getSliceImage( int i ) { return(_quantificationImages[ i ]); };
*/
-
- bool if3DcontourExist(int i);
- void Save3Dcontour(FILE *ff,int i);
- void SaveExisting3DContours(FILE *ff);
-
+ bool if3DcontourExist(int i);
+ void Save3Dcontour(FILE *ff,int i);
+ void SaveExisting3DContours(FILE *ff);
marContour* getContour( int i , kVolume* vol ); // DATA-MODEL-2D
- kVolume* getSlice( int i , kVolume* vol ); // DATA-MODEL-Voxel XxYx1
+ kVolume* getSlice( int i , kVolume* vol ); // DATA-MODEL-Voxel XxYx1
vtkProbeFilter* get3DSlice( int i , kVolume* vol ); // VISUALISATION-VTK 3D
vtkPoints* get3Dcontour( int i , kVolume* vol ); // VISUALISATION-VTK 3D
vtkImageData* getSliceImage( int i , kVolume* vol ); // VISUALISATION-VTK 2D
Program: wxMaracas
Module: $RCSfile: volume.cxx,v $
Language: C++
- Date: $Date: 2010/04/20 16:11:40 $
- Version: $Revision: 1.8 $
+ Date: $Date: 2010/04/29 16:05:37 $
+ Version: $Revision: 1.9 $
Copyright: (c) 2002, 2003
License:
switch( _type ) {
- case CHAR: p = ( double )( ( int8_t*** )_images )[ z ][ y ][ x ]; break;
- case FLOAT: p = ( double )( ( float*** )_images )[ z ][ y ][ x ]; break;
- case DOUBLE: p = ( double )( ( double*** )_images )[ z ][ y ][ x ]; break;
- case INT: p = ( double )( ( int32_t*** )_images )[ z ][ y ][ x ]; break;
- case SHORT: p = ( double )( ( int16_t*** )_images )[ z ][ y ][ x ]; break;
- case UCHAR: p = ( double )( ( uint8_t*** )_images )[ z ][ y ][ x ]; break;
+ case CHAR: p = ( double )( ( int8_t*** )_images )[ z ][ y ][ x ]; break;
+ case FLOAT: p = ( double )( ( float*** )_images )[ z ][ y ][ x ]; break;
+ case DOUBLE: p = ( double )( ( double*** )_images )[ z ][ y ][ x ]; break;
+ case INT: p = ( double )( ( int32_t*** )_images )[ z ][ y ][ x ]; break;
+ case SHORT: p = ( double )( ( int16_t*** )_images )[ z ][ y ][ x ]; break;
+ case UCHAR: p = ( double )( ( uint8_t*** )_images )[ z ][ y ][ x ]; break;
case UINT: p = ( double )( ( uint32_t*** )_images )[ z ][ y ][ x ]; break;
case USHORT: p = ( double )( ( uint16_t*** )_images )[ z ][ y ][ x ]; break;
default: p = 0.0; break;
case CHAR:
switch( type ) {
- case SHORT: convertCastT( ( char* )_raw, ( int16_t* )buffer, size ); break;
- case INT: convertCastT( ( char* )_raw, ( int32_t* )buffer, size ); break;
+ case SHORT: convertCastT( ( char* )_raw, ( int16_t* )buffer, size ); break;
+ case INT: convertCastT( ( char* )_raw, ( int32_t* )buffer, size ); break;
case USHORT: convertCastT( ( char* )_raw, ( uint16_t* )buffer, size ); break;
case UINT: convertCastT( ( char* )_raw, ( uint32_t* )buffer, size ); break;
- case FLOAT: convertCastT( ( char* )_raw, ( float* )buffer, size ); break;
- case DOUBLE: convertCastT( ( char* )_raw, ( double* )buffer, size ); break;
+ case FLOAT: convertCastT( ( char* )_raw, ( float* )buffer, size ); break;
+ case DOUBLE: convertCastT( ( char* )_raw, ( double* )buffer, size ); break;
case UCHAR: convertCastT( ( char* )_raw, ( uint8_t* )buffer, size ); break;
default : break;
case SHORT:
switch( type ) {
- case CHAR: convertCastT( ( int16_t* )_raw, ( uint8_t* )buffer, size ); break;
- case INT: convertCastT( ( int16_t* )_raw, ( int32_t* )buffer, size ); break;
+ case CHAR: convertCastT( ( int16_t* )_raw, ( uint8_t* )buffer, size ); break;
+ case INT: convertCastT( ( int16_t* )_raw, ( int32_t* )buffer, size ); break;
case USHORT: convertCastT( ( int16_t* )_raw, ( uint16_t* )buffer, size ); break;
case UINT: convertCastT( ( int16_t* )_raw, ( uint32_t* )buffer, size ); break;
- case FLOAT: convertCastT( ( int16_t* )_raw, ( float* )buffer, size ); break;
- case DOUBLE: convertCastT( ( int16_t* )_raw, ( double* )buffer, size ); break;
- case UCHAR: convertCastT( ( int16_t* )_raw, ( uint8_t* )buffer, size ); break;
+ case FLOAT: convertCastT( ( int16_t* )_raw, ( float* )buffer, size ); break;
+ case DOUBLE: convertCastT( ( int16_t* )_raw, ( double* )buffer, size ); break;
+ case UCHAR: convertCastT( ( int16_t* )_raw, ( uint8_t* )buffer, size ); break;
default : break;
} // fswitch
break;
Program: wxMaracas
Module: $RCSfile: volume.hxx,v $
Language: C++
- Date: $Date: 2010/04/20 16:11:40 $
- Version: $Revision: 1.7 $
+ Date: $Date: 2010/04/29 16:05:37 $
+ Version: $Revision: 1.8 $
Copyright: (c) 2002, 2003
License:
return( SIZETypes[ _type ] * getRawSize( ) );
}
- double getPixel( uint32_t x, uint32_t y, uint32_t z ) const;
- void setPixel( double v, uint32_t x, uint32_t y, uint32_t z );
+ double getPixel( uint x, uint y, uint z ) const;
+ void setPixel( double v, uint x, uint y, uint z );
void convertCast( Type type );
void convertScale( Type type, double min, double max );
git://git.creatis.insa-lyon.fr / creaMaracasVisu.git / commitdiff