Commit a6677b57 authored by Julian Stirling's avatar Julian Stirling 🐧
Browse files

Use multiline strings for version

parent a19db3df

openscad/libs/main_body_structure.scad

+10 −5
Original line number Diff line number Diff line 


use <./utilities.scad>

use <./string_utils.scad>

use <./compact_nut_seat.scad>

use <./logo.scad>

use <./z_axis.scad>
@@ -754,14 +755,18 @@ module xy_only_body(params){ 
/*This module creates the main body of the microscope, including the positioning mechanism.



:param params: microscope parameters dictionary

:param version_string: string or list of two strings. 

:param version_string: string of 1 or 2 lines. 

    Placed on the outer wall of the main body, under the open hardware logo

:param hash: string. placed on the inner wall of the main body

*/

module main_body(params, version_string, hash){

    // If version_string is a string, make it into a list, so that version_string_list[0]

    // gives the whole string, not the first letter, and version_string_list[1] is empty

    version_string_list = (is_string(version_string)) ? [version_string] : version_string;

    // Split version_string into a list by line

    version_string_list = split_string_lines(version_string);

    // Check the list isn't linger than 2 lines (will error already if empty)

    assert(len(version_string_list) <= 2, "Can only have 1 or 2 lines in a version string.");

    // Get the lines and used "" as a fallback for line 2 if only 1 lines is provided.

    version_line1 = version_string_list[0];

    version_line2 = len(version_string_list) == 1 ? "" : version_string_list[1];



    difference(){

        xy_positioning_system(params);
@@ -777,6 +782,6 @@ module main_body(params, version_string, hash){ 


    difference(){

        actuator_walls_and_z_casing(params, z_axis=true);

        body_logos(params, version_string_list[0],version_string_list[1]);

        body_logos(params, version_line1, version_line2);

    }

}

openscad/main_body.scad

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ use <./libs/main_body_structure.scad> 


//Note that the main body is complex enough you should run Render not preview

// To use in preview wrap with render(6)

VERSION_STRING = ["Custom",""];

VERSION_STRING = "Custom";

HASH = "#untracked";

main_body_stl(VERSION_STRING, HASH);

openscad/main_body_manual.scad

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ use <./libs/main_body_structure.scad> 


//Note that the main body is complex enough you should run Render not preview

// To use in preview wrap with render(6)

VERSION_STRING = ["Custom",""];

VERSION_STRING = "Custom";

HASH = "#untracked";

main_body_manual_stl(VERSION_STRING, HASH);

openscad/test_pieces/main_body_open_actuators.scad

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ use <../libs/main_body_structure.scad> 


//Note that the main body is complex enough you should run Render not preview

// To use in preview wrap with render(6)

VERSION_STRING = ["Open","Actuator"];

VERSION_STRING = "Open\nActuator";

HASH = "#untracked";

MANUAL = false;

rendering/librender/rendered_main_body.scad

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ use <./render_settings.scad> 
use <./render_utils.scad>

use <../../openscad/libs/main_body_structure.scad>



VERSION_STRING = ["Custom",""];

VERSION_STRING = "Custom";

HASH = "#untracked";



main_body(render_params(), VERSION_STRING, HASH);