Skip to content

Commit

Permalink
version 1.0 tags
Browse files Browse the repository at this point in the history
  • Loading branch information
kylechampley committed Jan 7, 2024
1 parent 20f3be9 commit 594847d
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 2 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

setup(
name='leapct',
version='0.99',
version='1.0',
author='Hyojin Kim, Kyle Champley',
author_email='hkim@llnl.gov',
description='LivermorE AI Projector for Computed Tomography (LEAPCT)',
Expand Down
2 changes: 1 addition & 1 deletion setup_ctype.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

setup(
name='leapct',
version='0.99',
version='1.0',
author='Kyle Champley, Hyojin Kim',
author_email='champley@gmail.com',
description='LivermorE AI Projector for Computed Tomography (LEAPCT)',
Expand Down
5 changes: 5 additions & 0 deletions src/leapctype.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,11 @@ def reset(self):
self.set_model()
return self.libprojectors.reset()

def about(self):
"""prints info about LEAP, including the version number"""
self.set_model()
return self.libprojectors.about()

def printParameters(self):
"""printParameters
prints all CT geometry and CT volume parameters to the screen
Expand Down
14 changes: 14 additions & 0 deletions src/tomographic_models.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,20 @@ bool tomographicModels::print_parameters()
return true;
}

const char* tomographicModels::about()
{
printf("****************************************************************\n");
printf("LivermorE AI Projector for Computed Tomography (LEAP)\n");
printf(" version %s\n", LEAP_VERSION);
printf(" LLNL-CODE-848657\n");
printf("\n");
printf(" compiled: %s %s\n", __DATE__, __TIME__);
printf(" written by: Kyle Champley and Hyojin Kim\n");
printf("****************************************************************\n");

return LEAP_VERSION;
}

bool tomographicModels::reset()
{
params.clearAll();
Expand Down
7 changes: 7 additions & 0 deletions src/tomographic_models.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#pragma once
#endif

#define LEAP_VERSION "1.0"

#include <stdlib.h>
#include "parameters.h"
Expand Down Expand Up @@ -199,6 +200,12 @@ class tomographicModels
*/
bool print_parameters();

/**
* \fn about
* \brief prints info about LEAP, including the version number
*/
const char* about();

/**
* \fn set_conebeam
* \brief sets the cone-beam parameters
Expand Down
5 changes: 5 additions & 0 deletions src/tomographic_models_c_interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ tomographicModels* tomo()
return list_models.get(whichModel);
}

void about()
{
tomo()->about();
}

bool print_parameters()
{
return tomo()->print_parameters();
Expand Down
1 change: 1 addition & 0 deletions src/tomographic_models_c_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
extern "C" PROJECTOR_API bool set_model(int);
extern "C" PROJECTOR_API int create_new_model();

extern "C" PROJECTOR_API void about();
extern "C" PROJECTOR_API bool print_parameters();
extern "C" PROJECTOR_API bool reset();

Expand Down

0 comments on commit 594847d

Please sign in to comment.