Skip to content

Commit 3c3afbb

Browse files
authored
Merge pull request #4 from Bondoki/master
Pull Request for Release 1.2.3
2 parents 0476f90 + 58670d0 commit 3c3afbb

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ SET (APPLICATION_CODENAME "${PROJECT_NAME}")
3434
SET (APPLICATION_COPYRIGHT_YEARS "2015")
3535
SET (APPLICATION_VERSION_MAJOR 1)
3636
SET (APPLICATION_VERSION_MINOR 2)
37-
SET (APPLICATION_VERSION_PATCH 2)
37+
SET (APPLICATION_VERSION_PATCH 3)
3838
SET (APPLICATION_VERSION_TYPE SNAPSHOT)
3939
SET (APPLICATION_VERSION_STRING "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}-${APPLICATION_VERSION_TYPE}")
4040
SET (APPLICATION_ID "${APPLICATION_VENDOR_ID}.${PROJECT_NAME}")

ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,10 @@
1010
* Release-1.2.1
1111
- adding command "!setColor:BG=(r,g,b)" for changing background color
1212
- code refactoring
13+
14+
* Release-1.2.2
15+
- code refactoring
16+
17+
* Release-1.2.3
18+
- code refactoring for LeMonADE v2.0.0
19+

include/LeMonADE-Viewer/LeMonADEViewer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ void initialize(){
498498

499499
// fill the groups with connected structures by an functor
500500
// fill_connected_groups( this->ingredients.getMolecules(), linearGroupsVector, MonomerGroup<typename IngredientsType::molecules_type>(&(this->ingredients.getMolecules())),alwaysTrue() );
501-
fill_connected_groups( this->ingredients.getMolecules(), linearGroupsVector, MonomerGroup<typename IngredientsType::molecules_type>(&(this->ingredients.getMolecules())),belongsToLinearStrand() );
501+
fill_connected_groups( this->ingredients.getMolecules(), linearGroupsVector, MonomerGroup<typename IngredientsType::molecules_type>((this->ingredients.getMolecules())),belongsToLinearStrand() );
502502

503503
// create the OpenGL window
504504
winOpenGL= new LeMonADEOpenGL<IngredientsType>(ingredients, linearGroupsVector, 400,25,800,800, "LeMonADE-Viewer OpenGL");

0 commit comments

Comments
 (0)