Changeset 135

Timestamp:

02/17/14 12:32:11 (11 years ago)

Author:

sz

Message:

neuron layout algorithm (for schematic drawing), usage example in frams/_demos/neuro_layout_test.cpp

Location:

cpp

Files:

• common/nonstd.h (modified) (3 diffs)
• common/nonstd_math.cpp (modified) (1 diff)
• common/nonstd_math.h (modified) (1 diff)
• frams/Makefile-GDK (modified) (2 diffs)
• frams/Makefile-GDK-files (modified) (2 diffs)
• frams/_demos/neuro_layout_test.cpp (added)
• frams/canvas (added)
• frams/canvas/nn_layout.h (added)
• frams/canvas/nn_layout_model.cpp (added)
• frams/canvas/nn_layout_model.h (added)
• frams/canvas/nn_simple_layout.cpp (added)
• frams/canvas/nn_smart_layout.cpp (added)

cpp/common/nonstd.h

@@ -55 +55 @@
   #define stricmp(a,b) strcasecmp(a,b)
  #endif
-#ifdef INITIAL_DIR_IS_HOME
- #include "cwd.h"
- #define GET_APP_HOME getAppHome()
-#else
- #define GET_APP_HOME "./"
-#endif
-#ifdef INITIAL_DIR_IS_RES
- #include "cwd.h"
- #define GET_APP_RESOURCES getAppResources()
-#else
- #define GET_APP_RESOURCES "./"
-#endif
 #endif
 
@@ -96 +84 @@
 #endif
 
+#ifdef LINUX
+ #define GET_APP_HOME "./"
+ #define GET_APP_RESOURCES "./"
+#endif
+
 #if defined(_WIN32) && !defined(SHP)
     #define GET_APP_HOME ".\\"
@@ -101 +94 @@
 #endif
 
+#ifdef INITIAL_DIR_IS_HOME
+ #include "cwd.h"
+ #ifdef GET_APP_HOME
+  #undef GET_APP_HOME
+ #endif
+ #define GET_APP_HOME getAppHome()
+#endif
 
-
+#ifdef INITIAL_DIR_IS_RES
+ #include "cwd.h"
+ #ifdef GET_APP_RESOURCES
+  #undef GET_APP_RESOURCES
+ #endif
+ #define GET_APP_RESOURCES getAppResources()
+#endif
 
 //typedef unsigned char boolean; //niestety nie mozna uzyc 'bool' bo VC w rpcndr.h wlasnie tak definiuje booleana, jako unsigned char

cpp/common/nonstd_math.cpp

@@ -14 +14 @@
 
 
-#ifdef _WIN32 //http://stackoverflow.com/questions/2170385/c-math-functions
-double round(double val)
+#if defined __BORLANDC__ || (_MSC_VER <= 1700)
+double round(double val) //http://stackoverflow.com/questions/2170385/c-math-functions
 {    
     return floor(val + 0.5);

cpp/common/nonstd_math.h

@@ -17 +17 @@
 #endif
 
-#ifdef _WIN32 //http://stackoverflow.com/questions/2170385/c-math-functions
-double round(double val);
+#if defined __BORLANDC__ || (_MSC_VER <= 1700)
+double round(double val);  //http://stackoverflow.com/questions/2170385/c-math-functions
 #endif
 

cpp/frams/Makefile-GDK

@@ -5 +5 @@
 include frams/Makefile-GDK-files
 
-GDK_TESTS=conv_test gdk_test geno_test neuro_test loader_test serial_test multiline_f0_test f0_variants_test full_props part_shapes
+GDK_TESTS=conv_test gdk_test geno_test neuro_test loader_test serial_test multiline_f0_test f0_variants_test full_props part_shapes neuro_layout_test
 
 gdk_tests: $(GDK_TESTS)
@@ -44 +44 @@
         $(CXX) $(PART_SHAPES_OBJS) -o $@
 
+neuro_layout_test: $(NEURO_LAYOUT_TEST_OBJS)
+        $(CXX) $(NEURO_LAYOUT_TEST_OBJS) -o $@
+
 #############################################
 
-ALL_OBJS=$(GDK_TEST_OBJS) $(CONV_TEST_OBJS) $(GENO_TEST_OBJS) $(NEURO_TEST_OBJS) $(LOADER_TEST_OBJS) $(SERIAL_TEST_OBJS) $(MULTILINE_F0_OBJS) $(F0_VARIANTS_OBJS) $(FULL_PROPS_OBJS) $(PART_SHAPES_OBJS)
+ALL_OBJS=$(GDK_TEST_OBJS) $(CONV_TEST_OBJS) $(GENO_TEST_OBJS) $(NEURO_TEST_OBJS) $(LOADER_TEST_OBJS) $(SERIAL_TEST_OBJS) $(MULTILINE_F0_OBJS) $(F0_VARIANTS_OBJS) $(FULL_PROPS_OBJS) $(PART_SHAPES_OBJS) $(NEURO_LAYOUT_TEST_OBJS)
 
 include frams/Makefile-maintain

cpp/frams/Makefile-GDK-files

@@ -2 +2 @@
 
 # ALL_DIRS is later expanded by the shell, no spaces/newlines allowed, or it breaks
-ALL_DIRS={common,frams,frams/config,frams/errmgr,frams/genetics,frams/genetics/f0,frams/genetics/f1,frams/genetics/f2,frams/genetics/f3,frams/genetics/f4,frams/genetics/f5,frams/genetics/f6,frams/genetics/f7,frams/genetics/f8,frams/genetics/f9,frams/model,frams/neuro,frams/neuro/impl,frams/param,frams/test,frams/util,frams/vm/classes,frams/virtfile,frams/_demos}
+ALL_DIRS={common,frams,frams/canvas,frams/config,frams/errmgr,frams/genetics,frams/genetics/f0,frams/genetics/f1,frams/genetics/f2,frams/genetics/f3,frams/genetics/f4,frams/genetics/f5,frams/genetics/f6,frams/genetics/f7,frams/genetics/f8,frams/genetics/f9,frams/model,frams/neuro,frams/neuro/impl,frams/param,frams/test,frams/util,frams/vm/classes,frams/virtfile,frams/_demos}
 
 GENOCONV_GDK_OBJS=frams/genetics/f1/conv_f1.o frams/genetics/f9/conv_f9.o
@@ -33 +33 @@
 PART_SHAPES_OBJS= frams/_demos/part_shapes.o frams/virtfile/virtfile.o  $(GDK_OBJS) $(GENOCONV_GDK_OBJS)
 
+NEURO_LAYOUT_TEST_OBJS= frams/_demos/neuro_layout_test.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) frams/canvas/nn_layout_model.o frams/canvas/nn_simple_layout.o frams/canvas/nn_smart_layout.o